easy3wui 1.5.66 → 1.5.67

package/lib/Easy3wFormPage/index.js

@@ -614,7 +614,7 @@ var Easy3wFormPage = function (_Component) {
           break;
       }
       return strRMsg;
-    }, _this.getFormItem = function (item, itemValue, afterBtns, itemArea, formItemLayout) {
+    }, _this.getFormItem = function (item, itemValue, afterBtns, itemArea, formItemLayout, noCheckFlag) {
       var _this$props2 = _this.props,
           form = _this$props2.form,
           allReadFlag = _this$props2.allReadFlag,
@@ -634,6 +634,16 @@ var Easy3wFormPage = function (_Component) {
           required = item.required,
           requiredMessage = item.requiredMessage,
           cmptPros = item.cmptPros;
+
+      var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
+      var isDisableRuleFlag = required;
+      if (readFlag === undefined) {
+        if (disableFlag && isApproval && noCheckFlag) {
+          isDisableRuleFlag = required;
+        } else if (disableFlag && isApproval) {
+          isDisableRuleFlag = false;
+        }
+      }
       var fieldId = item.fieldId;
 
       var strRMsg = _this.getAnalysisType(item);
@@ -665,7 +675,7 @@ var Easy3wFormPage = function (_Component) {
         addRules = [{ pattern: _comonConfig.objMobileRegular ? _comonConfig.objMobileRegular[e3wMobileNation] : objMobileRegularDefault[e3wMobileNation], message: '手机格式错误！' }].concat(addRules);
       }
       var decoratorObj = {
-        rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }].concat(addRules)
+        rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7' + strRMsg + label }].concat(addRules)
       };
       if (fieldType === 'braftEditor') {
         var objValidator = {};
@@ -677,7 +687,7 @@ var Easy3wFormPage = function (_Component) {
         decoratorObj = (0, _extends3['default'])({}, decoratorObj, {
           trigger: 'onBlur',
           validateTrigger: 'onBlur',
-          rules: [(0, _extends3['default'])({ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }, objValidator)].concat(addRules)
+          rules: [(0, _extends3['default'])({ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7' + strRMsg + label }, objValidator)].concat(addRules)
         });
       }
       if (itemValue || itemValue === 0) {
@@ -725,10 +735,12 @@ var Easy3wFormPage = function (_Component) {
       }
       if ((readFlag || allReadFlag) && fieldType !== 'braftEditor') {
         if ((fieldType === 'checkBox' || fieldType === 'radio') && label) {
+          var boolCrRequired = readFlag ? false : isDisableRuleFlag;
           return _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
-              label: label
+              label: label,
+              required: required
             }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
@@ -737,19 +749,20 @@ var Easy3wFormPage = function (_Component) {
               null,
               getFieldDecorator(fieldId, {
                 initialValue: 'easy3wView',
-                rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }]
+                rules: [{ required: boolCrRequired, message: requiredMessage || '\u8BF7' + strRMsg + label }]
               })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
               itemValue
             ) : getFieldDecorator(fieldId, {
               initialValue: itemValue,
-              rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }]
+              rules: [{ required: boolCrRequired, message: requiredMessage || '\u8BF7' + strRMsg + label }]
             })(itemArea)
           );
         } else if (fieldType === 'textarea' && typeof str === 'string') {
           return _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
-              label: label
+              label: label,
+              required: required
             }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
@@ -769,13 +782,14 @@ var Easy3wFormPage = function (_Component) {
           return _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
-              label: label
+              label: label,
+              required: required
             }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
             getFieldDecorator(fieldId, {
               initialValue: 'easy3wView',
-              rules: [{ required: required, message: requiredMessage || '\u8BF7' + strRMsg + label }]
+              rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7' + strRMsg + label }]
             })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
             itemValue,
             ' ',
@@ -794,7 +808,8 @@ var Easy3wFormPage = function (_Component) {
           _react2['default'].createElement(
             FormItem,
             (0, _extends3['default'])({
-              label: label
+              label: label,
+              required: required
             }, formItemLayout, formItemProps, {
               style: formItemStyle
             }),
@@ -827,7 +842,8 @@ var Easy3wFormPage = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: label
+            label: label,
+            required: required
           }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
@@ -837,7 +853,8 @@ var Easy3wFormPage = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: label
+            label: label,
+            required: required
           }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
