REPORT-83259 & REPORT-83263 【最强控件】控件样式跟随主题&开放自定义

designer-base/src/main/java/com/fr/design/fun/TemplateThemePaneProvider.java

@@ -20,7 +20,7 @@ public interface TemplateThemePaneProvider<T> extends Mutable {
      * 插入tab的位置
      *
      * @param total 已插入的tab数
-     * @return 插入位置，如果想放到最后，则返回-1
+     * @return 插入位置
      */
     int getInsertPosition(int total);
 

designer-base/src/main/java/com/fr/design/mainframe/theme/TemplateThemeBlock.java

@@ -6,11 +6,18 @@ import com.fr.base.theme.TemplateThemeConfig;
 import com.fr.base.theme.settings.ThemeThumbnail;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.file.HistoryTemplateListCache;
+import com.fr.design.fun.TemplateThemePaneProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.JTemplate;
 import com.fr.design.mainframe.theme.dialog.TemplateThemeProfileDialog;
+import com.fr.event.Event;
+import com.fr.event.EventDispatcher;
+import com.fr.event.Listener;
 import com.fr.general.IOUtils;
+import com.fr.plugin.context.PluginContext;
+import com.fr.plugin.injectable.PluginModule;
+import com.fr.plugin.observer.PluginEventType;
 import com.fr.stable.Constants;
 import com.fr.stable.StringUtils;
 
@@ -95,6 +102,18 @@ public class TemplateThemeBlock<T extends TemplateTheme> extends JPanel {
                 repaint();
             }
         });
+        initPluginListener();
+    }
+
+    private void initPluginListener() {
+        EventDispatcher.listen(PluginEventType.BeforeStop, new Listener<PluginContext>() {
+            @Override
+            public void on(Event event, PluginContext pluginContext) {
+                // 重置参数面板和控件主题样式
+                theme.setParamContainerStyle(null);
+                theme.setWidgetStyle(null);
+            }
+        }, pluginContext -> pluginContext.contain(PluginModule.ExtraDesign, TemplateThemePaneProvider.XML_TAG));
     }
 
     private void initializePane() {

designer-form/src/main/java/com/fr/design/fun/WidgetAdvancedPaneProvider.java

@@ -21,7 +21,7 @@ public interface WidgetAdvancedPaneProvider<T> extends Mutable {
      * 获取插入的位置
      *
      * @param total 已插入的面板数
-     * @return 插入位置，如果想放到最后，则返回-1
+     * @return 插入位置
      */
     int getInsertPosition(int total);
 

designer-form/src/main/java/com/fr/design/widget/ui/designer/CheckBoxDefinePane.java

@@ -1,8 +1,11 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.fun.WidgetAdvancedPaneProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -11,18 +14,28 @@ import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
 import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
 import com.fr.form.ui.CheckBox;
-
+import com.fr.general.GeneralContext;
+import com.fr.plugin.observer.PluginEvent;
+import com.fr.plugin.observer.PluginEventListener;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
 import javax.swing.SwingConstants;
 import java.awt.Component;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Set;
 
 public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 	private UITextField text;
 	private FontSizeComboPane fontSizePane;
 	private FormWidgetValuePane formWidgetValuePane;
 	protected UITextField labelNameTextField;
+	protected final List<BasicBeanPane<CheckBox>> extraPaneList = new ArrayList<>();
+	protected JPanel extraPane;
+
+	protected static double F = TableLayout.FILL;
+	protected static double P = TableLayout.PREFERRED;
 
 	public CheckBoxDefinePane(XCreator xCreator) {
 		super(xCreator);
@@ -37,16 +50,15 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 		UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value"));
 		widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
 		formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
-		double f = TableLayout.FILL;
+		initExtraPane();
-		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
 				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
 				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Text")),  text },
 				new Component[]{widgetValueLabel,  formWidgetValuePane },
-				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
+				new Component[]{extraPane, null},
 		};
-		double[] rowSize = {p, p, p, p, p, p};
+		double[] rowSize = {P, P, P, P, P, P};
-		double[] columnSize = {p, f};
+		double[] columnSize = {P, F};
 		int[][] rowCount = {{1, 1},{1, 1}, {1, 3},{1, 1}};
 		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
 		JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -56,6 +68,59 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 
 		this.add(uiExpandablePane);
 	}
+
+	protected void initExtraPane() {
+		initPluginListener();
+		refreshExtraAdvancedPane();
+	}
+
+	protected void refreshExtraAdvancedPane() {
+		extraPaneList.clear();
+		boolean containsExtraPane = false;
+		Set<WidgetAdvancedPaneProvider<CheckBox>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
+		for (WidgetAdvancedPaneProvider<CheckBox> provider : providers) {
+			if (!provider.accept(creator)) {
+				continue;
+			}
+			insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
+			containsExtraPane = true;
+		}
+		if (containsExtraPane) {
+			extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+			for (BasicBeanPane<CheckBox> pane : extraPaneList) {
+				extraPane.add(pane);
+			}
+		} else {
+			Component[][] components = new Component[][]{
+					new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}
+			};
+			double[] rowSize = {P};
+			double[] columnSize = {P, F};
+			int[][] rowCount = {{1, 1}};
+			extraPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+		}
+	}
+
+	protected void initPluginListener() {
+		GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
+			@Override
+			public void on(PluginEvent event) {
+				refreshExtraAdvancedPane();
+			}
+		}, pluginContext -> pluginContext.getRuntime().contain(WidgetAdvancedPaneProvider.XML_TAG));
+	}
+
+	/**
+	 * 插入配置项面板
+	 *
+	 * @param index    插入的位置
+	 * @param pane 配置项面板
+	 */
+	protected void insertShortCut(int index, BasicBeanPane<CheckBox> pane) {
+		int size = extraPaneList.size();
+		index = Math.min(index, size);
+		extraPaneList.add(index, pane);
+	}
 	
 	@Override
 	public String title4PopupWindow() {
@@ -68,6 +133,9 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 		fontSizePane.setValue(check.getFontSize());
 		formWidgetValuePane.populate(check);
 		labelNameTextField.setText(check.getLabelName());
+		for (BasicBeanPane<CheckBox> pane : extraPaneList) {
+			pane.populateBean(check);
+		}
 	}
 
 	@Override
