From 437d6dd804e4d3baf14978f2c411f384e856eb36 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 23 Feb 2022 10:14:14 +0800 Subject: [PATCH 1/2] fix issue --- templates/admin/cloudbrain/list.tmpl | 25 +++++++++++++------------ templates/admin/cloudbrain/search.tmpl | 3 ++- web_src/js/features/cloudrbanin.js | 1 - web_src/js/index.js | 14 ++++++++++++-- 4 files changed, 27 insertions(+), 16 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 0a09230eb..1229e0083 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -65,19 +65,19 @@
{{if eq .JobType "DEBUG"}} - + {{.JobName}} {{else if eq .JobType "INFERENCE"}} - + {{.JobName}} {{else if eq .JobType "TRAIN"}} - + {{.JobName}} {{else if eq .JobType "BENCHMARK"}} - + {{.JobName}} {{end}} @@ -88,7 +88,7 @@
- + {{.Status}}
@@ -114,7 +114,7 @@
- {{.Repo.OwnerName}}/{{.Repo.Alias}} + {{.Repo.OwnerName}}/{{.Repo.Name}}
@@ -126,11 +126,11 @@
{{$.CsrfTokenHtml}} {{if eq .Status "RUNNING" "WAITING" "CREATING" "STARTING"}} - + {{$.i18n.Tr "repo.debug"}} {{else}} - + {{$.i18n.Tr "repo.debug_again"}} {{end}} @@ -142,20 +142,20 @@ {{if eq .JobType "DEBUG" "BENCHMARK"}} {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.stop"}}
{{else}} - + {{$.i18n.Tr "repo.stop"}} {{end}}
-
+ {{$.CsrfTokenHtml}} - + {{$.i18n.Tr "repo.delete"}}
@@ -216,4 +216,5 @@ function getParams(){ }) } getParams() +console.log({{.Tasks}}) diff --git a/templates/admin/cloudbrain/search.tmpl b/templates/admin/cloudbrain/search.tmpl index bbd45e550..0414e45c5 100644 --- a/templates/admin/cloudbrain/search.tmpl +++ b/templates/admin/cloudbrain/search.tmpl @@ -15,6 +15,7 @@ DEBUG TRAIN INFERENCE + BENCHMARK
@@ -35,7 +36,7 @@ RESTARTING START_FAILED STOPPING - STOPPED + STOPPED WAITING COMPLETED FAILED diff --git a/web_src/js/features/cloudrbanin.js b/web_src/js/features/cloudrbanin.js index 5fcaf56c8..f54212a0f 100644 --- a/web_src/js/features/cloudrbanin.js +++ b/web_src/js/features/cloudrbanin.js @@ -8,7 +8,6 @@ export default async function initCloudrain() { // const computeResource = job.dataset.resource const versionname = job.dataset.version const status_text = $(`#${jobID}-text`).text() - console.log(versionname) const finalState = ['STOPPED','CREATE_FAILED','UNAVAILABLE','DELETED','RESIZE_FAILED','SUCCEEDED','IMAGE_FAILED','SUBMIT_FAILED','DELETE_FAILED','KILLED','COMPLETED','FAILED','CANCELED','LOST','START_FAILED','SUBMIT_MODEL_FAILED','DEPLOY_SERVICE_FAILED','CHECK_FAILED'] if (finalState.includes(status_text)) { return diff --git a/web_src/js/index.js b/web_src/js/index.js index cec6823a6..1abf3ba38 100755 --- a/web_src/js/index.js +++ b/web_src/js/index.js @@ -3601,17 +3601,27 @@ function initVueApp() { uid: Number( (document.querySelector('meta[name=_context_uid]') || {}).content ), - activityTopAuthors: window.ActivityTopAuthors || [] + activityTopAuthors: window.ActivityTopAuthors || [], + localHref:'' }, components: { ActivityTopAuthors }, mounted(){ this.page = parseInt(new URLSearchParams(window.location.search).get('page')) + this.localHref = location.href + }, methods:{ handleCurrentChange:function (val) { - window.location.href='/admin/cloudbrains?page='+val + const searchParams = new URLSearchParams(window.location.search) + if (!window.location.search) { + window.location.href = this.localHref + '?page='+val + } else if (searchParams.has('page')) { + window.location.href = this.localHref.replace(/page=[0-9]/g,'page='+val) + } else { + window.location.href=location.href+'&page='+val + } this.page = val } } From e9c713f46a74ccc0c4d18572ffbc7a689d878ed6 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Wed, 23 Feb 2022 10:32:18 +0800 Subject: [PATCH 2/2] fix issue --- templates/admin/cloudbrain/list.tmpl | 42 ++++++++++++++++++------------------ web_src/less/openi.less | 5 +++++ 2 files changed, 26 insertions(+), 21 deletions(-) diff --git a/templates/admin/cloudbrain/list.tmpl b/templates/admin/cloudbrain/list.tmpl index 1229e0083..d1fe64f1b 100644 --- a/templates/admin/cloudbrain/list.tmpl +++ b/templates/admin/cloudbrain/list.tmpl @@ -27,34 +27,34 @@
-
+
{{$.i18n.Tr "repo.cloudbrain_task"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_task_type"}}
-
+
{{$.i18n.Tr "repo.modelarts.status"}}
-
+
{{$.i18n.Tr "repo.modelarts.createtime"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_status_runtime"}}
-
+
{{$.i18n.Tr "repo.modelarts.computing_resources"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_creator"}}
-
+
{{$.i18n.Tr "repository"}}
-
+
{{.i18n.Tr "admin.cloudbrain.cloudbrain_name"}}
-
+
{{$.i18n.Tr "repo.cloudbrain_operate"}}
@@ -63,7 +63,7 @@
-
+
{{if eq .JobType "DEBUG"}} {{.JobName}} @@ -83,29 +83,29 @@ {{end}}
-
+
{{.JobType}}
-
+
{{.Status}}
-
+
{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}
-
+
{{if .TrainJobDuration}}{{.TrainJobDuration}}{{else}}--{{end}}
-
+
{{if .ComputeResource}}{{.ComputeResource}}{{else}}--{{end}}
-
+
{{if .User.Name}} {{else}} @@ -113,14 +113,14 @@ {{end}}
-
- {{.Repo.OwnerName}}/{{.Repo.Name}} +
+ {{.Repo.OwnerName}}/{{.Repo.Alias}}
-
+
{{.JobName}}
-
+
{{if eq .JobType "DEBUG"}}
diff --git a/web_src/less/openi.less b/web_src/less/openi.less index c9e6a546f..6598f5f40 100644 --- a/web_src/less/openi.less +++ b/web_src/less/openi.less @@ -1,6 +1,11 @@ a { color: #0366d6; } +.nowrap{ + white-space: nowrap; + overflow: hidden; + text-overflow: ellipsis; +} .ui .text.yellow a { color: #fbbd08!important }