Merge pull request 'fix-issue' (#2938) from pretrainmodel into V20220926

Reviewed-on: https://git.openi.org.cn/OpenI/aiforge/pulls/2938
Reviewed-by: chenshihai <chenshh@pcl.ac.cn>

templates/repo/modelarts/trainjob/show.tmpl

@@ -256,7 +256,7 @@
 
                                     {{if .CanModify}}
                                     <a class="ti-action-menu-item"
-                                        href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}">{{$.i18n.Tr "repo.modelarts.modify"}}</a>
+                                        href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}&path=show">{{$.i18n.Tr "repo.modelarts.modify"}}</a>
                                     {{else}}
                                     <a class="ti-action-menu-item disabled"
                                         href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}">{{$.i18n.Tr "repo.modelarts.modify"}}</a>

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -261,7 +261,7 @@
                     <button class="ui create_train_job green button">
                     {{.i18n.Tr "repo.cloudbrain.new"}}
                     </button>
-                    <a class="ui button" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
+                    <a class="ui button cancel" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>
                 </div>
 
                 <!-- 模态框 -->
@@ -274,7 +274,11 @@
 <script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script src="{{StaticUrlPrefix}}/js/cloudbrainNew.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 <script>
-    let version_name = location.search.split('?version_name=')[1]
+    const params = new URLSearchParams(location.search)
+    let version_name = params.get('create_version')
+    if(params.get('path')){
+        $('.ui.cancel.button').attr('href',location.pathname.split('/create_version')[0])
+    }
     $("#parents_version").val(version_name)
     $("input[name=version_name]").attr('value',version_name)
     ;(function() {

web_src/js/features/cloudbrainShow.js

@@ -469,20 +469,24 @@ export default async function initCloudrainSow() {
           }
           let faildModelName = $('input[name="model_name"]').val();
           let faildModelVersion = $('input[name="model_version"]').val();
-          let faildTrainUrl = $('input[name="pre_train_model_url"]').val();
-          let faildCkptName = $('input[name="ckpt_name"]').val();
+          let dataID;
+
           // 新建错误的表单返回初始化
           if (faildModelName && nameList.includes(faildModelName)) {
             $("#select_model").dropdown("set text", faildModelName);
             $("#select_model").dropdown("set value", faildModelName);
-            $("#select_model_version").dropdown("set text", faildModelVersion);
-            $("#select_model_version").dropdown("set value", faildTrainUrl);
-            $("#select_model_checkpoint").dropdown("set text", faildCkptName);
-            $("#select_model_checkpoint").dropdown("set value", faildCkptName);
+            nameMap[faildModelName].forEach((element) => {
+              if (element.Version === faildModelVersion) {
+                dataID = element.ID;
+              }
+            });
+            initModelVerison(faildModelName, nameMap, faildModelVersion);
+            initModelckpt(dataID);
           }
         }
       );
     }
+
     $("#select_model").dropdown({
       onChange: function (value, text, $selectedItem) {
         $("#model_name_version").empty();
@@ -523,7 +527,9 @@ export default async function initCloudrainSow() {
         const dataID =
           $selectedItem && $selectedItem[0].getAttribute("data-id");
         $("input#ai_model_version").val(text);
+        $("#select_model_checkpoint").dropdown("set text", "");
         $("#select_model_checkpoint").addClass("loading");
+
         $("#model_checkpoint").empty();
         let html = "";
         loadCheckpointList(dataID).then((res) => {
@@ -572,7 +578,55 @@ export default async function initCloudrainSow() {
       },
     });
   });
-
+  function initModelVerison(value, nameMap, faildModelVersion) {
+    let faildTrainUrl = $('input[name="pre_train_model_url"]').val();
+    let html = "";
+    nameMap[value].forEach((element) => {
+      let { TrainTaskInfo } = element;
+      TrainTaskInfo = JSON.parse(TrainTaskInfo);
+      html += `<div class="item" data-label="${element.Label}" data-id="${element.ID}" data-value="${element.Path}">${element.Version}</div>`;
+    });
+    $("#model_name_version").append(html);
+    $("#select_model_version").dropdown("set text", faildModelVersion);
+    $("#select_model_version").dropdown("set value", faildTrainUrl);
+  }
+  function initModelckpt(dataID) {
+    let faildCkptName = $('input[name="ckpt_name"]').val();
+    $("#select_model_checkpoint").addClass("loading");
+    $("#model_checkpoint").empty();
+    let html = "";
+    loadCheckpointList(dataID).then((res) => {
+      res.forEach((element) => {
+        const ckptSuffix = element.FileName.split(".");
+        const loadCheckpointFile = [
+          "ckpt",
+          "pb",
+          "h5",
+          "json",
+          "pkl",
+          "pth",
+          "t7",
+          "pdparams",
+          "onnx",
+          "pbtxt",
+          "keras",
+          "mlmodel",
+          "cfg",
+          "pt",
+        ];
+        if (
+          !element.IsDir &&
+          loadCheckpointFile.includes(ckptSuffix[ckptSuffix.length - 1])
+        ) {
+          html += `<div class="item" data-value=${element.FileName}>${element.FileName}</div>`;
+        }
+      });
+      $("#model_checkpoint").append(html);
+      $("#select_model_checkpoint").removeClass("loading");
+      $("#select_model_checkpoint").dropdown("set text", faildCkptName);
+      $("#select_model_checkpoint").dropdown("set value", faildCkptName);
+    });
+  }
   function loadCheckpointList(value) {
     return new Promise((resolve, reject) => {
       $.get(