@@ -980,7 +997,7 @@ var Easy3wFormPage = function (_Component) {
           )
         );
       }
-    }, _this.getSingleRow = function (rowItem) {
+    }, _this.getSingleRow = function (rowItem, noCheckFlag) {
       var cols = rowItem.cols,
           rowReadFlag = rowItem.rowReadFlag,
           rowAftBtnFlag = rowItem.rowAftBtnFlag;
@@ -1056,19 +1073,19 @@ var Easy3wFormPage = function (_Component) {
           col3Layout = threeItem;
         }
       }
-      var leftItem = _this.getColItem(cols[0], col1Layout);
+      var leftItem = _this.getColItem(cols[0], col1Layout, noCheckFlag);
       /** 获取所有列 */
       var allCols = '';
       if (colsLength === 1) {
         allCols = _this.getOneColObj(leftItem, mixColFlag, allReadFlag, rowReadFlag);
       }
       if (colsLength === 2) {
-        var rightItem = _this.getColItem(cols[1], col2Layout);
+        var rightItem = _this.getColItem(cols[1], col2Layout, noCheckFlag);
         allCols = _this.getTwoColObj(leftItem, rightItem, allReadFlag, rowReadFlag);
       }
       if (colsLength === 3) {
-        var right2Item = _this.getColItem(cols[1], col2Layout);
-        var right3Item = _this.getColItem(cols[2], col3Layout);
+        var right2Item = _this.getColItem(cols[1], col2Layout, noCheckFlag);
+        var right3Item = _this.getColItem(cols[2], col3Layout, noCheckFlag);
         allCols = _this.getThreeColObj(leftItem, right2Item, right3Item, allReadFlag, rowReadFlag);
       }
       return allCols;
@@ -1137,7 +1154,7 @@ var Easy3wFormPage = function (_Component) {
           col3Obj
         )
       );
