From c7ef351bffe2d5c00f24764a86a8bee4a9554c8c Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Wed, 25 Oct 2023 10:22:02 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BB=AA=E8=A1=A8=E6=9D=BF=E4=B8=BB?=
 =?UTF-8?q?=E9=A2=98-=E6=9F=A5=E8=AF=A2=E7=BB=84=E4=BB=B6=E6=A0=87?=
 =?UTF-8?q?=E9=A2=98=E9=A2=9C=E8=89=B2=E8=AE=BE=E7=BD=AE=E6=B2=A1=E6=9C=89?=
 =?UTF-8?q?=E7=94=9F=E6=95=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/v-query/Component.vue | 12 +++++++++---
 .../store/modules/data-visualization/dvMain.ts | 18 ++++++++++--------
 .../chart/components/editor/util/chart.ts      | 10 +++++-----
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/core/core-frontend/src/custom-component/v-query/Component.vue b/core/core-frontend/src/custom-component/v-query/Component.vue
index 098f42f62c..e551be3428 100644
--- a/core/core-frontend/src/custom-component/v-query/Component.vue
+++ b/core/core-frontend/src/custom-component/v-query/Component.vue
@@ -374,7 +374,11 @@ const opacityStyle = computed(() => {
       {{ customStyle.title }}
     </p>
     <div
-      :class="['v-query', customStyle.layout]"
+      :class="[
+        'v-query',
+        customStyle.layout,
+        customStyle.titleShow && !!customStyle.title && 'title-show'
+      ]"
       @dragover.prevent.stop="dragover"
       @drop.prevent.stop="drop"
     >
@@ -447,7 +451,6 @@ const opacityStyle = computed(() => {
 .v-query-container {
   width: 100%;
   height: 100%;
-  padding: 16px;
   overflow: auto;
   position: relative;
 
@@ -580,8 +583,11 @@ const opacityStyle = computed(() => {
     z-index: 0;
   }
 
-  &.vertical {
+  &.title-show {
     height: calc(100% - 22px);
+  }
+
+  &.vertical {
     .query-fields-container {
       .query-field {
         padding-top: 30px;
diff --git a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
index 66776aded3..88148d13b7 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -314,6 +314,8 @@ export const dvMainStore = defineStore('dataVisualization', {
         this.canvasViewInfo[component.id] = newView
       }
       if (component.component === 'VQuery') {
+        const { color, titleColor, labelColor, borderColor, bgColor, text, titleLayout, layout } =
+          this.canvasStyleData.component.filterStyle || {}
         const newView = {
           ...JSON.parse(JSON.stringify(BASE_VIEW_CONFIG)),
           id: component.id,
@@ -322,21 +324,21 @@ export const dvMainStore = defineStore('dataVisualization', {
           customStyle: {
             component: {
               show: true,
-              color: '#1f2329',
+              color,
               titleShow: false,
               borderShow: false,
-              text: '#1f2329',
+              text,
               textColorShow: false,
               labelColorShow: false,
-              labelColor: '',
-              borderColor: '',
+              labelColor,
+              borderColor,
               title: '',
               borderWidth: 1,
               bgColorShow: false,
-              bgColor: '',
-              titleColor: '',
-              titleLayout: 'left',
-              layout: 'horizontal',
+              bgColor,
+              titleColor,
+              titleLayout,
+              layout,
               btnList: ['sure']
             }
           }
diff --git a/core/core-frontend/src/views/chart/components/editor/util/chart.ts b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
index 7c2deda5bb..1b7c06e9b4 100644
--- a/core/core-frontend/src/views/chart/components/editor/util/chart.ts
+++ b/core/core-frontend/src/views/chart/components/editor/util/chart.ts
@@ -148,11 +148,11 @@ export const FILTER_COMMON_STYLE_BASE = {
 
 export const FILTER_COMMON_STYLE_LIGHT = {
   ...FILTER_COMMON_STYLE_BASE,
-  labelColor: '#000000',
-  titleColor: '#000000',
-  color: '#000000',
-  borderColor: '#F3E7E7',
-  text: '#484747',
+  labelColor: '#1f2329',
+  titleColor: '#1f2329',
+  color: '#1f2329',
+  borderColor: '#bbbfc4',
+  text: '#1f2329',
   bgColor: '#FFFFFF'
 }