Merge remote-tracking branch 'origin/V20220328' into fix-1654

routers/api/v1/repo/modelarts.go

@@ -377,9 +377,7 @@ func GetModelArtsInferenceJob(ctx *context.APIContext) {
 	}
 	job.Status = modelarts.TransTrainJobStatus(result.IntStatus)
 	job.Duration = result.Duration / 1000
-	job.TrainJobDuration = result.TrainJobDuration
-
-	job.TrainJobDuration = models.ConvertDurationToStr(result.Duration)
+	job.TrainJobDuration = models.ConvertDurationToStr(job.Duration)
 
 	if job.EndTime == 0 && models.IsTrainJobTerminal(job.Status) && job.StartTime > 0 {
 		job.EndTime = job.StartTime.Add(job.Duration)

templates/custom/select_dataset.tmpl

@@ -3,7 +3,11 @@
 <div class="inline {{if eq .cloudbraintype 0}} required {{end}} field" id="dataset-base">
     <label>{{.i18n.Tr "dataset.dataset"}}</label>
     <input type="hidden" name="attachment" :value="dataset_uuid">
-    <input type="text" :value="dataset_name" disabled>
+    {{if eq .cloudbraintype 0}}
+    <input class="disabled" type="text" :value="dataset_name" required onfocus="this.blur();">
+    {{else}}
+    <input class="disabled" type="text" :value="dataset_name">
+    {{end}}
     <el-button type="text" @click="dialogVisible = true" icon="el-icon-plus"> {{.i18n.Tr "dataset.select_dataset"}}</el-button>
     <el-dialog
     title="{{.i18n.Tr "dataset.select_dataset"}}"

templates/repo/modelarts/notebook/new.tmpl

@@ -59,21 +59,7 @@
                             {{end}}
                         </select>
                     </div>
-<<<<<<< HEAD
                     {{template "custom/select_dataset" .}}
-=======
-
-                    <div class="inline field">
-                        <label>{{.i18n.Tr "cloudbrain.dataset"}}</label>
-                        <input type="text" list="cloudbrain_dataset" placeholder="{{.i18n.Tr "cloudbrain.select_dataset"}}" name="" id="answerInput" autofocus maxlength="36">
-                        <datalist id="cloudbrain_dataset" class="ui search" style='width:385px' name="attachment">
-                            {{range .attachments}}
-                                <option name="attachment" data-value="{{.UUID}}">{{.Attachment.Name}}</option>
-                            {{end}}
-                        </datalist>
-                        <input type="hidden" name="attachment" id="answerInput-hidden">
-                    </div>
->>>>>>> V20220328
 
                     <!--<div class="inline required field">
                         <label>工作环境</label>

templates/repo/modelarts/trainjob/new.tmpl

@@ -395,7 +395,7 @@
                     identifier  : 'display_job_name',
                     rules: [
                     {
-                        type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[^-]$/]',
+                        type: 'regExp[/^[a-zA-Z0-9-_]{1,64}[a-zA-Z0-9_]$/]',
                     }
                     ]
                 },

web_src/js/components/ProAnalysis.vue

@@ -150,21 +150,21 @@
                         align="center">
                     </el-table-column>
                     <el-table-column
-                        prop="isMirror"
+                        prop="isFork"
                         label="派生"
                         align="center">
                         <template slot-scope="scope">
-                            {{scope.row.isMirror|changeType}}                      
-                       </template>
-                    </el-table-column>  
+                            {{scope.row.isFork|changeType}}                      
+                        </template>
+                    </el-table-column> 
                     <el-table-column
-                        prop="isFork"
+                        prop="isMirror"
                         label="镜像"
                         align="center">
                         <template slot-scope="scope">
-                            {{scope.row.isFork|changeType}}                      
+                            {{scope.row.isMirror|changeType}}                      
                        </template>
-                    </el-table-column>  
+                    </el-table-column>   
                     <el-table-column
                         prop="createUnix"
                         label="项目创建时间"