From 08f4f30d67b7da04dbe43b6ae17df2d87596961d Mon Sep 17 00:00:00 2001
From: "Yuan.Wang" <1536296691@qq.com>
Date: Tue, 27 Oct 2020 16:50:37 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-40027=20=E4=BB=A3=E7=A0=81=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../JTemplateActionListenerAdapter.java       | 22 +++++++++++++++++++
 .../fr/design/mainframe/ComponentTree.java    | 10 ++-------
 .../java/com/fr/design/mainframe/JForm.java   | 12 +---------
 3 files changed, 25 insertions(+), 19 deletions(-)
 create mode 100644 designer-base/src/main/java/com/fr/design/mainframe/JTemplateActionListenerAdapter.java

diff --git a/designer-base/src/main/java/com/fr/design/mainframe/JTemplateActionListenerAdapter.java b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateActionListenerAdapter.java
new file mode 100644
index 000000000..7065f3e94
--- /dev/null
+++ b/designer-base/src/main/java/com/fr/design/mainframe/JTemplateActionListenerAdapter.java
@@ -0,0 +1,22 @@
+package com.fr.design.mainframe;
+
+/**
+ * @Author: Yuan.Wang
+ * @Date: 2020/10/27
+ */
+public class JTemplateActionListenerAdapter implements JTemplateActionListener {
+    @Override
+    public void templateOpened(JTemplate<?, ?> jt) {
+
+    }
+
+    @Override
+    public void templateSaved(JTemplate<?, ?> jt) {
+
+    }
+
+    @Override
+    public void templateClosed(JTemplate<?, ?> jt) {
+
+    }
+}
diff --git a/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java b/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
index 2643f9596..e1ac304b2 100644
--- a/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
+++ b/designer-form/src/main/java/com/fr/design/mainframe/ComponentTree.java
@@ -202,7 +202,7 @@ public class ComponentTree extends JTree {
      * 删除key对应的缓存展开路径
      */
     public void removeTreePath(String key) {
-        if (!StringUtils.isEmpty(key)) {
+        if (StringUtils.isNotEmpty(key)) {
             treePathCache.remove(key);
         }
     }
@@ -267,13 +267,7 @@ public class ComponentTree extends JTree {
             return;
         }
         for (TreePath treePath : list) {
-            if (treePath.getLastPathComponent() instanceof XLayoutContainer) {
-                XLayoutContainer creator = (XLayoutContainer) treePath.getLastPathComponent();
-                if (XCreatorUtils.getParentXLayoutContainer(creator) == null) {
-                    continue;
-                }
-                expandPath(treePath);
-            }
+            expandPath(treePath);
         }
     }
 
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 7f5eb87d6..03934d035 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
@@ -307,17 +307,7 @@ public class JForm extends JTemplate<Form, FormUndoState> implements BaseJForm<F
                 }
             }
         });
-        addJTemplateActionListener(new JTemplateActionListener() {
-            @Override
-            public void templateOpened(JTemplate<?, ?> jt) {
-
-            }
-
-            @Override
-            public void templateSaved(JTemplate<?, ?> jt) {
-
-            }
-
+        addJTemplateActionListener(new JTemplateActionListenerAdapter() {
             @Override
             public void templateClosed(JTemplate<?, ?> jt) {
                 String key = jt.getEditingFILE().getPath() + template.getTemplateID();