fix issue

templates/repo/cloudbrain/inference/new.tmpl

@@ -114,13 +114,8 @@
                     <div class="required eight wide field">
                         <label style="font-weight: normal;white-space: nowrap;width: 210px;text-align: right;">{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}</label>
                         <div class="ui fluid search selection dropdown  loading " id="select_model">
-                            {{if $.ckpt_name}}
-                            <input type="hidden" name="model_name" value="{{$.model_name}}" required>
-                            <div class="text">{{$.model_name}}</div>
-                            {{else}}
                             <input type="hidden" name="model_name" required>
                             <div class="text"></div>
-                            {{end}}
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model_name">
                             </div>
@@ -128,13 +123,8 @@
                       </div>
                       <div class="three wide field">
                         <div class="ui fluid search selection dropdown" id="select_model_version">
-                            {{if $.ckpt_name}}
-                            <input type="hidden" name="train_url" value="{{$.train_url}}" required>
-                            <div class="text">{{$.model_version}}</div>
-                            {{else}}
                             <input type="hidden" name="train_url" required>
                             <div class="text"></div>
-                            {{end}}
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model_name_version">
                             </div>
@@ -143,13 +133,8 @@
                       </div>
                       <div class="five wide field">
                         <div class="ui fluid search selection dropdown" id="select_model_checkpoint">
-                            {{if $.ckpt_name}}
-                            <input type="hidden" name="ckpt_name" value="{{$.ckpt_name}}" required>
-                            <div class="text">{{$.ckpt_name}}</div>
-                            {{else}}
                             <input type="hidden" name="ckpt_name" required>
                             <div class="text"></div>
-                            {{end}}
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model_checkpoint">
                             </div>
@@ -297,7 +282,6 @@
 <script>
     const RepoLink = {{.RepoLink}}
     let nameMap,nameList
-    let faildModelName = $('#failed_model_name').val()
     // 获取模型列表和模型名称对应的模型版本
     $(document).ready(function(){
         modelVersion()
@@ -305,23 +289,21 @@
         $.get(`${RepoLink}/modelmanage/query_model_for_predict?type=0`, (data) => {
             nameMap = data.nameMap
             nameList = data.nameList
+            let faildModelName = document.getElementById('failed_model_name').value
             let html = ''
             nameList.forEach(element => {
                 html += `<div class="item" data-value=${element}>${element}</div>`
             });
             if(nameList.length!==0){
-                const initModelVersion = nameMap[nameList[0]][0]
-                const initTrainTaskInfo = JSON.parse(initModelVersion.TrainTaskInfo)
                 $('#model_name').append(html)
                 if(faildModelName){
                     $("#select_model").dropdown('set text',faildModelName)
-                    $("#select_model").dropdown('set value',faildModelName,faildModelName)
+                    $("#select_model").dropdown('set value',faildModelName)
                 }else{
                     $("#select_model").dropdown('set text',nameList[0])
                     $("#select_model").dropdown('set value',nameList[0],nameList[0])
                 }
             }
-
             $('#select_model').removeClass("loading")
         })
     })
@@ -332,9 +314,6 @@
         let faildTrainUrl = $('#failed_train_url').val()
         $('#select_model').dropdown({
             onChange: function(value, text, $selectedItem) {
-                faildModelVersion = ''
-                faildTrainUrl=''
-                console.log("-----------------")
                 $("#select_model_version").addClass("loading")
                 $('#model_name_version').empty()
                 let html = ''
@@ -349,14 +328,12 @@
                 const initVersionValue = $('#model_name_version div.item:first-child').data('value')
                 
                 if(faildModelVersion&&faildTrainUrl){
-                    console.log("-0-0-0-0-0-")
                     $("#select_model_version").dropdown('set text',faildModelVersion)
                     $("#select_model_version").dropdown('set value',faildTrainUrl,faildModelVersion,$('#model_name_version div.item:first-child'))
                 }else{
                     $("#select_model_version").dropdown('set text',initVersionText)
                     $("#select_model_version").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child'))
                 }
-                
             }
         })
     }
@@ -365,8 +342,6 @@
         let faildCkptName = $('#failed_ckpt_name').val()
         $('#select_model_version').dropdown({
             onChange: function(value, text, $selectedItem) {
-                faildCkptName=''
-                console.log("===========----------")
                 const dataID = $selectedItem[0].getAttribute("data-id")
                 const label = $selectedItem[0].getAttribute("data-label")
                 $("#select_model_checkpoint").addClass("loading")
@@ -379,13 +354,11 @@
                         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")
                     const initVersionText = $('#model_checkpoint div.item:first-child').text()
                     const initVersionValue = $('#model_checkpoint div.item:first-child').data('value')
-                    
                     if(faildCkptName){
                         $("#select_model_checkpoint").dropdown('set text',faildCkptName)
                         $("#select_model_checkpoint").dropdown('set value',faildCkptName,faildCkptName,$('#model_name_version div.item:first-child'))
@@ -394,8 +367,6 @@
                         $("#select_model_checkpoint").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child'))
                     }
                 })
-
-
                 $("input#ai_model_version").val(text)
                 $("input#ai_model_label").val(label)
             }

templates/repo/modelarts/inferencejob/new.tmpl

