From 27f974c4886db1461a58047709f2d157ef223983 Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Tue, 21 Jun 2022 15:52:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-71824=20frm=E6=89=93=E5=BC=80=E6=8A=A5?=
 =?UTF-8?q?=E8=A1=A8=E5=9D=97=E7=BC=96=E8=BE=91=E9=A1=B5=E9=9D=A2=EF=BC=8C?=
 =?UTF-8?q?=E5=88=87=E6=8D=A2=E5=B7=A5=E4=BD=9C=E7=9B=AE=E5=BD=95=E6=97=A0?=
 =?UTF-8?q?=E6=B3=95=E6=89=93=E5=BC=80=E5=BD=93=E5=89=8Dfrm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
切换工作空间后，应该刷新整个设计。
10.0和11.0的刷新都有问题，需要退出当前选中控件的编辑模式。

【改动思路】
同上
---
 .../com/fr/design/mainframe/JTemplate.java    | 20 +++++++++-------
 .../java/com/fr/design/mainframe/JForm.java   | 23 +++++++++++++++++++
 2 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
index a76d92913..eaf4b84bf 100644
--- a/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplate.java
@@ -499,19 +499,23 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
         UIUtil.invokeLaterIfNeeded(new Runnable() {
             @Override
             public void run() {
-                // 先移除旧的。
-                removeCenterPane();
-                // 加入新的
-                addCenterPane();
-
-                refreshToolArea();
-
-                TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();
+                refreshDesignerFromResource();
             }
         });
 
     }
 
+    protected void refreshDesignerFromResource() {
+        // 先移除旧的。
+        removeCenterPane();
+        // 加入新的
+        addCenterPane();
+
+        refreshToolArea();
+
+        TableDataTreePane.getInstance(DesignModelAdapter.getCurrentModelAdapter()).refreshDockingView();
+    }
+
     /**
      * 刷新 模板资源 和 EditingFILE
      * 仅在切换工作目录，reload模板时使用
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 831d245d1..b58932c8a 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
@@ -70,6 +70,7 @@ 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;
@@ -380,6 +381,28 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
         this.formDesign = formDesign;
     }
 
+    @Override
+    protected void refreshDesignerFromResource() {
+        stopCreatorEditing();
+        super.refreshDesignerFromResource();
+    }
+
+    private void stopCreatorEditing() {
+        if (index == ELEMENTCASE_TAB) {
+            tabChanged(FORM_TAB);
+        } else if (index == FORM_TAB) {
+            TreePath[] treePaths = FormHierarchyTreePane.getInstance(formDesign).getComponentTree().getSelectedTreePath();
+            if (treePaths != null) {
+                for (TreePath path : treePaths) {
+                    if (path != null) {
+                        formDesign.stopEditing(path);
+                    }
+                }
+            }
+            FormHierarchyTreePane.getInstance().refreshRoot();
+        }
+    }
+
     /**
      * 去除选择
      */