From ecd3ab3095aec5ac8755514d0a5329c06476c80d Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Fri, 1 Nov 2024 18:59:35 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E6=8C=87=E6=A0=87?=
 =?UTF-8?q?=E5=8D=A1=E7=A7=BB=E5=8A=A8=E7=AB=AF=E4=BA=8B=E4=BB=B6=E5=8F=AF?=
 =?UTF-8?q?=E8=83=BD=E4=B8=8D=E7=94=9F=E6=95=88=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 core/core-frontend/src/utils/canvasUtils.ts   | 28 +++++++++++++++----
 .../editor/editor-style/ChartStyle.vue        |  2 +-
 2 files changed, 24 insertions(+), 6 deletions(-)

diff --git a/core/core-frontend/src/utils/canvasUtils.ts b/core/core-frontend/src/utils/canvasUtils.ts
index 16d5d99085..415444aa87 100644
--- a/core/core-frontend/src/utils/canvasUtils.ts
+++ b/core/core-frontend/src/utils/canvasUtils.ts
@@ -423,15 +423,28 @@ export function initCanvasDataMobile(dvId, busiFlag, callBack) {
     function ({ canvasDataResult, canvasStyleResult, dvInfo, canvasViewInfoPreview }) {
       const componentData = canvasDataResult.filter(ele => !!ele.inMobile)
       canvasDataResult.forEach(ele => {
-        const { mx, my, mSizeX, mSizeY, mStyle, mPropValue, mEvents, mCommonBackground } = ele
+        const {
+          mx,
+          my,
+          mSizeX,
+          mSizeY,
+          mStyle,
+          mPropValue,
+          mEvents,
+          mCommonBackground,
+          style,
+          propValue,
+          events,
+          commonBackground
+        } = ele
         ele.x = mx
         ele.y = my
         ele.sizeX = mSizeX
         ele.sizeY = mSizeY
-        ele.mStyle = mStyle || ele.Style
-        ele.mPropValue = mPropValue || ele.propValue
-        ele.mEvents = mEvents || ele.events
-        ele.mCommonBackground = mCommonBackground || ele.commonBackground
+        ele.style = mStyle || style
+        ele.propValue = mPropValue || propValue
+        ele.events = mEvents || events
+        ele.commonBackground = mCommonBackground || commonBackground
         if (ele.component === 'DeTabs') {
           ele.propValue.forEach(tabItem => {
             tabItem.componentData.forEach(tabComponent => {
@@ -439,6 +452,11 @@ export function initCanvasDataMobile(dvId, busiFlag, callBack) {
               tabComponent.y = tabComponent.my
               tabComponent.sizeX = tabComponent.mSizeX
               tabComponent.sizeY = tabComponent.mSizeY
+              tabComponent.style = tabComponent.mStyle || tabComponent.style
+              tabComponent.propValue = tabComponent.mPropValue || tabComponent.propValue
+              tabComponent.events = tabComponent.mEvents || tabComponent.events
+              tabComponent.commonBackground =
+                tabComponent.mCommonBackground || tabComponent.commonBackground
             })
           })
         }
diff --git a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
index cf492ff552..748e597fe1 100644
--- a/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
+++ b/core/core-frontend/src/views/chart/components/editor/editor-style/ChartStyle.vue
@@ -445,7 +445,7 @@ watch(
               @onLabelChange="onLabelChange"
             />
           </collapse-switch-item>
-          // tooltip 为鼠标悬停 移动端看不到效果 不再单独配置
+          <!-- tooltip 为鼠标悬停 移动端看不到效果 不再单独配置 -->
           <collapse-switch-item
             v-if="showProperties('tooltip-selector') && !mobileInPc"
             v-model="chart.customAttr.tooltip.show"