Merge remote-tracking branch 'origin/release/10.0' into release/10.0

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

@@ -356,7 +356,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
 
             if (isCellGroup) {
                 column2.setCellRenderer(new ColumnRowGroupCellRenderer2());
-                column2.setCellEditor(new ColumnValueEditor(ValueEditorPaneFactory.cellGroupEditor()));
+                column2.setCellEditor(new ColumnValueEditor(ValueEditorPaneFactory.cellGroupEditor(), this));
             } else {
                 column2.setCellRenderer(new SelectedColumnValueTableCellRenderer());
             }
@@ -456,7 +456,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                 newAdd.clear();
                 for (int i = 0; i < cs; i++) {
                     for (int j = 0; j < rs; j++) {
-                        TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j );
+                        TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
                         if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
                             String value = cellElement.toString();
                             if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
@@ -512,7 +512,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
         private SmartJTablePaneAction a = new AbstractSmartJTablePaneAction(this, SmartInsertDBManipulationPane.this) {
             @Override
             public void doOk() {
-                ((KeyColumnTableModel)keyColumnValuesTable.getModel()).refreshNameValueList((KeyColumnTableModel)model);
+                ((KeyColumnTableModel) keyColumnValuesTable.getModel()).refreshNameValueList((KeyColumnTableModel) model);
             }
 
             @Override