easy3wui 1.5.40 → 1.5.41-beta2

package/lib/Easy3wFormPage/index.js

@@ -514,10 +514,10 @@ var Easy3wFormPage = function (_Component) {
           formItemProps = item.formItemProps,
           novalueFlag = item.novalueFlag,
           label = item.label,
-          fieldId = item.fieldId,
           required = item.required,
           requiredMessage = item.requiredMessage,
           cmptPros = item.cmptPros;
+      var fieldId = item.fieldId;
 
       var addRules = [];
       var hadOnBlurFlag = false;
@@ -550,10 +550,15 @@ var Easy3wFormPage = function (_Component) {
         rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }].concat(addRules)
       };
       if (fieldType === 'braftEditor') {
+        var objValidator = {};
+        if (required) {
+          objValidator = {
+            validator: _this.validateContent
+          };
+        }
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
-          trigger: 'onBlur',
-          // validateTrigger: 'onBlur',
-          rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label, validator: _this.validateContent }].concat(addRules)
+          valuePropName: 'defaultValue',
+          rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }, objValidator)].concat(addRules)
         });
       }
       if (itemValue || itemValue === 0) {
@@ -561,6 +566,20 @@ var Easy3wFormPage = function (_Component) {
           initialValue: itemValue
         });
       }
+      if (readFlag || allReadFlag) {
+        fieldId = fieldId + 'Easy3wView';
+        if (fieldType === 'braftEditor' && itemValue.isEmpty()) {
+          // 只读时，符合必填校验
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: _braftEditor2['default'].createEditorState('<p> </p>')
+          });
+        } else if (fieldType === 'textarea' && !(itemValue || itemValue === 0)) {
+          decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
+            initialValue: ' '
+          });
+        }
+      }
+
       if (cmptPros) {
         if (cmptPros.getValueFromEvent) {
           var getValueFromEvent = cmptPros.getValueFromEvent;
@@ -585,8 +604,7 @@ var Easy3wFormPage = function (_Component) {
           });
         }
       }
-      if ((readFlag || allReadFlag) && fieldType !== 'braftEditor') {
-        // allReadFlag
+      if ((readFlag || allReadFlag) && fieldType !== 'textarea' && fieldType !== 'braftEditor' || !label) {
         // if (fieldType === 'braftEditor') {
         //   return (
         //     <FormItem
@@ -605,7 +623,7 @@ var Easy3wFormPage = function (_Component) {
         //     </FormItem>
         //   );
         // } else if (fieldType === 'checkBox' || fieldType === 'radio') {
-        if (fieldType === 'checkBox' || fieldType === 'radio') {
+        if ((fieldType === 'checkBox' || fieldType === 'radio') && label) {
           return _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
@@ -616,12 +634,12 @@ var Easy3wFormPage = function (_Component) {
             itemValue && itemValue.$$typeof ? _react2['default'].createElement(
               'div',
               null,
-              getFieldDecorator(fieldId + 'Easy3wView', {
+              getFieldDecorator(fieldId, {
                 initialValue: 'easy3wView',
                 rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
               })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
               itemValue
-            ) : getFieldDecorator(fieldId + 'Easy3wView', {
+            ) : getFieldDecorator(fieldId, {
               initialValue: itemValue,
               rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
             })(itemArea)
@@ -634,7 +652,7 @@ var Easy3wFormPage = function (_Component) {
             }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
-            getFieldDecorator(fieldId + 'Easy3wView', {
+            getFieldDecorator(fieldId, {
               initialValue: 'easy3wView',
               rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
             })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),

package/lib/Easy3wGridPage/index.js

@@ -490,37 +490,7 @@ var _initialiseProps = function _initialiseProps() {
   };
 
   this.numeralFormat = function (text) {
-    var strText = text;
-    if (Number.isFinite(text)) {
-      // 有限值数字 用于检查一个数值是否是有限的。如果数值是有限数（即不是 Infinity、-Infinity 或 NaN），那么 Number.isFinite() 返回 true，否则返回 false。
-      strText = (0, _numeral2['default'])(text).format('0,0.00');
-    } else if (typeof text === 'string') {
-      // 字符串
-      if (/^\d+(\.\d+)?$/.test(text)) {
-        // 数字字符串
-        strText = (0, _numeral2['default'])(text).format('0,0.00');
-      } else {
-        strText = text;
-      }
-    } else {
-      strText = text;
-    }
-    // if (text || text === 0 || isNaN(text)) {
-    //   if (typeof text === 'string') {
-    //     if (/^\d+(\.\d+)?$/.test(text)) {
-    //       strText = numeral(text).format('0,0.00');
-    //     } else {
-    //       strText = text;
-    //     }
-    //   } else if (typeof text === 'number') {
-    //     if (Number.isInfinite(text) || isNaN(NaN)) {
-    //       strText = text;
-    //     } else {
-    //       strText = numeral(text).format('0,0.00');
-    //     }
-    //   }
-    // }
-    return strText;
+    return (0, _numeral2['default'])(text).format('0,0.00');
   };
 
   this.rowSelected = function (record) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wui",
-  "version": "1.5.40",
+  "version": "1.5.41-beta2",
   "description": "easy3wui components for react",
   "keywords": [
     "react",