From 3dc6ce9e4c07904a11f7e77928b8177f2eb6b631 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Wed, 4 Dec 2024 16:52:11 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E7=A7=BB=E5=8A=A8=E7=AB=AF):=20=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=BE=E8=AE=A1=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88=E5=8F=98=E5=8A=A8=E7=A7=BB=E5=8A=A8=E7=AB=AF=E8=AE=BE?=
 =?UTF-8?q?=E8=AE=A1=E6=B2=A1=E6=9C=89=E8=A2=AB=E8=BF=98=E5=8E=9F=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/components/visualization/ComponentEditBar.vue       | 4 ++--
 core/core-frontend/src/utils/canvasUtils.ts                 | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/core/core-frontend/src/components/visualization/ComponentEditBar.vue b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
index bfdc7b5ba9..a8bacd6178 100644
--- a/core/core-frontend/src/components/visualization/ComponentEditBar.vue
+++ b/core/core-frontend/src/components/visualization/ComponentEditBar.vue
@@ -1,7 +1,7 @@
 <template>
   <div
     class="bar-main"
-    v-if="!mobileInPc"
+    v-if="!mobileInPc && !isMobile()"
     :class="[
       showEditPosition,
       {
@@ -236,7 +236,7 @@ import { ElMessage, ElTooltip, ElButton } from 'element-plus-secondary'
 import CustomTabsSort from '@/custom-component/de-tabs/CustomTabsSort.vue'
 import { exportPivotExcel } from '@/views/chart/components/js/panel/common/common_table'
 import { XpackComponent } from '@/components/plugin'
-import { exportPermission } from '@/utils/utils'
+import { exportPermission, isMobile } from '@/utils/utils'
 const dvMainStore = dvMainStoreWithOut()
 const snapshotStore = snapshotStoreWithOut()
 const copyStore = copyStoreWithOut()
diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 9320a6cb12..fee2988917 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -410,9 +410,9 @@ export async function backCanvasData(dvId, mobileViewInfo, busiFlag, callBack) {
           }
         }
       })
-      Object.keys(mobileViewInfo).forEach(key => {
-        if (canvasViewInfo.value[key] && mobileViewInfo[key]) {
-          const { customAttrMobile, customStyleMobile } = mobileViewInfo[key]
+      Object.keys(canvasViewInfoPreview).forEach(key => {
+        if (canvasViewInfo.value[key] && canvasViewInfoPreview[key]) {
+          const { customAttrMobile, customStyleMobile } = canvasViewInfoPreview[key]
           // 此处作为还原移动设计使用
           canvasViewInfo.value[key]['customStyleMobile'] = customStyleMobile
           canvasViewInfo.value[key]['customAttrMobile'] = customAttrMobile