@@ -113,13 +113,8 @@
                     <div class="required eight wide field">
                         <label style="font-weight: normal;white-space: nowrap;width: 210px;text-align: right;">{{.i18n.Tr "repo.modelarts.infer_job.select_model"}}</label>
                         <div class="ui fluid search selection dropdown  loading " id="select_model">
-                            {{if $.ckpt_name}}
-                            <input type="hidden" name="model_name" value="{{$.model_name}}" required>
-                            <div class="text">{{$.model_name}}</div>
-                            {{else}}
                             <input type="hidden" name="model_name" required>
                             <div class="text"></div>
-                            {{end}}
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model_name">
                             </div>
@@ -127,13 +122,8 @@
                       </div>
                       <div class="three wide field">
                         <div class="ui fluid search selection dropdown" id="select_model_version">
-                            {{if $.ckpt_name}}
-                            <input type="hidden" name="train_url" value="{{$.train_url}}" required>
-                            <div class="text">{{$.model_version}}</div>
-                            {{else}}
                             <input type="hidden" name="train_url" required>
                             <div class="text"></div>
-                            {{end}}
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model_name_version">
                             </div>
@@ -142,13 +132,8 @@
                       </div>
                       <div class="five wide field">
                         <div class="ui fluid search selection dropdown" id="select_model_checkpoint">
-                            {{if $.ckpt_name}}
-                            <input type="hidden" name="ckpt_name" value="{{$.ckpt_name}}" required>
-                            <div class="text">{{$.ckpt_name}}</div>
-                            {{else}}
                             <input type="hidden" name="ckpt_name" required>
                             <div class="text"></div>
-                            {{end}}
                             <i class="dropdown icon"></i>
                             <div class="menu" id="model_checkpoint">
                             </div>
@@ -313,32 +298,30 @@
     const RepoLink = {{.RepoLink}}
     const url_href = window.location.pathname.split('create')[0]
     let nameMap,nameList
-    let faildModelName = $('#failed_model_name').val()
     $(".ui.button").attr('href',url_href)
     // 获取模型列表和模型名称对应的模型版本
+    
     $(document).ready(function(){
         modelVersion()
         modelCkpt()
         $.get(`${RepoLink}/modelmanage/query_model_for_predict?type=1`, (data) => {
             nameMap = data.nameMap
             nameList = data.nameList
+            let faildModelName = document.getElementById('failed_model_name').value
             let html = ''
             nameList.forEach(element => {
                 html += `<div class="item" data-value=${element}>${element}</div>`
             });
             if(nameList.length!==0){
-                const initModelVersion = nameMap[nameList[0]][0]
-                const initTrainTaskInfo = JSON.parse(initModelVersion.TrainTaskInfo)
                 $('#model_name').append(html)
                 if(faildModelName){
                     $("#select_model").dropdown('set text',faildModelName)
-                    $("#select_model").dropdown('set value',faildModelName,faildModelName)
+                    $("#select_model").dropdown('set value',faildModelName)
                 }else{
                     $("#select_model").dropdown('set text',nameList[0])
                     $("#select_model").dropdown('set value',nameList[0],nameList[0])
                 }
             }
-
             $('#select_model').removeClass("loading")
         })
     })
@@ -349,9 +332,6 @@
         let faildTrainUrl = $('#failed_train_url').val()
         $('#select_model').dropdown({
             onChange: function(value, text, $selectedItem) {
-                faildModelVersion = ''
-                faildTrainUrl=''
-                console.log("-----------------")
                 $("#select_model_version").addClass("loading")
                 $('#model_name_version').empty()
                 let html = ''
@@ -366,14 +346,12 @@
                 const initVersionValue = $('#model_name_version div.item:first-child').data('value')
                 
                 if(faildModelVersion&&faildTrainUrl){
-                    console.log("-0-0-0-0-0-")
                     $("#select_model_version").dropdown('set text',faildModelVersion)
                     $("#select_model_version").dropdown('set value',faildTrainUrl,faildModelVersion,$('#model_name_version div.item:first-child'))
                 }else{
                     $("#select_model_version").dropdown('set text',initVersionText)
                     $("#select_model_version").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child'))
                 }
-                
             }
         })
     }
@@ -382,8 +360,6 @@
         let faildCkptName = $('#failed_ckpt_name').val()
         $('#select_model_version').dropdown({
             onChange: function(value, text, $selectedItem) {
-                faildCkptName=''
-                console.log("===========----------")
                 const dataID = $selectedItem[0].getAttribute("data-id")
                 const label = $selectedItem[0].getAttribute("data-label")
                 $("#select_model_checkpoint").addClass("loading")
@@ -396,13 +372,11 @@
                         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")
                     const initVersionText = $('#model_checkpoint div.item:first-child').text()
                     const initVersionValue = $('#model_checkpoint div.item:first-child').data('value')
-                    
                     if(faildCkptName){
                         $("#select_model_checkpoint").dropdown('set text',faildCkptName)
                         $("#select_model_checkpoint").dropdown('set value',faildCkptName,faildCkptName,$('#model_name_version div.item:first-child'))
@@ -411,8 +385,6 @@
                         $("#select_model_checkpoint").dropdown('set value',initVersionValue,initVersionText,$('#model_name_version div.item:first-child'))
                     }
                 })
-
-
                 $("input#ai_model_version").val(text)
                 $("input#ai_model_label").val(label)
             }