Merge pull request #1429 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit '37ce54d077bfee7346dbcd33cedbd88ed89083fd':
  fix import
  MOBILE-25475 && MOBILE-25477

designer-base/src/main/java/com/fr/design/mainframe/mobile/ui/MobileCollapsedStyleExpandPane.java

@@ -2,6 +2,8 @@ package com.fr.design.mainframe.mobile.ui;
 
 import com.fr.design.gui.ilable.UILabel;
 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;
@@ -19,6 +21,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 +33,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")));

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);
+        if (style != null) {
-        style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom());
+            ((ChartEditor) xCreator.toData()).setMobileCollapsedStyle(style);
+            style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom());
+        }
         DesignerContext.getDesignerFrame().getSelectedJTemplate().fireTargetModified(); // 触发设计器保存按钮亮起来
     }
 }

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());
+        if (style != null) {
-        ((ElementCaseEditor) xCreator.toData()).setMobileCollapsedStyle(style);
+            style.setCollapsedWork(this.mobileCollapsedStyleEditor.isSelectedCustom());
+            ((ElementCaseEditor) xCreator.toData()).setMobileCollapsedStyle(style);
+        }
     }
 
     private void setGlobalNames() {