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

* commit '4a3917ae851002feeccd1bbd3345c8f856193777':
  REPORT-26160 && REPORT-26204 && && REPORT-25532

designer-base/src/main/java/com/fr/design/mainframe/DesignerFrame.java

@@ -181,7 +181,8 @@ public class DesignerFrame extends JFrame implements JTemplateActionListener, Ta
 
         @Override
         public void windowClosing(WindowEvent e) {
-
+            //关闭前当前模板 停止编辑
+            HistoryTemplateListCache.getInstance().getCurrentEditingTemplate().stopEditing();
             SaveSomeTemplatePane saveSomeTempaltePane = new SaveSomeTemplatePane(true);
             // 只有一个文件未保存时
             if (HistoryTemplateListCache.getInstance().getHistoryCount() == 1) {

designer-form/src/main/java/com/fr/design/widget/ui/designer/component/UIBoundSpinner.java

@@ -14,10 +14,16 @@ public class UIBoundSpinner extends UISpinner{
 
     public UIBoundSpinner(double minValue, double maxValue, double dierta) {
         super(minValue, maxValue, dierta);
+        initComponents();
     }
 
     public UIBoundSpinner(double minValue, double maxValue, double dierta, double defaultValue) {
         super(minValue, maxValue, dierta, defaultValue);
+        initComponents();
+    }
+
+    private void initComponents() {
+        setTextField(value);
     }
 
     @Override

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ChartEditorDefinePane.java

@@ -89,7 +89,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         panel.add(unavailableTipLabel, BorderLayout.NORTH);
         allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
         panel.add(allowFullCheckBox,BorderLayout.CENTER);
-        functionalWhenUnactivatedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Functional_When_Unactivated"));
+        functionalWhenUnactivatedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Functional_When_Unactivated"), true);
         panel.add(functionalWhenUnactivatedCheckBox, BorderLayout.SOUTH);
         return panel;
     }
@@ -101,7 +101,7 @@ public class ChartEditorDefinePane extends MobileWidgetDefinePane {
         tipLabel.setForeground(Color.gray);
         updateTipLabel();
         allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
-        functionalWhenUnactivatedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Functional_When_Unactivated"));
+        functionalWhenUnactivatedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Functional_When_Unactivated"), true);
 
         Component[][] components = new Component[][]{
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Zoom_In_Logic"), SwingConstants.LEFT), new UILabel(ChartMobileFitAttrState.PROPORTION.description())},

designer-form/src/main/java/com/fr/design/widget/ui/designer/mobile/ElementCaseDefinePane.java

@@ -88,7 +88,7 @@ public class ElementCaseDefinePane extends MobileWidgetDefinePane {
 
         allowFullCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Full_Screen"));
 
-        functionalWhenUnactivatedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Functional_When_Unactivated"));
+        functionalWhenUnactivatedCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Functional_When_Unactivated"), true);
 
         Component[][] components = new Component[][]{
                 new Component[] {new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Mobile_Horizontal"), SwingConstants.LEFT), hComboBox},