CN-956: 管理下的操作日志模块，自定义列功能异常

src/components/table/administration/ChartTable.vue

@@ -16,8 +16,8 @@
             width="55">
     </el-table-column>
     <el-table-column
-            v-for="(item, index) in customTableTitles"
+            v-for="item in customTableTitles"
-            :key="`col-${index}`"
+            :key="item.prop"
             :fixed="item.fixed"
             :label="item.label"
             :min-width="`${item.minWidth}`"

src/components/table/administration/GalaxyProxyTable.vue

@@ -18,8 +18,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
+      v-for="item in customTableTitles"
-      :key="`col-${index}`"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"

src/components/table/administration/I18nTable.vue

@@ -16,8 +16,8 @@
         width="55">
     </el-table-column>
     <el-table-column
-        v-for="(item, index) in customTableTitles"
+        v-for="item in customTableTitles"
-        :key="`col-${index}`"
+        :key="item.prop"
         :fixed="item.fixed"
         :label="item.label"
         :min-width="`${item.minWidth}`"

src/components/table/administration/OperationLogTable.vue

@@ -18,8 +18,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
+      v-for="item in customTableTitles"
-      :key="`col-${index}`"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"

src/components/table/administration/RoleTable.vue

@@ -16,8 +16,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
+      v-for="item in customTableTitles"
-      :key="`col-${index}`"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"

src/components/table/administration/UserTable.vue

@@ -17,8 +17,8 @@
       width="55">
     </el-table-column>
     <el-table-column
-      v-for="(item, index) in customTableTitles"
+      v-for="item in customTableTitles"
-      :key="`col-${index}`"
+      :key="item.prop"
       :fixed="item.fixed"
       :label="item.label"
       :min-width="`${item.minWidth}`"

src/components/table/report/ReportTable.vue

@@ -96,8 +96,8 @@
           width="30">
       </el-table-column>
       <el-table-column
-          v-for="(item, index) in customTableTitles"
+          v-for="item in customTableTitles"
-          :key="`col-${index}`"
+          :key="item.prop"
           :fixed="item.fixed"
           :label="item.label"
           :min-width="`${item.minWidth}`"

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) {

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"
         >

src/views/charts/charts/ChartIpOpenPortBar.vue

@@ -11,8 +11,8 @@
                 :size="'mini'"
                 :height="'100%'">
             <el-table-column
-                    v-for="(item,index) in tableKey"
+                    v-for="item in tableKey"
-                    :key="index"
+                    :key="item.prop"
                     :label="item.label"
                     :prop="item.prop"
                     :min-width="item.width"

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"
         >

src/views/charts/charts/PieTable.vue

@@ -27,8 +27,8 @@
                 width="48">
             </el-table-column>
             <el-table-column
-                v-for="(item, index) in tableTitlesOther"
+                v-for="item in tableTitlesOther"
-                :key="index"
+                :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"
+        v-for="item in tableTitles"
-        :key="index"
+        :key="item.prop"
         show-overflow-tooltip
         :min-width="item.width"
         :label="(tableNameColumn === 'appName'&& item.prop === 'tableNameColumn')? $t('overall.appName'):item.label"