为<Input /> 添加onlyLetterAndNumber属性

Author: samonxian

src/components/form/index.jsx

@@ -570,6 +570,7 @@ function getFormItemComponent(that) {
       delete otherItemProps.trigger;
       delete otherItemProps.aliasLabel;
       delete otherItemProps.arrayItemIndexs;
+      delete otherItemProps.onlyLetterAndNumber;
     }
     render() {
       const { validateStatus, canBeRendered } = this.state;

src/components/input/index.jsx

@@ -11,10 +11,31 @@ AInput.displayName = 'OriginalAntdComponent';
 export default class Input extends BasicComponent {
   currentAntdComponent = AInput;
   localeKey = 'afcInput';
+  getOnlyLetterAndNumberRule() {
+    const locale = this.locale;
+    return [
+      {
+        validator(rule, value, callback, source, options) {
+          var errors = [];
+          //数组和字母结合
+          var pass = new RegExp('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$').test(
+            value
+          );
+          if (!pass && value !== '') {
+            errors.push({
+              message: locale.afcPassword.formatErrorMsg,
+            });
+          }
+          callback(errors);
+        },
+      },
+    ];
+  }
   getSepcialRuleByType(type) {
     //继承父类可能有的rules
     const rules = super.getSepcialRuleByType();
     const locale = this.locale;
+    const { onlyLetterAndNumber } = this.props;
     switch (type) {
       case 'email':
         rules.push({
@@ -30,7 +51,11 @@ export default class Input extends BasicComponent {
         break;
       default:
     }
-    return rules;
+    if (onlyLetterAndNumber) {
+      return [...rules, ...this.getOnlyLetterAndNumberRule()];
+    } else {
+      return rules;
+    }
   }
 }
 Input.TextArea = class InputTextArea extends BasicComponent {

src/components/password/index.jsx

@@ -26,26 +26,6 @@ export default class Password extends BasicComponent {
     ];
     return rules;
   }
-  getOnlyLetterAndNumberRule() {
-    const locale = this.locale;
-    return [
-      {
-        validator(rule, value, callback, source, options) {
-          var errors = [];
-          //数组和字母结合
-          var pass = new RegExp('^(?![0-9]+$)(?![a-zA-Z]+$)[0-9A-Za-z]*$').test(
-            value
-          );
-          if (!pass && value !== '') {
-            errors.push({
-              message: locale.afcPassword.formatErrorMsg,
-            });
-          }
-          callback(errors);
-        },
-      },
-    ];
-  }
   onPasswordChange = e => {
     const { onChange } = this.props;
     this.setState({
@@ -59,7 +39,7 @@ export default class Password extends BasicComponent {
       rePassword,
       type = 'password',
       checkPassword,
-      rules = [],
+      onlyLetterAndNumber = true,
       ...other
     } = this.props;
     const locale = this.locale;
@@ -68,9 +48,9 @@ export default class Password extends BasicComponent {
         <Input
           autoComplete="new-password"
           type={type}
+          onlyLetterAndNumber={onlyLetterAndNumber}
           {...other}
           onChange={this.onPasswordChange}
-          rules={[...rules, ...this.getOnlyLetterAndNumberRule()]}
         />
         {(rePassword || checkPassword) && (
           //rePassword视为了兼容之前的formBuilder的api