@@ -77,6 +145,9 @@ public class CheckBoxDefinePane extends AbstractDataModify<CheckBox> {
 		box.setFontSize(fontSizePane.getValue());
 		formWidgetValuePane.update(box);
 		box.setLabelName(labelNameTextField.getText());
+		for (BasicBeanPane<CheckBox> pane : extraPaneList) {
+			pane.updateBean(box);
+		}
 		return box;
 	}
 }

designer-form/src/main/java/com/fr/design/widget/ui/designer/DateEditorDefinePane.java

@@ -2,15 +2,17 @@ package com.fr.design.widget.ui.designer;
 
 import com.fr.base.FRContext;
 import com.fr.data.core.FormatField;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.border.UIRoundedBorder;
 import com.fr.design.constants.UIConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.fun.WidgetAdvancedPaneProvider;
 import com.fr.design.gui.ibutton.UIButtonGroup;
 import com.fr.design.gui.icombobox.UIComboBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.widget.component.DateValuePane;
 import com.fr.design.widget.component.UIComboBoxNoArrow;
@@ -18,18 +20,23 @@ import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
 import com.fr.design.widget.ui.designer.date.DateFormatCheckManager;
 import com.fr.design.widget.ui.designer.date.DateFormatCheckResult;
 import com.fr.form.ui.DateEditor;
-
 import com.fr.stable.ArrayUtils;
 
-import javax.swing.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
 import javax.swing.border.TitledBorder;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Component;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.text.SimpleDateFormat;
 import java.util.Date;
