From 080e3323c5c54f637195820c2aa9ad268138e4df Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Wed, 1 Sep 2021 19:06:10 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-58486=20FR11-=E4=BA=8C=E8=BD=AE=E5=9B=9E?=
 =?UTF-8?q?=E5=BD=92-=E6=96=B0=E5=BB=BA=E6=A8=A1=E6=9D=BF=E7=9A=84?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=E5=9C=A8=E6=92=A4=E9=94=80=E6=97=B6=E6=9C=AA?=
 =?UTF-8?q?=E8=A2=AB=E9=94=81=E5=AE=9A=EF=BC=8C=E8=BF=9E=E5=90=8C=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E5=8A=9F=E8=83=BD=E4=B8=80=E8=B5=B7=E8=A2=AB=E6=92=A4?=
 =?UTF-8?q?=E9=94=80=E4=BA=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
初始的UndoState未包含主题效果

【改动思路】
同上
---
 .../src/main/java/com/fr/design/mainframe/JTemplate.java  | 8 ++++----
 1 file changed, 4 insertions(+), 4 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 843f76030..ed156aecd 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
@@ -189,13 +189,13 @@ public abstract class JTemplate<T extends BaseBook, U extends BaseUndoState<?>>
             designModel = createDesignModel(parameters);
         }
         addCenterPane();
-        this.undoState = createUndoState();
-
-        initAndStartPlugin();
-
         if (isNewFile) {
+            // REPORT-58486: 必须在初始的UndoState创建前设置主题，使得初始的UndoState就包含了主题效果
             setUpTheme4NewTemplate();
         }
+        this.undoState = createUndoState();
+
+        initAndStartPlugin();
         startListenThemeConfig();
     }