From ac14a207c4c2a6efc9acacb225e2bfccf3ab560d Mon Sep 17 00:00:00 2001
From: TsMask <340112800@qq.com>
Date: Sat, 25 Nov 2023 19:25:19 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=B6=85=E8=BF=87=E9=AB=98=E5=BA=A6?=
 =?UTF-8?q?=E6=89=8D=E6=98=BE=E7=A4=BA=E6=BB=9A=E5=8A=A8=E6=9D=A1?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableColumnsDnd/index.vue      |  2 +-
 .../configManage/configParamForm/index.vue    |  2 +-
 .../configManage/configParamTree/index.vue    |  4 ++--
 .../configParamTreeTable/index.vue            | 20 +++++++++++++++----
 src/views/neUser/sub/index.vue                |  4 ++--
 src/views/perfManage/customTarget/index.vue   |  2 +-
 src/views/perfManage/perfReport/index.vue     |  2 +-
 src/views/perfManage/perfSet/index.vue        |  2 +-
 src/views/traceManage/analysis/index.vue      |  2 +-
 9 files changed, 26 insertions(+), 14 deletions(-)

diff --git a/src/components/TableColumnsDnd/index.vue b/src/components/TableColumnsDnd/index.vue
index eca75b66..5a71e8ac 100644
--- a/src/components/TableColumnsDnd/index.vue
+++ b/src/components/TableColumnsDnd/index.vue
@@ -99,7 +99,7 @@ emit('update:columns-dnd', tableColumnsCheckList);
       <template #content>
         <a-checkbox-group
           v-model:value="state.columnsTitleList"
-          style="width: 100%"
+          style="width: 100%; max-height: 450px; overflow-y: auto;"
         >
           <Container orientation="vertical" @drop="fnTableColumnsDrop">
             <Draggable v-for="c in tableColumns" :key="c.title">
