From 0d43e2141f0f611e954316ac8cf357fe8a16dc05 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=88=98=E6=B4=AA=E6=B4=AA?= <2498601771@qq.com>
Date: Wed, 19 Apr 2023 16:25:55 +0800
Subject: [PATCH] =?UTF-8?q?CN-956:=20=E7=AE=A1=E7=90=86=E4=B8=8B=E7=9A=84?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E6=97=A5=E5=BF=97=E6=A8=A1=E5=9D=97=EF=BC=8C?=
 =?UTF-8?q?=E8=87=AA=E5=AE=9A=E4=B9=89=E5=88=97=E5=8A=9F=E8=83=BD=E5=BC=82?=
 =?UTF-8?q?=E5=B8=B8?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/table/administration/ChartTable.vue        | 4 ++--
 src/components/table/administration/GalaxyProxyTable.vue  | 4 ++--
 src/components/table/administration/I18nTable.vue         | 4 ++--
 src/components/table/administration/OperationLogTable.vue | 4 ++--
 src/components/table/administration/RoleTable.vue         | 4 ++--
 src/components/table/administration/UserTable.vue         | 4 ++--
 src/components/table/report/ReportTable.vue               | 4 ++--
 src/mixins/table.js                                       | 6 +++++-
 src/views/charts/charts/ChartActiveIpTable.vue            | 4 ++--
 src/views/charts/charts/ChartIpOpenPortBar.vue            | 4 ++--
 src/views/charts/charts/ChartTable.vue                    | 8 ++++----
 src/views/charts/charts/PieTable.vue                      | 8 ++++----
 12 files changed, 31 insertions(+), 27 deletions(-)

diff --git a/src/components/table/administration/ChartTable.vue b/src/components/table/administration/ChartTable.vue
index a7bd2d50..e3578d71 100644
--- a/src/components/table/administration/ChartTable.vue
+++ b/src/components/table/administration/ChartTable.vue
@@ -16,8 +16,8 @@
             width="55">
     </el-table-column>
     <el-table-column
-            v-for="(item, index) in customTableTitles"
-            :key="`col-${index}`"
+            v-for="item in customTableTitles"
+            :key="item.prop"
             :fixed="item.fixed"
             :label="item.label"
             :min-width="`${item.minWidth}`"
diff --git a/src/components/table/administration/GalaxyProxyTable.vue b/src/components/table/administration/GalaxyProxyTable.vue
index 9d1d3868..aa07fe21 100644
--- a/src/components/table/administration/GalaxyProxyTable.vue
+++ b/src/components/table/administration/GalaxyProxyTable.vue
@@ -18,8 +18,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
-      :key="`col-${index}`"
+      v-for="item in customTableTitles"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"
diff --git a/src/components/table/administration/I18nTable.vue b/src/components/table/administration/I18nTable.vue
index eb575afc..9e16fe56 100644
--- a/src/components/table/administration/I18nTable.vue
+++ b/src/components/table/administration/I18nTable.vue
@@ -16,8 +16,8 @@
         width="55">
     </el-table-column>
     <el-table-column
-        v-for="(item, index) in customTableTitles"
-        :key="`col-${index}`"
+        v-for="item in customTableTitles"
+        :key="item.prop"
         :fixed="item.fixed"
         :label="item.label"
         :min-width="`${item.minWidth}`"
diff --git a/src/components/table/administration/OperationLogTable.vue b/src/components/table/administration/OperationLogTable.vue
index 6df3a51f..9e851049 100644
--- a/src/components/table/administration/OperationLogTable.vue
+++ b/src/components/table/administration/OperationLogTable.vue
@@ -18,8 +18,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
-      :key="`col-${index}`"
+      v-for="item in customTableTitles"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"
diff --git a/src/components/table/administration/RoleTable.vue b/src/components/table/administration/RoleTable.vue
index 62238910..f4142e67 100644
--- a/src/components/table/administration/RoleTable.vue
+++ b/src/components/table/administration/RoleTable.vue
@@ -16,8 +16,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
-      :key="`col-${index}`"
+      v-for="item in customTableTitles"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"
diff --git a/src/components/table/administration/UserTable.vue b/src/components/table/administration/UserTable.vue
index 267468b9..1fc1e4ae 100644
--- a/src/components/table/administration/UserTable.vue
+++ b/src/components/table/administration/UserTable.vue
@@ -17,8 +17,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
-      :key="`col-${index}`"
+      v-for="item in customTableTitles"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"
diff --git a/src/components/table/report/ReportTable.vue b/src/components/table/report/ReportTable.vue
index 9d70e5e0..bbc6d184 100644
--- a/src/components/table/report/ReportTable.vue
+++ b/src/components/table/report/ReportTable.vue
@@ -96,8 +96,8 @@
           width="30">
       </el-table-column>
       <el-table-column
