From aac6a741041e59a62d09a6cb4891318e37570e49 Mon Sep 17 00:00:00 2001
From: Hans <Hans@fanruan.com>
Date: Sun, 27 Sep 2020 15:32:00 +0800
Subject: [PATCH] =?UTF-8?q?MOBILE-29590=E3=80=90=E8=AE=BE=E8=AE=A1?=
 =?UTF-8?q?=E5=99=A8=E3=80=91=E4=B8=8D=E5=8B=BE=E9=80=89=E6=89=8B=E6=9C=BA?=
 =?UTF-8?q?=E9=87=8D=E5=B8=83=E5=B1=80=EF=BC=8Ctabpane=E7=A7=BB=E5=8A=A8?=
 =?UTF-8?q?=E7=AB=AF=E5=B1=9E=E6=80=A7=E4=B8=AD=E6=B2=A1=E6=9C=89tab?=
 =?UTF-8?q?=E6=89=8B=E5=8A=BF=E8=AE=BE=E7=BD=AE=E9=A1=B9=20=E9=80=9A?=
 =?UTF-8?q?=E7=94=A8=E9=85=8D=E7=BD=AE=E9=A1=B9=E4=B8=BA=E9=95=BF=E5=AD=98?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A1=B9=20=E4=B8=8D=E5=8F=97=E7=BA=A6?=
 =?UTF-8?q?=E6=9D=9F=20=E7=9B=B4=E6=8E=A5=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mobile/TabMobileWidgetDefinePane.java       | 17 ++++++++++-------
 .../component/MobileTabCommonSettingPane.java   |  9 ++++++---
 2 files changed, 16 insertions(+), 10 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
index 9b0bc18b3b..ee7a28c295 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/TabMobileWidgetDefinePane.java
@@ -67,25 +67,28 @@ public class TabMobileWidgetDefinePane extends MobileWidgetDefinePane {
         JPanel jPanel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{label, templateStyleEditor}, {new UILabel()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_LARGE);
         JPanel holder = FRGUIPaneFactory.createBorderLayout_S_Pane();
         holder.add(jPanel, BorderLayout.NORTH);
+        JPanel innerAdvancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         if (!shouldHidePadding(designer)) {
-            JPanel innerAdvancePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
             marginPane = new MobileComponentMarginPane(FormTabPaddingAttrMark.XML_TAG);
             intervalPane = new MobileComponentLayoutIntervalPane(FormTabPaddingAttrMark.XML_TAG);
             if (FormDesignerUtils.isAppRelayout(designer)) {
                 mobileBookMarkUsePane = new MobileBookMarkUsePane();
                 innerAdvancePane.add(mobileBookMarkUsePane, BorderLayout.CENTER);
             }
-            mobileTabCommonSettingPane = new MobileTabCommonSettingPane();
-            innerAdvancePane.add(mobileTabCommonSettingPane, BorderLayout.SOUTH);
-            innerAdvancePane.add(marginPane, BorderLayout.NORTH);
-            UIExpandablePane advancePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, innerAdvancePane);
+            mobileTabCommonSettingPane = new MobileTabCommonSettingPane(false);
             UIExpandablePane layoutPane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Layout"), 280, 20, intervalPane);
-            //高级
-            holder.add(advancePane, BorderLayout.CENTER);
+            innerAdvancePane.add(marginPane, BorderLayout.NORTH);
             //布局
             holder.add(layoutPane, BorderLayout.SOUTH);
+        } else {
+            mobileTabCommonSettingPane = new MobileTabCommonSettingPane(true);
         }
 
+        innerAdvancePane.add(mobileTabCommonSettingPane, BorderLayout.SOUTH);
+        UIExpandablePane advancePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, innerAdvancePane);
+        //高级
+        holder.add(advancePane, BorderLayout.CENTER);
+
         this.add(holder, BorderLayout.NORTH);
     }
 
diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTabCommonSettingPane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTabCommonSettingPane.java
index 85475fd688..82a09c4e00 100644
--- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTabCommonSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/component/MobileTabCommonSettingPane.java
@@ -36,11 +36,11 @@ public class MobileTabCommonSettingPane extends BasicPane {
     private NewColorSelectBox initDotColorBox;
     private NewColorSelectBox selectDotColorBox;
 
-    public MobileTabCommonSettingPane() {
-        initComponent();
+    public MobileTabCommonSettingPane(boolean isTopComponent) {
+        initComponent(isTopComponent);
     }
 
-    private void initComponent() {
+    private void initComponent(boolean isTopComponent) {
         this.setLayout(FRGUIPaneFactory.createBorderLayout());
 
         this.showTabTitleCheck = new UICheckBox(
@@ -126,6 +126,9 @@ public class MobileTabCommonSettingPane extends BasicPane {
         );
 
         final JPanel tableConfigJPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
+        if (isTopComponent) {
+            tableConfigJPanel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, 0, 0));
+        }
         tableConfigJPanel.add(tabBaseConfigPanel, BorderLayout.NORTH);
         tableConfigJPanel.add(dotIndicatorSettingPanel, BorderLayout.CENTER);
         this.add(tableConfigJPanel, BorderLayout.CENTER);