fix issue

options/locale/locale_en-US.ini

@@ -823,7 +823,11 @@ modelarts.train_job.new_train=New Train Task
 modelarts.train_job.config=Configuration information
 modelarts.train_job.new=New train Task
 modelarts.train_job.new_place=The description should not exceed 256 characters
-
+modelarts.modify=Modify
+modelarts.current_version=Current version
+modelarts.parent_version=Parent Version
+modelarts.run_version=Run Version
+modelarts.train_job.compute_node=Compute Node
 
 
 modelarts.train_job.basic_info=Basic Info

options/locale/locale_zh-CN.ini

@@ -828,6 +828,10 @@ modelarts.train_job.new_train=新建训练任务
 modelarts.train_job.config=配置信息
 modelarts.train_job.new=新建训练任务
 modelarts.train_job.new_place=描述字数不超过256个字符
+modelarts.modify=修改
+modelarts.current_version=当前版本
+modelarts.parent_version=父版本
+modelarts.run_version=运行版本
 
 
 
@@ -847,11 +851,13 @@ modelarts.train_job.frames=常用框架
 modelarts.train_job.algorithm_origin=算法来源
 modelarts.train_job.AI_driver=AI引擎
 modelarts.train_job.start_file=启动文件
-modelarts.train_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。
+modelarts.train_job.boot_file_helper=启动文件是您程序执行的入口文件，必须是以.py结尾的文件。比如train.py、main.py、example/train.py、case/main.py。
 modelarts.train_job.boot_file_place=填写启动文件路径，默认为train.py
 modelarts.train_job.dataset=数据集
 modelarts.code_version=代码分支
 modelarts.parents_version=基于版本
+modelarts.train_job.compute_node=计算节点
+modelarts.train_job.train_dataset=训练数据集
 
 modelarts.train_job.run_parameter=运行参数
 modelarts.train_job.add_run_parameter=增加运行参数

templates/repo/modelarts/trainjob/show.tmpl

