Merge branch 'V20221102' into fix-2524

options/locale/locale_en-US.ini

@@ -1217,7 +1217,7 @@ cloudbrain.benchmark.evaluate_train=Train Script
 cloudbrain.benchmark.evaluate_test=Test Script
 cloudbrain.benchmark.types={"type":[{"id":1,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=detection","first":"Target detection","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"yangzhx","repo_name":"detection_benchmark_script"}]},{"id":2,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=reid","first":"Target re-identification","second":[{"id":1,"value":"Vehicle re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"},{"id":2,"value":"Image-based person re-identification","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"JiahongXu","repo_name":"benchmark_reID_script"}]},{"id":3,"rank_link":"https://git.openi.org.cn/benchmark/?username=admin&algType=tracking","first":"Multi-target tracking","second":[{"id":1,"value":"None","attachment":"84cf39c4-d8bc-41aa-aaa3-182ce289b105","owner":"lix07","repo_name":"MOT_benchmark_script"}]}]}
 cloudbrain.morethanonejob=You already have a running or waiting task, create it after that task is over.
-cloudbrain.morethanonejob1=You have created a <span style="color:rgba(242, 113, 28, 1);"> equivalent task </span> that is waiting or running, please wait for the task to finish before creating it.
+cloudbrain.morethanonejob1=You have created an <span style="color:rgba(242, 113, 28, 1);"> equivalent task </span> that is waiting or running, please wait for the task to finish before creating it.
 cloudbrain.morethanonejob2=You can view all your Cloud Brain tasks in <a href="/cloudbrains" target="_blank"> Home > Cloudbrain Task </a>. 
 
 modelarts.infer_job_model = Model

templates/custom/max_log.tmpl

@@ -1,11 +1,11 @@
 <div>
     <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 class="file-info" style="padding: 2rem;justify-content: space-between;height: 10%;">
             <div id="log-file-title" style="font-size: 16px;font-weight:600"></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>
+                    <span style="margin-left: 0.3rem;font-size: 12px;" 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>
@@ -16,7 +16,7 @@
                 
             </div>
         </div>
-        <div style="margin: 0 2.5rem;border: 1px solid #e8e8e8;height: 88%;position: relative;">
+        <div style="margin: 0 2.5rem;border: 1px solid #e8e8e8;height: 85%;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/grampus/trainjob/show.tmpl

@@ -527,7 +527,7 @@
                                 <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"}}"  
+                            <div class="file-info full-log-dialog" data-version="{{.VersionName}}" data-log="{{$.i18n.Tr "repo.modelarts.log_file"}}"  data-log-type="c2Net"
                                 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"}}">

web_src/js/features/cloudbrainShow.js

@@ -41,6 +41,7 @@ export default async function initCloudrainSow() {
           if (data.Lines == 0) {
             if (max) {
               $("body").toast({
+                class: "black",
                 message: `您已翻阅至日志底部,请稍后再试！`,
               });
             } else {
@@ -87,6 +88,7 @@ export default async function initCloudrainSow() {
           if (data.Lines == 0) {
             if (max) {
               $("body").toast({
+                class: "black",
                 message: `您已翻阅至日志顶部,请稍后再试！`,
               });
             } else {
@@ -165,6 +167,7 @@ export default async function initCloudrainSow() {
         if (data.Lines == 0) {
           if (max) {
             $("body").toast({
+              class: "black",
               message: `您已翻阅至日志顶部,请稍后再试！`,
             });
           } else {
@@ -244,6 +247,7 @@ export default async function initCloudrainSow() {
             if (data.Lines == 0) {
               if (max) {
                 $("body").toast({
+                  class: "black",
                   message: `您已翻阅至日志底部,请稍后再试！`,
                 });
               } else {
@@ -278,7 +282,8 @@ export default async function initCloudrainSow() {
         });
 
         let test = $(`#log_file${version_name}`).nextAll();
-        $(`#log${version_name} input[name=init_log]`).val(test[0].innerHTML);
+        test.length !== 0 &&
+          $(`#log${version_name} input[name=init_log]`).val(test[0].innerHTML);
 
         scrollAnimation(
           logContentDom,
@@ -287,7 +292,7 @@ export default async function initCloudrainSow() {
         );
       }
     ).fail((err) => {
-      $(`#log${version_name} .ui.inverted.active.dimmer`).css(
+      $(`#log${max}${version_name} .ui.inverted.active.dimmer`).css(
         "display",
         "none"
       );