REPORT-149091 修复动态参数切换异常

designer-realize/src/main/java/com/fr/design/dscolumn/SelectedDataColumnPane.java

@@ -21,6 +21,7 @@ import com.fr.design.mainframe.ElementCasePane;
 import com.fr.design.utils.gui.UIComponentUtils;
 import com.fr.design.widget.FRWidgetFactory;
 import com.fr.general.data.TableDataColumn;
+import com.fr.log.FineLoggerFactory;
 import com.fr.report.cell.CellElement;
 import com.fr.report.cell.TemplateCellElement;
 import com.fr.report.cell.cellattr.core.group.DSColumn;
@@ -373,13 +374,33 @@ public class SelectedDataColumnPane extends BasicPane {
                         update(SelectedDataColumnPane.this.cellElement);
                         casePane.fireTargetModified();
                     }
+                    @Override
+                    public void doCancel() {
+                        editorPane.stopEditing();
+                    }
                 });
-                editorPane.populate(ps == null ? new Parameter[0] : ps);
+                editorPane.populate(ps == null ? new Parameter[0] : cloneParameterList(ps));
                 paramDialog.setVisible(true);
             }
         });
     }
 
+    private Parameter[] cloneParameterList(Parameter[] parameters) {
+        if (parameters == null) {
+            return null;
+        }
+        try {
+            Parameter[] cloneParameterList = new Parameter[parameters.length];
+            for (int i = 0; i < parameters.length; i++) {
+                cloneParameterList[i] = (Parameter) parameters[i].clone();
+            }
+            return cloneParameterList;
+        } catch (CloneNotSupportedException e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+        }
+        return null;
+    }
+
 
     private boolean isColumnName(String columnExp) {
         return StringUtils.isNotBlank(columnExp) && (columnExp.length() > 0 && columnExp.charAt(0) == '#') && !columnExp.endsWith("#");
@@ -397,8 +418,7 @@ public class SelectedDataColumnPane extends BasicPane {
     public Dimension getPreferredSize() {
         if (this.isVisible()) {
             return super.getPreferredSize();
-        }
-        else {
+        } else {
             return new Dimension();
         }
     }