easy3wui 1.5.67 → 1.5.69

package/lib/Easy3wFormPage/index.js

@@ -614,7 +614,7 @@ var Easy3wFormPage = function (_Component) {
           break;
       }
       return strRMsg;
-    }, _this.getFormItem = function (item, itemValue, afterBtns, itemArea, formItemLayout, noCheckFlag) {
+    }, _this.getFormItem = function (item, itemValue, afterBtns, itemArea, formItemLayout, disableCheckFlag) {
       var _this$props2 = _this.props,
           form = _this$props2.form,
           allReadFlag = _this$props2.allReadFlag,
@@ -638,7 +638,7 @@ var Easy3wFormPage = function (_Component) {
       var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
       var isDisableRuleFlag = required;
       if (readFlag === undefined) {
-        if (disableFlag && isApproval && noCheckFlag) {
+        if (disableFlag && isApproval && disableCheckFlag) {
           isDisableRuleFlag = required;
         } else if (disableFlag && isApproval) {
           isDisableRuleFlag = false;
@@ -997,7 +997,7 @@ var Easy3wFormPage = function (_Component) {
           )
         );
       }
-    }, _this.getSingleRow = function (rowItem, noCheckFlag) {
+    }, _this.getSingleRow = function (rowItem, disableCheckFlag) {
       var cols = rowItem.cols,
           rowReadFlag = rowItem.rowReadFlag,
           rowAftBtnFlag = rowItem.rowAftBtnFlag;
@@ -1073,19 +1073,19 @@ var Easy3wFormPage = function (_Component) {
           col3Layout = threeItem;
         }
       }
-      var leftItem = _this.getColItem(cols[0], col1Layout, noCheckFlag);
+      var leftItem = _this.getColItem(cols[0], col1Layout, disableCheckFlag);
       /** 获取所有列 */
       var allCols = '';
       if (colsLength === 1) {
         allCols = _this.getOneColObj(leftItem, mixColFlag, allReadFlag, rowReadFlag);
       }
       if (colsLength === 2) {
-        var rightItem = _this.getColItem(cols[1], col2Layout, noCheckFlag);
+        var rightItem = _this.getColItem(cols[1], col2Layout, disableCheckFlag);
         allCols = _this.getTwoColObj(leftItem, rightItem, allReadFlag, rowReadFlag);
       }
       if (colsLength === 3) {
-        var right2Item = _this.getColItem(cols[1], col2Layout, noCheckFlag);
-        var right3Item = _this.getColItem(cols[2], col3Layout, noCheckFlag);
+        var right2Item = _this.getColItem(cols[1], col2Layout, disableCheckFlag);
+        var right3Item = _this.getColItem(cols[2], col3Layout, disableCheckFlag);
         allCols = _this.getThreeColObj(leftItem, right2Item, right3Item, allReadFlag, rowReadFlag);
       }
       return allCols;
@@ -1154,7 +1154,7 @@ var Easy3wFormPage = function (_Component) {
           col3Obj
         )
       );
-    }, _this.getColItem = function (colObj, formItemLayout, noCheckFlag) {
+    }, _this.getColItem = function (colObj, formItemLayout, disableCheckFlag) {
       var fieldType = colObj.fieldType;
 
       var itemArea = _this.getItemArea(colObj);
@@ -1173,14 +1173,14 @@ var Easy3wFormPage = function (_Component) {
         return _up2;
       }
       if (fieldType === 'inputNumberFormat') {
-        var _up3 = _this.inputNumberFormatHandler(colObj, formItemLayout, noCheckFlag);
+        var _up3 = _this.inputNumberFormatHandler(colObj, formItemLayout, disableCheckFlag);
         return _up3;
       }
       if (fieldType === 'inputNumber') {
-        var _up4 = _this.inputNumberHandler(colObj, formItemLayout, noCheckFlag);
+        var _up4 = _this.inputNumberHandler(colObj, formItemLayout, disableCheckFlag);
         return _up4;
       }
-      var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout, noCheckFlag);
+      var formItem = _this.getFormItem(colObj, itemValue, afterBtns, itemArea, formItemLayout, disableCheckFlag);
       return formItem;
     }, _this.getAllForms = function () {
       var _this$props5 = _this.props,
@@ -1188,7 +1188,7 @@ var Easy3wFormPage = function (_Component) {
           hiddenItems = _this$props5.hiddenItems,
           loadFinishFlag = _this$props5.loadFinishFlag,
           bigFormFlag = _this$props5.bigFormFlag,
-          noCheckFlag = _this$props5.noCheckFlag;
+          disableCheckFlag = _this$props5.disableCheckFlag;
 
       if (bigFormFlag === true) {
         if (loadFinishFlag === false) {
@@ -1203,7 +1203,7 @@ var Easy3wFormPage = function (_Component) {
       var hiddenForms = [];
       if (rowItems) {
         uiForms = rowItems.map(function (rowItem) {
-          var singleRow = _this.getSingleRow(rowItem, noCheckFlag);
+          var singleRow = _this.getSingleRow(rowItem, disableCheckFlag);
           return singleRow;
         });
       }
@@ -1517,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, noCheckFlag) {
+    }, _this.inputNumberHandler = function (item, formItemLayout, disableCheckFlag) {
       var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
       var cmptPros = item.cmptPros,
@@ -1534,7 +1534,7 @@ var Easy3wFormPage = function (_Component) {
       var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
       var isDisableRuleFlag = required;
       if (readFlag === undefined) {
-        if (disableFlag && isApproval && noCheckFlag) {
+        if (disableFlag && isApproval && disableCheckFlag) {
           isDisableRuleFlag = required;
         } else if (disableFlag && isApproval) {
           isDisableRuleFlag = false;
@@ -1592,7 +1592,7 @@ var Easy3wFormPage = function (_Component) {
           )
         )
       );
-    }, _this.inputNumberFormatHandler = function (item, formItemLayout, noCheckFlag) {
+    }, _this.inputNumberFormatHandler = function (item, formItemLayout, disableCheckFlag) {
       var allReadFlag = _this.props.allReadFlag;
       var getFieldDecorator = _this.props.form.getFieldDecorator;
       var cmptPros = item.cmptPros,
@@ -1609,7 +1609,7 @@ var Easy3wFormPage = function (_Component) {
       var isApproval = document.body.innerHTML.includes('class="approval_flag_only"');
       var isDisableRuleFlag = required;
       if (readFlag === undefined) {
-        if (disableFlag && isApproval && noCheckFlag) {
+        if (disableFlag && isApproval && disableCheckFlag) {
           isDisableRuleFlag = required;
         } else if (disableFlag && isApproval) {
           isDisableRuleFlag = false;

package/lib/Easy3wModal/index.js

@@ -6,6 +6,10 @@ var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
 
+var _objectWithoutProperties2 = require('babel-runtime/helpers/objectWithoutProperties');
+
+var _objectWithoutProperties3 = _interopRequireDefault(_objectWithoutProperties2);
+
 var _notification2 = require('antd/lib/notification');
 
 var _notification3 = _interopRequireDefault(_notification2);
@@ -77,13 +81,12 @@ var Easy3wModal = function (_Component) {
       return _react2['default'].createElement(
         _button2['default'],
         {
+          type: 'primary',
+          className: (0, _classnames2['default'])(['e3wFootBtn']),
+          loading: obj.loading,
           onClick: function onClick(e) {
             return _this.onClickFunc(e, obj.func);
-          },
-          type: 'primary',
-          className: (0, _classnames2['default'])(['e3wFootBtn'])
-          // loading={obj.loading}
-          , loading: obj.loading === undefined ? _this.props.loadingFlag.global : obj.loading
+          }
         },
         obj.cName
       );
@@ -100,26 +103,124 @@ 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);
-  //   }
-  // }
+  // 获取loading状态
+
+
+  // 供脚手架index存store
+  Easy3wModal.setGetLoading = function setGetLoading(fn) {
+    Easy3wModal.getLoading = fn;
+  };
+  // 统一的 loading 检查
+
+
+  Easy3wModal.checkLoadingAndRun = function checkLoadingAndRun(callback) {
+    var loadingFlag = Easy3wModal.getLoading();
+    if (loadingFlag) {
+      _notification3['default'].warning({
+        message: '温馨提示',
+        description: '操作正在进行中，请稍后！',
+        duration: 3
+      });
+      return;
+    }
+    if (typeof callback === 'function') {
+      return callback();
+    }
+  };
+  // confirm
+
+
+  Easy3wModal.confirm = function confirm() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+    var _onOk = props.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(props, ['onOk']);
+
+    return _modal2['default'].confirm((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        var loadingFlag = Easy3wModal.getLoading();
+        if (loadingFlag) {
+          _notification3['default'].warning({
+            message: '温馨提示',
+            description: '操作正在进行中，请稍后！',
+            duration: 3
+          });
+          return Promise.reject(); // 阻止 Modal 自动关闭
+        }
+        if (typeof _onOk === 'function') {
+          return _onOk();
+        }
+        return true;
+      }
+    }));
+  };
+  // info
+
+
+  Easy3wModal.info = function info() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk2 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].info((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk2);
+      }
+    }));
+  };
+  // success
+
+
+  Easy3wModal.success = function success() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk3 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].success((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk3);
+      }
+    }));
+  };
+  // error
+
+
+  Easy3wModal.error = function error() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk4 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].error((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk4);
+      }
+    }));
+  };
+  // warning
+
+
+  Easy3wModal.warning = function warning() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    // 判断类型
+    var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+    var _onOk5 = options.onOk,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+
+    return _modal2['default'].warning((0, _extends3['default'])({}, restProps, {
+      onOk: function onOk() {
+        return Easy3wModal.checkLoadingAndRun(_onOk5);
+      }
+    }));
+  };
 
   Easy3wModal.prototype.render = function render() {
     var _props = this.props,
@@ -144,7 +245,7 @@ var Easy3wModal = function (_Component) {
         width: width,
         destroyOnClose: true,
         maskClosable: false,
-        style: { top: 20 }
+        style: { top: 20, zIndex: 99998 }
       }, this.props, {
         afterClose: function afterClose() {
           document.body.style.overflow = '';
@@ -157,6 +258,10 @@ var Easy3wModal = function (_Component) {
   return Easy3wModal;
 }(_react.Component);
 
+Easy3wModal.getLoading = function () {
+  return false;
+};
+
 exports['default'] = (0, _dva.connect)(function (state) {
   return {
     loadingFlag: state.loading

package/package.json

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