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