+import java.util.Set;
 
 public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor> {
     private UIButtonGroup returnTypeComboBox;
@@ -68,8 +75,7 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
         JPanel formatHead =  createFormatHead();
         startDv = new DateValuePane();
         endDv = new DateValuePane();
-        double f = TableLayout.FILL;
+        initExtraPane();
-        double p = TableLayout.PREFERRED;
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                 new Component[]{widgetValueLabel, formWidgetValuePane},
@@ -77,12 +83,12 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
                 new Component[]{startDateLabel, startDv},
                 new Component[]{endDateLabel, endDv},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
+                new Component[]{extraPane, null},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Date_Selector_Return_Type")), returnTypeComboBox}
 
         };
-        double[] rowSize = {p, p, p, p, p, p, p, p, p, p};
+        double[] rowSize = {P, P, P, P, P, P, P, P, P, P};
-        double[] columnSize = {p, f};
+        double[] columnSize = {P, F};
         int[][] rowCount = {{1, 1}, {1, 3}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}, {1, 1}};
         JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_L2, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -90,6 +96,32 @@ public class DateEditorDefinePane extends DirectWriteEditorDefinePane<DateEditor
         return boundsPane;
     }
 
+    protected void refreshExtraAdvancedPane() {
+        extraPaneList.clear();
+        boolean containsExtraPane = false;
+        Set<WidgetAdvancedPaneProvider<DateEditor>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
+        for (WidgetAdvancedPaneProvider<DateEditor> provider : providers) {
+            if (!provider.accept(creator)) {
+                continue;
+            }
+            insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
+            containsExtraPane = true;
+        }
+        if (containsExtraPane) {
+            extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+            for (BasicBeanPane<DateEditor> pane : extraPaneList) {
+                extraPane.add(pane);
+            }
+        } else {
+            Component[][] components = new Component[][]{
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
+            };
+            double[] rowSize = {P};
+            double[] columnSize = {P, F};
+            int[][] rowCount = {{1, 1}};
+            extraPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        }
+    }
 
     private JPanel createFormatPane(UIComboBox formatComboBox, UILabel sampleLabel){
         JPanel previewPane = FRGUIPaneFactory.createBorderLayout_S_Pane();

designer-form/src/main/java/com/fr/design/widget/ui/designer/DirectWriteEditorDefinePane.java

@@ -1,19 +1,26 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.fun.WidgetAdvancedPaneProvider;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.utils.gui.GUICoreUtils;
 import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
 import com.fr.form.ui.DirectWriteEditor;
 
-
+import javax.swing.BorderFactory;
-import javax.swing.*;
+import javax.swing.JComponent;
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.FlowLayout;
+import java.util.Set;
 
 //richer:需要提供能否直接编辑的控件设置面板——下拉框、复选框、时间、日期、下拉树
 public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> extends FieldEditorDefinePane<T> {
@@ -34,18 +41,17 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 		Component[] removeRepeatPane = new Component[]{createRepeatCheckBox(), null};
 		Component[] dicPane = createDictPane();
 		Component[] waterMarkComponent = createWaterMarkPane();
-		double f = TableLayout.FILL;
+		initExtraPane();
-		double p = TableLayout.PREFERRED;
 		Component[][] components = new Component[][]{
 				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
 				new Component[]{widgetValueLabel,  formWidgetValuePane },
 				dicPane,
 				removeRepeatPane,
 				waterMarkComponent,
-				new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}
+				new Component[]{extraPane, null}
 		};
-		double[] rowSize = {p, p, p, p, p, p, p, p};
+		double[] rowSize = {P, P, P, P, P, P, P, P};
-		double[] columnSize = {p, f};
+		double[] columnSize = {P, F};
 		int[][] rowCount = {{1, 1},{1, 3},{1, 1},{1, 1},{1,1},{1,1}};
 		JPanel panel =  TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
 //		panel.setBorder(BorderFactory.createEmptyBorder(10, 0, 0, 0));
@@ -58,6 +64,33 @@ public abstract class DirectWriteEditorDefinePane<T extends DirectWriteEditor> e
 		return advancePane;
 	}
 
