From 77460c24d45488e4bda7f95cc5efb58446294c0d Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 30 Nov 2023 18:25:24 +0800
Subject: [PATCH 1/2] =?UTF-8?q?-=20[=E4=BF=AE=E5=A4=8D]=E5=B7=A5=E5=8D=95?=
 =?UTF-8?q?=E4=B8=AD=E5=BF=83table=E6=8A=96=E5=8A=A8=E9=97=AE=E9=A2=98=20?=
 =?UTF-8?q?=20-=20[=E5=85=B3=E8=81=94]#[1036002460663808]=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E4=B8=AD=E5=BF=83table=E6=8A=96=E5=8A=A8=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98=20http://192.168.0.96:8090/demo/rdm.html#/story-detai?=
 =?UTF-8?q?l/939050947543040/939050947543042/1036002460663808=20-=20[?=
 =?UTF-8?q?=E4=BF=AE=E5=A4=8D]=E5=B7=A5=E5=8D=95=E4=B8=AD=E5=BF=83?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E6=B2=A1=E6=9C=89=E8=BF=87=E6=BB=A4=E5=A4=8D?=
 =?UTF-8?q?=E9=80=89=E6=A1=86=E5=AF=BC=E8=87=B4=E6=8B=96=E5=8A=A8=E8=87=AA?=
 =?UTF-8?q?=E5=AE=9A=E4=B9=89=E9=9A=90=E8=97=8F=E8=A1=8C=E5=88=97=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E6=8A=A5=E9=94=99=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TsTable/component/table-thead.vue         |  2 +-
 .../process/task/overview/CarouseUserList.vue |  4 +-
 .../pages/process/task/processtask-manage.vue | 58 ++++++++++++-------
 3 files changed, 38 insertions(+), 26 deletions(-)

diff --git a/src/resources/components/TsTable/component/table-thead.vue b/src/resources/components/TsTable/component/table-thead.vue
index 4caaa848..9c54e15a 100644
--- a/src/resources/components/TsTable/component/table-thead.vue
+++ b/src/resources/components/TsTable/component/table-thead.vue
@@ -52,7 +52,7 @@
               </span>
               <span
                 v-else
-                :style="hitem.click && typeof hitem.click == 'function'?'cursor:pointer':''"
+                :style="[hitem.click && typeof hitem.click == 'function'?'cursor:pointer':'', hitem.style]"
                 :class="{'require-label':hitem.isRequired}"
                 @click.stop="clickHeader(hitem)"
               >{{ hitem.title }}</span>
diff --git a/src/views/pages/process/task/overview/CarouseUserList.vue b/src/views/pages/process/task/overview/CarouseUserList.vue
index 4064ddcf..e0036e21 100644
--- a/src/views/pages/process/task/overview/CarouseUserList.vue
+++ b/src/views/pages/process/task/overview/CarouseUserList.vue
@@ -13,7 +13,7 @@
           class=""
         >
           <CarouselItem v-for="(item,iindex) in row.currentstep" :key="row.id+'_'+item.id+'_'+iindex" class="mb-xs">
-            <div class="title-top ">
+            <div class="title-top mt-xs">
               <span class="colorText">{{ item.name }}</span>
             </div>
             <Row>
