From bf5084f236138edc7db41c9bcaf6ab84fd4f4ee6 Mon Sep 17 00:00:00 2001
From: wangjiahao <1522128093@qq.com>
Date: Mon, 4 Jul 2022 17:04:41 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E5=AF=BC=E5=85=A5?=
 =?UTF-8?q?=E6=9C=89=E7=A7=BB=E5=8A=A8=E7=AB=AF=E5=B8=83=E5=B1=80=E7=9A=84?=
 =?UTF-8?q?=E4=BB=AA=E8=A1=A8=E6=9D=BF=E6=97=B6=EF=BC=8C=E5=88=97=E8=A1=A8?=
 =?UTF-8?q?=E4=B8=AD=E6=B2=A1=E6=9C=89=E5=8F=8A=E6=97=B6=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E7=A7=BB=E5=8A=A8=E7=AB=AF=E6=A0=87=E8=AF=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../dataease/service/panel/PanelGroupService.java |  4 ++++
 .../dataease/service/panel/PanelViewService.java  | 15 +++++++++++++++
 2 files changed, 19 insertions(+)

diff --git a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
index 791075fa0c..8f4119f477 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelGroupService.java
@@ -372,6 +372,7 @@ public class PanelGroupService {
         String templateData = null;
         String dynamicData = null;
         String staticResource = null;
+        Boolean mobileLayout = false;
         if (PanelConstants.NEW_PANEL_FROM.NEW.equals(newFrom)) {
             // do nothing
         } else {
@@ -381,11 +382,13 @@ public class PanelGroupService {
                 templateStyle = panelTemplate.getTemplateStyle();
                 templateData = panelTemplate.getTemplateData();
                 dynamicData = panelTemplate.getDynamicData();
+                mobileLayout = panelViewService.havaMobileLayout(templateData);
             } else if (PanelConstants.NEW_PANEL_FROM.NEW_OUTER_TEMPLATE.equals(newFrom)) {
                 templateStyle = request.getPanelStyle();
                 templateData = request.getPanelData();
                 dynamicData = request.getDynamicData();
                 staticResource = request.getStaticResource();
+                mobileLayout = panelViewService.havaMobileLayout(templateData);
             }
             Map<String, String> dynamicDataMap = gson.fromJson(dynamicData, Map.class);
             List<PanelViewInsertDTO> panelViews = new ArrayList<>();
@@ -418,6 +421,7 @@ public class PanelGroupService {
         request.setId(newPanelId);
         request.setCreateTime(System.currentTimeMillis());
         request.setCreateBy(AuthUtils.getUser().getUsername());
+        request.setMobileLayout(mobileLayout);
         return newPanelId;
     }
 
diff --git a/backend/src/main/java/io/dataease/service/panel/PanelViewService.java b/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
index 92da5afb59..6dabb1229b 100644
--- a/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
+++ b/backend/src/main/java/io/dataease/service/panel/PanelViewService.java
@@ -133,6 +133,21 @@ public class PanelViewService {
         return viewIds;
     }
 
+    public Boolean havaMobileLayout(String panelData){
+        Boolean mobileLayout = false;
+        if (StringUtils.isNotEmpty(panelData)) {
+            JsonArray dataArray = JsonParser.parseString(panelData).getAsJsonArray();
+            for (int i = 0; i < dataArray.size(); i++) {
+                JsonObject jsonObject = dataArray.get(i).getAsJsonObject();
+                if (jsonObject.get("mobileSelected") != null && jsonObject.get("mobileSelected").getAsBoolean()) {
+                    mobileLayout = true;
+                }
+            }
+        }
+
+        return mobileLayout;
+    }
+
     public List<PanelViewTableDTO> detailList(String panelId) {
         return extPanelViewMapper.getPanelViewDetails(panelId);
     }