easy3wui 1.5.5 → 1.5.8

package/lib/Easy3wFormPage/index.js

@@ -468,14 +468,18 @@ var Easy3wFormPage = function (_Component) {
           addRules = rules;
         }
       }
-      var maxLength = 50;
-      if (cmptPros) {
-        if (cmptPros.maxLength) {
-          maxLength = cmptPros.maxLength;
+      if (fieldType === 'input' || fieldType === 'textarea') {
+        var maxLength = fieldType === 'textarea' ? 400 : 50;
+        if (cmptPros) {
+          if (cmptPros.maxLength) {
+            maxLength = cmptPros.maxLength;
+          }
+        }
+        if (disableFlag) {
+          //
+        } else {
+          addRules = [{ max: maxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + maxLength }].concat(addRules);
         }
-      }
-      if (fieldType === 'input') {
-        addRules = [{ max: maxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + maxLength }].concat(addRules);
       }
       var decoratorObj = {
         rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }].concat(addRules)

package/lib/Easy3wGridInput/index.js

@@ -56,15 +56,20 @@ var Easy3wGridInput = function (_Component) {
         pattern = _props.pattern,
         patternMessage = _props.patternMessage;
     var getFieldDecorator = form.getFieldDecorator;
-    var maxLength = cmptPros.maxLength;
+    var maxLength = cmptPros.maxLength,
+        disabled = cmptPros.disabled;
 
+    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { pattern: pattern, message: patternMessage }, { max: maxLength || 50, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 50) }];
+    if (disabled) {
+      rules.pop();
+    }
     return _react2['default'].createElement(
       _form2['default'].Item,
       { style: { marginBottom: 0 } },
       getFieldDecorator(fieldId, {
         // trigger: 'onBlur',
         // valuePropName: 'defaultValue',
-        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 50, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + maxLength }, { pattern: pattern, message: patternMessage }],
+        rules: rules,
         // addRules = [{ max: maxLength, message: `录入文字长度不能超过${maxLength}` }, ...addRules];
         initialValue: value
       })(_react2['default'].createElement(_input2['default'], (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))

package/lib/Easy3wGridTextArea/index.js

@@ -56,7 +56,13 @@ var Easy3wGridTextArea = function (_Component) {
         requiredMessage = _props.requiredMessage,
         label = _props.label;
     var getFieldDecorator = form.getFieldDecorator;
+    var maxLength = cmptPros.maxLength,
+        disabled = cmptPros.disabled;
 
+    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 50, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 50) }];
+    if (disabled) {
+      rules.pop();
+    }
     return _react2['default'].createElement(
       _form2['default'].Item,
       { style: { marginBottom: 0 } },
@@ -64,7 +70,7 @@ var Easy3wGridTextArea = function (_Component) {
         // trigger: 'onBlur',
         // valuePropName: 'defaultValue',
         initialValue: value,
-        rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+        rules: rules
       })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
     );
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.5",
+  "version": "1.5.8",
   "description": "easy3wui components for react",
   "keywords": [
     "react",