From a659ead2bfd5e07a3b2217f6ab9c29fb764ad201 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 22 Mar 2024 10:53:54 +0800
Subject: [PATCH 1/2] =?UTF-8?q?fix(=E4=BB=AA=E8=A1=A8=E6=9D=BF):=20?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=BE=E8=AE=A1=E9=A1=B5=E9=9D=A2?=
 =?UTF-8?q?=EF=BC=8C=E7=82=B9=E5=87=BBcheckbox=E6=97=A0=E6=B3=95=E9=80=89?=
 =?UTF-8?q?=E6=8B=A9=E7=BB=84=E4=BB=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/dashboard/MobileConfigPanel.vue   | 17 ++++++++++-------
 1 file changed, 10 insertions(+), 7 deletions(-)

diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
index 5d2695bef6..763ad983a1 100644
--- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
+++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
@@ -15,7 +15,7 @@ import mobileHeader from '@/assets/img/mobile-header.png'
 const dvMainStore = dvMainStoreWithOut()
 const { componentData, canvasStyleData, canvasViewInfo, dvInfo } = storeToRefs(dvMainStore)
 const mobileLoading = ref(true)
-const mobileStyle = ref({})
+const mobileStyle = ref(null)
 const emits = defineEmits(['pcMode'])
 const snapshotStore = snapshotStoreWithOut()
 
@@ -142,7 +142,7 @@ const setMobileStyle = debounce(() => {
     transform: `scale(${scale}) translateY(-50%)`,
     transformOrigin: '0 0'
   }
-}, 500)
+}, 100)
 onMounted(() => {
   window.addEventListener('message', hanedleMessage)
   window.addEventListener('resize', setMobileStyle)
@@ -212,7 +212,7 @@ const save = () => {
         <el-button type="primary" @click="save">保存</el-button>
       </div>
     </div>
-    <div class="mobile-canvas" :style="mobileStyle">
+    <div class="mobile-canvas" :style="mobileStyle" v-if="mobileStyle">
       <div class="mobile-header">
         <img :src="mobileHeader" alt="" srcset="" />
       </div>
@@ -396,14 +396,14 @@ const save = () => {
       --ed-collapse-content-font-size: 12px;
     }
 
-    :deep(.ed-tabs) {
+    & > :deep(.ed-tabs) {
       --ed-tabs-header-height: 36px;
       border-top: 1px solid #1f232926;
       position: sticky;
       top: 38px;
       left: 0;
       background: #fff;
-      z-index: 21;
+      z-index: 25;
       .ed-tabs__header {
         padding-left: 8px;
         &::before {
@@ -420,6 +420,9 @@ const save = () => {
 
     :deep(.ed-tabs__item) {
       font-size: 12px;
+    }
+
+    :deep(.ed-tabs__item):not(.is-active) {
       color: #646a73;
     }
 
@@ -432,7 +435,7 @@ const save = () => {
       top: 0;
       left: 0;
       background: #fff;
-      z-index: 21;
+      z-index: 25;
     }
 
     .config-mobile-tab {
@@ -480,7 +483,7 @@ const save = () => {
       right: 12px;
       border: 2px solid #8f959e;
       border-radius: 4px;
-      z-index: 20;
+      z-index: 24;
       cursor: pointer;
       &:hover {
         border-color: var(--ed-color-primary-99, #3370ff99);

From 94e4931df7b673bb73f020f2ce1cbb62168d05e6 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Fri, 22 Mar 2024 10:54:18 +0800
Subject: [PATCH 2/2] =?UTF-8?q?fix(=E5=B5=8C=E5=85=A5=E5=BC=8F):=20?=
 =?UTF-8?q?=E5=B5=8C=E5=85=A5=E5=BC=8F=E5=A4=96=E8=A7=82=E9=85=8D=E7=BD=AE?=
 =?UTF-8?q?=E6=8A=A5=E9=94=99?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/pages/panel/App.vue | 4 ----
 core/core-frontend/src/pages/panel/main.ts | 3 +++
 2 files changed, 3 insertions(+), 4 deletions(-)

diff --git a/core/core-frontend/src/pages/panel/App.vue b/core/core-frontend/src/pages/panel/App.vue
index 320a5a6695..125fc067fb 100644
--- a/core/core-frontend/src/pages/panel/App.vue
+++ b/core/core-frontend/src/pages/panel/App.vue
@@ -1,10 +1,6 @@
 <script setup lang="ts">
 import { shallowRef, defineAsyncComponent } from 'vue'
 import { propTypes } from '@/utils/propTypes'
-import { useAppearanceStoreWithOut } from '@/store/modules/appearance'
-
-const appearanceStore = useAppearanceStoreWithOut()
-appearanceStore.setAppearance()
 
 const VisualizationEditor = defineAsyncComponent(
   () => import('@/views/data-visualization/index.vue')
diff --git a/core/core-frontend/src/pages/panel/main.ts b/core/core-frontend/src/pages/panel/main.ts
index 4c2ac81423..544f2485ee 100644
--- a/core/core-frontend/src/pages/panel/main.ts
+++ b/core/core-frontend/src/pages/panel/main.ts
@@ -97,6 +97,9 @@ const setupAll = async (
   const appRes = await import('@/store/modules/app')
   const appStore = appRes.useAppStoreWithOut()
   appStore.setIsDataEaseBi(true)
+  const appearanceRes = await import('@/store/modules/appearance')
+  const appearanceStore = appearanceRes.useAppearanceStoreWithOut()
+  appearanceStore.setAppearance()
   app.mount(dom)
   return app
 }