diff --git a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java index 587b28f7a9..89814e24a3 100644 --- a/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java +++ b/designer-base/src/main/java/com/fr/design/widget/component/NumberEditorValidatePane.java @@ -260,11 +260,11 @@ public class NumberEditorValidatePane extends JPanel { ob.setAllowNegative(allowNegativeCheckBox.isSelected()); if (setMinValueCheckBox.isSelected()) { - ob.setMinValue(Double.parseDouble(StringUtils.EMPTY + minValueSpinner.getValue())); + ob.setMinValue(minValueSpinner.getValue()); } if (setMaxValueCheckBox.isSelected()) { - ob.setMaxValue(Double.parseDouble(StringUtils.EMPTY + maxValueSpinner.getValue())); + ob.setMaxValue(maxValueSpinner.getValue()); } if(setMinValueCheckBox.isSelected() || setMaxValueCheckBox.isSelected()){ diff --git a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java index 730b3b744a..56c3f54887 100644 --- a/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java +++ b/designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java @@ -310,7 +310,7 @@ public class DBManipulationPane extends BasicBeanPane { protected void setBorderAndLayout(JPanel jPanel){ jPanel.setLayout(FRGUIPaneFactory.createBorderLayout()); jPanel.setBorder(BorderFactory.createTitledBorder( - new ModLineBorder(ModLineBorder.TOP), Inter.getLocText(new String[]{"Submit", "Condition"}))); + new ModLineBorder(ModLineBorder.TOP), Inter.getLocText("Fine-Designer_Submit_Condition"))); } protected void addComponent(JPanel mainPane,JScrollPane addPane){ @@ -465,6 +465,11 @@ public class DBManipulationPane extends BasicBeanPane { // Richie:初始化 int returnValue = DEFAULT_RETURN_VALUE; int coverNumber = 0; + + if (!keyColumnNameValueList.isEmpty()) { + //如果存在先前项,设置状态为5 + returnValue = 5 ; + } for (int i = 0; i < selected.length; i++) { if (returnValue == 0 || returnValue == 3) { break; @@ -526,7 +531,12 @@ public class DBManipulationPane extends BasicBeanPane { for (int i = 0; i < selected.length; i++) { model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i)); } - } + } else if (returnValue == 5){ + //新选项和原来没有重复项的情况,产品确认:只做全量增加,原有的清除 + for (int i = 0; i < selected.length; i++) { + model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i)); + } + } // Richie:初始化 if (keyColumnNameValueList.isEmpty()) { @@ -534,12 +544,8 @@ public class DBManipulationPane extends BasicBeanPane { for (int i = 0; i < selected.length; i++) { model.addKeyColumnNameValue(new KeyColumnNameValue(false, (ColumnName)selected[i], new ColumnValue(""), false)); } - }else if (returnValue == 4){ - //新选项和原来没有重复项的情况,产品确认:只做全量增加,原有的清除 - for (int i = 0; i < selected.length; i++) { - model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i)); - } - } + } + model.fireTableDataChanged(); keyColumnValuesTable.validate(); }