From 30d61b32fc7418e5b37157d4cc7b3343818962fb Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 27 Aug 2024 16:23:17 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F?=
 =?UTF-8?q?=E3=80=81=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20=E4=BF=AE=E6=94=B9?=
 =?UTF-8?q?=E9=83=A8=E5=88=86=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E5=B1=9E?=
 =?UTF-8?q?=E6=80=A7=E5=A4=B1=E6=95=88=E9=97=AE=E9=A2=98=EF=BC=8C=E6=96=87?=
 =?UTF-8?q?=E6=A1=88=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/CanvasBaseSetting.vue |  2 +-
 .../src/custom-component/common/CommonStyleSet.vue     | 10 +++++++---
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue b/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue
index 3c4825f82e..4bb01d37f2 100644
--- a/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue
+++ b/core/core-frontend/src/components/visualization/CanvasBaseSetting.vue
@@ -9,7 +9,7 @@
           @change="onPopButtonChange"
         >
           <div style="display: flex; line-height: 14px">
-            显示弹窗区筛选按钮
+            <span style="margin-right: 4px">显示弹窗区筛选按钮</span>
             <el-tooltip class="item" :effect="themes" placement="bottom">
               <template #content>
                 <div>预览时启用</div>
diff --git a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
index 86d800adf1..5b90eae187 100644
--- a/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
+++ b/core/core-frontend/src/custom-component/common/CommonStyleSet.vue
@@ -16,7 +16,9 @@
                 :effect="themes"
                 v-model="styleForm[styleOptionKey.value]"
                 size="small"
-                @change="changeStyle"
+                @change="
+                  changeStyle({ key: styleOptionKey.value, value: styleForm[styleOptionKey.value] })
+                "
               >
                 <template #prefix>
                   <el-icon :class="{ 'dark-icon': themes === 'dark' }">
@@ -56,7 +58,9 @@
                 :triggerWidth="styleColorKey.width"
                 is-custom
                 :predefine="state.predefineColors"
-                @change="changeStyle"
+                @change="
+                  changeStyle({ key: styleColorKey.value, value: styleForm[styleColorKey.value] })
+                "
               >
               </el-color-picker>
             </el-form-item>
@@ -486,7 +490,7 @@ const checkItalic = () => {
 
 function setPosition(key, p: 'left' | 'center' | 'right') {
   styleForm.value[key] = p
-  changeStyle({ key: key, p })
+  changeStyle({ key: key, value: p })
 }
 
 watch(