Merge branch 'zouap_static' of https://git.openi.org.cn/OpenI/aiforge into zouap_static

routers/routes/routes.go

@@ -1229,9 +1229,9 @@ func RegisterRoutes(m *macaron.Macaron) {
 			})
 		}, context.RepoRef())
 		m.Group("/modelmanage", func() {
-			m.Get("/create_local_model_tmpl1", repo.CreateLocalModel)
-			m.Get("/create_local_model_tmpl2", repo.CreateLocalModelForUpload)
-			m.Get("/create_online_model_tmpl", repo.CreateOnlineModel)
+			m.Get("/create_local_model_1", repo.CreateLocalModel)
+			m.Get("/create_local_model_2", repo.CreateLocalModelForUpload)
+			m.Get("/create_online_model", repo.CreateOnlineModel)
 			m.Post("/create_local_model", repo.SaveLocalModel)
 			m.Delete("/delete_model_file", repo.DeleteModelFile)
 

templates/base/footer_content.tmpl

@@ -24,11 +24,30 @@
 							<div class="text">{{.LangName}}</div>
 							<div class="menu">
 								{{range .AllLangs}}
-									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+									<!-- <a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a> -->
+									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="javascript:;" olang="{{$.Lang}}" lang="{{.Lang}}" >{{.Name}}</a>
 								{{end}}
 							</div>
 						</div>
-
+						<script>
+						;(function() {
+							document.addEventListener('DOMContentLoaded', function() {
+								$('.ui.language .menu .item').on('click', function() {
+									var lang = $(this).attr('lang');
+									var oLang = $(this).attr('olang');
+									if (oLang === lang) return;
+									var origin = window.location.origin;
+									var pathname = window.location.pathname;
+									var search = window.location.search;
+									var hash = window.location.hash;
+									var oHref = window.location.href;
+									var urlSearchParams = new URLSearchParams(search);
+									urlSearchParams.set('lang', lang);
+									window.location.href = origin + pathname + '?' + urlSearchParams.toString() + hash;
+								});
+							});
+						})();
+						</script>
 						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="item" target="_blank"><i class="compass icon" ></i> {{.i18n.Tr "custom.Platform_Tutorial"}}</a>
 						{{if .EnableSwagger}}<a href="/api/swagger" class="item"><i class="plug icon"></i> API</a>{{end}}
 						{{if .IsSigned}}

templates/base/footer_content_fluid.tmpl

@@ -22,10 +22,30 @@
 							<div class="text">{{.LangName}}</div>
 							<div class="menu">
 								{{range .AllLangs}}
-									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>
+									<!--<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="{{if eq $.Lang .Lang}}#{{else}}{{$.Link}}?lang={{.Lang}}{{end}}">{{.Name}}</a>-->									
+									<a lang="{{.Lang}}" class="item {{if eq $.Lang .Lang}}active selected{{end}}" href="javascript:;" olang="{{$.Lang}}" lang="{{.Lang}}" >{{.Name}}</a>
 								{{end}}
 							</div>
 						</div>
+						<script>
+						;(function() {
+							document.addEventListener('DOMContentLoaded', function() {
+								$('.ui.language .menu .item').on('click', function() {
+									var lang = $(this).attr('lang');
+									var oLang = $(this).attr('olang');
+									if (oLang === lang) return;
+									var origin = window.location.origin;
+									var pathname = window.location.pathname;
+									var search = window.location.search;
+									var hash = window.location.hash;
+									var oHref = window.location.href;
+									var urlSearchParams = new URLSearchParams(search);
+									urlSearchParams.set('lang', lang);
+									window.location.href = origin + pathname + '?' + urlSearchParams.toString() + hash;
+								});
+							});
+						})();
+						</script>
 						<a href="https://git.openi.org.cn/zeizei/OpenI_Learning" class="item" target="_blank"><i class="compass icon"></i> {{.i18n.Tr "custom.Platform_Tutorial"}} </a>
 						{{if .EnableSwagger}}<a href="/api/swagger" class="item"><i class="plug icon" ></i> API</a>{{end}}
 						{{if .IsSigned}}

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -690,7 +690,15 @@
 <script src="{{StaticUrlPrefix}}/js/specsuse.js?v={{MD5 AppVer}}" type="text/javascript"></script>
 
 <script>
-   var setting = {
+    var userName;
+    var repoPath;
+    $(document).ready(function(){
+        var url = window.location.href;
+        var urlArr = url.split('/')
+        userName = urlArr.slice(-4)[0]
+        repoPath = urlArr.slice(-3)[0]
+    });
+    var setting = {
 			check: {
 				enable: true,
 				chkboxType: {"Y":"ps", "N":"ps"}

templates/repo/grampus/trainjob/show.tmpl

@@ -721,6 +721,15 @@
         });
         $('td.ti-text-form-content.spec').text(specStr);
     })();
+    var userName;
+    var repoPath;
+    $(document).ready(function(){
+        var url = window.location.href;
+        var urlArr = url.split('/')
+        userName = urlArr.slice(-4)[0]
+        repoPath = urlArr.slice(-3)[0]
+    });
+
    var setting = {
 			check: {
 				enable: true,

templates/repo/modelarts/trainjob/show.tmpl

@@ -732,6 +732,14 @@
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.core.js"></script>
 <script type="text/javascript" src="/self/ztree/js/jquery.ztree.excheck.js"></script>
 <script>
+    var userName;
+    var repoPath;
+    $(document).ready(function(){
+        var url = window.location.href;
+        var urlArr = url.split('/')
+        userName = urlArr.slice(-4)[0]
+        repoPath = urlArr.slice(-3)[0]
+    });    
     var setting = {
 			check: {
 				enable: true,

templates/repo/modelmanage/create_online.tmpl

@@ -351,7 +351,8 @@
                 let train_html = '';
                 modelData = data;
                 for (let i = 0; i < n_length; i++) {
-                    train_html += `<div class="item" data-value="${data[i].VersionName}">${data[i].VersionName}</div>`
+                    var VersionName = data[i].VersionName || 'V0001';
+                    train_html += `<div class="item" data-value="${VersionName}">${VersionName}</div>`
                     train_html += '</div>'
                 }
                 if (data.length) {
@@ -549,7 +550,7 @@
             let version = $("input[name='version']").val();
             let data = $("#formId").serialize();
             const initModel = $("input[name='initModel']").val();
-            let url_href = location.href.split("create_online_model_tmpl")[0] + 'create_new_model';
+            let url_href = location.href.split("create_online_model")[0] + 'create_new_model';
             $("#mask").css({ display: "block", "z-index": "9999" });
             $.ajax({
                 url: url_href,
@@ -571,7 +572,7 @@
         }
 
         function backToModelListPage() {
-            let url_href = location.href.split("create_online_model_tmpl")[0] + 'show_model';
+            let url_href = location.href.split("create_online_model")[0] + 'show_model';
             window.location.href = url_href;
         }
         window.submitSaveModel = submitSaveModel;

templates/repo/modelmanage/index.tmpl

@@ -75,9 +75,9 @@
             <div class="column right aligned">
                 <!--  -->
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} blue m-blue-btn {{else}} disabled {{end}}"
-                    href="{{.RepoLink}}/modelmanage/create_local_model_tmpl1">{{$.i18n.Tr "repo.model.manage.import_local_model"}}</a>
+                    href="{{.RepoLink}}/modelmanage/create_local_model_1">{{$.i18n.Tr "repo.model.manage.import_local_model"}}</a>
                 <a class="ui button {{if .Permission.CanWrite $.UnitTypeModelManage}} green {{else}} disabled {{end}}"
-                    href="{{.RepoLink}}/modelmanage/create_online_model_tmpl">{{$.i18n.Tr "repo.model.manage.import_online_model"}}</a>
+                    href="{{.RepoLink}}/modelmanage/create_online_model">{{$.i18n.Tr "repo.model.manage.import_online_model"}}</a>
             </div>
         </div>
         {{if eq $.MODEL_COUNT 0}}
@@ -443,7 +443,8 @@
                 let train_html = '';
                 modelData = data;
                 for (let i = 0; i < n_length; i++) {
-                    train_html += `<div class="item" data-value="${data[i].VersionName}">${data[i].VersionName}</div>`
+                    var VersionName = data[i].VersionName || 'V0001';
+                    train_html += `<div class="item" data-value="${VersionName}">${VersionName}</div>`
                     train_html += '</div>'
                 }
                 if (data.length) {

web_src/js/components/Model.vue

@@ -153,7 +153,7 @@
                 >-->
                 <a class="op-btn"
                   v-show="scope.row.modelType == 1"
-                  :href="url + 'create_local_model_tmpl1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
+                  :href="url + 'create_local_model_1?type=1&name=' + scope.row.name + '&id=' + scope.row.id"
                   :class="{ disabled: !scope.row.isCanOper }"
                   >{{ i18n.modify }}</a>
                 <a class="op-btn" v-show="scope.row.modelType != 1" style="color:transparent;cursor:default;" >{{ i18n.modify }}</a>
@@ -480,7 +480,7 @@ export default {
       try {
         this.loadNodeMap.clear();
         this.$axios
-          .get(location.href + "_api", {
+          .get(this.url + "show_model_api", {
             params: this.params,
           })
           .then((res) => {

web_src/vuepages/langs/config/en-US.js

@@ -241,7 +241,7 @@ const en = {
     specInfo: 'Specifications',
     workServerNumber: 'Amount of compute node',
     runParameters: 'Run parameters',
-    seeMore: 'See more',
+    seeMore: 'View more',
     collapseDetails: 'Collapse details',
     modelFilesList: 'Mode files list',
     fileName: 'File name',

web_src/vuepages/pages/modelmanage/common/modelmanage-common-detail.vue

@@ -335,7 +335,7 @@ export default {
       }
     },
     goUploadPage() {
-      window.location.href = `${this.repo}/modelmanage/create_local_model_tmpl2?type=1&name=${this.state.name}&id=${this.state.id}`;
+      window.location.href = `${this.repo}/modelmanage/create_local_model_2?type=1&name=${this.state.name}&id=${this.state.id}`;
     },
     backToModelListPage() {
       const list = window.location.href.split('/');

web_src/vuepages/pages/modelmanage/local/modelmanage-local-create-1.vue

@@ -159,7 +159,7 @@ export default {
           }
           const list = window.location.href.split('/');
           list.pop();
-          list.push('create_local_model_tmpl2');
+          list.push('create_local_model_2');
           window.location.href = list.join('/') + '?type=0&name=' + this.state.name + '&id=' + res.id;
         } else {
           this.$message({