From 182cce161c2c74ba028f3a2c96fd975d5f3e9b87 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 12 Jul 2024 14:53:52 +0800
Subject: [PATCH] =?UTF-8?q?feat(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F):=20?=
 =?UTF-8?q?=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=94=AF=E6=8C=81=E9=9A=90?=
 =?UTF-8?q?=E8=97=8F=E7=BB=84=E4=BB=B6=EF=BC=8C=E6=A0=B7=E5=BC=8F=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/data-visualization/DvToolbar.vue | 13 +++++++------
 .../editor/editor-style/VQueryChartStyle.vue        |  6 ++++--
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/core/core-frontend/src/components/data-visualization/DvToolbar.vue b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
index 2ab95177f8..415366efd3 100644
--- a/core/core-frontend/src/components/data-visualization/DvToolbar.vue
+++ b/core/core-frontend/src/components/data-visualization/DvToolbar.vue
@@ -155,6 +155,7 @@ const backHandler = (url: string) => {
     openHandler.value.invokeMethod(pm)
     return
   }
+  dvMainStore.canvasStateChange({ key: 'curPointArea', value: 'base' })
   wsCache.delete('DE-DV-CATCH-' + dvInfo.value.id)
   window.open(url, '_self')
 }
@@ -191,6 +192,11 @@ const openOuterParamsSet = () => {
 const multiplexingCanvasOpen = () => {
   multiplexingRef.value.dialogInit('dataV')
 }
+
+const fullScreenPreview = () => {
+  dvMainStore.canvasStateChange({ key: 'curPointArea', value: 'base' })
+  fullScreeRef.value.toggleFullscreen()
+}
 </script>
 
 <template>
@@ -305,12 +311,7 @@ const multiplexingCanvasOpen = () => {
         >
           编辑
         </el-button>
-        <el-button
-          v-else
-          class="preview-button"
-          @click="() => fullScreeRef.toggleFullscreen()"
-          style="float: right"
-        >
+        <el-button v-else class="preview-button" @click="fullScreenPreview" style="float: right">
           预览
         </el-button>
         <el-button
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
index 02ea31c26c..e1f2d08b9d 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/VQueryChartStyle.vue
@@ -214,6 +214,7 @@ if (!chart.value.customStyle.component.hasOwnProperty('labelShow')) {
               <el-input-number
                 v-model="chart.customStyle.component.queryConditionWidth"
                 :min="0"
+                :effect="themes"
                 controls-position="right"
               />
             </el-form-item>
@@ -226,6 +227,7 @@ if (!chart.value.customStyle.component.hasOwnProperty('labelShow')) {
               <el-input-number
                 v-model="chart.customStyle.component.queryConditionSpacing"
                 :min="0"
+                :effect="themes"
                 controls-position="right"
               />
             </el-form-item>
@@ -249,8 +251,8 @@ if (!chart.value.customStyle.component.hasOwnProperty('labelShow')) {
               :class="'form-item-' + themes"
             >
               <el-radio-group :effect="themes" v-model="chart.customStyle.component.layout">
-                <el-radio label="vertical"> 上侧 </el-radio>
-                <el-radio label="horizontal"> 左侧 </el-radio>
+                <el-radio label="vertical" :effect="themes"> 上侧 </el-radio>
+                <el-radio label="horizontal" :effect="themes"> 左侧 </el-radio>
               </el-radio-group>
             </el-form-item>
             <el-form-item