From 55bc0b10e12fd16c9acb428c7e8c66725e85a983 Mon Sep 17 00:00:00 2001
From: wisonic-s <shaochuan.wu@fit2cloud.com>
Date: Thu, 13 Apr 2023 17:28:14 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E8=A7=86=E5=9B=BE):=20=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E8=A7=86=E5=9B=BE=E5=88=9D=E5=A7=8B=E5=8C=96?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/views/chart/chart/util.js        | 26 ++++++++++---------
 .../functionStyle/MapMarkSelector.vue         |  2 +-
 2 files changed, 15 insertions(+), 13 deletions(-)

diff --git a/frontend/src/views/chart/chart/util.js b/frontend/src/views/chart/chart/util.js
index 224c1c11f4..6217ad80c3 100644
--- a/frontend/src/views/chart/chart/util.js
+++ b/frontend/src/views/chart/chart/util.js
@@ -3367,19 +3367,21 @@ export function getColors(chart, colors, reset) {
     }
   } else if (equalsAny(chart.type, 'bar-group', 'line')) {
     // 拿到data中的category，并去重，然后构建seriesColor
-    const data = chart.data.data
-    const s = []
-    data.forEach((cur) => {
-      if (s.indexOf(cur.category) < 0) {
-        s.push(cur.category)
-      }
-    })
-    for (let i = 0; i < s.length; i++) {
-      seriesColors.push({
-        name: s[i],
-        color: colors[i % colors.length],
-        isCustom: false
+    if (chart.data) {
+      const data = chart.data.data
+      const s = []
+      data.forEach((cur) => {
+        if (s.indexOf(cur.category) < 0) {
+          s.push(cur.category)
+        }
       })
+      for (let i = 0; i < s.length; i++) {
+        seriesColors.push({
+          name: s[i],
+          color: colors[i % colors.length],
+          isCustom: false
+        })
+      }
     }
   } else {
     if (chart.data) {
diff --git a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
index 0068368aa7..b670235d88 100644
--- a/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
+++ b/frontend/src/views/chart/components/functionStyle/MapMarkSelector.vue
@@ -243,7 +243,7 @@ export default {
     fieldOptions() {
       const xaxis = this.view.xaxis
       const yaxis = this.view.yaxis
-      const locationIds = this.view.viewFields.filter(item => item.busiType === 'locationXaxis' || item.busiType === 'locationYaxis').map(item => item.id)
+      const locationIds = this.view.viewFields ? this.view.viewFields.filter(item => item.busiType === 'locationXaxis' || item.busiType === 'locationYaxis').map(item => item.id) : []
       const xIds = xaxis ? xaxis.map(item => item.id) : []
       const yIds = yaxis ? yaxis.map(item => item.id) : []
       const disableIds = [...xIds, ...yIds, ...locationIds]