From bd087e99386511b3c74c1ed31da86b0750d0d05e Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 13 Jul 2018 17:33:19 +0800 Subject: [PATCH 1/2] REPORT-9643 & REPORT-9613 --- .../component/NumberEditorValidatePane.java | 8 +++++ .../write/submit/DBManipulationPane.java | 29 +++++++++++-------- 2 files changed, 25 insertions(+), 12 deletions(-) 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 a5923a9f1..587b28f7a 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 @@ -259,6 +259,14 @@ public class NumberEditorValidatePane extends JPanel { ob.setAllowNegative(allowNegativeCheckBox.isSelected()); + if (setMinValueCheckBox.isSelected()) { + ob.setMinValue(Double.parseDouble(StringUtils.EMPTY + minValueSpinner.getValue())); + } + + if (setMaxValueCheckBox.isSelected()) { + ob.setMaxValue(Double.parseDouble(StringUtils.EMPTY + maxValueSpinner.getValue())); + } + if(setMinValueCheckBox.isSelected() || setMaxValueCheckBox.isSelected()){ errorMsgTextFieldPane.setVisible(true); }else{ 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 dc2b4426b..730b3b744 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(new String[]{"Submit", "Condition"}))); } protected void addComponent(JPanel mainPane,JScrollPane addPane){ @@ -368,12 +368,12 @@ public class DBManipulationPane extends BasicBeanPane { @Override public void itemStateChanged(ItemEvent e) { if (e.getStateChange() == ItemEvent.SELECTED) { - Object ob = e.getItem(); - if ((ComparatorUtils.equals(ob,DML_CONFIG_TYPES[0])) || ComparatorUtils.equals(ob,DML_CONFIG_TYPES[3])) { - checkBoxUpdatePane.setVisible(true); - } else if ((ComparatorUtils.equals(ob,DML_CONFIG_TYPES[1])) || ComparatorUtils.equals(ob,DML_CONFIG_TYPES[2])){ - checkBoxUpdatePane.setVisible(false); - } + Object ob = e.getItem(); + if ((ComparatorUtils.equals(ob, DML_CONFIG_TYPES[0])) || ComparatorUtils.equals(ob, DML_CONFIG_TYPES[3])) { + checkBoxUpdatePane.setVisible(true); + } else if ((ComparatorUtils.equals(ob, DML_CONFIG_TYPES[1])) || ComparatorUtils.equals(ob, DML_CONFIG_TYPES[2])) { + checkBoxUpdatePane.setVisible(false); + } } } }); @@ -512,7 +512,7 @@ public class DBManipulationPane extends BasicBeanPane { for (int j = 0; j < keyColumnNameValueList.size(); j++) { if (ComparatorUtils.equals(selected[i], keyColumnNameValueList.get(j).cn)) { newKeyColumnNameValueList.remove(i); - newKeyColumnNameValueList.add(i, keyColumnNameValueList.get(j)); + newKeyColumnNameValueList.add(i, keyColumnNameValueList.get(j)); } } @@ -523,9 +523,9 @@ public class DBManipulationPane extends BasicBeanPane { } } else if (returnValue == 1 || returnValue == 2) { - for (int i = 0; i < selected.length; i++) { - model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i)); - } + for (int i = 0; i < selected.length; i++) { + model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i)); + } } // Richie:初始化 @@ -534,7 +534,12 @@ 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(); } From ee20241d1aba4e3d19d008954ac830edfd995cd6 Mon Sep 17 00:00:00 2001 From: "Mata.Li" Date: Fri, 13 Jul 2018 18:37:52 +0800 Subject: [PATCH 2/2] REPORT-9643 & REPORT-9613 --- .../component/NumberEditorValidatePane.java | 4 ++-- .../write/submit/DBManipulationPane.java | 22 ++++++++++++------- 2 files changed, 16 insertions(+), 10 deletions(-) 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 587b28f7a..89814e24a 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 730b3b744..56c3f5488 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(); }