easy3wui 1.5.24-beta4 → 1.5.25-beta1

package/lib/Easy3wFormPage/index.js

@@ -387,7 +387,7 @@ var Easy3wFormPage = function (_Component) {
         return _braftEditor2['default'].createEditorState(value);
       }
       if (allReadFlag || readFlag) {
-        if (fieldType === 'rangePicker') {
+        if (fieldType === 'rangePicker' && value instanceof Array) {
           value = value.length ? value.join(' 至 ') : '';
         }
         return value;
@@ -491,7 +491,7 @@ var Easy3wFormPage = function (_Component) {
         if (disableFlag) {
           //
         } else {
-          addRules = [{ max: maxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + maxLength }].concat(addRules);
+          addRules = [{ max: maxLength, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + maxLength, transform: _this.touchTransform }].concat(addRules);
         }
       }
       var decoratorObj = {
@@ -645,6 +645,12 @@ var Easy3wFormPage = function (_Component) {
           )
         );
       }
+    }, _this.touchTransform = function (value) {
+      var strValue = value;
+      if (typeof value === 'number') {
+        strValue = String(value);
+      }
+      return strValue;
     }, _this.getStrTemplateItem = function (item, itemArea) {
       var _this$props2 = _this.props,
           form = _this$props2.form,
@@ -1440,10 +1446,14 @@ var Easy3wFormPage = function (_Component) {
       var templateArray = cmptPros.templateArray;
 
       var templateArr = templateArray.map(function (obj) {
-        if (obj.fieldType === 'inputNumberFormat') {
-          var up = _this.inputNumberFormatHandler(obj);
+        if (obj.fieldType === 'inputNumber') {
+          var up = _this.inputNumberHandler(obj);
           return up;
         }
+        if (obj.fieldType === 'inputNumberFormat') {
+          var _up5 = _this.inputNumberFormatHandler(obj);
+          return _up5;
+        }
         var objArea = _this.getItemArea(obj);
         var itemArea = _this.getStrTemplateItem(obj, objArea);
         return itemArea;
@@ -1520,6 +1530,8 @@ var Easy3wFormPage = function (_Component) {
 
   /** 获取FormItem */
 
+  // 检验长度前转换字段值为字符串
+
   /** 获取单行 */
 
   /** 单列 */

package/lib/Easy3wGridInput/index.js

@@ -40,9 +40,24 @@ var Easy3wGridInput = function (_Component) {
   (0, _inherits3['default'])(Easy3wGridInput, _Component);
 
   function Easy3wGridInput() {
+    var _temp, _this, _ret;
+
     (0, _classCallCheck3['default'])(this, Easy3wGridInput);
-    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.touchTransform = function (value) {
+      var strValue = value;
+      if (typeof value === 'number') {
+        strValue = String(value);
+      }
+      return strValue;
+    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // 检验长度前转换字段值为字符串
+
 
   Easy3wGridInput.prototype.render = function render() {
     var _props = this.props,
@@ -61,7 +76,7 @@ var Easy3wGridInput = function (_Component) {
         maxLength = _ref.maxLength,
         disabled = _ref.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) }];
+    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), transform: this.touchTransform }];
     if (disabled) {
       rules.pop();
     }

package/lib/Easy3wGridTextArea/index.js

@@ -42,26 +42,45 @@ var Easy3wGridTextArea = function (_Component) {
   (0, _inherits3['default'])(Easy3wGridTextArea, _Component);
 
   function Easy3wGridTextArea() {
+    var _temp, _this, _ret;
+
     (0, _classCallCheck3['default'])(this, Easy3wGridTextArea);
-    return (0, _possibleConstructorReturn3['default'])(this, _Component.apply(this, arguments));
+
+    for (var _len = arguments.length, args = Array(_len), _key = 0; _key < _len; _key++) {
+      args[_key] = arguments[_key];
+    }
+
+    return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.touchTransform = function (value) {
+      var strValue = value;
+      if (typeof value === 'number') {
+        strValue = String(value);
+      }
+      return strValue;
+    }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // 检验长度前转换字段值为字符串
+
 
   Easy3wGridTextArea.prototype.render = function render() {
     var _props = this.props,
         fieldId = _props.fieldId,
         value = _props.value,
         form = _props.form,
-        cmptPros = _props.cmptPros,
         required = _props.required,
         requiredMessage = _props.requiredMessage,
         label = _props.label;
+    var cmptPros = this.props.cmptPros;
     var getFieldDecorator = form.getFieldDecorator;
 
     var _ref = cmptPros || {},
         maxLength = _ref.maxLength,
-        disabled = _ref.disabled;
+        disabled = _ref.disabled,
+        rows = _ref.rows;
 
-    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 1000, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 1000) }];
+    if (!rows) {
+      cmptPros = (0, _extends3['default'])({ autosize: { minRows: 2, maxRows: true } }, cmptPros);
+    }
+    var rules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, { max: maxLength || 1000, message: '\u5F55\u5165\u6587\u5B57\u957F\u5EA6\u4E0D\u80FD\u8D85\u8FC7' + (maxLength || 1000), transform: this.touchTransform }];
     if (disabled) {
       rules.pop();
     }
@@ -73,7 +92,7 @@ var Easy3wGridTextArea = function (_Component) {
         // valuePropName: 'defaultValue',
         initialValue: value,
         rules: rules
-      })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({}, cmptPros, { style: { minWidth: 80 } })))
+      })(_react2['default'].createElement(TextArea, (0, _extends3['default'])({ style: { minWidth: 80 } }, cmptPros)))
     );
   };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.24-beta4",
+  "version": "1.5.25-beta1",
   "description": "easy3wui components for react",
   "keywords": [
     "react",