From 29a4d873192113c88654c333f1a05da717e2fc85 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 9 Aug 2022 10:35:55 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=EF=BC=8C=E5=9C=A8=E6=96=B0=E5=BC=80=E9=A1=B5=E9=9D=A2=E4=B8=AD?= =?UTF-8?q?=E6=89=93=E5=BC=80=E9=93=BE=E6=8E=A5=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/show.tmpl | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/repo/cloudbrain/show.tmpl b/templates/repo/cloudbrain/show.tmpl index d111fe123..04a582fb9 100755 --- a/templates/repo/cloudbrain/show.tmpl +++ b/templates/repo/cloudbrain/show.tmpl @@ -413,7 +413,7 @@
{{range $m ,$n := $.datasetDownload}} - {{.DatasetName}} + {{.DatasetName}} {{end}}
From 67bdf55012e678d5b384018d0fe3514bd6e30276 Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 9 Aug 2022 16:37:25 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=AF=BC=E5=85=A5=E6=A8=A1=E5=9E=8B?= =?UTF-8?q?=E7=9A=84=E6=97=B6=E5=80=99=EF=BC=8C=E7=A9=BA=E7=9B=AE=E5=BD=95?= =?UTF-8?q?=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- templates/repo/cloudbrain/trainjob/show.tmpl | 36 +++++++++++++++++++++------- templates/repo/grampus/trainjob/show.tmpl | 36 +++++++++++++++++++++------- templates/repo/modelarts/trainjob/show.tmpl | 36 +++++++++++++++++++++------- 3 files changed, 84 insertions(+), 24 deletions(-) diff --git a/templates/repo/cloudbrain/trainjob/show.tmpl b/templates/repo/cloudbrain/trainjob/show.tmpl index 72cbaee02..435d17c29 100644 --- a/templates/repo/cloudbrain/trainjob/show.tmpl +++ b/templates/repo/cloudbrain/trainjob/show.tmpl @@ -702,7 +702,7 @@ hideMenu(); } } - + let dirKey="isOnlyDir--:&"; function loadSelectedModelFile(trainJob){ console.log("trainJob=" + trainJob); $('#choice_file').dropdown('clear') @@ -717,7 +717,7 @@ var zNodes=[]; var nodesMap={}; for (let i=0;i0){ - node["children"]=[]; - if(isFirst){ - node["open"] = true; - isFirst= false; + if(nodesMap[keyList[i]][dirKey] != null){ + node["open"] = false; + node["isParent"] = true; + }else{ + node["children"]=[]; + if(isFirst){ + node["open"] = true; + isFirst= false; + } + convertToNode(node["children"],nodesMap[keyList[i]]); } - convertToNode(node["children"],nodesMap[keyList[i]]); } } } diff --git a/templates/repo/grampus/trainjob/show.tmpl b/templates/repo/grampus/trainjob/show.tmpl index 25f1af82b..7edc43a60 100755 --- a/templates/repo/grampus/trainjob/show.tmpl +++ b/templates/repo/grampus/trainjob/show.tmpl @@ -691,7 +691,7 @@ hideMenu(); } } - + let dirKey="isOnlyDir--:&"; function loadSelectedModelFile(trainJob){ console.log("trainJob=" + trainJob); $('#choice_file').dropdown('clear') @@ -714,7 +714,7 @@ var zNodes=[]; var nodesMap={}; for (let i=0;i0){ - node["children"]=[]; - if(isFirst){ - node["open"] = true; - isFirst= false; + if(nodesMap[keyList[i]][dirKey] != null){ + node["open"] = false; + node["isParent"] = true; + }else{ + node["children"]=[]; + if(isFirst){ + node["open"] = true; + isFirst= false; + } + convertToNode(node["children"],nodesMap[keyList[i]]); } - convertToNode(node["children"],nodesMap[keyList[i]]); } } } diff --git a/templates/repo/modelarts/trainjob/show.tmpl b/templates/repo/modelarts/trainjob/show.tmpl index 7ae5d5c6b..a84071154 100755 --- a/templates/repo/modelarts/trainjob/show.tmpl +++ b/templates/repo/modelarts/trainjob/show.tmpl @@ -729,7 +729,7 @@ hideMenu(); } } - + let dirKey="isOnlyDir--:&"; function loadSelectedModelFile(trainJob){ console.log("trainJob=" + trainJob); $('#choice_file').dropdown('clear') @@ -744,7 +744,7 @@ var zNodes=[]; var nodesMap={}; for (let i=0;i0){ - node["children"]=[]; - if(isFirst){ - node["open"] = true; - isFirst= false; + if(nodesMap[keyList[i]][dirKey] != null){ + node["open"] = false; + node["isParent"] = true; + }else{ + node["children"]=[]; + if(isFirst){ + node["open"] = true; + isFirst= false; + } + convertToNode(node["children"],nodesMap[keyList[i]]); } - convertToNode(node["children"],nodesMap[keyList[i]]); } } } From 402194e455b2049363e369a502fbc26ce47ad94e Mon Sep 17 00:00:00 2001 From: zouap Date: Tue, 9 Aug 2022 17:10:53 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/search.go | 33 ++++++++++++++++---------------- templates/repo/modelmanage/showinfo.tmpl | 2 +- 2 files changed, 17 insertions(+), 18 deletions(-) diff --git a/routers/search.go b/routers/search.go index 72bf97bf4..8453d5c18 100644 --- a/routers/search.go +++ b/routers/search.go @@ -349,25 +349,24 @@ func searchRepo(ctx *context.Context, TableName string, Key string, Page int, Pa func setForkRepoOrder(esresult *SearchRes, SortBy string) { if SortBy == "default" || SortBy == "" { - return - } - forkidMap := make(map[string]int, 0) - for index, re := range esresult.Result { - if re["fork_id"] != nil { - fork_id := re["fork_id"].(string) - if _, ok := forkidMap[fork_id]; !ok { - forkidMap[fork_id] = index + forkidMap := make(map[string]int, 0) + for index, re := range esresult.Result { + if re["fork_id"] != nil { + fork_id := re["fork_id"].(string) + if _, ok := forkidMap[fork_id]; !ok { + forkidMap[fork_id] = index + } } } - } - for key, value := range forkidMap { - for index, re := range esresult.Result { - if re["id"].(string) == key { - if value < index { //swap - tmp := esresult.Result[index] - esresult.Result[index] = esresult.Result[value] - esresult.Result[value] = tmp - break + for key, value := range forkidMap { + for index, re := range esresult.Result { + if re["id"].(string) == key { + if value < index { //swap + tmp := esresult.Result[index] + esresult.Result[index] = esresult.Result[value] + esresult.Result[value] = tmp + break + } } } } diff --git a/templates/repo/modelmanage/showinfo.tmpl b/templates/repo/modelmanage/showinfo.tmpl index 4b4434908..f2ccb69b6 100644 --- a/templates/repo/modelmanage/showinfo.tmpl +++ b/templates/repo/modelmanage/showinfo.tmpl @@ -127,7 +127,7 @@ 训练任务 - + From 6549f6d08c88c5024bbe38ac74416305fd8d4247 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Tue, 9 Aug 2022 18:19:35 +0800 Subject: [PATCH 4/4] fix issue --- web_src/js/components/MinioUploader.vue | 2 +- web_src/js/features/cloudbrainShow.js | 17 ++++++++++++++++- web_src/js/features/cloudrbanin.js | 18 ------------------ 3 files changed, 17 insertions(+), 20 deletions(-) diff --git a/web_src/js/components/MinioUploader.vue b/web_src/js/components/MinioUploader.vue index 3b9b9a8e1..cb1e6a8f9 100755 --- a/web_src/js/components/MinioUploader.vue +++ b/web_src/js/components/MinioUploader.vue @@ -720,7 +720,7 @@ export default { } .datast-upload-progress .dataset-name { text-align: right; - width: 120px; + width: 200px; margin-right: 1rem; } .datast-upload-progress .dataset-progress { diff --git a/web_src/js/features/cloudbrainShow.js b/web_src/js/features/cloudbrainShow.js index b4b56bd8f..381aead3f 100644 --- a/web_src/js/features/cloudbrainShow.js +++ b/web_src/js/features/cloudbrainShow.js @@ -197,7 +197,22 @@ export default async function initCloudrainSow() { $(".log-info .log_bottom").trigger("click"); e.stopPropagation(); }); - + $(".stop-show-version").click(function (e) { + const ID = this.dataset.jobid; + const repoPath = this.dataset.repopath; + const version_name = this.dataset.version; + const url = `/api/v1/repos/${repoPath}/${ID}/stop_version`; + $.post(url, { version_name: version_name }, (data) => { + if (data.StatusOK === 0) { + $(`#${version_name}-stop`).removeClass("blue"); + $(`#${version_name}-stop`).addClass("disabled"); + refreshStatusShow(version_name, ID, repoPath); + } + }).fail(function (err) { + console.log(err); + }); + e.stopPropagation(); + }); function refreshStatusShow(version_name, ID, repoPath) { $.get( `/api/v1/repos/${repoPath}/${ID}?version_name=${version_name}`, diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 892d2ab41..a2275f7ad 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -329,24 +329,6 @@ export default async function initCloudrain() { console.log(err); }); } - - $(".stop-show-version").click(function (e) { - const ID = this.dataset.jobid; - const repoPath = this.dataset.repopath; - const version_name = this.dataset.version; - const url = `/api/v1/repos/${repoPath}/${ID}/stop_version`; - $.post(url, { version_name: version_name }, (data) => { - if (data.StatusOK === 0) { - $(`#${version_name}-stop`).removeClass("blue"); - $(`#${version_name}-stop`).addClass("disabled"); - refreshStatusShow(version_name, ID, repoPath); - } - }).fail(function (err) { - console.log(err); - }); - e.stopPropagation(); - }); - function refreshStatus(version_name, ID, repoPath) { const url = `/api/v1/repos/${repoPath}/${ID}/?version_name${version_name}`; $.get(url, (data) => {