Merge branch 'feature/x' of ssh://code.fineres.com:7999/~tommy/design into feature/x

designer-base/src/main/java/com/fr/design/beans/ErrorMsgTextFieldAdapter.java

@@ -0,0 +1,11 @@
+package com.fr.design.beans;
+
+import javax.swing.JComponent;
+
+public interface ErrorMsgTextFieldAdapter {
+    void setText(String str);
+
+    String getText();
+
+    JComponent getErrorMsgTextField();
+}

designer-base/src/main/java/com/fr/design/beans/UITextFieldAdapter.java

@@ -0,0 +1,46 @@
+package com.fr.design.beans;
+
+import com.fr.design.gui.itextfield.UITextField;
+
+import javax.swing.JComponent;
+import javax.swing.event.DocumentEvent;
+import javax.swing.event.DocumentListener;
+
+public class UITextFieldAdapter implements ErrorMsgTextFieldAdapter {
+    private final UITextField uiTextField = new UITextField();
+
+    public UITextFieldAdapter(){
+        addDocumentListener();
+    }
+    @Override
+    public void setText(String str) {
+        uiTextField.setText(str);
+    }
+
+    @Override
+    public String getText() {
+        return uiTextField.getText();
+    }
+
+    public void addDocumentListener() {
+        uiTextField.getDocument().addDocumentListener(new DocumentListener() {
+
+            public void changedUpdate(DocumentEvent e) {
+                uiTextField.setToolTipText(uiTextField.getText());
+            }
+
+            public void insertUpdate(DocumentEvent e) {
+                uiTextField.setToolTipText(uiTextField.getText());
+            }
+
+            public void removeUpdate(DocumentEvent e) {
+                uiTextField.setToolTipText(uiTextField.getText());
+            }
+        });
+    }
+
+    @Override
+    public JComponent getErrorMsgTextField() {
+        return uiTextField;
+    }
+}

designer-base/src/main/java/com/fr/design/dialog/UIDialog.java

@@ -175,7 +175,11 @@ public abstract class UIDialog extends JDialog {
         try {
             checkValid();
         } catch (Exception exp) {
-            FineJOptionPane.showMessageDialog(this, exp.getMessage());
+            FineJOptionPane.showMessageDialog(
+                    this,
+                    exp.getMessage(),
+                    com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
+                    JOptionPane.WARNING_MESSAGE);
             return;
         }
 

designer-base/src/main/java/com/fr/design/formula/FormulaPane.java

@@ -655,7 +655,7 @@ public class FormulaPane extends BasicPane implements KeyListener, UIFormula {
                     FormulaPane.this,
                     formulaValidMessage + ".",
                     com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Tool_Tips"),
-                    JOptionPane.INFORMATION_MESSAGE);
+                    JOptionPane.WARNING_MESSAGE);
         }
     };
 

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

@@ -0,0 +1,11 @@
+package com.fr.design.fun;
+
+import com.fr.design.gui.frpane.RegFieldPane;
+import com.fr.stable.fun.mark.Immutable;
+
+public interface RegPaneProvider extends Immutable {
+    int CURRENT_LEVEL = 1;
+    String XML_TAG = "RegPaneProvider";
+
+    RegFieldPane createRegPane();
+}

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

@@ -0,0 +1,11 @@
+package com.fr.design.fun;
+
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.stable.fun.mark.Immutable;
+
+public interface TextFieldAdapterProvider extends Immutable {
+    String XML_TAG = "ErrorMesPaneWrapperProvider";
+    int CURRENT_LEVEL = 1;
+
+    ErrorMsgTextFieldAdapter createTextFieldAdapter();
+}

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

@@ -0,0 +1,22 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.RegPaneProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * @author Joe
+ * 2021/10/8 15:19
+ */
+@API(level = RegPaneProvider.CURRENT_LEVEL)
+public abstract class AbstractRegPaneProvider implements RegPaneProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+}

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