-    }, _this.getColItem = function (colObj, formItemLayout) {
+    }, _this.getColItem = function (colObj, formItemLayout, noCheckFlag) {
       var fieldType = colObj.fieldType;
 
       var itemArea = _this.getItemArea(colObj);
@@ -1156,21 +1173,22 @@ var Easy3wFormPage = function (_Component) {
         return _up2;
       }
       if (fieldType === 'inputNumberFormat') {
-        var _up3 = _this.inputNumberFormatHandler(colObj, formItemLayout);
+        var _up3 = _this.inputNumberFormatHandler(colObj, formItemLayout, noCheckFlag);
         return _up3;
       }
       if (fieldType === 'inputNumber') {
-        var _up4 = _this.inputNumberHandler(colObj, formItemLayout);
+        var _up4 = _this.inputNumberHandler(colObj, formItemLayout, noCheckFlag);
         return _up4;
       }
-      var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout);
+      var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout, noCheckFlag);
       return formItem;
     }, _this.getAllForms = function () {
       var _this$props5 = _this.props,
           rowItems = _this$props5.rowItems,
           hiddenItems = _this$props5.hiddenItems,
           loadFinishFlag = _this$props5.loadFinishFlag,
-          bigFormFlag = _this$props5.bigFormFlag;
+          bigFormFlag = _this$props5.bigFormFlag,
+          noCheckFlag = _this$props5.noCheckFlag;
 
       if (bigFormFlag === true) {
         if (loadFinishFlag === false) {
@@ -1185,7 +1203,7 @@ var Easy3wFormPage = function (_Component) {
       var hiddenForms = [];
       if (rowItems) {
         uiForms = rowItems.map(function (rowItem) {
-          var singleRow = _this.getSingleRow(rowItem);
+          var singleRow = _this.getSingleRow(rowItem, noCheckFlag);
           return singleRow;
         });
       }
@@ -1499,7 +1517,7 @@ var Easy3wFormPage = function (_Component) {
       return _react2['default'].createElement(TextArea, (0, _extends3['default'])({ onChange: function onChange(e) {
           return _this.textAreaOnchange(e, maxlength);
         } }, cmptPros));
-    }, _this.inputNumberHandler = function (item, formItemLayout) {
+    }, _this.inputNumberHandler = function (item, formItemLayout, noCheckFlag) {
       var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
       var cmptPros = item.cmptPros,
@@ -1513,7 +1531,16 @@ var Easy3wFormPage = function (_Component) {
           readFlag = item.readFlag,
           hideLabel = item.hideLabel;
 
-      var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
+      var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
+      var isDisableRuleFlag = required;
+      if (readFlag === undefined) {
+        if (disableFlag && isApproval && noCheckFlag) {
+          isDisableRuleFlag = required;
+        } else if (disableFlag && isApproval) {
+          isDisableRuleFlag = false;
+        }
+      }
+      var addrules = [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
       if (cmptPros && cmptPros.rules) {
         var rules = cmptPros.rules;
 
@@ -1524,13 +1551,14 @@ var Easy3wFormPage = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: hideLabel ? null : label
+            label: hideLabel ? null : label,
+            required: required
           }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           getFieldDecorator(fieldId + 'Easy3wView', {
             initialValue: 'easy3wView',
-            rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+            rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
           })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
           value,
           ' ',
@@ -1564,7 +1592,7 @@ var Easy3wFormPage = function (_Component) {
           )
         )
       );
-    }, _this.inputNumberFormatHandler = function (item, formItemLayout) {
+    }, _this.inputNumberFormatHandler = function (item, formItemLayout, noCheckFlag) {
       var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
       var cmptPros = item.cmptPros,
@@ -1578,7 +1606,16 @@ var Easy3wFormPage = function (_Component) {
           readFlag = item.readFlag,
           hideLabel = item.hideLabel;
 
-      var addrules = [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
+      var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
+      var isDisableRuleFlag = required;
+      if (readFlag === undefined) {
+        if (disableFlag && isApproval && noCheckFlag) {
+          isDisableRuleFlag = required;
+        } else if (disableFlag && isApproval) {
+          isDisableRuleFlag = false;
+        }
+      }
+      var addrules = [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }];
       if (cmptPros && cmptPros.rules) {
         var rules = cmptPros.rules;
 
@@ -1589,13 +1626,14 @@ var Easy3wFormPage = function (_Component) {
         return _react2['default'].createElement(
           FormItem,
           (0, _extends3['default'])({
-            label: hideLabel ? null : label
+            label: hideLabel ? null : label,
+            required: required
           }, formItemLayout, formItemProps, {
             style: formItemStyle
           }),
           getFieldDecorator(fieldId + 'Easy3wView', {
             initialValue: 'easy3wView',
-            rules: [{ required: required, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
+            rules: [{ required: isDisableRuleFlag, message: requiredMessage || '\u8BF7\u586B\u5199' + label }]
           })(_react2['default'].createElement(_input2['default'], { type: 'hidden' })),
           value,
           ' ',

package/lib/Easy3wModal/index.js

@@ -81,8 +81,9 @@ var Easy3wModal = function (_Component) {
             return _this.onClickFunc(e, obj.func);
           },
           type: 'primary',
-          className: (0, _classnames2['default'])(['e3wFootBtn']),
-          loading: obj.loading
+          className: (0, _classnames2['default'])(['e3wFootBtn'])
+          // loading={obj.loading}
+          , loading: obj.loading === undefined ? _this.props.loadingFlag.global : obj.loading
         },
         obj.cName
       );
@@ -99,6 +100,26 @@ var Easy3wModal = function (_Component) {
       );
     }, _temp), (0, _possibleConstructorReturn3['default'])(_this, _ret);
   }
+  // constructor(props) {
+  //   super(props);
+  //   this.state = {
+  //     notificationKey: 'easy3w_processing_notice',
+  //   };
+  // }
+
+  // componentWillReceiveProps(prevProps) {
+  //   const { notificationKey } = this.state;
+  //   if (prevProps.loadingFlag.global) {
+  //     notification.warning({
+  //       key: notificationKey,
+  //       message: '温馨提示',
+  //       description: '正在后台处理，请稍后！',
+  //       duration: 0, // 不自动关闭
+  //     });
+  //   } else {
+  //     notification.close(notificationKey);
+  //   }
+  // }
 
   Easy3wModal.prototype.render = function render() {
     var _props = this.props,

package/package.json

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