From 18cfe958ff31934819e58386d5552304d1177cc6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Tue, 23 Jan 2024 15:58:51 +0800
Subject: [PATCH] =?UTF-8?q?refactor:=20=E6=89=B9=E9=87=8F=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/data-visualization/dvMain.ts           | 5 ++++-
 .../chart/components/editor/editor-style/ChartStyle.vue      | 2 +-
 .../editor/editor-style/components/LabelSelector.vue         | 1 -
 3 files changed, 5 insertions(+), 3 deletions(-)

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 37cad0c879..23479f03d1 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -569,7 +569,10 @@ export const dvMainStore = defineStore('dataVisualization', {
           mixPropertiesTemp = deepCopy(componentInfo.properties)
           mixPropertyInnerTemp = deepCopy(componentInfo.propertyInner)
         }
-        batchAttachInfo.type = componentInfo.value
+        batchAttachInfo.type =
+          batchAttachInfo.type === null || batchAttachInfo.type === componentInfo.value
+            ? componentInfo.value
+            : 'mix'
       }
       mixPropertiesTemp.forEach(property => {
         if (mixPropertyInnerTemp[property]) {
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index fd70f29ec7..54707fee91 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -271,7 +271,7 @@ watch(
           </collapse-switch-item>
           <el-collapse-item
             :effect="themes"
-            v-if="showProperties('misc-selector')"
+            v-if="showProperties('misc-selector') && !chart.type.includes('mix')"
             name="size"
             title="大小"
           >
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
index 12d063fc9e..8406c6e0cc 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/components/LabelSelector.vue
@@ -210,7 +210,6 @@ onMounted(() => {
     :model="state.labelForm"
     label-position="top"
   >
-    <el-row v-if="batchOptStatus" style="margin-bottom: 12px"> 无其他公共属性 </el-row>
     <el-space>
       <el-form-item
         class="form-item"