From 9e7242c27dfec7427acfb9503376888213fc3b56 Mon Sep 17 00:00:00 2001
From: jackhoo_98 <jackhoo_98@foxmail.com>
Date: Tue, 28 Mar 2023 22:06:04 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20bug#11161=20=E4=BF=AE=E5=A4=8D=E9=87=87?=
 =?UTF-8?q?=E9=9B=86=E5=99=A8=E6=89=AB=E6=8F=8Ftable=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E5=BC=82=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Collector/Point/Scan/Table.vue            | 34 +++++++++++++------
 src/views/DataCollect/Collector/data.ts       |  8 ++---
 2 files changed, 28 insertions(+), 14 deletions(-)

diff --git a/src/views/DataCollect/Collector/Point/Scan/Table.vue b/src/views/DataCollect/Collector/Point/Scan/Table.vue
index 51e183f9..4ee32205 100644
--- a/src/views/DataCollect/Collector/Point/Scan/Table.vue
+++ b/src/views/DataCollect/Collector/Point/Scan/Table.vue
@@ -4,7 +4,7 @@
             v-if="modelRef.dataSource.length !== 0"
             :dataSource="modelRef.dataSource"
             :columns="FormTableColumns"
-            :scroll="{ x: 1000, y: 550 }"
+            :scroll="{ y: 580 }"
         >
             <template #headerCell="{ column }">
                 <template
@@ -46,12 +46,18 @@
                             :bordered="false"
                         ></j-input>
                     </j-form-item>
-                    <div style="margin: -24px 0 0 10px">
-                        <Ellipsis style="width: calc(100% - 10px)">
-                            <span>
-                                {{ record[dataIndex] }}
-                            </span>
-                        </Ellipsis>
+                    <div
+                        style="
+                            margin: -24px 0 0 10px;
+                            overflow: hidden;
+                            white-space: nowrap;
+                            text-overflow: ellipsis;
+                        "
+                    >
+                        <j-tooltip>
+                            <template #title>{{ record[dataIndex] }}</template>
+                            {{ record[dataIndex] }}
+                        </j-tooltip>
                     </div>
                 </template>
                 <template v-if="dataIndex === 'accessModes'">
@@ -112,7 +118,7 @@
                         ]"
                     >
                         <j-input
-                            style="width: 70%"
+                            style="width: 60%"
                             v-model:value="
                                 record.configuration[dataIndex].value
                             "
@@ -148,7 +154,7 @@
                         ]"
                     >
                         <j-select
-                            style="width: 50%"
+                            style="width: 40%"
                             v-model:value="record[dataIndex].value"
                             placeholder="请选择"
                             allowClear
@@ -309,12 +315,20 @@ watch(
 
 <style lang="less" scoped>
 .table {
+    width: 100%;
+    min-width: 600px;
+    :deep(.ant-table-header) {
+        .ant-table-cell {
+            padding: 16px 5px;
+        }
+    }
+
     :deep(.ant-table-tbody) {
         .ant-table-cell {
             padding: 24px 0 0 0;
         }
         .ant-table-cell-fix-right-first {
-            padding: 0 0 0 20px;
+            padding: 0 0 0 10px;
         }
     }
     :deep(.ant-pagination) {
diff --git a/src/views/DataCollect/Collector/data.ts b/src/views/DataCollect/Collector/data.ts
index 3256b89d..738c5eb4 100644
--- a/src/views/DataCollect/Collector/data.ts
+++ b/src/views/DataCollect/Collector/data.ts
@@ -177,7 +177,7 @@ export const FormTableColumns = [
         title: 'nodeId',
         dataIndex: 'id',
         key: 'id',
-        width: 180,
+        width: 200,
         ellipsis: true,
     },
     {
@@ -190,19 +190,19 @@ export const FormTableColumns = [
         title: '采集频率',
         key: 'interval',
         dataIndex: 'interval',
-        width: 220,
+        width: 200,
     },
     {
         title: '只推送变化的数据',
         key: 'features',
         dataIndex: 'features',
-        width: 160,
+        width: 140,
     },
     {
         title: '操作',
         key: 'action',
         dataIndex: 'action',
         fixed: 'right',
-        width: 60,
+        width: 50,
     },
 ];