fix issue 关于全屏查看日志

templates/custom/max_log.tmpl

@@ -2,14 +2,21 @@
     <div class="ui modal max-full-log{{.VersionName}} container" style="height: 90%;margin: 3rem auto;">
         <div class="file-info" style="padding: 2rem;justify-content: space-between;">
             <div id="log-file-title" style="font-size: 16px;font-weight:600"></div>
-            <div>
+            <div class="file-info">
+                <a class="file-info" id="{{.VersionName}}-log-down" href="">
+                    <i class="ri-download-cloud-2-line"></i>
+                    <span style="margin-left: 0.3rem;" class="log-file-down"></span>
+                </a>
                 <div class="file-info close-log-dialog" data-version="{{.VersionName}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
                     <i class="ri-fullscreen-exit-fill" style="font-size: 16px;"></i>
                     <span id="log-file-exit" style="margin-left: 0.3rem;font-size: 12px;"></span>
                 </div>
+                
+                
+                
             </div>
         </div>
-        <div style="margin: 0 2rem;border: 1px solid #e8e8e8;height: 88%;position: relative;">
+        <div style="margin: 0 2.5rem;border: 1px solid #e8e8e8;height: 88%;position: relative;">
             <span>
                 <a  style="position: absolute; right: -32px;cursor: pointer;"
                     class="log_top-max" data-version="{{.VersionName}}" data-max="-max"><i class="icon-to-top"></i></a>

templates/repo/cloudbrain/benchmark/show.tmpl

@@ -531,19 +531,22 @@
                                  <i class="ri-download-cloud-2-line"></i>
                                  <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                              </a>
-                             <div class="file-info full-log-dialog" data-version="{{.VersionName}}"  data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}" data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
+                             <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  
+                                data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
+                                data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file"
+                                data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
                                 <i class="ri-aspect-ratio-line"></i>
-                                <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
+                                <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
                             </div>
                          </div>
                          <div
                              style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
                              <span>
-                                 <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
+                                 <a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
                                      class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
                              </span>
                              <span class="log-info-{{.VersionName}}">
-                                 <a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
+                                 <a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
                                      class="log_bottom" data-version="{{.VersionName}}"><i
                                          class="icon-to-bottom"></i></a>
                              </span>

templates/repo/cloudbrain/inference/show.tmpl

@@ -542,7 +542,10 @@
                                  <i class="ri-download-cloud-2-line"></i>
                                  <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                              </a>
-                             <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
+                             <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  
+                                data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
+                                data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file"
+                                data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
                                 <i class="ri-aspect-ratio-line"></i>
                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
                             </div>
@@ -550,11 +553,11 @@
                          <div
                              style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
                              <span>
-                                 <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
+                                 <a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
                                      class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
                              </span>
                              <span class="log-info-{{.VersionName}}">
-                                 <a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
+                                 <a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
                                      class="log_bottom" data-version="{{.VersionName}}"><i
                                          class="icon-to-bottom"></i></a>
                              </span>
@@ -570,7 +573,7 @@
                                 <input type="hidden" name="end_line-max" value>
                                 <input type="hidden" name="start_line-max" value>
                                 <input type="hidden" name="start_line-max-copy" value>
-                                <input type="hidden" name="start_line" value>	                                <input type="hidden" name="start_line" value>
+                                <input type="hidden" name="start_line" value>
                                 <input type="hidden" name="init_log" value>
                                 <pre id="log_file{{.VersionName}}"></pre>
                              </div>

templates/repo/cloudbrain/trainjob/show.tmpl

@@ -531,18 +531,21 @@
                                 <i class="ri-download-cloud-2-line"></i>
                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                             </a>
-                            <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
+                            <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  
+                                data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
+                                data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain/{{.ID}}/download_log_file"
+                                data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
                                 <i class="ri-aspect-ratio-line"></i>
                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
                             </div>
                         </div>
                         <div style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
                             <span>
-                                <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
+                                <a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
                                     class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
                             </span>
                             <span class="log-info-{{.VersionName}}">
-                                <a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
+                                <a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
                                     class="log_bottom" data-version="{{.VersionName}}"><i
                                         class="icon-to-bottom"></i></a>
                             </span>
@@ -558,7 +561,7 @@
                                 <input type="hidden" name="end_line-max" value>
                                 <input type="hidden" name="start_line-max" value>
                                 <input type="hidden" name="start_line-max-copy" value>
