Pull request #13371: REPORT-111723 【控件显示增强】删除当前模板主题，按钮和标签控件的字体大小异常 & REPORT-111281 控件内置后，新模版默认开启变成默认关闭

Merge in DESIGN/design from ~OBO/design1:release/11.0 to release/11.0

* commit '31a4146d024d48b077587a31f93ce764706af52d':
  REPORT-111281 控件内置后，新模版默认开启变成默认关闭
  REPORT-111723 【控件显示增强】删除当前模板主题，按钮和标签控件的字体大小异常

designer-form/src/main/java/com/fr/design/widgettheme/BaseStyleSettingPane.java

@@ -217,7 +217,7 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
         setLineComboBox(widgetStyle);
         setBorderRadiusSpinner(widgetStyle);
         setTextStylePane(widgetStyle);
-        setFrFontPane();
+        setFrFontPane(widgetStyle);
         setButtonStyleDefinedPane(widgetStyle);
         setSelectBgColor(widgetStyle);
     }
@@ -257,9 +257,9 @@ public abstract class BaseStyleSettingPane<T extends Widget> extends BasicBeanPa
         this.fontColorButton.setColor(textStyle.getFontColor());
     }
 
-    private void setFrFontPane() {
+    private void setFrFontPane(ThemedWidgetStyle widgetStyle) {
         if (frFontPane != null) {
-            frFontPane.populateBean(FRFont.getInstance());
+            frFontPane.populateBean(widgetStyle.getFontStyle().getFont());
         }
     }
 

designer-realize/src/main/java/com/fr/strongest/WidgetThemeListenerStarter.java

@@ -53,7 +53,7 @@ public class WidgetThemeListenerStarter {
             BaseBook workBook = (BaseBook) temp.getTarget();
             if (isNeedAddAttr(temp, workBook)) {
                 WidgetDisplayEnhanceMarkAttr attr = new WidgetDisplayEnhanceMarkAttr();
-                attr.setWidgetEnhance(true);
+                attr.setWidgetEnhance(false);
                 workBook.addAttrMark(attr);
             }
         }