Merge pull request #1103 in DESIGN/design from ~HADES/design:release/10.0 to release/10.0

* commit 'cac459be9c4c27b3f8fce99d6b15306b756e471c':
  fix 调试输出
  update
  REPORT-21871 批量添加单元格组 合并场景

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

@@ -27,6 +27,7 @@ import com.fr.design.selection.SelectionListener;
 import com.fr.grid.selection.CellSelection;
 import com.fr.grid.selection.FloatSelection;
 import com.fr.grid.selection.Selection;
+import com.fr.report.cell.TemplateCellElement;
 import com.fr.stable.ColumnRow;
 import com.fr.stable.ColumnRowGroup;
 import com.fr.stable.StringUtils;
@@ -454,11 +455,22 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                 newAdd.clear();
                 for (int i = 0; i < cs; i++) {
                     for (int j = 0; j < rs; j++) {
-                        ColumnRow columnRow = ColumnRow.valueOf(c + i, r + j);
+                        TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j );
-                        if (!allColumnRow.contains(columnRow.toString())) {
+                        if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
-                            add.addColumnRow(columnRow);
+                            String value = cellElement.toString();
+                            if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
+                                add.addColumnRow(ColumnRow.valueOf(value));
+                            }
+                            newAdd.add(value);
+                        }
+
+                        if (cellElement == null) {
+                            ColumnRow columnRow = ColumnRow.valueOf(c + i, r + j);
+                            if (!allColumnRow.contains(columnRow.toString())) {
+                                add.addColumnRow(columnRow);
+                            }
+                            newAdd.add(columnRow.toString());
                         }
-                        newAdd.add(columnRow.toString());
                     }
                 }
                 int oldSize = oldAdd.size();