From 68f35f5262db0f522b896ea50571d8bdb6ae83d3 Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Tue, 16 Aug 2022 13:58:19 +0800
Subject: [PATCH] * Fix bug #26520,26520.

---
 extension/lite/common/ext/lang/zh-cn/lite.php | 1 +
 module/common/view/noticeimport.html.php      | 2 --
 module/port/view/footer.html.php              | 3 ++-
 module/port/view/header.html.php              | 1 +
 module/testcase/view/showimport.html.php      | 4 ++--
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/extension/lite/common/ext/lang/zh-cn/lite.php b/extension/lite/common/ext/lang/zh-cn/lite.php
index 69a02f326e..c74deb3e3f 100644
--- a/extension/lite/common/ext/lang/zh-cn/lite.php
+++ b/extension/lite/common/ext/lang/zh-cn/lite.php
@@ -51,6 +51,7 @@ else
 }
 
 $lang->task->common = '任务';
+$lang->dashboard = isset($lang->dashboard->common) ? $lang->dashboard->common : $lang->dashboard;
 
 /* My menu. */
 $lang->my->menu           = new stdclass();
diff --git a/module/common/view/noticeimport.html.php b/module/common/view/noticeimport.html.php
index 600fcbea00..5f87dd9b43 100644
--- a/module/common/view/noticeimport.html.php
+++ b/module/common/view/noticeimport.html.php
@@ -27,7 +27,5 @@ function submitForm(type)
     $('.modal-body #insert').val(type == 'insert' ? 1 : 0);
     $('#importNoticeModal .form-actions .btn').addClass('disabled');
     $("button[data-target='#importNoticeModal']").closest('form').submit();
-
-    setTimeout(function(){$('#importNoticeModal .form-actions .btn').removeClass('disabled');}, 1000);
 }
 </script>
diff --git a/module/port/view/footer.html.php b/module/port/view/footer.html.php
index 6fd32ded84..38c6c2541d 100644
--- a/module/port/view/footer.html.php
+++ b/module/port/view/footer.html.php
@@ -1,5 +1,5 @@
 <script>
-
+$('#showData > tbody').addClass('load-indicator loading');
 $.get(createLink('port', 'ajaxGetTbody','model=<?php echo $model;?>&lastID=0&pagerID=<?php echo $pagerID;?>'), function(data)
 {
     $('#showData > tbody').append(data);
@@ -7,6 +7,7 @@ $.get(createLink('port', 'ajaxGetTbody','model=<?php echo $model;?>&lastID=0&pag
     $('#showData tbody').find('.picker-select').picker({chosenMode: true});
     $('.form-date').datetimepicker('update');
     $('.form-datetime').datetimepicker('update');
+    $('#showData > tbody').removeClass('load-indicator loading');
 })
 
 window.addEventListener('scroll', this.handleScroll);
diff --git a/module/port/view/header.html.php b/module/port/view/header.html.php
index af65d29994..2b3bbc2b16 100644
--- a/module/port/view/header.html.php
+++ b/module/port/view/header.html.php
@@ -24,6 +24,7 @@ thead > tr > th{width:150px;}
 .c-id{width:50px}
 .c-team {width:100px; padding:0px 0px 8px 0px !important;}
 .c-estimate-1 {width:50px;padding:0px 0px 8px 8px !important;}
+.load-indicator{width: 100px; height: 500px;}
 </style>
 <?php if(!empty($suhosinInfo)):?>
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>
diff --git a/module/testcase/view/showimport.html.php b/module/testcase/view/showimport.html.php
index 5627391e48..01506ec369 100644
--- a/module/testcase/view/showimport.html.php
+++ b/module/testcase/view/showimport.html.php
@@ -14,8 +14,8 @@
           <th class='c-step'>
             <table class='w-p100 table-borderless'>
               <tr>
-                <th class="no-padding"><?php echo $fields['stepDesc']['title']?></th>
-                <th class="no-padding"><?php echo $fields['stepExpect']['title']?></th>
+                <th><?php echo $fields['stepDesc']['title']?></th>
+                <th><?php echo $fields['stepExpect']['title']?></th>
               </tr>
             </table>
           </th>