@@ -213,10 +213,8 @@ export default {
   }
   &.table-Carousel {
     width: 216px;
-    height: 56px;
     padding: 0 20px;
     .title-top {
-      // margin-bottom: 3px;
       font-size: 12px;
     }
 
diff --git a/src/views/pages/process/task/processtask-manage.vue b/src/views/pages/process/task/processtask-manage.vue
index cd98f422..04a20c7e 100644
--- a/src/views/pages/process/task/processtask-manage.vue
+++ b/src/views/pages/process/task/processtask-manage.vue
@@ -54,7 +54,7 @@
                 @getSelected="(value,selectList)=>{ getSelected(selectList) }"
               >
                 <template v-for="(tbody, tindex) in filtertheadList(tableConfig.theadList)" :slot="tbody.key" slot-scope="{ row }">
-                  <div :key="tindex">
+                  <div :key="tindex" style="overflow: hidden;" :style="tbody.key == 'currentstep' ? {height: '50px',display: 'flex',alignItems: 'center'} : {height: '50px',lineHeight: '50px'}">
                     <tdjson
                       v-if="typeof row[tbody.key] === 'object' && tbody.key != 'action'"
                       :key="tindex"
@@ -280,7 +280,7 @@ export default {
     checkshow(headList, val) {
       //设置表格列是否可视
       let theadList = headList
-        .filter(item => !['action', 'focususers', 'score'].includes(item.key))
+        .filter(item => !['action', 'focususers', 'score', 'selection'].includes(item.key))
         .map((d, i) => ({
           name: d.key,
           sort: i,
@@ -319,11 +319,12 @@ export default {
     handlerSearchResult(data) {
       // 处理搜索条件过来的数据
       let theadList = data.theadList.map(d => ({
+       
+        //  title: d.name == 'focususers' ? '关注工单' : d.displayName,
         title: d.displayName,
         key: d.name,
         isShow: d.isShow,
         type: d.type,
-        width: d.width,
         //20220415需求调整为标题可配置
         disabled: d.name == '_' ? 1 : d.disabled,
         isDisabled: d.name == 'title',
@@ -334,7 +335,29 @@ export default {
       }));
       // 页码
       if (this.tableConfig.theadList.length <= 0) {
-        this.tableConfig.theadList = theadList;
+        let newTheadList = [];
+        theadList.forEach((item) => {
+          if (item && item.key) {
+            newTheadList.push(this.getColumnWidth(item));
+          }
+        });
+        // 添加操作
+        let isAction = newTheadList.find(d => d.key === 'action');
+        let isSelection = newTheadList.find(d => d.key === 'selection');
+        if (!isAction) {
+          newTheadList.push({
+            key: 'action',
+            align: 'right',
+            width: 20,
+            isShow: 1
+          });
+        }
+        if (!isSelection) {
+          newTheadList.unshift({
+            key: 'selection'
+          });
+        }
+        this.tableConfig.theadList = [...newTheadList];
       }
       this.tableConfig.rowNum = data.rowNum;
       this.tableConfig.pageSize = data.pageSize;
@@ -386,6 +409,15 @@ export default {
         this.getListOperation(idList);
       }
     },
+    getColumnWidth(item = {}) {
+      const newItem = {...item };
+      if (item && item.key == 'focususers') {
+        // 解决关注工单字段，没有title导致页面宽度会有抖动的问题
+        newItem.width = 50;
+        newItem.style = {width: '50px', display: 'inline-block'};
+      }
+      return newItem;
+    },
     checkExpire(timeList) {
       let timeLeftMin, expireStatus, expireTimeMin, expiredSlaName, willOverTimeMin, willOverSlaName;
       if (timeList && timeList.length > 0) {
@@ -462,24 +494,6 @@ export default {
               }
             });
           });
-          // 添加操作
-          let isAction = this.tableConfig.theadList.find(d => d.key === 'action');
-          if (!isAction) {
-            this.tableConfig.theadList.push({
-              //这个是最后一行操作栏
-              key: 'action',
-              align: 'right',
-              width: 10,
-              isShow: 1
-            });
-          }
-          //选择列表
-          let isSelection = this.tableConfig.theadList.find(d => d.key === 'selection');
-          if (!isSelection) {
-            this.tableConfig.theadList.unshift({
-              key: 'selection'
-            });
-          }
         }
       });
     },
-- 
Gitee


From 48584b2cf4e3e7cf828f91f7e8d3f1c615531b5f Mon Sep 17 00:00:00 2001
From: yaojn <everast@aliyun.com>
Date: Thu, 30 Nov 2023 18:28:20 +0800
Subject: [PATCH 2/2] =?UTF-8?q?-=20[=E5=88=A0=E9=99=A4]=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=E5=86=97=E4=BD=99=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/pages/process/task/processtask-manage.vue | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/views/pages/process/task/processtask-manage.vue b/src/views/pages/process/task/processtask-manage.vue
index 04a20c7e..090dac19 100644
--- a/src/views/pages/process/task/processtask-manage.vue
+++ b/src/views/pages/process/task/processtask-manage.vue
@@ -319,8 +319,6 @@ export default {
     handlerSearchResult(data) {
       // 处理搜索条件过来的数据
       let theadList = data.theadList.map(d => ({
-       
-        //  title: d.name == 'focususers' ? '关注工单' : d.displayName,
         title: d.displayName,
         key: d.name,
         isShow: d.isShow,
-- 
Gitee