Merge pull request #14174 in DESIGN/design from release/11.0 to final/11.0

* commit 'e1bbc436ee4ce320024263048d28074b1f33be32':
  REPORT-123532 控件字体样式设置不生效 【问题原因】设计器端修改字体样式后，没有修改对象中属性值 【改动思路】修改对象属性值
  REPORT-123731 数据集含有注释和未注释的参数，但注释参数依然生效
  REPORT-122312 【设计器】win系统设计器，报表添加数字控件、文件控件时会出现提示音

designer-base/src/main/java/com/fr/design/data/tabledata/tabledatapane/DBTableDataPane.java

@@ -296,8 +296,8 @@ public class DBTableDataPane extends AbstractTableDataPane<DBTableData> implemen
 
     private void refreshParameters() {
         String[] paramTexts = new String[2];
-        paramTexts[0] = SqlUtils.tryPureSqlText(this.sqlTextPane.getText());
-        paramTexts[1] = SqlUtils.tryPureSqlText(this.pageQuery);
+        paramTexts[0] = SqlUtils.clearSqlComments(this.sqlTextPane.getText());
+        paramTexts[1] = SqlUtils.clearSqlComments(this.pageQuery);
         List<ParameterProvider> existParameterList = this.editorPane.update();
         Parameter[] ps = (existParameterList == null) ? new Parameter[0] : existParameterList.toArray(new Parameter[0]);
 

designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java

@@ -255,7 +255,6 @@ public class NumberEditorValidatePane extends JPanel {
         allowNegativeCheckBox.setSelected(e.isAllowNegative());
         if (AssistUtils.equals(e.getMaxValue(),Double.MAX_VALUE)) {
             setMaxValueCheckBox.setSelected(false);
-            maxValueSpinner.setValue(Double.MAX_VALUE);
             maxValueSpinner.setEnabled(false);
         } else {
             setMaxValueCheckBox.setSelected(true);
@@ -265,7 +264,6 @@ public class NumberEditorValidatePane extends JPanel {
 
         if (AssistUtils.equals(e.getMinValue(),-Double.MAX_VALUE)) {
             setMinValueCheckBox.setSelected(false);
-            minValueSpinner.setValue(-Double.MAX_VALUE);
             minValueSpinner.setEnabled(false);
 
         } else {

designer-form/src/main/java/com/fr/design/widgettheme/ParaEditorSettingPane.java

@@ -41,6 +41,7 @@ public class ParaEditorSettingPane<T extends Widget> extends EditorSettingPane<T
         fontColorButton.setColor(textStyle.getFontColor());
         bold.setSelected(textStyle.isBold());
         italic.setSelected(textStyle.isItalic());
+        fontNameSelectBox.setSelectedItem(textStyle.getName());
     }
 
     @Override
@@ -51,6 +52,7 @@ public class ParaEditorSettingPane<T extends Widget> extends EditorSettingPane<T
         textStyle.setFontColor(fontColorButton.getColor());
         textStyle.setBold(bold.isSelected());
         textStyle.setItalic(italic.isSelected());
+        textStyle.setName((String) fontNameSelectBox.getSelectedItem());
         paraEditorTheme.setTextStyle(textStyle);
     }
 

designer-realize/src/main/java/com/fr/design/widget/ui/MultiFileEditorPane.java

@@ -41,7 +41,7 @@ public class MultiFileEditorPane extends FieldEditorDefinePane<MultiFileEditor>
         singleFileCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays);
 //		acceptType.setPreferredSize(new Dimension(100, 20));
-        fileSizeField = new UISpinner(0, Integer.MAX_VALUE, 1, -1);
+        fileSizeField = new UISpinner(0, Integer.MAX_VALUE, 1);
         fileSizeField.setPreferredSize(new Dimension(140, 20));
 
         JPanel fileSizePane = new JPanel(new BorderLayout());