easy3wui 1.5.24-beta4 → 1.5.25

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;
@@ -1440,10 +1440,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;

package/lib/Easy3wGridTextArea/index.js

@@ -51,16 +51,20 @@ var Easy3wGridTextArea = function (_Component) {
         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;
 
+    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) }];
     if (disabled) {
       rules.pop();
@@ -73,7 +77,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",
   "description": "easy3wui components for react",
   "keywords": [
     "react",