Merge pull request #13831 from dataease/pr@dev-v2@fix_mobile-design

fix(移动端): 修改移动端设计取消变动移动端设计没有被还原问题

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()

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