Browse Source

Merge pull request #14071 in DESIGN/design from release/11.0 to bugfix/11.0

* commit '7f98867ae5f6b355b99932157bcfc535d4b2b3e7':
  REPORT-122312 【设计器】win系统设计器,报表添加数字控件、文件控件时会出现提示音
bugfix/11.0
superman 6 months ago
parent
commit
0a938eb869
  1. 2
      designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java
  2. 2
      designer-realize/src/main/java/com/fr/design/widget/ui/MultiFileEditorPane.java

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

2
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)); singleFileCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays); acceptType = new DictionaryComboBox(DictionaryConstants.acceptTypes, DictionaryConstants.fileTypeDisplays);
// acceptType.setPreferredSize(new Dimension(100, 20)); // 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)); fileSizeField.setPreferredSize(new Dimension(140, 20));
JPanel fileSizePane = new JPanel(new BorderLayout()); JPanel fileSizePane = new JPanel(new BorderLayout());

Loading…
Cancel
Save