@@ -174,7 +174,7 @@ td, th {
                     {{$.i18n.Tr "repo.modelarts.train_job"}}
                 </a>
                 <div class="divider"> / </div>
-				<div class="active section"></div>
+				<div class="active section">{{.jobName}}</div>
 			</div>
         </h4>
         {{range $k ,$v := .version_list_task}}
@@ -186,21 +186,36 @@ td, th {
                         <span class="accordion-panel-title-content">
                             <span>
                                 <div style="float: right;">
-                                    <a class="ti-action-menu-item {{if ne .Status "COMPLETED"}}disabled {{end}}">创建模型</a>
-                                    <a class="ti-action-menu-item" href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}">修改</a>
-                                    <a class="ti-action-menu-item {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{end}}" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">停止</a>
-                                    <a class="ti-action-menu-item " href="{{$.Link}}/models?version_name={{.VersionName}}" target="_blank">模型下载</a>
-                                    <a class="ti-action-menu-item"  onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">删除</a>
+                                    <!-- <a class="ti-action-menu-item {{if ne .Status "COMPLETED"}}disabled {{end}}">创建模型</a> -->
+                                    {{$.CsrfTokenHtml}}
+                                    {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
+                                    <a class="ti-action-menu-item" href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/create_version?version_name={{.VersionName}}">{{$.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>
+                                    {{end}}
+                                    {{$.CsrfTokenHtml}}
+                                    {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
+                                    <a class="ti-action-menu-item {{if eq .Status "KILLED" "FAILED" "START_FAILED" "KILLING" "COMPLETED"}}disabled {{end}}" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">{{$.i18n.Tr "repo.stop"}}</a>
+                                    {{else}}
+                                    <a class="ti-action-menu-item disabled" id="{{.VersionName}}-stop" onclick="stopVersion({{.VersionName}})">{{$.i18n.Tr "repo.stop"}}</a>
+                                    {{end}}
+                                    
+                                    {{$.CsrfTokenHtml}}
+                                    {{if $.Permission.CanWrite $.UnitTypeCloudBrain}}
+                                    <a class="ti-action-menu-item"  onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">{{$.i18n.Tr "repo.delete"}}</a>
+                                    {{else}}
+                                    <a class="ti-action-menu-item disabled"  onclick="deleteVersion({{.VersionName}})" style="color: #FF4D4F;">{{$.i18n.Tr "repo.delete"}}</a>
+                                    {{end}}
                                 </div>
                                 <div class="ac-display-inblock title_text acc-margin-bottom">
                                     
                                     <span class="cti-mgRight-sm">{{TimeSinceUnix1 .Cloudbrain.CreatedUnix}}</span>   
-                                    <span class="cti-mgRight-sm"> 当前版本：{{.VersionName}}</span>
-                                    <span class="cti-mgRight-sm">  父版本：{{.PreVersionName}}</span>
-                                    <span class="cti-mgRight-sm ac-text-normal title_text">状态：
+                                    <span class="cti-mgRight-sm"> {{$.i18n.Tr "repo.modelarts.current_version"}}：{{.VersionName}}</span>
+                                    <span class="cti-mgRight-sm">  {{$.i18n.Tr "repo.modelarts.parent_version"}}：{{.PreVersionName}}</span>
+                                    <span class="cti-mgRight-sm ac-text-normal title_text">{{$.i18n.Tr "repo.modelarts.status"}}：
                                         <span id="{{.VersionName}}-status-span"><i id="icon" style="vertical-align: middle;" class="{{.Status}}"></i><span id="text" style="margin-left: 0.4em;font-size: 12px;">{{.Status}}</span></span>
                                     </span>
-                                    <span class="ac-text-normal title_text">运行时间：</span>
+                                    <span class="ac-text-normal title_text">{{$.i18n.Tr "repo.modelarts.train_job.dura_time"}}：</span>
                                     <span class="cti-mgRight-sm uc-accordionTitle-black" id="{{.VersionName}}-duration-span">{{.TrainJobDuration}}</span>
                                     <span data-tooltip="刷新" style="cursor: pointer;" data-inverted="" onclick="refreshStatus({{.VersionName}})"><i class="redo icon redo-color"></i></span>
 
@@ -214,9 +229,9 @@ td, th {
                 <div class="content-pad">
                     <div class="ui pointing secondary menu">
                         
-                        <a class="active item" data-tab="first{{$k}}">配置信息</a>
-                        <a class="item" data-tab="second{{$k}}" onclick="loadLog({{.VersionName}})">日志文件</a>
-                        <a class="item" data-tab="third{{$k}}" onclick="loadModelFile({{.VersionName}},'','','init')">模型下载</a>
+                        <a class="active item" data-tab="first{{$k}}">{{$.i18n.Tr "repo.modelarts.train_job.config"}}</a>
+                        <a class="item" data-tab="second{{$k}}" onclick="loadLog({{.VersionName}})">{{$.i18n.Tr "repo.modelarts.log"}}</a>
+                        <a class="item" data-tab="third{{$k}}" onclick="loadModelFile({{.VersionName}},'','','init')">{{$.i18n.Tr "repo.model_download"}}</a>
                     </div>
                     <div class="ui tab active" data-tab="first{{$k}}">
                         <div style="padding-top: 10px;">
@@ -227,7 +242,7 @@ td, th {
                                             <tbody class="ti-text-form">
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        任务名称
+                                                            {{$.i18n.Tr "repo.cloudbrain_task"}}
                                                     </td>
 
                                                     <td class="ti-text-form-content">
@@ -238,7 +253,7 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        状态
+                                                        {{$.i18n.Tr "repo.modelarts.status"}}
                                                     </td>
 
                                                     <td class="ti-text-form-content">
@@ -249,7 +264,7 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        运行版本
+                                                        {{$.i18n.Tr "repo.modelarts.run_version"}}
                                                     </td>
         
                                                     <td class="ti-text-form-content">
@@ -260,7 +275,7 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        开始时间
+                                                        {{$.i18n.Tr "repo.modelarts.train_job.start_time"}} 
                                                     </td>
         
                                                     <td class="ti-text-form-content">
@@ -271,7 +286,7 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        运行时间
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.dura_time"}} 
                                                     </td>
         
                                                     <td class="ti-text-form-content">
@@ -282,7 +297,7 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        规格
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.standard"}} 
                                                     </td>
         
                                                     <td class="ti-text-form-content">
@@ -293,7 +308,7 @@ td, th {
                                                 </tr>
                                                 <tr class="ti-no-ng-animate">
                                                     <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                        计算节点
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.compute_node"}} 
                                                     </td>
         
                                                     <td class="ti-text-form-content">
@@ -310,7 +325,7 @@ td, th {
                                                 <tbody class="ti-text-form">
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            AI引擎
+                                                                {{$.i18n.Tr "repo.modelarts.train_job.AI_driver"}} 
                                                         </td>
     
                                                         <td class="ti-text-form-content">
@@ -332,7 +347,7 @@ td, th {
                                                     </tr>
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            启动文件
+                                                                {{$.i18n.Tr "repo.modelarts.train_job.start_file"}}
                                                         </td>
             
                                                         <td class="ti-text-form-content">
@@ -343,7 +358,7 @@ td, th {
                                                     </tr>
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            训练数据集
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.train_dataset"}}   
                                                         </td>
                 
                                                         <td class="ti-text-form-content">
@@ -354,7 +369,7 @@ td, th {
                                                     </tr>
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            运行参数
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.run_parameter"}} 
                                                         </td>
                 
                                                         <td class="ti-text-form-content">
@@ -363,7 +378,7 @@ td, th {
                                                             </div>
                                                         </td>
                                                     </tr>
-                                                    <tr class="ti-no-ng-animate">
+                                                    <!-- <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
                                                             训练输出位置
                                                         </td>
@@ -373,10 +388,10 @@ td, th {
                                                                 {{.TrainUrl}}
                                                             </div>
                                                         </td>
-                                                    </tr>
+                                                    </tr> -->
                                                     <tr class="ti-no-ng-animate">
                                                         <td class="ti-no-ng-animate ti-text-form-label text-width80">
-                                                            描述
+                                                            {{$.i18n.Tr "repo.modelarts.train_job.description"}}  
                                                         </td>
                 
                                                         <td class="ti-text-form-content">
@@ -494,18 +509,17 @@ td, th {
     let timeid = window.setInterval(loadJobStatus, 30000);
     $(document).ready(loadJobStatus);
     
-    function format()
-    {
-    //shijianchuo是整数，否则要parseInt转换
-    let dataunix = $(``)
-    let time = new Date(shijianchuo);
-    let y = time.getFullYear();
-    let m = time.getMonth()+1;
-    let d = time.getDate();
-    let h = time.getHours();
-    let mm = time.getMinutes();
-    let s = time.getSeconds();
-    return y+'-'+add0(m)+'-'+add0(d)+' '+add0(h)+':'+add0(mm)+':'+add0(s);
+    function renderSize(value){
+        if(null==value||value==''){
+            return "0 Bytes";
+        }
+        var unitArr = new Array("Bytes","KB","MB","GB","TB","PB","EB","ZB","YB");
+        var index=0;
+        var srcsize = parseFloat(value);
+        index=Math.floor(Math.log(srcsize)/Math.log(1024));
+        var size =srcsize/Math.pow(1024,index);
+        size=size.toFixed(2);//保留的小数位数
+        return size+unitArr[index];
     }
     function loadJobStatus() {
         $(".ui.accordion.border-according").each((index, job) => {
@@ -655,6 +669,7 @@ td, th {
             html += '<tbody>'
             // html += "</tbody>"
             for(let i=0;i<data.Dirs.length;i++){
+                let dirs_size = renderSize(data.Dirs[i].Size)
                 html += "<tr>"
                 html += "<td class='name six wid'>"
                 html += "<span class='truncate'>"
@@ -671,7 +686,7 @@ td, th {
                 html += "</span>"
                 html += "</td>"
                 html += "<td class='message seven wide'>"
-                html += "<span class='truncate has-emoji'>"+ `${data.Dirs[i].Size}` + "</span>"
+                html += "<span class='truncate has-emoji'>"+ `${dirs_size}` + "</span>"
                 html += "</td>"
 
                 html += "<td class='text right age three wide'>"

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -516,7 +516,16 @@
                         prompt : '计算节点需要在1-25之间，请您键入正确的值'
                     }
                     ]
-                }
+                },
+                run_para_list:{
+                    identifier  : 'run_para_list',
+                    rules: [
+                    {
+                        type: 'maxLength[256]',
+                        prompt : '所有字符最长不超过256个字符。'
+                    }
+                    ]
+                },
             },
         })
 
@@ -569,8 +578,8 @@
                     identifier  : 'run_para_list',
                     rules: [
                     {
-                        type: 'regExp[/^[a-zA-Z0-9]{1,256}$/]',
-                        prompt : '只包含大小写字母、数字,所有字符最长不超过256个字符。'
+                        type: 'maxLength[256]',
+                        prompt : '所有字符最长不超过256个字符。'
                     }
                     ]
                 },