From 1894cc135002310ec842072fcfed11d8c452f94d Mon Sep 17 00:00:00 2001
From: wangjr <wangjr@pcl.ac.cn>
Date: Mon, 28 Mar 2022 16:01:24 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E9=95=9C=E5=83=8F?=
 =?UTF-8?q?=E5=92=8C=E6=B4=BE=E7=94=9F=E5=8F=8D=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 web_src/js/components/ProAnalysis.vue | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/web_src/js/components/ProAnalysis.vue b/web_src/js/components/ProAnalysis.vue
index d92eb6df9..bdc874c27 100755
--- a/web_src/js/components/ProAnalysis.vue
+++ b/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="项目创建时间"

From 39ebb7358cc29c495f0d701c9fbc194297deb6b9 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 28 Mar 2022 16:49:09 +0800
Subject: [PATCH 2/7] fix issue

---
 templates/repo/modelarts/notebook/new.tmpl | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/templates/repo/modelarts/notebook/new.tmpl b/templates/repo/modelarts/notebook/new.tmpl
index a66690f43..61ece0f8d 100755
--- a/templates/repo/modelarts/notebook/new.tmpl
+++ b/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>

From 421093e2dcb40cbcc173b58f828cc18ba9412907 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 28 Mar 2022 17:24:46 +0800
Subject: [PATCH 3/7] fix issue

---
 templates/custom/select_dataset.tmpl | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/templates/custom/select_dataset.tmpl b/templates/custom/select_dataset.tmpl
index 17e4eee42..bef5839c0 100644
--- a/templates/custom/select_dataset.tmpl
+++ b/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>
+    {{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"}}"

From 66014cda6cba09dfbfb46b2622b026b6d4419ecc Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 28 Mar 2022 17:35:20 +0800
Subject: [PATCH 4/7] fix issue

---
 templates/custom/select_dataset.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/custom/select_dataset.tmpl b/templates/custom/select_dataset.tmpl
index bef5839c0..dc5ca6c9e 100644
--- a/templates/custom/select_dataset.tmpl
+++ b/templates/custom/select_dataset.tmpl
@@ -4,7 +4,7 @@
     <label>{{.i18n.Tr "dataset.dataset"}}</label>
     <input type="hidden" name="attachment" :value="dataset_uuid">
     {{if eq .cloudbraintype 0}}
-    <input class="disabled" type="text" :value="dataset_name" required>
+    <input class="disabled" type="text" :value="dataset_name" required onfocus="this.blur();">
     {{else}}
     <input class="disabled" type="text" :value="dataset_name">
     {{end}}

From f4991184ea9dd1b0e149ffafe21b8a2097562fc5 Mon Sep 17 00:00:00 2001
From: zhoupzh <zhoupzh@pcl.ac.cn>
Date: Mon, 28 Mar 2022 17:59:59 +0800
Subject: [PATCH 5/7] fix issue

---
 templates/repo/modelarts/trainjob/new.tmpl | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/templates/repo/modelarts/trainjob/new.tmpl b/templates/repo/modelarts/trainjob/new.tmpl
index afa09cf29..f0ac98b17 100755
--- a/templates/repo/modelarts/trainjob/new.tmpl
+++ b/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_]$/]',
                     }
                     ]
                 },

From 415a6464002b879f2f7f5a3445f921b7c233a966 Mon Sep 17 00:00:00 2001
From: chenyifan01 <gitea@fake.local>
Date: Tue, 29 Mar 2022 10:06:50 +0800
Subject: [PATCH 6/7] #1765 fix bug

---
 routers/api/v1/repo/modelarts.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index d7d011e07..d5a152b35 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -379,7 +379,7 @@ func GetModelArtsInferenceJob(ctx *context.APIContext) {
 	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)

From 7f84d50c52e16cb9581e615d21b130d9d82c3f28 Mon Sep 17 00:00:00 2001
From: chenyifan01 <gitea@fake.local>
Date: Tue, 29 Mar 2022 10:30:27 +0800
Subject: [PATCH 7/7] #1765 fix bug

---
 routers/api/v1/repo/modelarts.go | 2 --
 1 file changed, 2 deletions(-)

diff --git a/routers/api/v1/repo/modelarts.go b/routers/api/v1/repo/modelarts.go
index d5a152b35..660efdfef 100755
--- a/routers/api/v1/repo/modelarts.go
+++ b/routers/api/v1/repo/modelarts.go
@@ -377,8 +377,6 @@ func GetModelArtsInferenceJob(ctx *context.APIContext) {
 	}
 	job.Status = modelarts.TransTrainJobStatus(result.IntStatus)
 	job.Duration = result.Duration / 1000
-	job.TrainJobDuration = result.TrainJobDuration
-
 	job.TrainJobDuration = models.ConvertDurationToStr(job.Duration)
 
 	if job.EndTime == 0 && models.IsTrainJobTerminal(job.Status) && job.StartTime > 0 {