diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 2eca76373..cdfedc862 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -3077,3 +3077,5 @@ TRAIN = TRAIN INFERENCE = INFERENCE BENCHMARK = BENCHMARK brain_area = Brain Area + +error.dataset_select = dataset select error:the count exceed the limit or has same name \ No newline at end of file diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 78d80a6bc..de15dd98f 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -3094,3 +3094,4 @@ INFERENCE = 推理任务 BENCHMARK = 评测任务 brain_area = 脑区 +error.dataset_select = 数据集选择错误:数量超过限制或者有同名数据集 \ No newline at end of file diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index a62d25abc..5a3d0a6f8 100755 --- a/routers/repo/cloudbrain.go +++ b/routers/repo/cloudbrain.go @@ -265,7 +265,7 @@ func CloudBrainCreate(ctx *context.Context, form auth.CreateCloudBrainForm) { if err != nil { log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"]) cloudBrainNewDataPrepare(ctx) - ctx.RenderWithErr("GetDatasetInfo failed", tpl, &form) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tpl, &form) return } @@ -2040,7 +2040,7 @@ func BenchMarkAlgorithmCreate(ctx *context.Context, form auth.CreateCloudBrainFo if err != nil { log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"]) cloudBrainNewDataPrepare(ctx) - ctx.RenderWithErr("GetDatasetInfo failed", tplCloudBrainBenchmarkNew, &form) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplCloudBrainBenchmarkNew, &form) return } @@ -2168,7 +2168,7 @@ func ModelBenchmarkCreate(ctx *context.Context, form auth.CreateCloudBrainForm) if err != nil { log.Error("GetDatasetInfo failed: %v", err, ctx.Data["MsgID"]) cloudBrainNewDataPrepare(ctx) - ctx.RenderWithErr("GetDatasetInfo failed", tpl, &form) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tpl, &form) return } diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 8501de3ad..29545fb58 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -1001,7 +1001,7 @@ func TrainJobCreate(ctx *context.Context, form auth.CreateModelArtsTrainJobForm) if err != nil { log.Error("GetDatasetInfo failed:%v", err, ctx.Data["MsgID"]) trainJobErrorNewDataPrepare(ctx, form) - ctx.RenderWithErr("GetDatasetInfo error", tplModelArtsTrainJobNew, &form) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplModelArtsTrainJobNew, &form) return } @@ -1280,7 +1280,7 @@ func TrainJobCreateVersion(ctx *context.Context, form auth.CreateModelArtsTrainJ if err != nil { log.Error("GetDatasetInfo failed:%v", err, ctx.Data["MsgID"]) versionErrorDataPrepare(ctx, form) - ctx.RenderWithErr("GetDatasetInfo error", tplModelArtsTrainJobVersionNew, &form) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplModelArtsTrainJobVersionNew, &form) return } diff --git a/templates/repo/cloudbrain/trainjob/new.tmpl b/templates/repo/cloudbrain/trainjob/new.tmpl index f4ffc17b0..0b7fc8d30 100755 --- a/templates/repo/cloudbrain/trainjob/new.tmpl +++ b/templates/repo/cloudbrain/trainjob/new.tmpl @@ -27,7 +27,8 @@ .width85 { width: 85% !important; - margin-left: 4.5rem !important; + margin-left: 10.5rem !important; + align-items: center; } .width81 { diff --git a/templates/repo/modelarts/notebook/show.tmpl b/templates/repo/modelarts/notebook/show.tmpl index 398ac3c3e..508733e08 100755 --- a/templates/repo/modelarts/notebook/show.tmpl +++ b/templates/repo/modelarts/notebook/show.tmpl @@ -444,9 +444,9 @@ {{range $.datasetDownload}} - {{.DatasetName}} + {{.DatasetName}} {{.DatasetDownloadLink}} - 复制链接 + 复制链接 {{end}} diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl index 5437323e2..1d1583e2d 100755 --- a/templates/repo/modelarts/trainjob/new.tmpl +++ b/templates/repo/modelarts/trainjob/new.tmpl @@ -22,7 +22,8 @@ } .width85{ width: 85% !important; - margin-left: 4.5rem !important; + margin-left: 10.5rem !important; + align-items: center; } .width81{ margin-left: 1.5rem; diff --git a/web_src/js/components/dataset/selectDataset.vue b/web_src/js/components/dataset/selectDataset.vue index 2540e8a31..a03f90775 100755 --- a/web_src/js/components/dataset/selectDataset.vue +++ b/web_src/js/components/dataset/selectDataset.vue @@ -74,7 +74,7 @@ > @@ -618,7 +618,10 @@ export default { methods: { openDataset() { this.dialogVisible = true; - this.confirmFlag = false; + if (!this.confirmDatasetList) { + this.confirmFlag = false; + } + this.getCurrentRepoDataset(); }, handleClick(tab, event) { @@ -651,7 +654,8 @@ export default { console.log("111111111111"); if ( this.selectDatasetArray.some((item) => { - return item.label === data.label; + console.log(item.label.split(".")[0], data.label.split(".")[0]); + return item.label.split(".")[0] === data.label.split(".")[0]; }) ) { this.$refs[data.ref].setChecked(data.id, false, false);