From b5a3a66362d44dabe3d03eac2df3fdb8225b1d29 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 29 Nov 2022 14:51:45 +0800
Subject: [PATCH] =?UTF-8?q?refacor(=E8=A7=86=E5=9B=BE):=20=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96=E8=A7=86=E5=9B=BE=E8=81=94=E5=8A=A8loading=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=EF=BC=8C=E7=A9=BA=E5=80=BC=E5=A4=84=E7=90=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 frontend/src/api/dataset/dataset.js                      | 4 +++-
 frontend/src/components/deDrag/index.vue                 | 2 +-
 frontend/src/views/chart/components/ChartComponentG2.vue | 2 +-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/frontend/src/api/dataset/dataset.js b/frontend/src/api/dataset/dataset.js
index fc4c5b7c69..6ca3a206a6 100644
--- a/frontend/src/api/dataset/dataset.js
+++ b/frontend/src/api/dataset/dataset.js
@@ -185,7 +185,7 @@ export function multFieldValues(data) {
   return request({
     url: '/dataset/field/multFieldValues',
     method: 'post',
-    loading: true,
+    loading: false,
     data
   })
 }
@@ -241,6 +241,7 @@ export function checkCustomDs() {
     loading: true
   })
 }
+
 export function exportExcel(data) {
   return request({
     url: '/dataset/taskLog/export',
@@ -268,4 +269,5 @@ export function exportDataset(data) {
     responseType: 'blob'
   })
 }
+
 export default { loadTable, getScene, addGroup, delGroup, addTable, delTable, groupTree, checkCustomDs, exportDataset }
diff --git a/frontend/src/components/deDrag/index.vue b/frontend/src/components/deDrag/index.vue
index 032794c410..1fc60a50ab 100644
--- a/frontend/src/components/deDrag/index.vue
+++ b/frontend/src/components/deDrag/index.vue
@@ -602,7 +602,7 @@ export default {
           return 'auto'
         }
       }
-      if (this.element.auxiliaryMatrix) {
+      if (this.element.auxiliaryMatrix && this.curCanvasScaleSelf) {
         const height = Math.round(this.height / this.curCanvasScaleSelf.matrixStyleHeight) * this.curCanvasScaleSelf.matrixStyleHeight
         return (height - this.curGap * 2) + 'px'
       } else {
diff --git a/frontend/src/views/chart/components/ChartComponentG2.vue b/frontend/src/views/chart/components/ChartComponentG2.vue
index 8633394a71..95feea34ab 100644
--- a/frontend/src/views/chart/components/ChartComponentG2.vue
+++ b/frontend/src/views/chart/components/ChartComponentG2.vue
@@ -202,7 +202,7 @@ export default {
       })
     },
     checkSelected(param) {
-      return (this.linkageActiveParam.name === param.name) &&
+      return (this.linkageActiveParam.name === param.name || (this.linkageActiveParam.name === 'NO_DATA' && !param.name)) &&
         (this.linkageActiveParam.category === param.category)
     },
     preDraw() {