From 3c5602beb1ea9ba4b065c33cc84df32658e24b81 Mon Sep 17 00:00:00 2001
From: zyh <zhuyanheng@geedgenetworks.com>
Date: Mon, 4 Dec 2023 10:55:19 +0800
Subject: [PATCH] =?UTF-8?q?fix=EF=BC=9A=E6=A0=B9=E6=8D=AE=E7=94=A8?=
 =?UTF-8?q?=E6=88=B7=E5=81=8F=E5=A5=BD=E8=8E=B7=E5=8F=96=E8=A1=A8=E5=A4=B4?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 nezha-fronted/package-lock.json               |  4 +--
 .../src/components/common/mixin/dataList.js   | 30 +++++++++----------
 2 files changed, 17 insertions(+), 17 deletions(-)

diff --git a/nezha-fronted/package-lock.json b/nezha-fronted/package-lock.json
index bfbde26d4..7e16b4037 100644
--- a/nezha-fronted/package-lock.json
+++ b/nezha-fronted/package-lock.json
@@ -17732,7 +17732,7 @@
     },
     "node-sass": {
       "version": "4.14.1",
-      "resolved": "https://registry.npmjs.org/node-sass/-/node-sass-4.14.1.tgz",
+      "resolved": "https://registry.npmmirror.com/node-sass/-/node-sass-4.14.1.tgz",
       "integrity": "sha512-sjCuOlvGyCJS40R8BscF5vhVlQjNN069NtQ1gSxyK1u9iqvn6tf7O1R4GNowVZfiZUCRt5MmMs1xd+4V/7Yr0g==",
       "dev": true,
       "requires": {
@@ -24364,7 +24364,7 @@
     },
     "webpack-bundle-analyzer": {
       "version": "2.13.1",
-      "resolved": "https://registry.npmjs.org/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
+      "resolved": "https://registry.npmmirror.com/webpack-bundle-analyzer/-/webpack-bundle-analyzer-2.13.1.tgz",
       "integrity": "sha512-rwxyfecTAxoarCC9VlHlIpfQCmmJ/qWD5bpbjkof+7HrNhTNZIwZITxN6CdlYL2axGmwNUQ+tFgcSOiNXMf/sQ==",
       "dev": true,
       "requires": {
diff --git a/nezha-fronted/src/components/common/mixin/dataList.js b/nezha-fronted/src/components/common/mixin/dataList.js
index d582e1583..5156853dd 100644
--- a/nezha-fronted/src/components/common/mixin/dataList.js
+++ b/nezha-fronted/src/components/common/mixin/dataList.js
@@ -447,22 +447,22 @@ export default {
       if (!tableTitle || !this.tableId) {
         return
       }
-      const preferenceTableTitle = (tableHeaders && tableHeaders.length) ? tableHeaders : tableTitle
-      if (tableTitle) {
-        // 先根据本地缓存中的prop进行排序
-        tableTitle.sort(function (a, b) {
-          return preferenceTableTitle.findIndex(function (c) {
-            return c.prop === a.prop
-          }) - preferenceTableTitle.findIndex(function (c) {
-            return c.prop === b.prop
-          })
+      let preferenceTableTitle = (tableHeaders && tableHeaders.length) ? tableHeaders : tableTitle
+      // 先根据本地缓存中的prop进行排序
+      tableTitle.sort(function (a, b) {
+        return preferenceTableTitle.findIndex(function (c) {
+          return c.prop === a.prop
+        }) - preferenceTableTitle.findIndex(function (c) {
+          return c.prop === b.prop
         })
-        this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题
-          item.show = preferenceTableTitle[index].show
-          return item
-        })
-      }
-      if (preferenceTableTitle && (preferenceTableTitle.length > tableTitle.length)) {
+      })
+      this.tools.customTableTitle = tableTitle.map((item, index) => { // 修复切换中英文的问题
+        item.show = preferenceTableTitle[index].show
+        return item
+      })
+
+      preferenceTableTitle = preferenceTableTitle.filter(item => tableTitle.find(t => item.prop === t.prop || item.type === 'label'))
+      if (preferenceTableTitle.length > tableTitle.length) { // asset label
         const arr = preferenceTableTitle.splice(tableTitle.length, preferenceTableTitle.length)
         arr.forEach(item => {
           item.minWidth = item.label.length * 16 + 20