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

* commit 'af865be2dbb665dc768099a6215d443b56459784':
  REPORT-9297 设计器中按钮设置提交入库事件，选取的字段只要绑定单元格组该设置就无法保存

designer-realize/src/com/fr/design/write/submit/SmartInsertDBManipulationPane.java

@@ -183,30 +183,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 		 * @param evt 事件s
 		 */
 		public void actionPerformed(ActionEvent evt) {
-
-			// Grid.GridSelectionListener
-			if (ePane == null) {
-				return;
-			}
-
-			/*
-			 * 布局
-			 */
-			BasicPane bPane = new SmartJTablePane4DB(keyColumnValuesTable.getTableModel4SmartAddCell(), ePane);
-
-			// ReportWriteAttrDialog.this.setVisible(false);
-			hideDialog4AddCellAction();
-			/*
-			 * 当前的ReportPane不可编辑,不可切换Sheet,加GridSelectionChangeListener
-			 */
-			ePane.setEditable(false);
-			ePane.setSelection(NO_SELECTION);
-			ePane.getGrid().setNotShowingTableSelectPane(false);
-
-			BasicDialog dlg = bPane.showWindow(DesignerContext.getDesignerFrame());
-
-			dlg.setModal(false);
-			dlg.setVisible(true);
+			showCellWindow(false);
 		}
 	}
 
@@ -220,26 +197,36 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 		 * @param e 事件s
 		 */
 		public void actionPerformed(ActionEvent e) {
-			if (ePane == null) {
-				return;
-			}
+			showCellWindow(true);
+		}
+	}
+
+	/**
+	 * 切换到单元格窗口，设置属性面板不可编辑
+	 * @param isCellGroup 判断是否单元格组
+	 */
 
-			BasicPane bPane = new SmartJTablePane4DB(keyColumnValuesTable.getTableModel4SmartAddCell(), ePane, true);
+	private void showCellWindow(boolean isCellGroup){
+		if (ePane == null) {
+			return;
+		}
 
-			// ReportWriteAttrDialog.this.setVisible(false);
-			hideDialog4AddCellAction();
+		BasicPane bPane = new SmartJTablePane4DB(keyColumnValuesTable.getTableModel4SmartAddCell(), ePane, isCellGroup);
+
+		// ReportWriteAttrDialog.this.setVisible(false);
+		hideDialog4AddCellAction();
 			/*
 			 * 当前的ReportPane不可编辑,不可切换Sheet,加GridSelectionChangeListener
 			 */
-			ePane.setSelection(NO_SELECTION);
-			ePane.setEditable(false);
-			ePane.getGrid().setNotShowingTableSelectPane(false);
+		//必须先设置面板不可编辑才能释放单元格选中
+		ePane.setEditable(false);
+		ePane.setSelection(NO_SELECTION);
+		ePane.getGrid().setNotShowingTableSelectPane(false);
 
-			BasicDialog dlg = bPane.showWindow(SwingUtilities.getWindowAncestor(SmartInsertDBManipulationPane.this));
+		BasicDialog dlg = bPane.showWindow(SwingUtilities.getWindowAncestor(SmartInsertDBManipulationPane.this));
 
-			dlg.setModal(false);
-			dlg.setVisible(true);
-		}
+		dlg.setModal(false);
+		dlg.setVisible(true);
 	}
 
 	private void showDialogAfterAddCellAction() {