diff --git a/templates/custom/select_dataset.tmpl b/templates/custom/select_dataset.tmpl index befd186c5..d545f487e 100644 --- a/templates/custom/select_dataset.tmpl +++ b/templates/custom/select_dataset.tmpl @@ -1,138 +1,171 @@ - - +
{{if eq .cloudbraintype 0}} - + {{else}} {{end}} - {{.i18n.Tr "dataset.select_dataset"}} - -
- - -
- - - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
-
- - - - ${dataset.Description} -
-
-
- - - - 解压中 - - - - 解压失败 - -
+ + {{.i18n.Tr "dataset.select_dataset"}} + +
+
+ +
- - - - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
-
- - - - ${dataset.Description} + + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
+
+ + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
-
-
- - - - 解压中 - - - - 解压失败 - -
-
- - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
-
- - - - ${dataset.Description} + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
-
-
- - - - 解压中 - - - - 解压失败 - -
-
- - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
-
- - - - ${dataset.Description} + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
-
-
- - - - 解压中 - - - - 解压失败 - -
-
- - -
- - -
+ + +
+ + +
+
-
+
\ No newline at end of file diff --git a/templates/custom/select_dataset_train.tmpl b/templates/custom/select_dataset_train.tmpl index 28fce2490..f1d2abaf3 100644 --- a/templates/custom/select_dataset_train.tmpl +++ b/templates/custom/select_dataset_train.tmpl @@ -1,142 +1,179 @@ - - +
{{if or (.benchmarkMode) (.newInference)}} -       {{else}}{{.i18n.Tr "dataset.dataset"}}    {{end}} +       {{else}}{{.i18n.Tr "dataset.dataset"}}    {{end}} {{else}}     {{end}} - {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}} + + {{if .benchmarkMode}}{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}{{else}}{{.i18n.Tr "dataset.select_dataset"}}{{end}} + {{if .benchmarkMode}} 说明：先使用数据集功能上传模型，然后从数据集列表选模型。 {{end}} - -
- - -
- - - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias} ${dataset.Name}
-
- - - - ${dataset.Description} -
-
-
- - - - 解压中 - - - - 解压失败 - -
+ +
+
+ +
- - {{if not .benchmarkMode}} - - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
-
- - - - ${dataset.Description} + + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias} + ${dataset.Name} +
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
-
-
- - - - 解压中 - - - - 解压失败 - -
-
- - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
-
- - - - ${dataset.Description} + {{if not .benchmarkMode}} + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
-
-
- - - - 解压中 - - - - 解压失败 - -
-
- - -
-
-
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
-
- - - - ${dataset.Description} + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
+
+ + + +
+
+
${dataset.Repo.OwnerName}/${dataset.Repo.Alias}${dataset.Name}
+
+ + + + ${dataset.Description} +
+
+
+ + + + 解压中 + + + + 解压失败 + +
-
-
- - - - 解压中 - - - - 解压失败 - -
-
- - {{end}} - -
- - -
+ + {{end}} + +
+ + +
+
-
+
\ No newline at end of file diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 6639c0dbb..107415e04 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -127,6 +127,7 @@
{{.CsrfTokenHtml}} +

{{.i18n.Tr "repo.cloudbrain.new"}}

@@ -185,7 +186,8 @@
- {{if .branch_name}} {{range $k, $v :=.Branches}} @@ -213,19 +215,6 @@
-
@@ -298,10 +287,6 @@ \ No newline at end of file diff --git a/web_src/js/index.js b/web_src/js/index.js index ed8fb3473..6e10f2f75 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3867,7 +3867,7 @@ function initVueDataset() { cloudbrainType: 0, dataset_uuid: '', dataset_name: '', - loadingDataIndex: true, + loadingDataIndex: false, timer: null, ruleForm: { title: '', @@ -4338,6 +4338,7 @@ function initVueDataset() { } }, getCurrentRepoDataset(repoLink, type) { + clearInterval(this.timer) this.loadingDataIndex = true let url = repoLink + '/datasets/current_repo' @@ -4348,12 +4349,17 @@ function initVueDataset() { q: this.searchDataItem } }).then((res) => { - this.currentRepoDataset = JSON.parse(res.data.data) - const checkStatuDataset = this.currentRepoDataset.filter(item => item.DecompressState === 2) - if (checkStatuDataset.length > 0) { - this.polling(checkStatuDataset, repoLink) + if (res.result_code == '0') { + this.currentRepoDataset = JSON.parse(res.data.data) + const checkStatuDataset = this.currentRepoDataset.filter(item => item.DecompressState === 2) + if (checkStatuDataset.length > 0) { + this.polling(checkStatuDataset, repoLink) + } + this.totalnums = parseInt(res.data.count) + } else { + this.totalnums = 0 } - this.totalnums = parseInt(res.data.count) + this.loadingDataIndex = false }) },