Merge pull request #3625 in DESIGN/design from release/10.0 to bugfix/10.0

* commit '12f6eddb2772daa1e2992c5bc76d1a3cefb1ad96': (63 commits)
  merge code
  update
  REPORT-48124 内置缓存插件漏掉了其它提交&方法改个名字
  REPORT-46915 重命名
  单元测试
  REPORT-47034 FRM新前端&新自适应合入主JAR
  添加单元测试
  REPORT-47034 FRM新前端&新自适应合入主JAR
  REPORT-46916 修复单元测试
  REPORT-46916 调整包名，兼容性调整
  REPORT-46916 调整包名
  REPORT-46916 新引擎内置，调整代码结构，适配代码调用方式
  REPORT-46916 新引擎内置，添加模块
  REPORT-46916 新引擎内置，添加模块
  esd-design内置融合
  无jira任务，单元测试误屏蔽
  无jira任务，新增的方法代码合并重复
  REPORT-46915 内置
  无JIRA任务 接口签名重复
  CHART-15837  字段汇总方式控件修改
  ...

designer-chart/src/main/java/com/fr/van/chart/designer/component/VanChartTooltipContentPane.java

@@ -47,6 +47,7 @@ import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.MouseAdapter;
 import java.awt.event.MouseEvent;
+import java.util.Arrays;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -463,9 +464,15 @@ public class VanChartTooltipContentPane extends BasicBeanPane<AttrTooltipContent
 
     private void refreshTableFieldParams(Map<String, String> params) {
         List<String> tableFieldNames = VanChartRichEditorPane.getFieldNames();
+        List<String> defaultParams = Arrays.asList(getRichTextFieldNames());
 
-        if (tableFieldNames != null && params != null) {
-            for (String fieldName : tableFieldNames) {
+        if (tableFieldNames == null || params == null) {
+            return;
+        }
+
+        for (String fieldName : tableFieldNames) {
+            // 富文本默认参数和数据集字段重名时，显示默认参数
+            if (!defaultParams.contains(fieldName)) {
                 params.put(fieldName, "${" + fieldName + "_" + fieldName.hashCode() + "}");
             }
         }

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

@@ -310,9 +310,9 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
         // 单元格组要记录下之前的选中情况
         private CellSelection oriCellSelection = null;
 
-        private List<ColumnRow> newAdd = new ArrayList<>();
+        private List<String> newAdd = new ArrayList<String>();
 
-        private List<ColumnRow> oldAdd = new ArrayList<>();
+        private List<String> oldAdd = new ArrayList<String>();
 
         public SmartJTablePane4DB(KeyColumnTableModel model, ElementCasePane actionReportPane) {
             this(model, actionReportPane, false);
@@ -433,8 +433,7 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                     if (!allColumnRow.contains(columnRow.toString())) {
                         add.addColumnRow(columnRow);
                     }
-                    // 重新更换区域框选单元格后 清理历史框选
-                    oldAdd.clear();
+
                 }
 
                 if (add.getSize() > 0) {
@@ -460,11 +459,10 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                         TemplateCellElement cellElement = ePane.getEditingElementCase().getTemplateCellElement(c + i, r + j);
                         if (cellElement != null && ((i + c) != 0 || (r + j) != 0)) {
                             String value = cellElement.toString();
-                            ColumnRow columnRow = ColumnRow.valueOf(value);
-                            if (!newAdd.contains(columnRow) && !allColumnRow.contains(value)) {
-                                add.addColumnRow(columnRow);
+                            if (!newAdd.contains(value) && !allColumnRow.contains(value)) {
+                                add.addColumnRow(ColumnRow.valueOf(value));
                             }
-                            newAdd.add(columnRow);
+                            newAdd.add(value);
                         }
 
                         if (cellElement == null) {
@@ -472,14 +470,16 @@ public class SmartInsertDBManipulationPane extends DBManipulationPane {
                             if (!allColumnRow.contains(columnRow.toString())) {
                                 add.addColumnRow(columnRow);
                             }
-                            newAdd.add(columnRow);
+                            newAdd.add(columnRow.toString());
                         }
                     }
                 }
-                // 计算出前后两次选中的差值
-                oldAdd.removeAll(newAdd);
-                // 移除差值部分
-                newValue.removeAll(oldAdd);
+                int oldSize = oldAdd.size();
+                int newSize = newAdd.size();
+                if (oldSize > newSize && oldAdd.containsAll(newAdd)) {
+                    int diff = oldSize - newSize;
+                    newValue.splice(newValue.getSize() - diff, diff);
+                }
                 oldAdd.clear();
                 oldAdd.addAll(newAdd);
             }