REPORT-59475 控件校验错误提示支持公式

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

@@ -7,7 +7,7 @@ import javax.swing.event.DocumentEvent;
 import javax.swing.event.DocumentListener;
 
 public class UITextFieldAdapter implements ErrorMsgTextFieldAdapter {
-    UITextField uiTextField = new UITextField();
+    private final UITextField uiTextField = new UITextField();
 
     public UITextFieldAdapter(){
         addDocumentListener();

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

@@ -5,7 +5,11 @@ 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;
@@ -15,12 +19,12 @@ 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.*;
-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.event.ItemEvent;
 import java.awt.event.ItemListener;
 
@@ -80,12 +84,18 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     protected void initErrorMsgPane() {
         // 错误信息
         TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
-        if (provider != null) {
-            errorMsgTextField= provider.createTextFieldAdapter();
+        if (provider == null) {
+            errorMsgTextField = new UITextFieldAdapter();
             return;
         }
+        try {
+            errorMsgTextField = provider.createTextFieldAdapter();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             errorMsgTextField = new UITextFieldAdapter();
         }
+    }
+
 
     protected abstract T updateSubFieldEditorBean();
 

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

@@ -13,6 +13,7 @@ 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.JPanel;
@@ -73,27 +74,32 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
                 new Component[]{new UILabel(com.fr.design.i18n.Toolkit.i18nText("Fine-Design_Form_Font_Size"), SwingConstants.LEFT), fontSizePane}
         };
         double[] rowSize = {p, p, p, p, p, p};
-        double[] columnSize = {p,f};
-        int[][] rowCount = {{1, 1},{1, 3},{1, 1},{1, 1}};
+        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();
         boundsPane.add(panel);
         return boundsPane;
     }
 
-    public  JPanel setValidatePane(){
+    public JPanel setValidatePane() {
         return regPane;
     }
 
 
-
     protected RegFieldPane createRegPane() {
         RegPaneProvider provider = ExtraDesignClassManager.getInstance().getSingle(RegPaneProvider.XML_TAG);
-        if (provider != null) {
-            return provider.createRegPane();
+        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() {
@@ -109,7 +115,7 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
 
     @Override
     protected TextEditor updateSubFieldEditorBean() {
-        TextEditor ob = (TextEditor)creator.toData();
+        TextEditor ob = (TextEditor) creator.toData();
         this.regPane.update(ob);
         ob.setWaterMark(waterMarkDictPane.getText());
         formWidgetValuePane.update(ob);

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

@@ -12,6 +12,7 @@ import com.fr.design.gui.ilable.UILabel;
 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;
@@ -47,12 +48,17 @@ public abstract class FieldEditorDefinePane<T extends FieldEditor> extends Abstr
     protected void initErrorMsgPane() {
         // 错误信息
         TextFieldAdapterProvider provider = ExtraDesignClassManager.getInstance().getSingle(TextFieldAdapterProvider.XML_TAG);
-        if (provider != null) {
-            errorMsgTextField= provider.createTextFieldAdapter();
+        if (provider == null) {
+            errorMsgTextField = new UITextFieldAdapter();
             return;
         }
+        try {
+            errorMsgTextField = provider.createTextFieldAdapter();
+        } catch (Exception e) {
+            FineLoggerFactory.getLogger().error(e.getMessage(), e);
             errorMsgTextField = new UITextFieldAdapter();
         }
+    }
 
     @Override
     public void populateBean(T ob) {

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

@@ -6,6 +6,7 @@ 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.JPanel;
@@ -62,11 +63,17 @@ public class TextFieldEditorDefinePane extends FieldEditorDefinePane<TextEditor>
 
     protected RegFieldPane createRegPane() {
         RegPaneProvider provider = ExtraDesignClassManager.getInstance().getSingle(RegPaneProvider.XML_TAG);
-        if (provider != null) {
-            return provider.createRegPane();
+        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() {