From ebdba76f2e9283c7ff9d99e28f7b6d07d09f8f6e Mon Sep 17 00:00:00 2001
From: Starryi <starryi@foxmail.com>
Date: Mon, 30 Aug 2021 17:16:05 +0800
Subject: [PATCH] =?UTF-8?q?REPORT-58383=20=E3=80=90=E5=9B=9E=E5=BD=92?=
 =?UTF-8?q?=E6=B5=8B=E8=AF=95=E3=80=91=E8=81=9A=E5=90=88=E6=8A=A5=E8=A1=A8?=
 =?UTF-8?q?=E7=BA=B8=E5=BC=A0=E8=83=8C=E6=99=AF-=E8=B7=9F=E9=9A=8F?=
 =?UTF-8?q?=E4=B8=BB=E9=A2=98=EF=BC=8C=E8=AE=BE=E8=AE=A1=E5=99=A8=E5=86=85?=
 =?UTF-8?q?=E9=85=8D=E7=BD=AE=E9=A2=84=E8=A7=88=E6=95=88=E6=9E=9C=E4=B8=8D?=
 =?UTF-8?q?=E6=AD=A3=E7=A1=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

【问题原因】
FollowingThemePane只返回了表单模版所使用的主题，导致其
无法获取报表模版使用的主题

【改动思路】
同上
---
 .../java/com/fr/design/gui/style/FollowingThemePane.java     | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java b/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java
index c7c1da0efd..55f4612a2b 100644
--- a/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java
+++ b/designer-base/src/main/java/com/fr/design/gui/style/FollowingThemePane.java
@@ -114,10 +114,7 @@ public class FollowingThemePane extends BasicPane implements UIObserver {
     public TemplateTheme getUsingTheme() {
         JTemplate<?, ?> template = HistoryTemplateListCache.getInstance().getCurrentEditingTemplate();
         if (template != null) {
-            TemplateTheme theme = template.getTemplateTheme();
-            if (theme instanceof FormTheme) {
-                return theme;
-            }
+            return template.getTemplateTheme();
         }
         return null;
     }