@@ -0,0 +1,22 @@
+package com.fr.design.fun.impl;
+
+import com.fr.design.fun.TextFieldAdapterProvider;
+import com.fr.stable.fun.mark.API;
+
+/**
+ * @author Joe
+ * 2021/10/8 15:17
+ */
+@API(level = TextFieldAdapterProvider.CURRENT_LEVEL)
+public abstract class AbstractTextFieldAdapterProvider implements TextFieldAdapterProvider {
+
+    @Override
+    public int currentAPILevel() {
+        return CURRENT_LEVEL;
+    }
+
+    @Override
+    public int layerIndex() {
+        return DEFAULT_LAYER_INDEX;
+    }
+}

designer-base/src/main/java/com/fr/design/gui/frpane/RegFieldPane.java

@@ -1,21 +1,25 @@
 package com.fr.design.gui.frpane;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.design.beans.UITextFieldAdapter;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.dialog.BasicPane;
+import com.fr.design.fun.TextFieldAdapterProvider;
 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.TableLayoutHelper;
 import com.fr.form.ui.TextEditor;
 import com.fr.form.ui.reg.NoneReg;
 import com.fr.form.ui.reg.RegExp;
+import com.fr.log.FineLoggerFactory;
 
-
+import javax.swing.BorderFactory;
-import javax.swing.*;
+import javax.swing.JPanel;
-import javax.swing.event.DocumentEvent;
+import java.awt.BorderLayout;
-import javax.swing.event.DocumentListener;
+import java.awt.Component;
-import java.awt.*;
+import java.awt.Dimension;
 
 /**
  * Created by kerry on 2017/9/4.
@@ -67,33 +71,35 @@ public class RegFieldPane extends RegPane {
     }
 
     private static class RegErrorMsgPane extends BasicPane {
-        private UITextField regErrorMsgField;
+        private ErrorMsgTextFieldAdapter errorMsgTextFieldAdapter;
 
         public RegErrorMsgPane() {
+            initRegErrorMsgField();
+            setStyle();
+        }
+
+        private void setStyle() {
             this.setLayout(FRGUIPaneFactory.createBorderLayout());
             this.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
-            initRegErrorMsgField();
             UILabel tipLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
             tipLabel.setPreferredSize(new Dimension(60, 20));
-            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, regErrorMsgField}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
+            JPanel panel = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{tipLabel, errorMsgTextFieldAdapter.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, 10, LayoutConstants.VGAP_MEDIUM);
             this.add(panel);
         }
 
         private void initRegErrorMsgField() {
-            regErrorMsgField = new UITextField();
+            TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
-            regErrorMsgField.getDocument().addDocumentListener(new DocumentListener() {
+            if (provider == null) {
-                public void changedUpdate(DocumentEvent e) {
+                errorMsgTextFieldAdapter = new UITextFieldAdapter();
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
+                return;
-                }
-
-                public void insertUpdate(DocumentEvent e) {
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
             }
+            try {
+                errorMsgTextFieldAdapter = provider.createTextFieldAdapter();
+            } catch (Exception e) {
+                FineLoggerFactory.getLogger().error(e.getMessage(), e);
+                errorMsgTextFieldAdapter = new UITextFieldAdapter();
 
-                public void removeUpdate(DocumentEvent e) {
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
             }
-            });
         }
 
         @Override
@@ -102,11 +108,11 @@ public class RegFieldPane extends RegPane {
         }
 
         public void populate(TextEditor textEditor) {
-            regErrorMsgField.setText(textEditor.getRegErrorMessage());
+            errorMsgTextFieldAdapter.setText(textEditor.getRegErrorMessage());
         }
 
         public void update(TextEditor textEditor) {
-            textEditor.setRegErrorMessage(regErrorMsgField.getText());
+            textEditor.setRegErrorMessage(errorMsgTextFieldAdapter.getText());
         }
     }
 

designer-base/src/main/java/com/fr/design/report/fit/BaseFitAttrPane.java

@@ -41,6 +41,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
     public JPanel attrJPanel;
     public FitPreviewPane previewJPanel;
     public FitAttrModel fitAttrModel;
+    private static final int BELOW_SET_COMPONENT_HSPACE = 8;
 
 
     protected BaseFitAttrPane() {
@@ -180,7 +181,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
 
     @Override
     protected String title4PopupWindow() {
-        return i18nText("Fine-Designer_PC_Element_Case_Fit_Attr");
+        return i18nText("Fine-Designer_PC_Fit_Attr");
     }
 
     protected abstract String[] getItemNames();
@@ -203,7 +204,7 @@ public abstract class BaseFitAttrPane extends BasicBeanPane<ReportFitAttr> {
         itemChoose.addItemListener(itemListener);
         UILabel belowSetLabel = new UILabel(i18nText("Fine-Design_Report_Blow_Set"));
         JPanel buttonPane = GUICoreUtils.createFlowPane(new Component[]{
-                belowSetLabel, itemChoose}, FlowLayout.LEFT, 0, 0);
+                belowSetLabel, itemChoose}, FlowLayout.LEFT, BELOW_SET_COMPONENT_HSPACE);
         chooseJPanel.add(buttonPane);
         chooseJPanel.setPreferredSize(new Dimension(500, 50));
         JPanel jPanel = new JPanel();

designer-base/src/main/java/com/fr/design/report/fit/menupane/ReportFitAttrAction.java

@@ -34,22 +34,6 @@ public class ReportFitAttrAction extends JTemplateAction {
             return null;
         }
     };
-    private static final MenuKeySet REPORT_FIT_ATTR_ELEMENTCASE = new MenuKeySet() {
-        @Override
-        public char getMnemonic() {
-            return 'T';
-        }
-
-        @Override
-        public String getMenuName() {
-            return Toolkit.i18nText("Fine-Designer_PC_Element_Case_Fit_Attr");
-        }
-
-        @Override
-        public KeyStroke getKeyStroke() {
-            return null;
-        }
-    };
 
     public ReportFitAttrAction(JTemplate jTemplate) {
         super(jTemplate);
@@ -57,12 +41,7 @@ public class ReportFitAttrAction extends JTemplateAction {
     }
 
     private void initMenuStyle() {
-        JTemplate jTemplate = getEditingComponent();
-        if (jTemplate.isJWorkBook()) {
         this.setMenuKeySet(REPORT_FIT_ATTR);
-        } else {
-            this.setMenuKeySet(REPORT_FIT_ATTR_ELEMENTCASE);
-        }
         this.setName(getMenuKeySet().getMenuKeySetName() + "...");
         this.setMnemonic(getMenuKeySet().getMnemonic());
         this.setSmallIcon("/com/fr/design/images/reportfit/fit");

designer-base/src/main/java/com/fr/design/worker/open/OpenWorker.java

@@ -53,7 +53,6 @@ public class OpenWorker<T> extends SwingWorker<T, Void> {
 
     @Override
     protected T doInBackground() throws Exception {
-        TimeUnit.SECONDS.sleep(5);
         return this.callable.call();
     }
 

designer-base/src/main/java/com/fr/env/ErrorDialog.java

@@ -39,7 +39,7 @@ public class ErrorDialog extends JDialog implements ActionListener {
         messagePanel.setBorder(BorderFactory.createEmptyBorder(5,0,0,0));
 
         MessageWithLink messageWithLink = new MessageWithLink(message + ",", Toolkit.i18nText("Fine-Design_Basic_Sync_Help"), CloudCenter.getInstance().acquireUrlByKind("help.replacejars", "https://help.fanruan.com/finereport/doc-view-3268.html"));
-        messageWithLink.setPreferredSize(new Dimension(108, 20));
+        messageWithLink.setPreferredSize(new Dimension(150, 20));
         JPanel messageLinkPane = FRGUIPaneFactory.createBorderLayout_L_Pane();
         messageLinkPane.setBorder(BorderFactory.createEmptyBorder(5, 8, 5, 0));
         messageLinkPane.add(messageWithLink);

designer-base/src/main/java/com/fr/env/SyncFailedPluginsDialog.java

@@ -5,6 +5,7 @@ import com.fr.design.dialog.link.MessageWithLink;
 import com.fr.design.gui.ibutton.UIButton;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextarea.UITextArea;
+import com.fr.design.i18n.DesignSizeI18nManager;
 import com.fr.design.i18n.Toolkit;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.mainframe.DesignerContext;
@@ -62,7 +63,7 @@ public class SyncFailedPluginsDialog extends JDialog {
         JPanel messagePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         MessageWithLink messageWithLink = new MessageWithLink(Toolkit.i18nText("Fine-Design_Basic_Sync_Plugin_Fail_Suggestion"),Toolkit.i18nText("Fine-Design_Basic_Sync_Deal_Immediately"),
                 CloudCenter.getInstance().acquireUrlByKind("help.installplugins", "https://help.fanruan.com/finereport/doc-view-2198.html"));
-        messageWithLink.setPreferredSize(new Dimension(316, 20));
+        messageWithLink.setPreferredSize(DesignSizeI18nManager.getInstance().i18nDimension("com.fr.env.SyncFailedPluginsDialog.messageWithLink"));
 
         messagePane.add(messageWithLink);
         messagePane.setBorder(BorderFactory.createEmptyBorder(5, 5, 5, 0));

designer-base/src/main/resources/com/fr/design/i18n/dimension_en.properties

@@ -7,4 +7,5 @@ com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=490*95
 com.fr.design.version.detail.label=750*30
 com.fr.design.version.detail.dialog=900*500
+com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36
 com.fr.design.web.pane.text.field=450*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_ja_JP.properties

@@ -6,4 +6,5 @@ com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=430*95
 com.fr.design.version.detail.label=650*30
 com.fr.design.version.detail.dialog=800*500
+com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36
 com.fr.design.web.pane.text.field=400*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_ko_KR.properties

@@ -6,4 +6,5 @@ com.fr.env.RemoteEnvPane.dialog=458*132
 com.fr.design.version.check.dialog=450*95
 com.fr.design.version.detail.label=700*30
 com.fr.design.version.detail.dialog=850*500
+com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*36
 com.fr.design.web.pane.text.field=450*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh.properties

@@ -7,4 +7,5 @@ com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
 com.fr.design.version.detail.dialog=600*500
+com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20
 com.fr.design.web.pane.text.field=450*20

designer-base/src/main/resources/com/fr/design/i18n/dimension_zh_TW.properties

@@ -6,4 +6,5 @@ com.fr.env.RemoteEnvPane.dialog=308*132
 com.fr.design.version.check.dialog=230*95
 com.fr.design.version.detail.label=450*30
 com.fr.design.version.detail.dialog=600*500
+com.fr.env.SyncFailedPluginsDialog.messageWithLink=316*20
 com.fr.design.web.pane.text.field=450*20

designer-form/src/main/java/com/fr/design/designer/beans/actions/FormDeleteAction.java

@@ -41,6 +41,14 @@ public class FormDeleteAction extends FormWidgetEditAction {
         return comp;
     }
 
+    @Override
+    public JComponent createToolBarComponentByName(String componentName) {
+        JComponent comp = super.createToolBarComponentByName(componentName);
+        // 除了 BACKSPACE 之外，DELETE 键也要能删除（直接在此处添加绑定，没有按钮提示）
+        comp.registerKeyboardAction(this, KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), JComponent.WHEN_IN_FOCUSED_WINDOW);
+        return comp;
+    }
+
     /**
      * 删除
      *

designer-form/src/main/java/com/fr/design/designer/beans/adapters/layout/FRCardMainBorderLayoutAdapter.java

@@ -4,7 +4,10 @@ import com.fr.design.designer.creator.XCreator;
 import com.fr.design.designer.creator.XLayoutContainer;
 import com.fr.design.designer.creator.cardlayout.XWCardTagLayout;
 import com.fr.design.dialog.FineJOptionPane;
+import com.fr.design.file.HistoryTemplateListPane;
 import com.fr.design.form.layout.FRBorderLayout;
+import com.fr.design.mainframe.JTemplate;
+import com.fr.design.ui.util.UIUtil;
 import com.fr.general.ComparatorUtils;
 
 import java.awt.BorderLayout;
@@ -61,7 +64,22 @@ public class FRCardMainBorderLayoutAdapter extends FRBorderLayoutAdapter {
     private boolean isBeyondMinConstraint(int minConstraint, int value) {
         if (minConstraint > value) {
             FineJOptionPane.showMessageDialog(null, com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Beyond_Tablayout_Bounds"));
+            if (container.getBackupBound() != null) {
+                // 手动拖动导致变矮的场景
                 container.setSize(container.getBackupBound().getSize());
+            } else {
+                // 自适应布局平分高度导致变矮的场景
+                UIUtil.invokeLaterIfNeeded(new Runnable() {
+                    @Override
+                    public void run() {
+                        JTemplate<?, ?> jt = HistoryTemplateListPane.getInstance().getCurrentEditingTemplate();
+                        if (jt != null) {
+                            jt.undo();
+                        }
+                    }
+                });
+
+            }
             return true;
         } else {
             return false;

designer-form/src/main/java/com/fr/design/mainframe/FormDesigner.java

@@ -1010,15 +1010,6 @@ public class FormDesigner extends TargetComponent<Form> implements TreeSelection
     }
 
     private void refreshCenter(Widget centerWidget, XLayoutContainer formLayoutContainer) {
-        // 不存在center块, 说明是新建的模板
-        if (centerWidget == null) {
-            XLayoutContainer layoutContainer = (XLayoutContainer) XCreatorUtils.createXCreator(new WFitLayout("body"));
-            layoutContainer.setSize(LARGE_PREFERRED_SIZE);
-            setRootComponent(layoutContainer);
-            formLayoutContainer.add(rootComponent, WBorderLayout.CENTER);
-            return;
-        }
-
         XLayoutContainer centerContainer = (XLayoutContainer) XCreatorUtils.createXCreator(centerWidget);
         Dimension d = new Dimension();
         d.width = ((WFitLayout) centerWidget).getContainerWidth();

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

@@ -1,9 +1,17 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.design.beans.UITextFieldAdapter;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
-import com.fr.design.designer.creator.*;
+import com.fr.design.designer.creator.XCreator;
+import com.fr.design.designer.creator.XCreatorUtils;
+import com.fr.design.designer.creator.XLayoutContainer;
+import com.fr.design.designer.creator.XWFitLayout;
+import com.fr.design.designer.creator.XWParameterLayout;
 import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.fun.TextFieldAdapterProvider;
 import com.fr.design.gui.icheckbox.UICheckBox;
 import com.fr.design.gui.ilable.UILabel;
 import com.fr.design.gui.itextfield.UITextField;
@@ -11,19 +19,19 @@ import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.design.layout.TableLayoutHelper;
 import com.fr.design.widget.ui.designer.component.FontSizeComboPane;
 import com.fr.form.ui.FieldEditor;
+import com.fr.log.FineLoggerFactory;
 
-
+import javax.swing.BorderFactory;
-import javax.swing.*;
+import javax.swing.JPanel;
-import javax.swing.event.DocumentEvent;
+import java.awt.BorderLayout;
-import javax.swing.event.DocumentListener;
+import java.awt.Component;
-import java.awt.*;
 import java.awt.event.ItemEvent;
 import java.awt.event.ItemListener;
 
 public abstract class FieldEditorDefinePane<T extends FieldEditor> extends AbstractDataModify<T> {
     protected UICheckBox allowBlankCheckBox;
     // richer:错误信息，是所有控件共有的属性，所以放到这里来
-    protected UITextField errorMsgTextField;
+    protected ErrorMsgTextFieldAdapter errorMsgTextField;
     protected JPanel validatePane;
     protected FontSizeComboPane fontSizePane;
     protected UITextField labelNameTextField;
@@ -40,7 +48,6 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Null"));
         allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         fontSizePane = new FontSizeComboPane();
-        errorMsgTextField = new UITextField();
         JPanel contentPane = this.setFirstContentPane();
         JPanel jPanel = FRGUIPaneFactory.createBorderLayout_S_Pane();
         jPanel.add(contentPane, BorderLayout.CENTER);
@@ -76,23 +83,17 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void initErrorMsgPane() {
         // 错误信息
-        errorMsgTextField = new UITextField();
+        TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
-//        // richer:主要为了方便查看比较长的错误信息
+        if (provider == null) {
-        errorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
+            errorMsgTextField = new UITextFieldAdapter();
-
+            return;
-            public void changedUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
         }
-
+        try {
-            public void insertUpdate(DocumentEvent e) {
+            errorMsgTextField = provider.createTextFieldAdapter();
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            errorMsgTextField = new UITextFieldAdapter();
         }
-
-            public void removeUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-        });
-
     }
 
 
@@ -111,7 +112,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         validatePane = FRGUIPaneFactory.createBorderLayout_S_Pane();
         final UILabel uiLabel = new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Basic_Widget_Error_Tip"));
         JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
         errorTipPane.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L6, IntervalConstants.INTERVAL_L5, 0, 0));
         borderPane.add(errorTipPane, BorderLayout.CENTER);
         allowBlankCheckBox.addItemListener(new ItemListener() {

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

@@ -294,7 +294,9 @@ public class NewFormPane extends BasicPane {
     }
 
     private Form initEmptyBodyForm() {
-        WFitLayout body = new WFitLayout();
+        WFitLayout body = new WFitLayout("body");
+        body.setContainerWidth(WBorderLayout.DEFAULT_WIDTH);
+        body.setContainerHeight(WBorderLayout.DEFAULT_HEIGHT);
         WBorderLayout borderLayout = new WBorderLayout("form");
         borderLayout.addCenter(body);
         return new Form(borderLayout);

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

@@ -1,7 +1,9 @@
 package com.fr.design.widget.ui.designer;
 
+import com.fr.design.ExtraDesignClassManager;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.designer.creator.XCreator;
+import com.fr.design.fun.RegPaneProvider;
 import com.fr.design.gui.frpane.RegFieldPane;
 import com.fr.design.gui.frpane.RegPane;
 import com.fr.design.gui.ilable.UILabel;
@@ -11,10 +13,12 @@ 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;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
-import javax.swing.*;
+
-import java.awt.*;
+import javax.swing.JPanel;
+import javax.swing.SwingConstants;
+import java.awt.Component;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
@@ -83,11 +87,20 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
     }
 
 
-
     protected RegFieldPane createRegPane() {
+        RegPaneProvider provider = ExtraDesignClassManager.getInstance().getSingle(RegPaneProvider.XML_TAG);
+        if (provider == null) {
             return new RegFieldPane();
         }
 
+        try {
+            return provider.createRegPane();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return new RegFieldPane();
+        }
+    }
+
     @Override
     public String title4PopupWindow() {
         return "text";

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

@@ -1,19 +1,21 @@
 package com.fr.design.widget.ui;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.beans.ErrorMsgTextFieldAdapter;
+import com.fr.design.beans.UITextFieldAdapter;
 import com.fr.design.constants.LayoutConstants;
 import com.fr.design.designer.IntervalConstants;
 import com.fr.design.foldablepane.UIExpandablePane;
+import com.fr.design.fun.TextFieldAdapterProvider;
 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.TableLayoutHelper;
 import com.fr.form.ui.FieldEditor;
+import com.fr.log.FineLoggerFactory;
 
 import javax.swing.BorderFactory;
 import javax.swing.JPanel;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
 import java.awt.BorderLayout;
 import java.awt.Component;
 import java.awt.event.ItemEvent;
@@ -22,7 +24,7 @@ import java.awt.event.ItemListener;
 public abstract class FieldEditorDefinePane<T extends FieldEditor> extends AbstractDataModify<T> {
     protected UICheckBox allowBlankCheckBox;
     // richer:错误信息，是所有控件共有的属性，所以放到这里来
-    protected UITextField errorMsgTextField;
+    protected ErrorMsgTextFieldAdapter errorMsgTextField;
     protected JPanel validatePane;
 
     public FieldEditorDefinePane() {
@@ -45,23 +47,17 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void initErrorMsgPane() {
         // 错误信息
-        errorMsgTextField = new UITextField();
+        TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
-//        // richer:主要为了方便查看比较长的错误信息
+        if (provider == null) {
-        errorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
+            errorMsgTextField = new UITextFieldAdapter();
-
+            return;
-            public void changedUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-
-            public void insertUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
         }
-
+        try {
-            public void removeUpdate(DocumentEvent e) {
+            errorMsgTextField = provider.createTextFieldAdapter();
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            errorMsgTextField = new UITextFieldAdapter();
         }
-        });
-
     }
 
     @Override
@@ -101,7 +97,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
         allowBlankCheckBox = new UICheckBox(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Allow_Null"));
         allowBlankCheckBox.setBorder(BorderFactory.createEmptyBorder(0, 0, 0, 0));
         JPanel borderPane = FRGUIPaneFactory.createBorderLayout_S_Pane();
-        final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
+        final JPanel errorTipPane = TableLayoutHelper.createGapTableLayoutPane(new Component[][]{new Component[]{uiLabel, errorMsgTextField.getErrorMsgTextField()}}, TableLayoutHelper.FILL_LASTCOLUMN, IntervalConstants.INTERVAL_L1, LayoutConstants.VGAP_MEDIUM);
         errorTipPane.setBorder(BorderFactory.createEmptyBorder(0, IntervalConstants.INTERVAL_L5, 0, 0));
         borderPane.add(errorTipPane, BorderLayout.CENTER);
         allowBlankCheckBox.addItemListener(new ItemListener() {

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

@@ -1,14 +1,16 @@
 package com.fr.design.widget.ui;
 
+import com.fr.design.ExtraDesignClassManager;
+import com.fr.design.fun.RegPaneProvider;
 import com.fr.design.gui.frpane.RegFieldPane;
 import com.fr.design.gui.frpane.RegPane;
 import com.fr.design.layout.FRGUIPaneFactory;
 import com.fr.form.ui.TextEditor;
-
+import com.fr.log.FineLoggerFactory;
 import com.fr.stable.StringUtils;
 
-import javax.swing.*;
+import javax.swing.JPanel;
-import java.awt.*;
+import java.awt.BorderLayout;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
@@ -60,9 +62,19 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
 
 
     protected RegFieldPane createRegPane() {
+        RegPaneProvider provider = ExtraDesignClassManager.getInstance().getSingle(RegPaneProvider.XML_TAG);
+        if (provider == null) {
             return new RegFieldPane();
         }
 
+        try {
+            return provider.createRegPane();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
+            return new RegFieldPane();
+        }
+    }
+
     @Override
     protected String title4PopupWindow() {
         return "text";

designer-realize/src/main/java/com/fr/start/common/SplashPane4WinAndJDK11.java

@@ -7,6 +7,7 @@ import com.fr.design.locale.impl.SplashMark;
 import com.fr.general.IOUtils;
 import com.fr.general.locale.LocaleCenter;
 
+import java.awt.RenderingHints;
 import javax.swing.Icon;
 import java.awt.Dimension;
 import java.awt.Graphics;
@@ -53,6 +54,7 @@ public class SplashPane4WinAndJDK11 extends SplashPane{
         }
         BufferedImage image = BaseUtils.readImage(imagePath);
         Graphics2D newG = (Graphics2D)g.create(0, 0, image.getWidth(), image.getHeight());
+        newG.setRenderingHint(RenderingHints.KEY_INTERPOLATION, RenderingHints.VALUE_INTERPOLATION_BILINEAR);
         newG.scale(0.5D, 0.5D);
         newG.drawImage(image, 0, 0, null);
         newG.scale(1.0D, 1.0D);