From aac6a741041e59a62d09a6cb4891318e37570e49 Mon Sep 17 00:00:00 2001 From: Hans Date: Sun, 27 Sep 2020 15:32:00 +0800 Subject: [PATCH 1/4] =?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); From 80a151dfa4e17e8bf2688cac32c0471e97d6bb0a Mon Sep 17 00:00:00 2001 From: pengda Date: Sun, 27 Sep 2020 17:02:17 +0800 Subject: [PATCH 2/4] =?UTF-8?q?REPORT-40606=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=91=E8=A1=A8=E5=8D=95=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=AA=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=A4=9A=E6=AC=A1=E6=8B=96=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=88=87=E6=8D=A2=E6=A8=A1=E6=9D=BF=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E8=A1=8C=E4=BA=86=EF=BC=8C=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/FormDesigner.java | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index c4fa2df8a1..ba26806e9c 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -1337,6 +1337,9 @@ public class FormDesigner extends TargetComponent
implements TreeSelection // 当前选中控件可以上移一层吗？ public boolean isCurrentComponentMovableUp() { XCreator creator = getSelectionModel().getSelection().getSelectedCreator(); + if (null == creator) { + return false; + } XLayoutContainer container = (XLayoutContainer) creator.getParent(); if (container == null || !container.supportInnerOrderChangeActions()) { return false; @@ -1347,6 +1350,9 @@ public class FormDesigner extends TargetComponent implements TreeSelection // 当前选中控件可以下移一层吗？ public boolean isCurrentComponentMovableDown() { XCreator creator = getSelectionModel().getSelection().getSelectedCreator(); + if (creator == null) { + return false; + } XLayoutContainer container = (XLayoutContainer) creator.getParent(); if (container == null || !container.supportInnerOrderChangeActions()) { return false; From f091351eb61a83410d56c1fcf9c460444e34556e Mon Sep 17 00:00:00 2001 From: pengda Date: Sun, 27 Sep 2020 17:03:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?REPORT-40606=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=91=E8=A1=A8=E5=8D=95=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=AA=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=A4=9A=E6=AC=A1=E6=8B=96=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=88=87=E6=8D=A2=E6=A8=A1=E6=9D=BF=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E8=A1=8C=E4=BA=86=EF=BC=8C=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/FormDesigner.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index ba26806e9c..200eced172 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -1350,7 +1350,7 @@ public class FormDesigner extends TargetComponent implements TreeSelection // 当前选中控件可以下移一层吗？ public boolean isCurrentComponentMovableDown() { XCreator creator = getSelectionModel().getSelection().getSelectedCreator(); - if (creator == null) { + if (null == creator) { return false; } XLayoutContainer container = (XLayoutContainer) creator.getParent(); From 84dc75af2cb0fedd3c8d0395a4764e351a87c5ce Mon Sep 17 00:00:00 2001 From: pengda Date: Sun, 27 Sep 2020 17:59:57 +0800 Subject: [PATCH 4/4] =?UTF-8?q?REPORT-40606=20=E3=80=90=E5=9B=9E=E5=BD=92?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=91=E8=A1=A8=E5=8D=95=E6=A8=A1=E6=9D=BF?= =?UTF-8?q?=E5=A6=82=E6=9E=9C=E6=9C=AA=E9=80=89=E6=8B=A9=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E8=BF=9B=E8=A1=8C=E5=A4=9A=E6=AC=A1=E6=8B=96=E5=8A=A8=EF=BC=8C?= =?UTF-8?q?=E5=86=8D=E5=88=87=E6=8D=A2=E6=A8=A1=E6=9D=BF=E5=B0=B1=E4=B8=8D?= =?UTF-8?q?=E8=A1=8C=E4=BA=86=EF=BC=8C=E6=8A=A5=E9=94=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../src/main/java/com/fr/design/mainframe/FormDesigner.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java index 200eced172..a80032ed6f 100644 --- a/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java +++ b/designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java @@ -619,8 +619,9 @@ public class FormDesigner extends TargetComponent implements TreeSelection if (paraComponent != null && paraComponent.acceptType(XWParameterLayout.class)) { return true; } else { - if (this.getSelectionModel().getSelection().getSelectedCreator().getParent() != null - && ((XLayoutContainer) this.getSelectionModel().getSelection().getSelectedCreator().getParent()).acceptType(XWAbsoluteLayout.class)) { + XCreator creator = this.getSelectionModel().getSelection().getSelectedCreator(); + if (creator != null && creator.getParent() != null + && ((XLayoutContainer) creator.getParent()).acceptType(XWAbsoluteLayout.class)) { return true; } }