From 930525cbd828e01b30f525eb294840cfd53b1cf7 Mon Sep 17 00:00:00 2001
From: zyn <nn_0223@163.com>
Date: Tue, 7 Feb 2023 15:45:38 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8B=96=E6=8B=BD-=E8=AE=BE=E7=BD=AE=E6=9C=80?=
 =?UTF-8?q?=E5=B0=8F=E5=88=97=E5=AE=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jero-web/src/mixins/header.js                 | 19 +++++++++++++------
 .../projectManagement/components/TaskList.vue |  2 +-
 2 files changed, 14 insertions(+), 7 deletions(-)

diff --git a/jero-web/src/mixins/header.js b/jero-web/src/mixins/header.js
index d7211c7ec..978ebff96 100644
--- a/jero-web/src/mixins/header.js
+++ b/jero-web/src/mixins/header.js
@@ -101,10 +101,9 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
     // col = getRenderCoL(key, val)
     col = getRenderCoL(key, columnsAll)
     let content = [].concat(children)
-    console.log(col)
     if (col) {
       let handlerVNode;
-      if(minColumn && minColumn.length>0){
+      if(minColumn && minWidths !== undefined && minColumn.length>0){
         // 存放所有需要手动设置最小宽度的列的dataIndex
         let colsdataIndex = []
         minColumn.forEach((item)=>{
@@ -113,9 +112,12 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
             props: {
               width: col.width,
               minWidth: Math.min(item[1]),
-              column: JSON.parse(JSON.stringify(item[0]))
+              column: col
             }
           }, [])
+          content = content.concat(
+            handlerVNode
+          )
         })
         // 不需要手动设置最小宽度的列
         if(colsdataIndex.indexOf(col.dataIndex) === -1){
@@ -126,6 +128,9 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
               column: col
             }
           }, [])
+          content = content.concat(
+            handlerVNode
+          )
         }
       }else{
         handlerVNode = h(DragHandler, {
@@ -135,10 +140,10 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
             column: col
           }
         }, [])
+        content = content.concat(
+          handlerVNode
+        )
       }
-      content = content.concat(
-        handlerVNode
-      )
     }
     return h('th', {
       key,
@@ -150,6 +155,7 @@ const ResizeHeaderOne = function(val, name ,minWidths) {
 export const ResizeHeader = {
   methods: {
     drag(columns, name ,minWidths) {
+      console.log(minWidths)
       return {
         header: {
           // minWidths : 最小宽度 => [[需要设置的列,最小宽],[需要设置的列,最小宽],...]
@@ -227,6 +233,7 @@ export const ResizeColumnProvide = {
   },
   methods: {
     _resizeColumn(w, column) {
+      console.log(column)
       tableAll.forEach(item=>{
         item.forEach((i)=>{
           if(i === column && i.dataIndex === column.dataIndex){
diff --git a/jero-web/src/views/projectManagement/components/TaskList.vue b/jero-web/src/views/projectManagement/components/TaskList.vue
index 50898bfae..da4c69f48 100644
--- a/jero-web/src/views/projectManagement/components/TaskList.vue
+++ b/jero-web/src/views/projectManagement/components/TaskList.vue
@@ -118,7 +118,7 @@
         rowKey="id"
         @change="tableOnChange"
         :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onSelectChange }"
-        :columns="columns" :components="drag(columns,'columns')"
+        :columns="columns" :components="drag(columns,'columns',JSON.parse(JSON.stringify([[columns[3],200],[columns[4],200],[columns[5],200]])))"
       >
         <div slot="standardInformation" slot-scope="text,result" class="box-left">
           <div class="content">