From 11d671669c56f00b0f0e338f540ffb67b3894065 Mon Sep 17 00:00:00 2001 From: zhoupzh Date: Fri, 8 Apr 2022 10:23:14 +0800 Subject: [PATCH] fix issue --- options/locale/locale_en-US.ini | 2 + options/locale/locale_zh-CN.ini | 2 + public/img/jian.svg | 1 + templates/admin/navbar.tmpl | 2 +- templates/repo/cloudbrain/image/edit.tmpl | 6 +- templates/repo/cloudbrain/image/submit.tmpl | 2 +- templates/repo/cloudbrain/new.tmpl | 13 +- templates/repo/debugjob/index.tmpl | 86 +--- web_src/js/components/{ => images}/Images.vue | 93 ++--- .../components/{ => images}/adminImages.vue | 72 ++-- web_src/js/components/images/selectImages.vue | 382 ++++++++++++++++++ web_src/js/features/images.js | 34 +- 12 files changed, 525 insertions(+), 170 deletions(-) create mode 100644 public/img/jian.svg rename web_src/js/components/{ => images}/Images.vue (94%) rename web_src/js/components/{ => images}/adminImages.vue (84%) create mode 100644 web_src/js/components/images/selectImages.vue diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index 513e1d854..9f8133b7b 100755 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -912,6 +912,7 @@ more=More gpu_type_all=All model_download=Model Download submit_image=Submit Image +modify_image=Modify Image image_exist=Image name has been used, please use a new one. image_commit_fail=Failed to submit image, please try again later. image_not_exist=Image does not exits. @@ -924,6 +925,7 @@ images.name = Image Name images.name_placerholder = Please enter the image name image.label_tooltips = Example Python 3.7, Tensorflow 2.0, cuda 10, pytorch 1.6 images.public_tooltips = After the image is set to public, it can be seen by other users. +images.name_rule = Please enter letters, numbers, _ and - up to 64 characters and cannot end with a dash (-). cloudbrain=Cloudbrain cloudbrain.new=New cloudbrain diff --git a/options/locale/locale_zh-CN.ini b/options/locale/locale_zh-CN.ini index 05b9393fa..c2ddac23d 100755 --- a/options/locale/locale_zh-CN.ini +++ b/options/locale/locale_zh-CN.ini @@ -917,6 +917,7 @@ more=更多 gpu_type_all=全部 model_download=结果下载 submit_image=提交镜像 +modify_image=修改镜像 image_exist=镜像名称已被使用，请修改镜像名称。 image_commit_fail=提交镜像失败，请稍后再试。 image_not_exist=镜像不存在。 @@ -930,6 +931,7 @@ images.name = 镜像名称 images.name_placerholder = 请输入镜像名称 image.label_tooltips = 如Python 3.7, Tensorflow 2.0, cuda 10, pytorch 1.6 images.public_tooltips = 镜像设置为公开后，可被其他用户看到。 +images.name_rule = 请输入字母、数字、_和-，最长100个字符，且不能以中划线（-）结尾。 cloudbrain=云脑 cloudbrain.new=新建任务 diff --git a/public/img/jian.svg b/public/img/jian.svg new file mode 100644 index 000000000..0fc47c1b7 --- /dev/null +++ b/public/img/jian.svg @@ -0,0 +1 @@ + \ No newline at end of file diff --git a/templates/admin/navbar.tmpl b/templates/admin/navbar.tmpl index 4875a39ee..a3739d96e 100644 --- a/templates/admin/navbar.tmpl +++ b/templates/admin/navbar.tmpl @@ -17,7 +17,7 @@ 云脑任务 - + 云脑镜像 diff --git a/templates/repo/cloudbrain/image/edit.tmpl b/templates/repo/cloudbrain/image/edit.tmpl index 29ea1bfb8..eee5c87b0 100644 --- a/templates/repo/cloudbrain/image/edit.tmpl +++ b/templates/repo/cloudbrain/image/edit.tmpl @@ -21,7 +21,7 @@

- {{.i18n.Tr "repo.submit_image"}} + {{.i18n.Tr "repo.modify_image"}}

@@ -40,7 +40,7 @@ - {{.i18n.Tr "cloudbrain.job_name_rule"}} + {{.i18n.Tr "repo.images.name_rule"}}
@@ -81,7 +81,7 @@
{{.i18n.Tr "repo.cloudbrain.cancel"}}
diff --git a/templates/repo/cloudbrain/image/submit.tmpl b/templates/repo/cloudbrain/image/submit.tmpl index 8ae357c7b..86f269f04 100644 --- a/templates/repo/cloudbrain/image/submit.tmpl +++ b/templates/repo/cloudbrain/image/submit.tmpl @@ -38,7 +38,7 @@
- {{.i18n.Tr "cloudbrain.job_name_rule"}} + {{.i18n.Tr "repo.images.name_rule"}}
diff --git a/templates/repo/cloudbrain/new.tmpl b/templates/repo/cloudbrain/new.tmpl index 5e84857bd..c596d06bc 100755 --- a/templates/repo/cloudbrain/new.tmpl +++ b/templates/repo/cloudbrain/new.tmpl @@ -189,7 +189,7 @@
-
+ +
+
{{template "custom/select_dataset" .}} @@ -260,10 +263,10 @@ diff --git a/web_src/js/components/Images.vue b/web_src/js/components/images/Images.vue similarity index 94% rename from web_src/js/components/Images.vue rename to web_src/js/components/images/Images.vue index e814624cd..3842a58b7 100644 --- a/web_src/js/components/Images.vue +++ b/web_src/js/components/images/Images.vue @@ -11,17 +11,6 @@