From 1b4a760238df035f43b7eb2500e3a81def16e2c1 Mon Sep 17 00:00:00 2001
From: hyx <hanyuxia@iie.ac.cn>
Date: Tue, 20 Dec 2022 16:10:28 +0800
Subject: [PATCH] =?UTF-8?q?CN-827=20=E8=A7=A3=E5=86=B3=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E5=90=8E=E6=8A=A5=E9=94=99=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/utils/tools.js | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

diff --git a/src/utils/tools.js b/src/utils/tools.js
index d0d6af51..31b15b4f 100644
--- a/src/utils/tools.js
+++ b/src/utils/tools.js
@@ -976,10 +976,30 @@ export async function combinDrilldownTableWithUserConfig () {
             defaultTab.checked = currentUserTab.checked
             if (defaultTab && defaultTab.hasMetricSearch === true) {
               defaultTab.metrics.forEach(metric => {
+                if(currentUserTableConfig.columns) {
+                  const sortColumns = []
+                  sortColumns.push(metric.columns[0])
+                  currentUserTableConfig.columns.forEach((column, index) => {
+                    const sortColumn = metric.columns.find(metricColumn => {
+                      if (metricColumn.name) {
+                        return metricColumn.name === column
+                      } else {
+                        return metricColumn === column
+                      }
+                    })
+                    if (sortColumn) {
+                      sortColumns.push(sortColumn)
+                    }
+                  })
+                  metric.columns = sortColumns
+                }
+              })
+            } else {
+              if(currentUserTableConfig.columns) {
                 const sortColumns = []
-                sortColumns.push(metric.columns[0])
+                sortColumns.push(defaultTab.columns[0])
                 currentUserTableConfig.columns.forEach((column, index) => {
-                  const sortColumn = metric.columns.find(metricColumn => {
+                  const sortColumn = defaultTab.columns.find(metricColumn => {
                     if (metricColumn.name) {
                       return metricColumn.name === column
                     } else {
@@ -990,24 +1010,8 @@ export async function combinDrilldownTableWithUserConfig () {
                     sortColumns.push(sortColumn)
                   }
                 })
-                metric.columns = sortColumns
-              })
-            } else {
-              const sortColumns = []
-              sortColumns.push(defaultTab.columns[0])
-              currentUserTableConfig.columns.forEach((column, index) => {
-                const sortColumn = defaultTab.columns.find(metricColumn => {
-                  if (metricColumn.name) {
-                    return metricColumn.name === column
-                  } else {
-                    return metricColumn === column
-                  }
-                })
-                if (sortColumn) {
-                  sortColumns.push(sortColumn)
-                }
-              })
-              defaultTab.columns = sortColumns
+                defaultTab.columns = sortColumns
+              }
             }
             sortTabs.push(defaultTab)
           }