refactor(仪表板): 优化移动端设计面板部分交互问题

core/core-backend/src/main/java/io/dataease/chart/manage/ChartViewManege.java

@@ -335,7 +335,9 @@ public class ChartViewManege {
         record.setExtLabel(objectMapper.writeValueAsString(dto.getExtLabel()));
         record.setExtTooltip(objectMapper.writeValueAsString(dto.getExtTooltip()));
         record.setCustomAttr(objectMapper.writeValueAsString(dto.getCustomAttr()));
+        record.setCustomAttrMobile(objectMapper.writeValueAsString(dto.getCustomAttrMobile()));
         record.setCustomStyle(objectMapper.writeValueAsString(dto.getCustomStyle()));
+        record.setCustomStyleMobile(objectMapper.writeValueAsString(dto.getCustomStyleMobile()));
         record.setSenior(objectMapper.writeValueAsString(dto.getSenior()));
         record.setDrillFields(objectMapper.writeValueAsString(dto.getDrillFields()));
         record.setCustomFilter(objectMapper.writeValueAsString(dto.getCustomFilter()));
@@ -363,7 +365,9 @@ public class ChartViewManege {
         dto.setExtLabel(JsonUtil.parseList(record.getExtLabel(), tokenType));
         dto.setExtTooltip(JsonUtil.parseList(record.getExtTooltip(), tokenType));
         dto.setCustomAttr(JsonUtil.parse(record.getCustomAttr(), Map.class));
+        dto.setCustomAttrMobile(JsonUtil.parse(record.getCustomAttrMobile(), Map.class));
         dto.setCustomStyle(JsonUtil.parse(record.getCustomStyle(), Map.class));
+        dto.setCustomStyleMobile(JsonUtil.parse(record.getCustomStyleMobile(), Map.class));
         dto.setSenior(JsonUtil.parse(record.getSenior(), Map.class));
         dto.setDrillFields(JsonUtil.parseList(record.getDrillFields(), tokenType));
         dto.setCustomFilter(JsonUtil.parseObject(record.getCustomFilter(), FilterTreeObj.class));

core/core-backend/src/main/resources/mybatis/ExtDataVisualizationMapper.xml

@@ -19,7 +19,9 @@
                                        `ext_label`,
                                        `ext_tooltip`,
                                        `custom_attr`,
+                                       `custom_attr_mobile`,
                                        `custom_style`,
+                                       `custom_style_mobile`,
                                        `custom_filter`,
                                        `drill_fields`,
                                        `senior`,
@@ -59,7 +61,9 @@
                `ext_label`,
                `ext_tooltip`,
                `custom_attr`,
+               `custom_attr_mobile`,
                `custom_style`,
+               `custom_style_mobile`,
                `custom_filter`,
                `drill_fields`,
                `senior`,

core/core-frontend/src/utils/canvasUtils.ts

@@ -397,11 +397,13 @@ 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 } = ele
+        const { mx, my, mSizeX, mSizeY, mStyle, mCommonBackground } = ele
         ele.x = mx
         ele.y = my
         ele.sizeX = mSizeX
         ele.sizeY = mSizeY
+        ele.mStyle = mStyle || ele.Style
+        ele.mCommonBackground = mCommonBackground || ele.commonBackground
         if (ele.component === 'DeTabs') {
           ele.propValue.forEach(tabItem => {
             tabItem.componentData.forEach(tabComponent => {
@@ -413,6 +415,14 @@ export function initCanvasDataMobile(dvId, busiFlag, callBack) {
           })
         }
       })
+      if (!!canvasViewInfoPreview) {
+        Object.keys(canvasViewInfoPreview).forEach(key => {
+          const viewInfo = canvasViewInfoPreview[key]
+          const { customAttrMobile, customStyleMobile } = viewInfo
+          viewInfo['customAttr'] = customAttrMobile || viewInfo['customAttr']
+          viewInfo['customStyle'] = customStyleMobile || viewInfo['customStyle']
+        })
+      }
       dvMainStore.setComponentData(componentData)
       dvMainStore.setCanvasStyle(canvasStyleResult)
       dvMainStore.updateCurDvInfo(dvInfo)

sdk/extensions/extensions-view/src/main/java/io/dataease/extensions/view/dto/ChartViewBaseDTO.java

@@ -114,10 +114,19 @@ public class ChartViewBaseDTO implements Serializable {
      */
     private Map<String, Object> customAttr;
 
+    /**
+     * 移动端图形属性
+     */
+    private Map<String, Object> customAttrMobile;
+
     /**
      * 组件样式
      */
     private Map<String, Object> customStyle;
+    /**
+     * 移动端组件样式
+     */
+    private Map<String, Object> customStyleMobile;
 
     /**
      * 结果过滤