-          v-for="(item, index) in customTableTitles"
-          :key="`col-${index}`"
+          v-for="item in customTableTitles"
+          :key="item.prop"
           :fixed="item.fixed"
           :label="item.label"
           :min-width="`${item.minWidth}`"
diff --git a/src/mixins/table.js b/src/mixins/table.js
index fd975e5c..8180a826 100644
--- a/src/mixins/table.js
+++ b/src/mixins/table.js
@@ -81,7 +81,11 @@ export default {
 
             // 有排序的，额外添加24px的排序图标宽度
             if (item.sortable) {
-              item.minWidth = item.minWidth + 32
+              if (!item.initFlag) {
+                item.minWidth = item.minWidth + 32
+              }
+              // 避免customize多次点击save生成表格，导致width越来越大，保证初始化一次就确定宽度
+              item.initFlag = true
             }
 
             if (item.minWidth < newWidth) {
diff --git a/src/views/charts/charts/ChartActiveIpTable.vue b/src/views/charts/charts/ChartActiveIpTable.vue
index 8ed39f27..08823b33 100644
--- a/src/views/charts/charts/ChartActiveIpTable.vue
+++ b/src/views/charts/charts/ChartActiveIpTable.vue
@@ -25,9 +25,9 @@
         </el-table-column>
 
         <el-table-column
-            v-for="(c, i) in table.tableColumns"
+            v-for="c in table.tableColumns"
             show-overflow-tooltip
-            :key="i"
+            :key="c"
             :label="c"
             :prop="c"
         >
diff --git a/src/views/charts/charts/ChartIpOpenPortBar.vue b/src/views/charts/charts/ChartIpOpenPortBar.vue
index 9985d680..66df9358 100644
--- a/src/views/charts/charts/ChartIpOpenPortBar.vue
+++ b/src/views/charts/charts/ChartIpOpenPortBar.vue
@@ -11,8 +11,8 @@
                 :size="'mini'"
                 :height="'100%'">
             <el-table-column
-                    v-for="(item,index) in tableKey"
-                    :key="index"
+                    v-for="item in tableKey"
+                    :key="item.prop"
                     :label="item.label"
                     :prop="item.prop"
                     :min-width="item.width"
diff --git a/src/views/charts/charts/ChartTable.vue b/src/views/charts/charts/ChartTable.vue
index abb8eb03..c94dd8d2 100644
--- a/src/views/charts/charts/ChartTable.vue
+++ b/src/views/charts/charts/ChartTable.vue
@@ -9,17 +9,17 @@
         <el-table-column :width="60" v-if="table.currentPageData.length" type="index" label="#">
         </el-table-column>
         <el-table-column
-            v-for="(c, i) in table.tableColumns.common"
+            v-for="c in table.tableColumns.common"
             show-overflow-tooltip
-            :key="i"
+            :key="c"
             :label="$t(chartTableColumnMapping[c] || c)"
             :prop="c"
         >
         </el-table-column>
         <el-table-column
-            v-for="(c, i) in table.tableColumns.order"
+            v-for="c in table.tableColumns.order"
             show-overflow-tooltip
-            :key="i"
+            :key="c"
             :label="$t(chartTableColumnMapping[c] || c)"
             :prop="c"
         >
diff --git a/src/views/charts/charts/PieTable.vue b/src/views/charts/charts/PieTable.vue
index 29ccc0b7..c7a6e5c0 100644
--- a/src/views/charts/charts/PieTable.vue
+++ b/src/views/charts/charts/PieTable.vue
@@ -27,8 +27,8 @@
                 width="48">
             </el-table-column>
             <el-table-column
-                v-for="(item, index) in tableTitlesOther"
-                :key="index"
+                v-for="item in tableTitlesOther"
+                :key="item.prop"
                 show-overflow-tooltip
                 :min-width="item.width"
                 :label="item.label"
@@ -55,8 +55,8 @@
       </template>
     </el-table-column>
     <el-table-column
-        v-for="(item, index) in tableTitles"
-        :key="index"
+        v-for="item in tableTitles"
+        :key="item.prop"
         show-overflow-tooltip
         :min-width="item.width"
         :label="(tableNameColumn === 'appName'&& item.prop === 'tableNameColumn')? $t('overall.appName'):item.label"