From c816179a08be227856c41cb9ebdcb8ea45f0b99f Mon Sep 17 00:00:00 2001
From: tanghucheng <tanghucheng@easycorp.ltd>
Date: Mon, 15 Aug 2022 12:26:44 +0800
Subject: [PATCH] * Fix bug #26419,26417.

---
 extension/lite/task/ext/config/lite.php |  2 +-
 module/caselib/css/showimport.css       |  1 -
 module/caselib/view/showimport.html.php | 13 +++++++++----
 module/port/model.php                   |  3 +++
 module/port/view/header.html.php        |  3 ++-
 5 files changed, 15 insertions(+), 7 deletions(-)

diff --git a/extension/lite/task/ext/config/lite.php b/extension/lite/task/ext/config/lite.php
index f93feacbbc..aeb63bd17a 100644
--- a/extension/lite/task/ext/config/lite.php
+++ b/extension/lite/task/ext/config/lite.php
@@ -7,4 +7,4 @@ $config->task->datatable->fieldList['lane']['title']    = 'lane';
 $config->task->datatable->fieldList['lane']['fixed']    = 'no';
 $config->task->datatable->fieldList['lane']['width']    = '120';
 $config->task->datatable->fieldList['lane']['required'] = 'no';
-$config->task->datatable->fieldList['lane']['sort']     = 'no';
\ No newline at end of file
+$config->task->datatable->fieldList['lane']['sort']     = 'no';
diff --git a/module/caselib/css/showimport.css b/module/caselib/css/showimport.css
index 9e7a963939..df3757a2cf 100644
--- a/module/caselib/css/showimport.css
+++ b/module/caselib/css/showimport.css
@@ -1,2 +1 @@
 .table table td,.outer .table table tbody > tr:last-child td {padding: 2px 0 2px 5px !important; border: none !important;}
-.c-pri{width: 70px;}
diff --git a/module/caselib/view/showimport.html.php b/module/caselib/view/showimport.html.php
index bb360fbda2..30b341937b 100644
--- a/module/caselib/view/showimport.html.php
+++ b/module/caselib/view/showimport.html.php
@@ -14,11 +14,12 @@ $datas          = $datas->datas;
 ?>
 <style>
 form{overflow-x: scroll}
-.c-pri, .c-estStarted, .c-deadline{width:100px;}
+thead > tr > th{width:150px;}
 .c-estimate {width:150px;}
 .c-story{width:150px;}
-.c-team {width:100px; padding:0px 0px 8px 0px !important;}
-.c-estimate-1 {width:50px;padding:0px 0px 8px 8px !important;}
+.c-step{width:400px;}
+.c-pri,.c-stage{width:150px}
+.c-precondition{width:200px;}
 </style>
 <?php if(!empty($suhosinInfo)):?>
 <div class='alert alert-info'><?php echo $suhosinInfo?></div>
@@ -37,7 +38,11 @@ $(function()
     {
         if(parseInt($('#maxImport').val())) $('#times').html(Math.ceil(parseInt($('#allCount').html()) / parseInt($('#maxImport').val())));
     });
-    $('#import').click(function(){location.href = createLink('caselib', 'showImport', "libID=<?php echo $libID;?>&pageID=1&maxImport=" + $('#maxImport').val())})
+    $('#import').click(function()
+    {
+        $.cookie('maxImport', $('#maxImport').val());
+        location.href = createLink('caselib', 'showImport', "libID=<?php echo $libID;?>&pageID=1&maxImport=" + $('#maxImport').val())
+    });
 });
 </script>
 <?php else:?>
diff --git a/module/port/model.php b/module/port/model.php
index ffc231ee4f..c42ec99268 100644
--- a/module/port/model.php
+++ b/module/port/model.php
@@ -642,6 +642,7 @@ class portModel extends model
             foreach($listFields as $field)
             {
                 $listName = $field . 'List';
+                if(!empty($_POST[$listName])) continue;
                 if(!empty($fieldList[$field]))
                 {
                     $lists[$listName] = $fieldList[$field]['values'];
@@ -901,6 +902,8 @@ class portModel extends model
         $result->isEndPage = $pagerID >= $result->allPager;
         $result->datas     = $datas;
 
+        $this->session->set('insert', true);
+
         foreach($datas as $data)
         {
             if(isset($data->id)) $this->session->set('insert', false);
diff --git a/module/port/view/header.html.php b/module/port/view/header.html.php
index 373f268f77..af65d29994 100644
--- a/module/port/view/header.html.php
+++ b/module/port/view/header.html.php
@@ -18,8 +18,9 @@ $notEmptyRule   = $this->session->notEmptyRule;
 form{overflow-x: scroll}
 #maxImport:focus {outline: none;}
 .pointorNone{pointer-events:none;}
+thead > tr > th{width:150px;}
 .c-pri{width:100px}
-#showData > thead > tr > th{width:150px;}
+.c-precondition{width:200px;}
 .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;}