easy3wui 1.5.25 → 1.5.27

package/lib/Easy3wFormPage/index.js

@@ -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,
@@ -1245,7 +1251,8 @@ var Easy3wFormPage = function (_Component) {
           value = item.value,
           disableFlag = item.disableFlag,
           formItemProps = item.formItemProps,
-          readFlag = item.readFlag;
+          readFlag = item.readFlag,
+          hideLabel = item.hideLabel;
 
       var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
       if (cmptPros && cmptPros.rules) {
@@ -1258,7 +1265,7 @@ var Easy3wFormPage = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: label
+            label: hideLabel ? null : label
           }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
@@ -1274,7 +1281,7 @@ var Easy3wFormPage = function (_Component) {
       return _react2['default'].createElement(
         FormItem,
         (0, _extends3['default'])({
-          label: label
+          label: hideLabel ? null : label
         }, formItemLayout, formItemProps, {
           style: formItemStyle
         }),
@@ -1282,8 +1289,8 @@ var Easy3wFormPage = function (_Component) {
           'div',
           { className: (0, _classnames2['default'])(['inputNumberFormat']) },
           getFieldDecorator(fieldId, { rules: addrules, initialValue: value })(_react2['default'].createElement(_inputNumber2['default'], (0, _extends3['default'])({
-            precision: 2,
-            style: { flex: 1 },
+            precision: 2 // 数值精度 2 保留两位小数  0 整数  可以通过cmptPros修改
+            , style: { flex: 1 },
             disabled: disableFlag
           }, cmptPros))),
           cmptPros ? cmptPros.addonAfter ? _react2['default'].createElement(
@@ -1309,7 +1316,8 @@ var Easy3wFormPage = function (_Component) {
           value = item.value,
           disableFlag = item.disableFlag,
           formItemProps = item.formItemProps,
-          readFlag = item.readFlag;
+          readFlag = item.readFlag,
+          hideLabel = item.hideLabel;
 
       var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
       if (cmptPros && cmptPros.rules) {
@@ -1322,7 +1330,7 @@ var Easy3wFormPage = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: label
+            label: hideLabel ? null : label
           }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
@@ -1338,7 +1346,7 @@ var Easy3wFormPage = function (_Component) {
       return _react2['default'].createElement(
         FormItem,
         (0, _extends3['default'])({
-          label: label
+          label: hideLabel ? null : label
         }, formItemLayout, formItemProps, {
           style: formItemStyle
         }),
@@ -1440,15 +1448,15 @@ var Easy3wFormPage = function (_Component) {
       var templateArray = cmptPros.templateArray;
 
       var templateArr = templateArray.map(function (obj) {
+        var objArea = _this.getItemArea(obj);
         if (obj.fieldType === 'inputNumber') {
-          var up = _this.inputNumberHandler(obj);
-          return up;
+          objArea = _this.inputNumberHandler((0, _extends3['default'])({ hideLabel: true }, obj));
+          // return up;
         }
         if (obj.fieldType === 'inputNumberFormat') {
-          var _up5 = _this.inputNumberFormatHandler(obj);
-          return _up5;
+          objArea = _this.inputNumberFormatHandler((0, _extends3['default'])({ hideLabel: true }, obj));
+          // return up;
         }
-        var objArea = _this.getItemArea(obj);
         var itemArea = _this.getStrTemplateItem(obj, objArea);
         return itemArea;
       });
@@ -1524,6 +1532,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,9 +42,24 @@ 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,
@@ -65,7 +80,7 @@ var Easy3wGridTextArea = function (_Component) {
     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) }];
+    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();
     }

package/package.json

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