-                                <input type="hidden" name="start_line" value>	                                <input type="hidden" name="start_line" value>
+                                <input type="hidden" name="start_line" value>
                                 <input type="hidden" name="init_log" value>
                                 <pre id="log_file{{.VersionName}}"></pre>
                             </div>

templates/repo/grampus/trainjob/show.tmpl

@@ -527,7 +527,10 @@
                                 <i class="ri-download-cloud-2-line"></i>
                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                             </a>
-                            <div class="file-info full-log-dialog" data-log-type="c2Net" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
+                            <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  
+                                data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
+                                data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/grampus/train-job/{{.JobID}}/download_log"
+                                data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
                                 <i class="ri-aspect-ratio-line"></i>
                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
                             </div>

templates/repo/modelarts/inferencejob/show.tmpl

@@ -467,18 +467,21 @@ td, th {
                                     <i class="ri-download-cloud-2-line"></i>
                                     <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                                 </a>
-                                <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
+                                <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  
+                                    data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
+                                    data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/download_log_file?version_name={{.VersionName}}"
+                                    data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
                                     <i class="ri-aspect-ratio-line"></i>
                                     <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
                                 </div>
                             </div>
                             <div style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
                                     <span>
-                                        <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
+                                        <a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
                                             class="log_top" data-version="{{.VersionName}}"><i class="icon-to-top"></i></a>
                                     </span>
                                     <span class="log-info-{{.VersionName}}">
-                                        <a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
+                                        <a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
                                             class="log_bottom" data-version="{{.VersionName}}"><i
                                                 class="icon-to-bottom"></i></a>
                                     </span>
@@ -493,7 +496,7 @@ td, th {
                                     <input type="hidden" name="end_line-max" value>
                                     <input type="hidden" name="start_line-max" value>
                                     <input type="hidden" name="start_line-max-copy" value>
-                                    <input type="hidden" name="start_line" value>	                                <input type="hidden" name="start_line" value>
+                                    <input type="hidden" name="start_line" value>
                                     <input type="hidden" name="init_log" value>
                                     <pre id="log_file{{.VersionName}}"></pre>
                                 </div>

templates/repo/modelarts/trainjob/show.tmpl

@@ -555,7 +555,10 @@
                                 <i class="ri-download-cloud-2-line"></i>
                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                             </a>
-                            <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
+                            <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  
+                                data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
+                                data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="{{$.RepoLink}}/modelarts/train-job/{{.JobID}}/download_log_file?version_name={{.VersionName}}"
+                                data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
                                 <i class="ri-aspect-ratio-line"></i>
                                 <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
                             </div>

templates/repo/modelarts/trainjob/version_new.tmpl

@@ -56,7 +56,10 @@
     {{template "repo/header" .}}
     <div class="ui container">
         <div class="cloudbrain-type" style="display: none;" data-cloudbrain-type="{{.datasetType}}" data-repo-link="{{.RepoLink}}" data-flag-model="true" data-dataset-uuid="{{.attachment}}" data-dataset-name="{{.dataset_name}}"></div>
-        {{template "base/alert" .}}
+        {{if eq .NotStopTaskCount 0}}
+            {{template "base/alert" .}}
+        {{end}}
+        {{template "custom/alert_cb" .}}
         <h4 class="ui top attached header">
             {{.i18n.Tr "repo.modelarts.train_job.new"}}
         </h4>
@@ -260,7 +263,7 @@
                 </div>
 
                 <div class="inline unite min_title field">
-                    <button class="ui create_train_job green button">
+                    <button class="ui create_train_job green button {{if eq .NotStopTaskCount 1}}disabled{{end}}">
                     {{.i18n.Tr "repo.cloudbrain.new"}}
                     </button>
                     <a class="ui button cancel" href="{{.RepoLink}}/modelarts/train-job">{{.i18n.Tr "repo.cloudbrain.cancel"}}</a>

templates/repo/modelsafety/show.tmpl

@@ -474,7 +474,10 @@
                               <i class="ri-download-cloud-2-line"></i>
                               <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.download_log"}}</span>
                           </a>
-                          <div class="file-info full-log-dialog" data-version="{{.VersionName}}"  data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;">
+                          <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  
+                              data-exit="{{$.i18n.Tr "repo.modelarts.exit_full_screen"}}" style="margin-left: 1rem;color:#0366d6;cursor: pointer;"
+                              data-log-down="{{$.i18n.Tr "repo.modelarts.download_log"}}" data-href="/api/v1/repos/{{$.RepoRelPath}}/cloudbrain"
+                              data-scroll-top="{{$.i18n.Tr "repo.log_scroll_start"}}" data-scroll-bottom="{{$.i18n.Tr "repo.log_scroll_end"}}">
                               <i class="ri-aspect-ratio-line"></i>
                               <span style="margin-left: 0.3rem;">{{$.i18n.Tr "repo.modelarts.fullscreen_log_file"}}</span>
                           </div>
@@ -482,11 +485,11 @@
                         <div
                              style="position: relative;border: 1px solid rgba(0,0,0,.2);padding: 0 10px;margin-top: 10px;">
                              <span>
-                                 <a title="滚动到顶部" style="position: absolute; right: -32px;cursor: pointer;"
+                                 <a title="{{$.i18n.Tr "repo.log_scroll_start"}}" style="position: absolute; right: -32px;cursor: pointer;"
                                      class="log_top" data-version=""><i class="icon-to-top"></i></a>
                              </span>
                              <span class="log-info-">
-                                 <a title="滚动到底部" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
+                                 <a title="{{$.i18n.Tr "repo.log_scroll_end"}}" style="position: absolute; bottom: 10px;right: -32px;cursor: pointer;"
                                      class="log_bottom" data-version=""><i
                                          class="icon-to-bottom"></i></a>
                              </span>

web_src/js/features/cloudbrainShow.js

@@ -41,7 +41,6 @@ export default async function initCloudrainSow() {
           if (data.Lines == 0) {
             if (max) {
               $("body").toast({
-                class: "info",
                 message: `您已翻阅至日志底部,请稍后再试！`,
               });
             } else {
@@ -88,7 +87,6 @@ export default async function initCloudrainSow() {
           if (data.Lines == 0) {
             if (max) {
               $("body").toast({
-                class: "info",
                 message: `您已翻阅至日志顶部,请稍后再试！`,
               });
             } else {
@@ -167,7 +165,6 @@ export default async function initCloudrainSow() {
         if (data.Lines == 0) {
           if (max) {
             $("body").toast({
-              class: "info",
               message: `您已翻阅至日志顶部,请稍后再试！`,
             });
           } else {
@@ -212,10 +209,16 @@ export default async function initCloudrainSow() {
           $(`#${version_name}-log-down`)
             .removeClass("ti-download-file")
             .addClass("disabled");
+          $(`.max-full-log${version_name} #${version_name}-log-down`)
+            .removeClass("ti-download-file")
+            .addClass("disabled");
         } else {
           $(`#${version_name}-log-down`)
             .addClass("ti-download-file")
             .removeClass("disabled");
+          $(`.max-full-log${version_name} #${version_name}-log-down`)
+            .addClass("ti-download-file")
+            .removeClass("disabled");
         }
         $(`#log${version_name} input[name=end_line${max}]`).val(data.EndLine); //如果变动就改变所对应的值
         if ($(this)[0].hasAttribute("data-tab")) {
@@ -241,7 +244,6 @@ export default async function initCloudrainSow() {
             if (data.Lines == 0) {
               if (max) {
                 $("body").toast({
-                  class: "info",
                   message: `您已翻阅至日志底部,请稍后再试！`,
                 });
               } else {
@@ -318,6 +320,24 @@ export default async function initCloudrainSow() {
           $(".file-info #log-file-exit").text(
             $(".full-log-dialog").data("exit")
           );
+          $(".file-info .log-file-down").text(
+            $(".full-log-dialog").data("log-down")
+          );
+          $(".file-info .log-file-down").text(
+            $(".full-log-dialog").data("log-down")
+          );
+          $(`.max-full-log${version_name} #${version_name}-log-down`).attr(
+            "href",
+            $(".full-log-dialog").data("href")
+          );
+          $(`.max-full-log${version_name} .log_top-max`).attr(
+            "title",
+            $(".full-log-dialog").data("scroll-top")
+          );
+          $(`.max-full-log${version_name} .log_bottom-max`).attr(
+            "title",
+            $(".full-log-dialog").data("scroll-bottom")
+          );
         },
         onVisible: function () {
           $(`#log-max${version_name}`).append(