Pull request #1663: REPORT-28813 bugfix

Merge in DESIGN/design from ~JAVA.EDGE/design:release/10.0 to release/10.0

* commit '49d9ac9ff7fb5014469f3da80f11bff6d7859381':
  REPORT-28813 bugfix 补充子类实现
  REPORT-28813 bugfix 消除过多重复代码
  REPORT-28813 bugfix  优化import
  REPORT-28813 bugfix

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePane.java

@@ -918,9 +918,7 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         actionMap.put("paste", new AbstractAction() {
             public void actionPerformed(ActionEvent evt) {
                 if (paste()) {
-                    QuickEditorRegion.getInstance().populate(getCurrentEditor());
-                    fireTargetModified();
-                    QuickEditorRegion.getInstance().populate(getCurrentEditor());
+                    afterPasteAction();
                 }
             }
         });
@@ -942,6 +940,12 @@ public abstract class ElementCasePane<T extends TemplateElementCase> extends Tar
         });
     }
 
+    protected void afterPasteAction() {
+        QuickEditorRegion.getInstance().populate(getCurrentEditor());
+        fireTargetModified();
+        QuickEditorRegion.getInstance().populate(getCurrentEditor());
+    }
+
     /**
      * 是否列表头可见
      *

designer-realize/src/main/java/com/fr/design/mainframe/ElementCasePaneDelegate.java

@@ -38,6 +38,7 @@ import com.fr.stable.ArrayUtils;
 import javax.swing.JPanel;
 import java.awt.BorderLayout;
 
+
 /**
  * 类说明: 设计面板中最上方的"插入" "单元格"下拉列表Menu模块.
  *
@@ -113,6 +114,12 @@ public class ElementCasePaneDelegate extends ElementCasePane<WorkSheet> {
         }
     }
 
+    @Override
+    protected void afterPasteAction() {
+        refreshPropertyPanes();
+        repaint();
+    }
+
     @Override
     protected boolean supportRepeatedHeaderFooter() {
         return true;

designer-realize/src/main/java/com/fr/design/mainframe/form/FormElementCasePaneDelegate.java

@@ -1,8 +1,5 @@
 package com.fr.design.mainframe.form;
 
-import javax.swing.JComponent;
-import javax.swing.JPanel;
-
 import com.fr.design.DesignState;
 import com.fr.design.actions.UpdateAction;
 import com.fr.design.actions.core.ActionFactory;
@@ -11,7 +8,6 @@ import com.fr.design.actions.form.FormECColumnsAction;
 import com.fr.design.actions.form.FormECFrozenAction;
 import com.fr.design.event.TargetModifiedEvent;
 import com.fr.design.event.TargetModifiedListener;
-import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.gui.frpane.HyperlinkGroupPane;
 import com.fr.design.mainframe.*;
 import com.fr.design.mainframe.cell.QuickEditorRegion;
@@ -22,13 +18,14 @@ import com.fr.design.menu.ToolBarDef;
 import com.fr.design.present.ConditionAttributesGroupPane;
 import com.fr.form.main.Form;
 import com.fr.grid.Grid;
-import com.fr.js.NameJavaScriptGroup;
 import com.fr.page.ReportSettingsProvider;
-import com.fr.report.elementcase.TemplateElementCase;
 import com.fr.report.worksheet.FormElementCase;
 import com.fr.design.selection.SelectionEvent;
 import com.fr.design.selection.SelectionListener;
 
+import javax.swing.JComponent;
+import javax.swing.JPanel;
+
 /**
  */
 public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase>{
@@ -72,6 +69,12 @@ public class FormElementCasePaneDelegate extends ElementCasePane<FormElementCase
         EastRegionContainerPane.getInstance().updateCellElementState(isSelectedOneCell());
     }
 
+    @Override
+    protected void afterPasteAction() {
+        refreshPropertyPanes();
+        repaint();
+    }
+
     @Override
     protected boolean supportRepeatedHeaderFooter() {
         return true;