From 06462e71510e2474273a05f145c9af31997e1e26 Mon Sep 17 00:00:00 2001
From: obo <Obo@fanruan.com>
Date: Thu, 16 Nov 2023 10:02:48 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9B=9E=E9=80=80=E5=89=A9=E4=BD=99=E7=9A=84?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../design/widgettheme/common/NormalButtonSettingPane.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
index 34fb6d396..006df9661 100644
--- a/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
+++ b/designer-form/src/main/java/com/fr/design/widgettheme/common/NormalButtonSettingPane.java
@@ -98,11 +98,6 @@ public class NormalButtonSettingPane<T extends Widget> extends BaseStyleSettingP
 
         updateNormalButtonStyleBean(widgetTheme);
 
-        // 切换到跟随主题时，修改主题样式为默认样式，防止将自定义样式写入到模版，被主jar读取解析
-        if (widgetTheme.isFollowTheme()) {
-            t.setWidgetTheme(getDefaultNormalButtonTheme());
-        }
-
         if (t instanceof FreeButton) {
             FreeButton freeButton = (FreeButton) t;
             freeButton.setCustomStyle(!widgetTheme.isFollowTheme());