From defb4f37df53eb15262673fb0377633e4e99c5f8 Mon Sep 17 00:00:00 2001 From: Hades Date: Tue, 18 Feb 2020 19:37:40 +0800 Subject: [PATCH 1/2] MOBILE-25475 && MOBILE-25477 --- .../mobile/ui/MobileCollapsedStyleExpandPane.java | 14 +++++++++++++- .../ui/designer/mobile/ChartEditorDefinePane.java | 6 ++++-- .../ui/designer/mobile/ElementCaseDefinePane.java | 6 ++++-- 3 files changed, 21 insertions(+), 5 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java index d1b603561..ff7e830de 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java @@ -1,7 +1,10 @@ package com.fr.design.mainframe.mobile.ui; import com.fr.design.gui.ilable.UILabel; +import com.fr.design.gui.ispinner.ColumnRowSpinner; import com.fr.design.gui.ispinner.UISpinner; +import com.fr.design.gui.itextfield.UIIntNumberField; +import com.fr.design.gui.itextfield.UINumberField; import com.fr.design.i18n.Toolkit; import com.fr.design.layout.FRGUIPaneFactory; import com.fr.design.mainframe.widget.UITitleSplitLine; @@ -9,6 +12,7 @@ import com.fr.form.ui.mobile.MobileCollapsedStyle; import com.fr.form.ui.mobile.MobileFormCollapsedStyle; import javax.swing.JPanel; +import javax.swing.SpinnerListModel; import java.awt.BorderLayout; import java.awt.Dimension; @@ -19,6 +23,8 @@ import java.awt.Dimension; */ public class MobileCollapsedStyleExpandPane extends MobileCollapsedStylePane { + private static final Dimension DEFAULT_SPINNER_SIZE = new Dimension(60, 24); + private UISpinner rowSpinner; public MobileCollapsedStyleExpandPane() { @@ -29,7 +35,13 @@ public class MobileCollapsedStyleExpandPane extends MobileCollapsedStylePane { protected JPanel createLinePane() { UITitleSplitLine splitLine = new UITitleSplitLine(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Line_Number"), 520); splitLine.setPreferredSize(new Dimension(520, 20)); - this.rowSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, 1); + this.rowSpinner = new UISpinner(1, Integer.MAX_VALUE, 1, 1) { + @Override + protected UINumberField initNumberField(){ + return new UIIntNumberField(); + } + }; + rowSpinner.setPreferredSize(DEFAULT_SPINNER_SIZE); JPanel panel = new JPanel(); panel.setLayout(FRGUIPaneFactory.createBoxFlowLayout()); panel.add(new UILabel(Toolkit.i18nText("Fine-Design_Mobile_Collapse_Start_From"))); diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java index dd3aba563..7427a0281 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java @@ -217,8 +217,10 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane { mobileAttr.setFunctionalWhenUnactivated(!functionalWhenUnactivatedCheckBox.isSelected()); } MobileCollapsedStyle style = this.mobileCollapsedStyleEditor.getStyle(); - ((ChartEditor) xCreator.toData()).setMobileCollapsedStyle(style); - style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom()); + if (style != null) { + ((ChartEditor) xCreator.toData()).setMobileCollapsedStyle(style); + style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom()); + } DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来 } } diff --git a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java index 847ddff65..5ff9c783c 100644 --- a/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java +++ b/designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java @@ -187,8 +187,10 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane { ((ElementCaseEditor) xCreator.toData()).setFunctionalWhenUnactivated(!functionalWhenUnactivatedCheckBox.isSelected()); } MobileCollapsedStyle style = this.mobileCollapsedStyleEditor.getStyle(); - style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom()); - ((ElementCaseEditor) xCreator.toData()).setMobileCollapsedStyle(style); + if (style != null) { + style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom()); + ((ElementCaseEditor) xCreator.toData()).setMobileCollapsedStyle(style); + } } private void setGlobalNames() { From 37ce54d077bfee7346dbcd33cedbd88ed89083fd Mon Sep 17 00:00:00 2001 From: Hades Date: Tue, 18 Feb 2020 19:45:35 +0800 Subject: [PATCH 2/2] fix import --- .../mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java index ff7e830de..766f06d51 100644 --- a/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java +++ b/designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java @@ -1,7 +1,6 @@ package com.fr.design.mainframe.mobile.ui; import com.fr.design.gui.ilable.UILabel; -import com.fr.design.gui.ispinner.ColumnRowSpinner; import com.fr.design.gui.ispinner.UISpinner; import com.fr.design.gui.itextfield.UIIntNumberField; import com.fr.design.gui.itextfield.UINumberField; @@ -12,7 +11,6 @@ import com.fr.form.ui.mobile.MobileCollapsedStyle; import com.fr.form.ui.mobile.MobileFormCollapsedStyle; import javax.swing.JPanel; -import javax.swing.SpinnerListModel; import java.awt.BorderLayout; import java.awt.Dimension;