Merge pull request 'fix-1139 fix-1124 dix-1121 fix-1095 fix-875' (#1168) from fix-1095 into V20211228

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

templates/repo/cloudbrain/new.tmpl

@@ -93,6 +93,14 @@
         display: none;
     }
 
+    .icons{
+        /* position: absolute !important;
+        right: 150px;
+        top: 14px;
+        z-index: 2; */
+    }
+
+
 </style>
 
 <div id="mask">
@@ -182,9 +190,10 @@
                         </select>
                     </div>
 
-                    <div class="inline required field">
+                    <div class="inline required field" style="position: relative;">
                         <label>镜像</label>
                         <input type="text" list="cloudbrain_image" placeholder="选择镜像" name="image" required autofocus maxlength="254">
+                        <i class="times circle outline icon icons" style="visibility: hidden;" onclick="clearValue()"></i>
                         <datalist class="ui search" id="cloudbrain_image" style='width:385px;' name="image">
                             {{range .images}}
                                 <option name="image" value="{{.Place}}">{{.PlaceView}}</option>
@@ -261,9 +270,17 @@
 <script>
     let form = document.getElementById('form_id');
 
-    
-    $('#messageInfo').css('display','none')
+    let inputs = document.querySelectorAll('input[list]');
+    inputs[0].addEventListener('change', function() {
+        $(".icon.icons").css("visibility","visible")
+    });
 
+    $('#messageInfo').css('display','none')
+    function clearValue(){
+       context=inputs[0]
+       context.value=''
+       $(".icon.icons").css("visibility","hidden")
+    }
     form.onsubmit = function(e){
         let value_task = $("input[name='job_name']").val()
         let value_image = $("input[name='image']").val()

templates/repo/modelmanage/index.tmpl

@@ -141,7 +141,6 @@
 <script>
     let repolink =  {{.RepoLink}}
     let repoId = {{$repository}}
-    let url_href = window.location.pathname.split('show_model')[0] + 'create_model'
     const {_AppSubUrl, _StaticUrlPrefix, csrf} = window.config;
     $('input[name="_csrf"]').val(csrf)
 

templates/repo/modelmanage/showinfo.tmpl

@@ -110,7 +110,36 @@
                         </tr>
                         <tr>
                             <td class="ti-text-form-label text-width80">模型描述</td>
-                            <td class="ti-text-form-content" ><div id="edit-td" style="display:flex"><span id="Description" title="" class="iword-elipsis"></span><i id="edit-pencil" data-id="" data-desc="" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></div></td>
+                            <td class="ti-text-form-content" >
+                                <div id="edit-td" style="display:flex">
+                                    <span id="Description" title="" class="iword-elipsis"></span>
+                                    <i id="edit-pencil" data-id="" data-desc="" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></i>
+                                </div>
+                            </td>
+                        </tr>
+                        <tr>
+                            <td class="ti-text-form-label text-width80">代码版本</td>
+                            <td class="ti-text-form-content word-elipsis"><span id="CodeBranch" title=""></span></td>
+                        </tr>
+                        <tr>
+                            <td class="ti-text-form-label text-width80">启动文件</td>
+                            <td class="ti-text-form-content word-elipsis"><span id="BootFile" title=""></span></td>
+                        </tr>
+                        <tr>
+                            <td class="ti-text-form-label text-width80">训练数据集</td>
+                            <td class="ti-text-form-content word-elipsis"><span id="DatasetName" title=""></span></td>
+                        </tr>
+                        <tr>
+                            <td class="ti-text-form-label text-width80">运行参数</td>
+                            <td class="ti-text-form-content word-elipsis"><span id="Parameters" title=""></span></td>
+                        </tr>
+                        <tr>
+                            <td class="ti-text-form-label text-width80">规格</td>
+                            <td class="ti-text-form-content word-elipsis"><span id="FlavorName" title=""></span></td>
+                        </tr>
+                        <tr>
+                            <td class="ti-text-form-label text-width80">计算节点</td>
+                            <td class="ti-text-form-content word-elipsis"><span id="WorkServerNumber" title=""></span></td>
                         </tr>
                     </tbody>
                 </table>
@@ -155,6 +184,7 @@ function changeInfo(version){
         let returnArray = []
         returnArray = transObj(versionData)
         let [initObj,initModelAcc,id] = returnArray
+        editorCancel('','')
         renderInfo(initObj,initModelAcc,id)
     })
 }
