easy3wui 4.0.33 → 4.0.34

package/lib/Easy3wModal/index.js

@@ -32,8 +32,6 @@ var _react = require('react');
 
 var _react2 = _interopRequireDefault(_react);
 
-var _dva = require('dva');
-
 var _antd = require('antd');
 
 var _modal = require('antd/lib/modal');
@@ -42,6 +40,8 @@ var _modal2 = _interopRequireDefault(_modal);
 
 require('antd/lib/modal/style');
 
+var _dva = require('dva');
+
 var _button = require('antd/lib/button');
 
 var _button2 = _interopRequireDefault(_button);
@@ -81,12 +81,12 @@ var Easy3wModal = function (_Component) {
       return _react2['default'].createElement(
         _button2['default'],
         {
-          onClick: function onClick(e) {
-            return _this.onClickFunc(e, obj.func);
-          },
           type: 'primary',
           className: (0, _classnames2['default'])(['e3wFootBtn']),
-          loading: obj.loading
+          loading: obj.loading,
+          onClick: function onClick(e) {
+            return _this.onClickFunc(e, obj.func);
+          }
         },
         obj.cName
       );
@@ -110,22 +110,25 @@ var Easy3wModal = function (_Component) {
   Easy3wModal.setGetLoading = function setGetLoading(fn) {
     Easy3wModal.getLoading = fn;
   };
-  // 统一的 loading 检查
+  // 返回一个promise
 
 
-  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();
-    }
+  Easy3wModal.returnPromise = function returnPromise() {
+    var onOk = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : function () {};
+
+    return new Promise(function (resolve) {
+      try {
+        onOk();
+        setTimeout(function () {
+          resolve(); // 300ms 后关闭 Modal
+          document.body.style.overflow = '';
+        }, 300);
+      } catch (e) {
+        console.error('onOk 执行报错：', e);
+        resolve(); // 出错时不关闭
+        document.body.style.overflow = '';
+      }
+    });
   };
   // confirm
 
@@ -133,10 +136,18 @@ var Easy3wModal = function (_Component) {
   Easy3wModal.confirm = function confirm() {
     var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
     var _onOk = props.onOk,
-        restProps = (0, _objectWithoutProperties3['default'])(props, ['onOk']);
+        _onCancel = props.onCancel,
+        restProps = (0, _objectWithoutProperties3['default'])(props, ['onOk', 'onCancel']);
 
     return _modal2['default'].confirm((0, _extends3['default'])({}, restProps, {
+      onCancel: function onCancel() {
+        if (_onCancel) {
+          _onCancel();
+        }
+        document.body.style.overflow = '';
+      },
       onOk: function onOk() {
+        // 1. 检查全局 loading 状态，阻止重复操作
         var loadingFlag = Easy3wModal.getLoading();
         if (loadingFlag) {
           _notification3['default'].warning({
@@ -146,80 +157,113 @@ var Easy3wModal = function (_Component) {
           });
           return Promise.reject(); // 阻止 Modal 自动关闭
         }
-        if (typeof _onOk === 'function') {
-          return _onOk();
+
+        // 2. onOk不是函数，关闭
+        if (typeof _onOk !== 'function') {
+          return true; // 直接关闭 Modal
         }
-        return true;
+
+        // 3. 执行onOk
+        return new Promise(function (resolve) {
+          try {
+            _onOk();
+            setTimeout(function () {
+              resolve(); // 300ms 后关闭 Modal
+              document.body.style.overflow = '';
+            }, 300);
+          } catch (e) {
+            console.error('onOk 执行报错：', e);
+            resolve(); // 出错时不关闭
+            document.body.style.overflow = '';
+          }
+        });
       }
     }));
   };
-  // info
 
+  // 展示modal
 
-  Easy3wModal.info = function info() {
-    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
 
-    // 判断类型
+  Easy3wModal.showModal = function showModal(type) {
+    var _this2 = this;
+
+    var props = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : {};
+
+    // 1. 判断参数类型
     var options = typeof props === 'string' || typeof props === 'number' ? { content: props } : props;
+
     var _onOk2 = options.onOk,
-        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk']);
+        _onCancel2 = options.onCancel,
+        restProps = (0, _objectWithoutProperties3['default'])(options, ['onOk', 'onCancel']);
 
-    return _modal2['default'].info((0, _extends3['default'])({}, restProps, {
+    // 2. 定义统一的关闭逻辑
+
+    var resetBodyOverflow = function resetBodyOverflow() {
+      document.body.style.overflow = '';
+    };
+
+    // 3. 调用对应类型的 Modal 方法
+    return _modal2['default'][type]((0, _extends3['default'])({}, restProps, {
+      onCancel: function onCancel() {
+        if (_onCancel2) {
+          _onCancel2();
+        }
+        resetBodyOverflow();
+      },
       onOk: function onOk() {
-        return Easy3wModal.checkLoadingAndRun(_onOk2);
+        if (_onOk2) {
+          var loadingFlag = Easy3wModal.getLoading();
+          if (loadingFlag) {
+            _notification3['default'].warning({
+              message: '温馨提示',
+              description: '操作正在进行中，请稍后！',
+              duration: 3
+            });
+            return;
+          }
+          if (typeof _onOk2 !== 'function') {
+            return true; // 直接关闭 Modal
+          }
+          _this2.returnPromise(_onOk2).then(function () {});
+        }
       }
     }));
   };
+
+  // info
+
+
+  Easy3wModal.info = function info() {
+    var props = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+
+    return this.showModal('info', props);
+  };
+
   // 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);
-      }
-    }));
+    return this.showModal('success', props);
   };
+
   // 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);
-      }
-    }));
+    return this.showModal('error', props);
   };
+
   // 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);
-      }
-    }));
+    return this.showModal('warning', props);
   };
 
   Easy3wModal.prototype.render = function render() {
@@ -231,9 +275,10 @@ var Easy3wModal = function (_Component) {
         cancelHandler = _props.cancelHandler,
         onOk = _props.onOk,
         width = _props.width,
+        footer = _props.footer,
         footBtnArr = _props.footBtnArr;
 
-    var btnObj = footBtnArr && footBtnArr.length ? this.getBtnObj() : null;
+    var btnObj = footer && footer.length ? footer : footBtnArr && footBtnArr.length ? this.getBtnObj() : null;
     return _react2['default'].createElement(
       _modal2['default'],
       (0, _extends3['default'])({

package/package.json

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