+	protected void refreshExtraAdvancedPane() {
+		extraPaneList.clear();
+		boolean containsExtraPane = false;
+		Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
+		for (WidgetAdvancedPaneProvider<T> provider : providers) {
+			if (!provider.accept(creator)) {
+				continue;
+			}
+			insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
+			containsExtraPane = true;
+		}
+		if (containsExtraPane) {
+			extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+			for (BasicBeanPane<T> pane : extraPaneList) {
+				extraPane.add(pane);
+			}
+		} else {
+			Component[][] components = new Component[][]{
+					new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}
+			};
+			double[] rowSize = {P};
+			double[] columnSize = {P, F};
+			int[][] rowCount = {{1, 1}};
+			extraPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+		}
+	}
+
 	public UICheckBox createRepeatCheckBox(){
 		return null;
 	}

designer-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@@ -18,6 +18,7 @@ import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
+import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
 import com.fr.form.ui.FieldEditor;
@@ -34,7 +35,6 @@ import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Set;
 
 public abstract class FieldEditorDefinePane<T extends FieldEditor> extends AbstractDataModify<T> {
     protected UICheckBox allowBlankCheckBox;
@@ -43,8 +43,11 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     protected JPanel validatePane;
     protected FontSizeComboPane fontSizePane;
     protected UITextField labelNameTextField;
-    private final List<BasicBeanPane<T>> extraPaneList = new ArrayList<>();
+    protected final List<BasicBeanPane<T>> extraPaneList = new ArrayList<>();
-    private JPanel extraPane;
+    protected JPanel extraPane;
+
+    protected static double F = TableLayout.FILL;
+    protected static double P = TableLayout.PREFERRED;
 
     public FieldEditorDefinePane(XCreator xCreator) {
         super(xCreator);
@@ -58,11 +61,8 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         fontSizePane = new FontSizeComboPane();
         JPanel contentPane = this.setFirstContentPane();
-        JPanel jPanel = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+        JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        jPanel.add(contentPane);
+        jPanel.add(contentPane, BorderLayout.CENTER);
-        extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
-        jPanel.add(extraPane);
-        this.initExtraPane();
         contentPane.setBorder(BorderFactory.createEmptyBorder(10, 0, 10, 0));
         if (contentPane != null) {
             UIExpandablePane uiExpandablePane = new UIExpandablePane(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Report_Advanced"), 280, 20, jPanel);
@@ -71,24 +71,13 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         this.addValidatePane();
     }
 
-    private void initExtraPane() {
+    protected void initExtraPane() {
         initPluginListener();
         refreshExtraAdvancedPane();
     }
 
-    private void refreshExtraAdvancedPane() {
+    protected void refreshExtraAdvancedPane() {
-        extraPaneList.clear();
+        // do nothing
-        extraPane.removeAll();
-        Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
-        for (WidgetAdvancedPaneProvider<T> provider : providers) {
-            if (!provider.accept(creator)) {
-                continue;
-            }
-            insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
-        }
-        for (BasicBeanPane<T> pane : extraPaneList) {
-            extraPane.add(pane);
-        }
     }
 
     @Override
@@ -196,13 +185,13 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
      * @param index    插入的位置
      * @param pane 配置项面板
      */
-    private void insertShortCut(int index, BasicBeanPane<T> pane) {
+    protected void insertShortCut(int index, BasicBeanPane<T> pane) {
         int size = extraPaneList.size();
         index = Math.min(index, size);
         extraPaneList.add(index, pane);
     }
 
-    private void initPluginListener() {
+    protected void initPluginListener() {
         GeneralContext.listenPluginRunningChanged(new PluginEventListener() {
             @Override
             public void on(PluginEvent event) {

designer-form/src/main/java/com/fr/design/widget/ui/designer/NumberEditorDefinePane.java

@@ -1,7 +1,10 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.fun.WidgetAdvancedPaneProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.ispinner.UIBasicSpinner;
 import com.fr.design.layout.FRGUIPaneFactory;
@@ -11,9 +14,12 @@ import com.fr.design.widget.component.NumberEditorValidatePane;
 import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
 import com.fr.form.ui.NumberEditor;
 
-
+import javax.swing.JComponent;
-import javax.swing.*;
+import javax.swing.JFormattedTextField;
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.Component;
+import java.util.Set;
 
 public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor> {
     public NumberEditorDefinePane(XCreator xCreator){
@@ -43,11 +49,12 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
+        initExtraPane();
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                 new Component[]{widgetValueLabel,  formWidgetValuePane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark")), waterMarkDictPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}
+                new Component[]{extraPane, null}
         };
         double[] rowSize = {p, p, p, p, p, p};
         double[] columnSize = {p,f};
@@ -58,6 +65,33 @@ public class NumberEditorDefinePane extends FieldEditorDefinePane<NumberEditor>
         return boundsPane;
     }
 
+    protected void refreshExtraAdvancedPane() {
+        extraPaneList.clear();
+        boolean containsExtraPane = false;
+        Set<WidgetAdvancedPaneProvider<NumberEditor>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
+        for (WidgetAdvancedPaneProvider<NumberEditor> provider : providers) {
+            if (!provider.accept(creator)) {
+                continue;
+            }
+            insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
+            containsExtraPane = true;
+        }
+        if (containsExtraPane) {
+            extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+            for (BasicBeanPane<NumberEditor> pane : extraPaneList) {
+                extraPane.add(pane);
+            }
+        } else {
+            Component[][] components = new Component[][]{
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}
+            };
+            double[] rowSize = {P};
+            double[] columnSize = {P, F};
+            int[][] rowCount = {{1, 1}};
+            extraPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        }
+    }
+
     public JPanel setValidatePane() {
         numberEditorValidatePane = new NumberEditorValidatePane();
         return numberEditorValidatePane;

designer-form/src/main/java/com/fr/design/widget/ui/designer/TextFieldEditorDefinePane.java

@@ -1,15 +1,16 @@
 package com.fr.design.widget.ui.designer;
 
 import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
 import com.fr.design.fun.RegPaneProvider;
+import com.fr.design.fun.WidgetAdvancedPaneProvider;
 import com.fr.design.gui.frpane.RegFieldPane;
 import com.fr.design.gui.frpane.RegPane;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
 import com.fr.design.layout.FRGUIPaneFactory;
-import com.fr.design.layout.TableLayout;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
 import com.fr.form.ui.TextEditor;
@@ -21,6 +22,7 @@ import javax.swing.SwingConstants;
 import java.awt.Component;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
+import java.util.Set;
 
 public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor> {
     protected RegFieldPane regPane;
@@ -63,18 +65,17 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         });
 
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
-        double f = TableLayout.FILL;
-        double p = TableLayout.PREFERRED;
         UILabel widgetValueLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Estate_Widget_Value"), SwingConstants.LEFT);
         widgetValueLabel.setVerticalAlignment(SwingConstants.TOP);
+        initExtraPane();
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                 new Component[]{widgetValueLabel, formWidgetValuePane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_WaterMark"), SwingConstants.LEFT), waterMarkDictPane},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size"), SwingConstants.LEFT), fontSizePane}
+                new Component[]{extraPane, null}
         };
-        double[] rowSize = {p, p, p, p, p, p};
+        double[] rowSize = {P, P, P, P, P};
-        double[] columnSize = {p, f};
+        double[] columnSize = {P, F};
         int[][] rowCount = {{1, 1}, {1, 3}, {1, 1}, {1, 1}};
         final JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
         JPanel boundsPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
@@ -82,6 +83,33 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
         return boundsPane;
     }
 
+    protected void refreshExtraAdvancedPane() {
+        extraPaneList.clear();
+        boolean containsExtraPane = false;
+        Set<WidgetAdvancedPaneProvider<TextEditor>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
+        for (WidgetAdvancedPaneProvider<TextEditor> provider : providers) {
+            if (!provider.accept(creator)) {
+                continue;
+            }
+            insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
+            containsExtraPane = true;
+        }
+        if (containsExtraPane) {
+            extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+            for (BasicBeanPane<TextEditor> pane : extraPaneList) {
+                extraPane.add(pane);
+            }
+        } else {
+            Component[][] components = new Component[][]{
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size"), SwingConstants.LEFT), fontSizePane}
+            };
+            double[] rowSize = {P};
+            double[] columnSize = {P, F};
+            int[][] rowCount = {{1, 1}};
+            extraPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        }
+    }
+
     public JPanel setValidatePane() {
         return regPane;
     }

designer-form/src/main/java/com/fr/design/widget/ui/designer/btn/ButtonGroupDefinePane.java

@@ -1,8 +1,11 @@
 package com.fr.design.widget.ui.designer.btn;
 
 import com.fr.data.Dictionary;
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.BasicBeanPane;
 import com.fr.design.designer.IntervalConstants;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.fun.WidgetAdvancedPaneProvider;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayout;
@@ -13,9 +16,11 @@ import com.fr.design.widget.ui.designer.FieldEditorDefinePane;
 import com.fr.design.widget.ui.designer.component.FormWidgetValuePane;
 import com.fr.form.ui.ButtonGroup;
 
-
+import javax.swing.JPanel;
-import javax.swing.*;
+import javax.swing.SwingConstants;
-import java.awt.*;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.util.Set;
 
 /**
  * Created by ibm on 2017/8/5.
@@ -40,11 +45,12 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
         formWidgetValuePane = new FormWidgetValuePane(creator.toData(), false);
         double f = TableLayout.FILL;
         double p = TableLayout.PREFERRED;
+        initExtraPane();
         Component[][] components = new Component[][]{
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Label_Name")), labelNameTextField},
                 new Component[]{widgetValueLabel, formWidgetValuePane},
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_DS_Dictionary")), dictionaryEditor},
-                new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane},
+                new Component[]{extraPane, null},
                 new Component[]{buttonGroupDictPane, null}
         };
         double[] rowSize = {p, p, p, p, p, p, p};
@@ -60,6 +66,33 @@ public abstract class ButtonGroupDefinePane<T extends ButtonGroup> extends Field
         return advancePane;
     }
 
+    protected void refreshExtraAdvancedPane() {
+        extraPaneList.clear();
+        boolean containsExtraPane = false;
+        Set<WidgetAdvancedPaneProvider<T>> providers = ExtraDesignClassManager.getInstance().getArray(WidgetAdvancedPaneProvider.XML_TAG);
+        for (WidgetAdvancedPaneProvider<T> provider : providers) {
+            if (!provider.accept(creator)) {
+                continue;
+            }
+            insertShortCut(provider.getInsertPosition(extraPaneList.size()), provider.createExtraAdvancedPane());
+            containsExtraPane = true;
+        }
+        if (containsExtraPane) {
+            extraPane = FRGUIPaneFactory.createYBoxEmptyBorderPane();
+            for (BasicBeanPane<T> pane : extraPaneList) {
+                extraPane.add(pane);
+            }
+        } else {
+            Component[][] components = new Component[][]{
+                    new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size")), fontSizePane}
+            };
+            double[] rowSize = {P};
+            double[] columnSize = {P, F};
+            int[][] rowCount = {{1, 1}};
+            extraPane = TableLayoutHelper.createGapTableLayoutPane(components, rowSize, columnSize, rowCount, IntervalConstants.INTERVAL_W1, IntervalConstants.INTERVAL_L1);
+        }
+    }
+
     public JPanel createOtherPane() {
         return null;
     }

designer-realize/src/main/java/com/fr/design/mainframe/JWorkBook.java

@@ -1311,7 +1311,9 @@ public class JWorkBook extends JTemplate<WorkBook, WorkBookUndoState> {
         boolean shouldCreateUndoState = compatible == TemplateThemeCompatible.NONE && !StringUtils.equals(oldTheme.getName(), newTheme.getName());
 
         getTarget().setTemplateTheme(newTheme, compatible);
-        getTarget().getReportParameterAttr().onTemplateUsingThemeChange(newTheme, compatible);
+        if (getTarget().getReportParameterAttr() != null) {
+            getTarget().getReportParameterAttr().onTemplateUsingThemeChange(newTheme, compatible);
+        }
         setTarget((WorkBook) FineColorSynchronizer.flush(getTarget(), newTheme, compatible));
 
         if (HistoryTemplateListCache.getInstance().getCurrentEditingTemplate() == this) {