From 10a0b0c3bd61c8c64fc2c9a52fb57f1849e738b2 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 30 Jun 2022 17:21:38 +0800 Subject: [PATCH 1/4] mod error info --- options/locale/locale_en-US.ini | 2 ++ options/locale/locale_zh-CN.ini | 1 + routers/repo/cloudbrain.go | 2 +- 3 files changed, 4 insertions(+), 1 deletion(-) 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..7a67d898c 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("repo.cloudbrain.error.dataset_select"), tpl, &form) return } From b291877a5b5d3c3b0007baa50c8bb358198b37d8 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 30 Jun 2022 17:23:10 +0800 Subject: [PATCH 2/4] mod error info --- routers/repo/modelarts.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/routers/repo/modelarts.go b/routers/repo/modelarts.go index 6a2974294..719569502 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -987,7 +987,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("repo.cloudbrain.error.dataset_select"), tplModelArtsTrainJobNew, &form) return } From f72af0ec35194a13fcaebdf24fe59319768bed45 Mon Sep 17 00:00:00 2001 From: lewis <747342561@qq.com> Date: Thu, 30 Jun 2022 17:36:21 +0800 Subject: [PATCH 3/4] mod error info --- routers/repo/cloudbrain.go | 6 +++--- routers/repo/modelarts.go | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/routers/repo/cloudbrain.go b/routers/repo/cloudbrain.go index 7a67d898c..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(ctx.Tr("repo.cloudbrain.error.dataset_select"), 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 719569502..ddb2d8589 100755 --- a/routers/repo/modelarts.go +++ b/routers/repo/modelarts.go @@ -987,7 +987,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(ctx.Tr("repo.cloudbrain.error.dataset_select"), tplModelArtsTrainJobNew, &form) + ctx.RenderWithErr(ctx.Tr("cloudbrain.error.dataset_select"), tplModelArtsTrainJobNew, &form) return } @@ -1266,7 +1266,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 } From d92552779f8a871e0d1d3938a16781a2212b8336 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Thu, 30 Jun 2022 17:51:37 +0800 Subject: [PATCH 4/4] fix issue --- templates/repo/cloudbrain/trainjob/new.tmpl | 3 ++- templates/repo/modelarts/notebook/show.tmpl | 4 ++-- templates/repo/modelarts/trainjob/new.tmpl | 3 ++- web_src/js/components/dataset/selectDataset.vue | 10 +++++++--- 4 files changed, 13 insertions(+), 7 deletions(-) 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);