From 5430ede56d55f3878eb0aa32940fdc852203951c Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Tue, 3 Jan 2023 15:37:55 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-86045=20FR11=E5=86=B3=E7=AD=96=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=81=87=E4=BF=9D=E5=AD=98-=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E5=9D=97=E5=86=85=E6=92=A4=E9=94=80=E5=90=8E=EF=BC=8C=E5=86=8D?=
 =?UTF-8?q?=E7=BC=96=E8=BE=91=E9=99=A4=E6=AD=A4=E6=8A=A5=E8=A1=A8=E5=9D=97?=
 =?UTF-8?q?=E5=A4=96=E9=83=A8=E5=88=86=EF=BC=8C=E4=BF=9D=E5=AD=98=E6=A8=A1?=
 =?UTF-8?q?=E6=9D=BF=20=E5=AE=9E=E9=99=85=E6=9C=AA=E4=BF=9D=E5=AD=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
在报表块编辑模式下重置Form对象，比如setTarget，需要做些额外
的工作，才能确保新的target完全可用，主要是要确保散落
在formDesign中各处的对象，如selectedCreators等，要有新的
target对象保持一致，否则再回到表单编辑界面时，就不能通过
这些creators，对target对象进行修改了。

【改动思路】
将表单编辑界面的一些修改操作也放到报表块编辑模式场景下执行，
确保该更新的都能更新到
---
 .../java/com/fr/design/mainframe/JForm.java   | 88 ++++++++++---------
 1 file changed, 47 insertions(+), 41 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
index e3162e9ef6..4e9c45ce44 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/JForm.java
@@ -6,8 +6,6 @@ import com.fr.base.Parameter;
 import com.fr.base.Releasable;
 import com.fr.base.extension.FileExtension;
 import com.fr.base.iofile.attr.ExtendSharableAttrMark;
-import com.fr.base.theme.FineColorGather;
-import com.fr.base.theme.FineColorManager;
 import com.fr.base.theme.FineColorSynchronizer;
 import com.fr.base.theme.FormTheme;
 import com.fr.base.theme.TemplateTheme;
@@ -17,8 +15,8 @@ import com.fr.base.vcs.DesignerMode;
 import com.fr.design.DesignModelAdapter;
 import com.fr.design.DesignState;
 import com.fr.design.DesignerEnvManager;
-import com.fr.design.actions.FormMobileAttrAction;
 import com.fr.design.actions.FormECParallelCalAction;
+import com.fr.design.actions.FormMobileAttrAction;
 import com.fr.design.actions.TemplateParameterAction;
 import com.fr.design.actions.core.WorkBookSupportable;
 import com.fr.design.actions.file.export.EmbeddedFormExportExportAction;
@@ -56,8 +54,8 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.form.FormECCompositeProvider;
 import com.fr.design.mainframe.form.FormECDesignerProvider;
 import com.fr.design.mainframe.reuse.ComponentReuseNotificationInfo;
-import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.share.ComponentShareUtil;
+import com.fr.design.mainframe.share.collect.ComponentCollector;
 import com.fr.design.mainframe.template.info.JFormProcessInfo;
 import com.fr.design.mainframe.template.info.TemplateProcessInfo;
 import com.fr.design.mainframe.theme.dialog.TemplateThemeUsingDialog;
@@ -71,7 +69,6 @@ import com.fr.design.parameter.ParameterPropertyPane;
 import com.fr.design.preview.FormPreview;
 import com.fr.design.preview.MobilePreview;
 import com.fr.design.roleAuthority.RolesAlreadyEditedPane;
-import com.fr.design.ui.util.UIUtil;
 import com.fr.design.utils.gui.LayoutUtils;
 import com.fr.file.FILE;
 import com.fr.file.FILEChooserPane;
@@ -110,7 +107,14 @@ import javax.swing.JComponent;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import javax.swing.tree.TreePath;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.Insets;
+import java.awt.Rectangle;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.image.BufferedImage;
@@ -1266,46 +1270,48 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
     private void refreshTarget(Form form) {
         setTarget(form);
 
-        if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() == this) {
-            if (this.index == FORM_TAB) {
-                // save state
-                FormArea formArea = formDesign.getArea();
-                int horizontalValue = formArea.getHorizontalValue();
-                int verticalValue = formArea.getVerticalValue();
-                Dimension areaSize = formArea.getAreaSize();
-                double widthValue = formArea.getWidthPaneValue();
-                double heightValue = formArea.getHeightPaneValue();
-                double slideValue = formArea.getSlideValue();
-                Widget[] selectedWidgets = formArea.getFormEditor().getSelectionModel().getSelection().getSelectedWidgets();
-
-                // refresh ui
-                JForm.this.refreshRoot();
-
-                // restore state
-                formDesign.getArea().setAreaSize(areaSize, horizontalValue, verticalValue, widthValue, heightValue, slideValue);
-                formDesign.getArea().undoFixLayoutState(formArea.isFixLayout());
-                this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(),
-                        formDesign.getRootComponent() == selectedBodyLayout() ? selectedWidgets : new Widget[]{selectedBodyLayout().toData()}));
+        if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() != this) {
+            return;
+        }
+        // save state
+        FormArea formArea = formDesign.getArea();
+        int horizontalValue = formArea.getHorizontalValue();
+        int verticalValue = formArea.getVerticalValue();
+        Dimension areaSize = formArea.getAreaSize();
+        double widthValue = formArea.getWidthPaneValue();
+        double heightValue = formArea.getHeightPaneValue();
+        double slideValue = formArea.getSlideValue();
+        Widget[] selectedWidgets = formArea.getFormEditor().getSelectionModel().getSelection().getSelectedWidgets();
+
+        // refresh ui
+        JForm.this.refreshRoot();
+
+        // restore state
+        formDesign.getArea().setAreaSize(areaSize, horizontalValue, verticalValue, widthValue, heightValue, slideValue);
+        formDesign.getArea().undoFixLayoutState(formArea.isFixLayout());
+        this.formDesign.getSelectionModel().setSelectedCreators(FormSelectionUtils.rebuildSelection(formDesign.getRootComponent(),
+                formDesign.getRootComponent() == selectedBodyLayout() ? selectedWidgets : new Widget[]{selectedBodyLayout().toData()}));
 
-                refreshToolArea();
+        refreshToolArea();
 
-                // 停止编辑 恢复浮层展示
-                TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
-                if (treePaths != null) {
-                    for (TreePath path : treePaths) {
-                        if (path != null) {
-                            formDesign.stopEditing(path);
-                        }
-                    }
+        // 停止编辑 恢复浮层展示
+        TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
+        if (treePaths != null) {
+            for (TreePath path : treePaths) {
+                if (path != null) {
+                    formDesign.stopEditing(path);
                 }
-            } else {
-                String widgetName = this.formDesign.getElementCaseContainerName();
-                FormElementCaseProvider dataTable = form.getElementCaseByName(widgetName);
-                this.reportComposite.setSelectedWidget(dataTable);
-                formDesign.setElementCase(dataTable);
             }
-            TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();
         }
+
+        if (this.index != FORM_TAB) {
+            String widgetName = this.formDesign.getElementCaseContainerName();
+            FormElementCaseProvider dataTable = form.getElementCaseByName(widgetName);
+            this.reportComposite.setSelectedWidget(dataTable);
+            formDesign.setElementCase(dataTable);
+        }
+
+        TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();
     }
 
     @Override