From 2e21e38cf9f28fdd64e24fc4fa57b70fb97dcaaa Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 25 Jul 2024 16:18:37 +0800
Subject: [PATCH 1/2] =?UTF-8?q?refactor(=E6=95=B0=E6=8D=AE=E5=A4=A7?=
 =?UTF-8?q?=E5=B1=8F):=20=E6=95=B0=E6=8D=AE=E5=A4=A7=E5=B1=8F=E6=89=B9?=
 =?UTF-8?q?=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/custom-component/common/CommonAttr.vue           | 9 +++++++--
 .../editor/editor-style/ChartStyleBatchSet.vue           | 2 +-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/core/core-frontend/src/custom-component/common/CommonAttr.vue b/core/core-frontend/src/custom-component/common/CommonAttr.vue
index c1034964d6..4044854748 100644
--- a/core/core-frontend/src/custom-component/common/CommonAttr.vue
+++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue
@@ -34,7 +34,7 @@ const props = withDefaults(
 
 const { themes, element, showStyle } = toRefs(props)
 const dvMainStore = dvMainStoreWithOut()
-const { dvInfo } = storeToRefs(dvMainStore)
+const { dvInfo, batchOptStatus } = storeToRefs(dvMainStore)
 const activeName = ref(element.value.collapseName)
 
 const styleKeys = computed(() => {
@@ -53,6 +53,11 @@ const onChange = () => {
 const isIncludesColor = str => {
   return str.toLowerCase().includes('color')
 }
+
+const positionComponentShow = computed(() => {
+  return !batchOptStatus.value && !dashboardActive.value
+})
+
 const dashboardActive = computed(() => {
   return dvInfo.value.type === 'dashboard'
 })
@@ -123,7 +128,7 @@ const stopEvent = e => {
 <template>
   <div class="v-common-attr" ref="containerRef">
     <el-collapse v-model="activeName" @change="onChange()">
-      <el-collapse-item :effect="themes" title="位置" name="position" v-if="!dashboardActive">
+      <el-collapse-item :effect="themes" title="位置" name="position" v-if="positionComponentShow">
         <component-position :themes="themes" />
       </el-collapse-item>
 
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
index 04b65605ab..dfac95cae8 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyleBatchSet.vue
@@ -33,7 +33,7 @@
       :element="batchOptComponentInfo"
       :show-style="mixProperties.includes('common-style')"
       @onAttrChange="onStyleAttrChange"
-      themes="light"
+      :themes="themes"
     ></common-attr>
     <el-row v-else class="view-selected-message-class">
       <span class="select-view">请选择组件...</span>

From cb9506c6691b20249174ff43e924a7e4ea934536 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Thu, 25 Jul 2024 16:27:40 +0800
Subject: [PATCH 2/2] =?UTF-8?q?refactor(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E4=BC=98=E5=8C=96=E6=89=B9=E9=87=8F=E8=AE=BE=E7=BD=AE=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E8=83=8C=E6=99=AF=E9=BB=98=E8=AE=A4=E5=80=BC=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/store/modules/data-visualization/dvMain.ts        | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 567afe4125..331caadd92 100644
--- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
+++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts
@@ -16,6 +16,8 @@ import { useEmitt } from '@/hooks/web/useEmitt'
 import chartViewManager from '@/views/chart/components/js/panel'
 import {
   COMMON_COMPONENT_BACKGROUND_BASE,
+  COMMON_COMPONENT_BACKGROUND_DARK,
+  COMMON_COMPONENT_BACKGROUND_LIGHT,
   defaultStyleValue,
   findBaseDeFaultAttr
 } from '@/custom-component/component-list'
@@ -630,7 +632,11 @@ export const dvMainStore = defineStore('dataVisualization', {
             mode: 'batchOpt',
             render: batchAttachInfo.render,
             type: batchAttachInfo.type,
-            commonBackground: deepCopy(COMMON_COMPONENT_BACKGROUND_BASE),
+            commonBackground: deepCopy(
+              this.curOriginThemes === 'light'
+                ? COMMON_COMPONENT_BACKGROUND_LIGHT
+                : COMMON_COMPONENT_BACKGROUND_DARK
+            ),
             customAttr: this.changeProperties.customAttr,
             customStyle: this.changeProperties.customStyle
           }