REPORT-59476 && REPORT-59475

1、文本控件校验规则支持国际化
2、控件校验错误提示支持公式

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 {
+    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/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,24 @@
 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 javax.swing.*;
-import javax.swing.event.DocumentEvent;
-import javax.swing.event.DocumentListener;
-import java.awt.*;
+import javax.swing.BorderFactory;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
+import java.awt.Component;
+import java.awt.Dimension;
 
 /**
  * Created by kerry on 2017/9/4.
@@ -23,7 +26,7 @@ import java.awt.*;
 public class RegFieldPane extends RegPane {
     protected RegErrorMsgPane regErrorMsgPane;
 
-    public RegFieldPane(){
+    public RegFieldPane() {
         this(ALL_REG_TYPE);
     }
 
@@ -39,8 +42,8 @@ public class RegFieldPane extends RegPane {
 
             @Override
             public void regChangeAction() {
-                RegExp regExp = (RegExp)getRegComboBox().getSelectedItem();
-                if(regExp instanceof NoneReg){
+                RegExp regExp = (RegExp) getRegComboBox().getSelectedItem();
+                if (regExp instanceof NoneReg) {
                     regErrorMsgPane.setVisible(false);
                     return;
                 }
@@ -67,33 +70,29 @@ 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();
-            regErrorMsgField.getDocument().addDocumentListener(new DocumentListener() {
-                public void changedUpdate(DocumentEvent e) {
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
-                }
-
-                public void insertUpdate(DocumentEvent e) {
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
-                }
-
-                public void removeUpdate(DocumentEvent e) {
-                    regErrorMsgField.setToolTipText(regErrorMsgField.getText());
-                }
-            });
+            TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
+            if (provider != null) {
+                errorMsgTextFieldAdapter= provider.createTextFieldAdapter();
+                return;
+            }
+            errorMsgTextFieldAdapter = new UITextFieldAdapter();
         }
 
         @Override
@@ -102,11 +101,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-form/src/main/java/com/fr/design/widget/ui/designer/FieldEditorDefinePane.java

@@ -1,9 +1,13 @@
 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.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;
@@ -23,7 +27,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;
     protected FontSizeComboPane fontSizePane;
     protected UITextField labelNameTextField;
@@ -40,7 +44,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,26 +79,14 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void initErrorMsgPane() {
         // 错误信息
-        errorMsgTextField = new UITextField();
-//        // richer:主要为了方便查看比较长的错误信息
-        errorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
-
-            public void changedUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-
-            public void insertUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-
-            public void removeUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-        });
-
+        TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
+        if (provider != null) {
+            errorMsgTextField= provider.createTextFieldAdapter();
+            return;
+        }
+        errorMsgTextField = new UITextFieldAdapter();
     }
 
-
     protected abstract T updateSubFieldEditorBean();
 
     protected abstract JPanel setFirstContentPane();
@@ -111,7 +102,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/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,11 @@ 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.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;
 
@@ -85,6 +88,10 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
 
 
     protected RegFieldPane createRegPane() {
+        RegPaneProvider provider = ExtraDesignClassManager.getInstance().getSingle(RegPaneProvider.XML_TAG);
+        if (provider != null) {
+            return provider.createRegPane();
+        }
         return new RegFieldPane();
     }
 

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

@@ -1,19 +1,20 @@
 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 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 +23,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 +46,12 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
 
     protected void initErrorMsgPane() {
         // 错误信息
-        errorMsgTextField = new UITextField();
-//        // richer:主要为了方便查看比较长的错误信息
-        errorMsgTextField.getDocument().addDocumentListener(new DocumentListener() {
-
-            public void changedUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-
-            public void insertUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-
-            public void removeUpdate(DocumentEvent e) {
-                errorMsgTextField.setToolTipText(errorMsgTextField.getText());
-            }
-        });
-
+        TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
+        if (provider != null) {
+            errorMsgTextField= provider.createTextFieldAdapter();
+            return;
+        }
+        errorMsgTextField = new UITextFieldAdapter();
     }
 
     @Override
@@ -101,7 +91,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() {
@@ -117,7 +107,7 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
                 new Component[]{allowBlankCheckBox},
                 new Component[]{borderPane},
         };
-        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components,TableLayoutHelper.FILL_LASTCOLUMN, 5, 5);
+        JPanel panel = TableLayoutHelper.createGapTableLayoutPane(components, TableLayoutHelper.FILL_LASTCOLUMN, 5, 5);
         panel.setBorder(BorderFactory.createEmptyBorder(IntervalConstants.INTERVAL_L1, 0, IntervalConstants.INTERVAL_L6, 0));
         validatePane.add(panel, BorderLayout.NORTH);
 

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

@@ -1,14 +1,15 @@
 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.stable.StringUtils;
 
-import javax.swing.*;
-import java.awt.*;
+import javax.swing.JPanel;
+import java.awt.BorderLayout;
 import java.awt.event.KeyAdapter;
 import java.awt.event.KeyEvent;
 
@@ -60,6 +61,10 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
 
 
     protected RegFieldPane createRegPane() {
+        RegPaneProvider provider = ExtraDesignClassManager.getInstance().getSingle(RegPaneProvider.XML_TAG);
+        if (provider != null) {
+            return provider.createRegPane();
+        }
         return new RegFieldPane();
     }