Merge pull request #227 in DESIGN/design from ~MATA.LI/designrel:release/10.0 to release/10.0

* commit 'ee20241d1aba4e3d19d008954ac830edfd995cd6':
  REPORT-9643 & REPORT-9613
  REPORT-9643 & REPORT-9613

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(minValueSpinner.getValue());
+        }
+
+        if (setMaxValueCheckBox.isSelected()) {
+            ob.setMaxValue(maxValueSpinner.getValue());
+        }
+
         if(setMinValueCheckBox.isSelected() || setMaxValueCheckBox.isSelected()){
             errorMsgTextFieldPane.setVisible(true);
         }else{

designer-base/src/main/java/com/fr/design/write/submit/DBManipulationPane.java

@@ -310,7 +310,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
     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){
@@ -368,12 +368,12 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
 			@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);
+					}
 				}
 			}
 		});
@@ -465,6 +465,11 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
         // 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;
@@ -512,7 +517,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                 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,10 +528,15 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
             }
 
         } 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));
+			}
+        } else if (returnValue == 5){
+			//新选项和原来没有重复项的情况，产品确认:只做全量增加，原有的清除
+			for (int i = 0; i < selected.length; i++) {
+				model.addKeyColumnNameValue(newKeyColumnNameValueList.get(i));
+			}
+		}
 
         // Richie:初始化
         if (keyColumnNameValueList.isEmpty()) {
@@ -535,6 +545,7 @@ public class DBManipulationPane extends BasicBeanPane<DBManipulation> {
                 model.addKeyColumnNameValue(new KeyColumnNameValue(false, (ColumnName)selected[i], new ColumnValue(""), false));
             }
         }
+		
         model.fireTableDataChanged();
         keyColumnValuesTable.validate();
     }