diff --git a/src/views/configManage/configParamForm/index.vue b/src/views/configManage/configParamForm/index.vue
index a9351db3..0a6aa79a 100644
--- a/src/views/configManage/configParamForm/index.vue
+++ b/src/views/configManage/configParamForm/index.vue
@@ -1604,7 +1604,7 @@ onMounted(() => {
     <!-- 新增框或修改框 -->
     <a-modal
       width="800px"
-      :body-style="{ maxHeight: '650px', 'overflow-y': 'scroll' }"
+      :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByAdd"
diff --git a/src/views/configManage/configParamTree/index.vue b/src/views/configManage/configParamTree/index.vue
index 39a756fe..65fbc5ed 100644
--- a/src/views/configManage/configParamTree/index.vue
+++ b/src/views/configManage/configParamTree/index.vue
@@ -1078,7 +1078,7 @@ onMounted(() => {
         <a-card
           size="small"
           :bordered="false"
-          :body-style="{ maxHeight: '650px', 'overflow-y': 'scroll' }"
+          :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
           :loading="treeState.selectLoading"
         >
           <template #title>
@@ -1648,7 +1648,7 @@ onMounted(() => {
     <!-- 新增框或修改框 -->
     <a-modal
       width="800px"
-      :body-style="{ maxHeight: '650px', 'overflow-y': 'scroll' }"
+      :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByAdd"
diff --git a/src/views/configManage/configParamTreeTable/index.vue b/src/views/configManage/configParamTreeTable/index.vue
index ce0b831e..4fea5c29 100644
--- a/src/views/configManage/configParamTreeTable/index.vue
+++ b/src/views/configManage/configParamTreeTable/index.vue
@@ -3,6 +3,7 @@ import { reactive, ref, onMounted } from 'vue';
 import { PageContainer } from '@ant-design-vue/pro-layout';
 import { message } from 'ant-design-vue/lib';
 import useI18n from '@/hooks/useI18n';
+import TableColumnsDnd from '@/components/TableColumnsDnd/index.vue';
 import { RESULT_CODE_SUCCESS } from '@/constants/result-constants';
 import {
   getParamConfigTopTab,
@@ -106,7 +107,10 @@ function fnActiveConfigNode(key: string | number) {
             title: rule.display,
             dataIndex: rule.name,
             align: 'left',
-            width: 5,
+            resizable: true,
+            width: 150,
+            minWidth: 150,
+            maxWidth: 350,
           });
         }
         columns.push({
@@ -115,7 +119,7 @@ function fnActiveConfigNode(key: string | number) {
           key: 'index',
           align: 'center',
           fixed: 'right',
-          width: 3,
+          width: 100,
         });
         arrayState.columns = columns;
 
@@ -276,6 +280,8 @@ type ArrayStateType = {
   size: SizeType;
   /**多列嵌套记录字段 */
   columns: Record<string, any>[];
+  /**表格字段列排序 */
+  columnsDnd: Record<string, any>[];
   /**多列记录数据 */
   columnsData: Record<string, any>[];
   /**多列嵌套展开key */
@@ -291,6 +297,7 @@ type ArrayStateType = {
 let arrayState: ArrayStateType = reactive({
   size: 'middle',
   columns: [],
+  columnsDnd: [],
   columnsData: [],
   arrayChildExpandKeys: [],
   data: [],
@@ -1276,12 +1283,13 @@ onMounted(() => {
             <a-table
               class="table"
               row-key="index"
-              :columns="treeState.selectNode.method === 'get' ? arrayState.columns.filter((s:any)=>s.key !== 'index') :arrayState.columns"
+              :columns="treeState.selectNode.method === 'get' ? arrayState.columns.filter((s:any)=>s.key !== 'index') : arrayState.columns"
               :data-source="arrayState.columnsData"
               :size="arrayState.size"
               :pagination="false"
               :bordered="true"
               :scroll="{ x: arrayState.columns.length * 200, y: 450 }"
+              @resizeColumn="(w:number, col:any) => (col.width = w)"
               :show-expand-column="false"
               v-model:expanded-row-keys="arrayState.arrayChildExpandKeys"
             >
@@ -1295,6 +1303,10 @@ onMounted(() => {
                   <template #icon> <PlusOutlined /> </template>
                   {{ t('common.addText') }}
                 </a-button>
+                <TableColumnsDnd
+                  :columns="arrayState.columns"
+                  v-model:columns-dnd="arrayState.columnsDnd"
+                ></TableColumnsDnd>
               </template>
 
               <!-- 多列数据渲染 -->
@@ -1443,7 +1455,7 @@ onMounted(() => {
     <!-- 新增框或修改框 -->
     <a-modal
       width="800px"
-      :body-style="{ maxHeight: '650px', 'overflow-y': 'scroll' }"
+      :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visible"
diff --git a/src/views/neUser/sub/index.vue b/src/views/neUser/sub/index.vue
index 05775b23..fd64ad45 100644
--- a/src/views/neUser/sub/index.vue
+++ b/src/views/neUser/sub/index.vue
@@ -1135,7 +1135,7 @@ onMounted(() => {
     <!-- 新增框或修改框 -->
     <DraggableModal
       width="800px"
-      :body-style="{ height: '650px', 'overflow-y': 'scroll' }"
+      :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByEdit"
@@ -1566,7 +1566,7 @@ onMounted(() => {
     <!-- 批量增加框 -->
     <DraggableModal
       width="800px"
-      :body-style="{ height: '650px', 'overflow-y': 'scroll' }"
+      :body-style="{ maxHeight: '650px', 'overflow-y': 'auto' }"
       :keyboard="false"
       :mask-closable="false"
       :visible="modalState.visibleByBatch"
diff --git a/src/views/perfManage/customTarget/index.vue b/src/views/perfManage/customTarget/index.vue
index ae3eb90a..4c971be1 100644
--- a/src/views/perfManage/customTarget/index.vue
+++ b/src/views/perfManage/customTarget/index.vue
@@ -528,7 +528,7 @@ onMounted(() => {
 
   &-html {
     max-height: 300px;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
 }
 </style>
diff --git a/src/views/perfManage/perfReport/index.vue b/src/views/perfManage/perfReport/index.vue
index ae3eb90a..4c971be1 100644
--- a/src/views/perfManage/perfReport/index.vue
+++ b/src/views/perfManage/perfReport/index.vue
@@ -528,7 +528,7 @@ onMounted(() => {
 
   &-html {
     max-height: 300px;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
 }
 </style>
diff --git a/src/views/perfManage/perfSet/index.vue b/src/views/perfManage/perfSet/index.vue
index 462f49df..634bda68 100644
--- a/src/views/perfManage/perfSet/index.vue
+++ b/src/views/perfManage/perfSet/index.vue
@@ -528,7 +528,7 @@ onMounted(() => {
 
   &-html {
     max-height: 300px;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
 }
 </style>
diff --git a/src/views/traceManage/analysis/index.vue b/src/views/traceManage/analysis/index.vue
index c88be98f..b1901bf8 100644
--- a/src/views/traceManage/analysis/index.vue
+++ b/src/views/traceManage/analysis/index.vue
@@ -528,7 +528,7 @@ onMounted(() => {
 
   &-html {
     max-height: 300px;
-    overflow-y: scroll;
+    overflow-y: auto;
   }
 }
 </style>