From 5c499d9237c640e2d6d37e61b654dd46f9d64431 Mon Sep 17 00:00:00 2001
From: dataeaseShu <tong.shu@fit2cloud.com>
Date: Thu, 11 Apr 2024 14:22:31 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B8=83=E5=B1=80=E5=90=8E?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=97=A0=E6=B3=95=E7=BB=A7=E7=BB=AD?=
 =?UTF-8?q?=E5=90=91tab=E7=BB=84=E4=BB=B6=E6=B7=BB=E5=8A=A0=E5=9B=BE?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../custom-component/de-tabs/Component.vue    |  2 +-
 .../src/views/dashboard/MobileConfigPanel.vue | 24 ++-----------------
 .../src/views/mobile/panel/index.vue          | 10 ++++----
 3 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/core/core-frontend/src/custom-component/de-tabs/Component.vue b/core/core-frontend/src/custom-component/de-tabs/Component.vue
index 7da1567c0c..9c1ce42381 100644
--- a/core/core-frontend/src/custom-component/de-tabs/Component.vue
+++ b/core/core-frontend/src/custom-component/de-tabs/Component.vue
@@ -50,7 +50,7 @@
           </el-dropdown>
         </template>
         <de-canvas
-          v-if="isEdit"
+          v-if="isEdit && !mobileInPc"
           :ref="'tabCanvas_' + index"
           :component-data="tabItem.componentData"
           :canvas-style-data="canvasStyleData"
diff --git a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
index bc876958a0..6e02d04a5a 100644
--- a/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
+++ b/core/core-frontend/src/views/dashboard/MobileConfigPanel.vue
@@ -41,9 +41,6 @@ const mobileStatusChange = (type, value) => {
 }
 
 const handleLoad = () => {
-  componentData.value.forEach(ele => {
-    ele.inMobile = canvasDataPreview.includes(ele.id)
-  })
   mobileStatusChange(
     'panelInit',
     JSON.parse(
@@ -111,26 +108,9 @@ const saveCanvasWithCheckFromMobile = () => {
     ElMessage.success('保存成功')
   })
 }
-let canvasDataPreview = []
 const loadCanvasData = () => {
-  if (!dvInfo.value?.id) {
-    handleLoad()
-    mobileLoading.value = false
-    return
-  }
-  findById(dvInfo.value.id, 'dashboard')
-    .then(res => {
-      const canvasInfo = res.data
-      const canvasDataResult = JSON.parse(canvasInfo.componentData) as unknown as Array<{
-        inMobile: boolean
-        id: string
-      }>
-      canvasDataPreview = (canvasDataResult || []).filter(ele => !!ele.inMobile).map(ele => ele.id)
-      handleLoad()
-    })
-    .finally(() => {
-      mobileLoading.value = false
-    })
+  handleLoad()
+  mobileLoading.value = false
 }
 
 const setMobileStyle = debounce(() => {
diff --git a/core/core-frontend/src/views/mobile/panel/index.vue b/core/core-frontend/src/views/mobile/panel/index.vue
index d47b72e70a..7e69bd72b5 100644
--- a/core/core-frontend/src/views/mobile/panel/index.vue
+++ b/core/core-frontend/src/views/mobile/panel/index.vue
@@ -30,10 +30,12 @@ const hanedleMessage = event => {
         ele.propValue.forEach(tabItem => {
           tabItem.componentData.forEach(tabComponent => {
             const { mx: tx, my: ty, mSizeX: tSizeX, mSizeY: tSizeY } = tabComponent
-            tabComponent.x = tx
-            tabComponent.y = ty
-            tabComponent.sizeX = tSizeX
-            tabComponent.sizeY = tSizeY
+            if (tSizeX && tSizeY) {
+              tabComponent.x = tx
+              tabComponent.y = ty
+              tabComponent.sizeX = tSizeX
+              tabComponent.sizeY = tSizeY
+            }
           })
         })
       }