From b6413e9bdacf66e154c8ed3151ac4e7e972e3e2f Mon Sep 17 00:00:00 2001 From: wangjiahao <1522128093@qq.com> Date: Sun, 1 Dec 2024 18:51:01 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=83=A8=E5=88=86=E7=BB=84=E4=BB=B6=E6=B2=A1?= =?UTF-8?q?=E6=9C=89=E8=83=8C=E6=99=AF=E8=89=B2=E9=80=89=E9=A1=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/custom-component/common/CommonAttr.vue | 7 ++++++- .../src/store/modules/data-visualization/dvMain.ts | 12 ++++++++++-- .../src/views/dashboard/MobileConfigPanel.vue | 1 + 3 files changed, 17 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 821b9ecdc6..71ce524ce2 100644 --- a/core/core-frontend/src/custom-component/common/CommonAttr.vue +++ b/core/core-frontend/src/custom-component/common/CommonAttr.vue @@ -94,7 +94,12 @@ const tabTitleShow = computed(() => { }) const styleShow = computed(() => { - return element.value && element.value.style && element.value.component !== 'DeTabs' + return ( + element.value && + element.value.style && + element.value.component !== 'DeTabs' && + Object.keys(element.value.style).length > 0 + ) }) onMounted(() => { 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 0154481963..1057a7e944 100644 --- a/core/core-frontend/src/store/modules/data-visualization/dvMain.ts +++ b/core/core-frontend/src/store/modules/data-visualization/dvMain.ts @@ -643,7 +643,11 @@ export const dvMainStore = defineStore('dataVisualization', { if (this.batchOptComponentType !== 'UserView') { this.batchOptComponentInfo = { collapseName: 'background', - commonBackground: deepCopy(COMMON_COMPONENT_BACKGROUND_BASE), + commonBackground: deepCopy( + this.curOriginThemes === 'light' + ? COMMON_COMPONENT_BACKGROUND_LIGHT + : COMMON_COMPONENT_BACKGROUND_DARK + ), style: {} } @@ -678,7 +682,11 @@ export const dvMainStore = defineStore('dataVisualization', { } else { this.batchOptComponentInfo = { collapseName: 'background', - commonBackground: deepCopy(COMMON_COMPONENT_BACKGROUND_BASE), + commonBackground: deepCopy( + this.curOriginThemes === 'light' + ? COMMON_COMPONENT_BACKGROUND_LIGHT + : COMMON_COMPONENT_BACKGROUND_DARK + ), style: {} } this.mixPropertiesInner['common-style']?.forEach(styleKey => { diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue index f6aa204065..b2869310bf 100644 --- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue +++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue @@ -371,6 +371,7 @@ const save = () => { .mobile-config-panel { height: 100vh; width: 100vw; + overflow: hidden; position: relative; background: #f5f6f7;