@@ -175,8 +205,15 @@ function loadInfo(){
     })
 }
 function transObj(data){
-    let {ID,Name,Version,Label,Size,Description,CreatedUnix,Accuracy} = data[0]
+    let {ID,Name,Version,Label,Size,Description,CreatedUnix,Accuracy,CodeBranch,CodeCommitID,TrainTaskInfo} = data[0]
     let modelAcc = JSON.parse(Accuracy)
+    TrainTaskInfo = JSON.parse(TrainTaskInfo)
+    // Parameters = JSON.parse(Parameters)
+    console.log("TrainTaskInfo",TrainTaskInfo)
+    let {Parameters} = TrainTaskInfo
+    Parameters = JSON.parse(Parameters)
+    Parameters = Parameters.parameter.length === 0 ? '--':Parameters.parameter
+    console.log(Parameters)
     let size = tranSize(Size) 
     let time = transTime(CreatedUnix)
     let initObj = {
@@ -186,6 +223,14 @@ function transObj(data){
         Size:size,
         CreateTime:time,
         Description:Description || '--',
+        CodeBranch:CodeBranch || '--',
+        CodeCommitID:CodeCommitID || '--',
+        BootFile:TrainTaskInfo.BootFile || '--',
+        DatasetName:TrainTaskInfo.DatasetName || '--',
+        Parameters:TrainTaskInfo.Parameters || '--',
+        FlavorName:TrainTaskInfo.FlavorName || '--',
+        WorkServerNumber:TrainTaskInfo.WorkServerNumber || '--',
+        Parameters:Parameters
     }
     let initModelAcc = {
         Accuracy: modelAcc.Accuracy || '--',
@@ -221,15 +266,16 @@ function tranSize(value){
 function editorFn(context){
     let id= context.dataset.id
     let text = context.dataset.desc
-    console.log(id,text)
-    $('#edit-td').replaceWith("<div id='edit-div' style='width:80%;display: inline-block;'><textarea id='textarea-value' value='' rows='3' maxlength='255' style='width:80%;' id='edit-text'>"+text+"</textarea><i class='check icon' style='color: #50d4ab;' onclick='editorSure(\"" + text + "\",\"" + id + "\")'></i><i class='times icon' style='color: #f66f6a;' onclick='editorCancel(\"" + text + "\",\"" + id + "\")'></i></div>");
-    
+    let textValue = text.replace(/enter;/g,'\r\n')
+    $('#edit-td').replaceWith(`<div id='edit-div' style='width:80%;display: inline-block;'><textarea id='textarea-value' value='' rows='3' maxlength='255' style='width:80%;white-space: nowrap;' id='edit-text'>${textValue}</textarea><i class='check icon' style='color: #50d4ab;' onclick='editorSure("${text}","${id}")'></i><i class='times icon' style='color: #f66f6a;' onclick='editorCancel("${text}","${id}")'></i></div>`);
 }
 function editorCancel(text,id){
-    $('#edit-div').replaceWith(`<div id="edit-td" style="display:flex;"><span id="Description" title="${text}" class="iword-elipsis">${text}</span><i id="edit-pencil" data-id="${id}" data-desc="${text}" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></div>`)
+    let objkey = text.replace(/enter;/g,'\r\n')
+    $('#edit-div').replaceWith(`<div id="edit-td" style="display:flex;"><span id="Description" title="${objkey}" class="iword-elipsis">${objkey}</span><i id="edit-pencil" data-id="${id}" data-desc="${text}" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></div>`)
 }
 function editorSure(text,id){
     let description=$('#textarea-value').val()
+    let sourcetext = $('#textarea-value').val().replace(/\n/g,'enter;')
     let data = {
         ID:id,
         Description:description
@@ -239,16 +285,18 @@ function editorSure(text,id){
         type:'PUT',
         data:data
     }).done((res)=>{
-        $('#edit-div').replaceWith(`<div id="edit-td" style="display:flex;"><span id="Description" title="${description}" class="iword-elipsis">${description}</span><i id="edit-pencil" data-id="${id}" data-desc="${description}" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></div>`)
+        $('#edit-div').replaceWith(`<div id="edit-td" style="display:flex;"><span id="Description" title="${description}" class="iword-elipsis">${description}</span><i id="edit-pencil" data-id="${id}" data-desc="${sourcetext}" class="pencil alternate icon" style="cursor:pointer;vertical-align: top;" id="editor" onclick="editorFn(this)"></div>`)
     })
 }
 function renderInfo(obj,accObj,id){
     for(let key in obj){
         if(key==="Description"){
+            let descriptionText=obj[key].replace(/\r\n|\n/g,'enter;')
             $(`#${key}`).text(obj[key])
             $(`#${key}`).attr("title",obj[key])
+
             $('#edit-pencil').attr("data-id",id)
-            $('#edit-pencil').attr("data-desc",obj[key])
+            $('#edit-pencil').attr("data-desc",descriptionText)
         }
         else if(key==="Label"){
             $('#Label').empty()
@@ -263,6 +311,29 @@ function renderInfo(obj,accObj,id){
                 }
                 $('#Label').append(html)
             }
+        }
+        else if(key==="CodeCommitID"){
+            let codeCommit = obj[key].slice(0,10)
+            let html = `<a style="margin-left:1rem" class="ui label" title="${codeCommit}">${codeCommit}</a>`
+            $('#CodeBranch').append(html)
+
+        }
+        else if(key==="Parameters"){
+            console.log("obj[key",obj[key])
+            if(obj[key]==='--'){
+                $(`#${key}`).text(obj[key])
+            }else{
+                const parameterArray = obj[key].map(element => {
+                let labelValue = `${element.label}=${element.value}` 
+                return labelValue
+                });
+                const parameter = parameterArray.join(';  ')
+                console.log(parameter)
+                $(`#${key}`).text(parameter)
+                $(`#${key}`).attr("title",parameter)
+            }
+            
+
         }
         else{
             $(`#${key}`).text(obj[key])

web_src/js/components/Model.vue

@@ -263,6 +263,7 @@ export default {
             let cName =  $("input[name='Name']").val()
             let version = $("input[name='Version']").val()
             let data = $("#formId").serialize()
+            let url_href = version === '0.0.1' ? context.url_create_newModel : context.url_create_newVersion
             $("#mask").css({"display":"block","z-index":"9999"})
             $.ajax({
                 url:url_href,
@@ -292,7 +293,7 @@ export default {
         if(!this.loadNodeMap.get(row.cName)){
             const parent = store.states.data
             const index = parent.findIndex(child => child.ID == row.ID)
-            parent.splice(index, 1)
+            this.getModelList()
         }else{
             let {tree,treeNode,resolve} = this.loadNodeMap.get(row.cName)
             const keys = Object.keys(store.states.lazyTreeNodeMap);
@@ -406,6 +407,8 @@ export default {
     this.getModelList()
     this.url = location.href.split('show_model')[0]
     this.submitId.addEventListener("click", this.submit)
+    this.url_create_newVersion = this.url + 'create_model'
+    this.url_create_newModel = this.url + 'create_new_model'
   },
 
   beforeDestroy() {  // 实例销毁之前对点击事件进行解绑
@@ -517,4 +520,4 @@ export default {
     opacity: .45 !important;
 }
 
-</style>
+</style>