easy3wui 1.5.70-beta9 → 1.5.71

package/lib/Easy3wGridPage/index.js

@@ -129,8 +129,7 @@ var Easy3wGridPage = function (_Component) {
         chooseFlag = _props.chooseFlag,
         scroll = _props.scroll,
         className = _props.className,
-        paginationInfo = _props.paginationInfo,
-        handleSearchNew = _props.handleSearchNew;
+        paginationInfo = _props.paginationInfo;
     var _state = this.state,
         selectedRowKeysState = _state.selectedRowKeysState,
         selectedRowsState = _state.selectedRowsState,
@@ -140,16 +139,6 @@ var Easy3wGridPage = function (_Component) {
     var recursion = function recursion(arr) {
       arr.forEach(function (item) {
         var columnsType = item.type;
-        var title = item.title;
-
-        if (title && typeof title === 'string' && title.length > 6) {
-          item.title = _react2['default'].createElement(
-            _tooltip2['default'],
-            { placement: 'topLeft', title: title },
-            title.substring(0, 6),
-            '...'
-          );
-        }
         switch (columnsType) {
           case 'shortText':
             item.className = 'e3wGridShortText';break;
@@ -242,7 +231,7 @@ var Easy3wGridPage = function (_Component) {
     }
     var myColumns = columns;
     // 处理分页 start
-    if (needPaginationFlag || handleSearchNew) {
+    if (needPaginationFlag) {
       var defaultCurrent = paginationInfo ? paginationInfo.offset : 1;
       var defaultPageSize = paginationInfo ? paginationInfo.limit : 10;
       var current = paginationInfo ? paginationInfo.offset : this.state.pagination.offset;
@@ -261,14 +250,10 @@ var Easy3wGridPage = function (_Component) {
       };
       if (autoAddNumber) {
         if (columns.length > 0) {
-          var fixed = columns[0].fixed;
-
           myColumns = [{
             title: '序号',
             dataIndex: 'number',
             className: 'e3wGridShortText',
-            width: 50,
-            fixed: fixed,
             render: function render(text, record, index) {
               return _react2['default'].createElement(
                 'div',
@@ -639,21 +624,15 @@ var _initialiseProps = function _initialiseProps() {
     var _props7 = _this3.props,
         selfDealPageChangeFunc = _props7.selfDealPageChangeFunc,
         getSearchCondition = _props7.getSearchCondition,
-        handleSearch = _props7.handleSearch,
-        handleSearchNew = _props7.handleSearchNew;
+        handleSearch = _props7.handleSearch;
 
-    var formVal = {};
-    if (getSearchCondition && typeof getSearchCondition === 'function') {
-      formVal = getSearchCondition();
-    }
+    var formVal = getSearchCondition();
     var paginationInfo = { offset: pagination.current, limit: pagination.pageSize };
     _this3.setState({ pagination: paginationInfo });
-    if (selfDealPageChangeFunc && typeof selfDealPageChangeFunc === 'function') {
+    if (selfDealPageChangeFunc) {
       selfDealPageChangeFunc(paginationInfo, formVal);
-    } else if (handleSearch && typeof handleSearch === 'function') {
+    } else {
       handleSearch(paginationInfo, formVal);
-    } else if (handleSearchNew && typeof handleSearchNew === 'function') {
-      handleSearchNew(paginationInfo, formVal);
     }
   };
 };

package/lib/Easy3wModal/index.js

@@ -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']);
+
+    // 2. 定义统一的关闭逻辑
+
+    var resetBodyOverflow = function resetBodyOverflow() {
+      document.body.style.overflow = '';
+    };
 
-    return _modal2['default'].info((0, _extends3['default'])({}, restProps, {
+    // 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() {
@@ -230,9 +274,11 @@ var Easy3wModal = function (_Component) {
         loadingFlag = _props.loadingFlag,
         cancelHandler = _props.cancelHandler,
         onOk = _props.onOk,
-        width = _props.width;
+        width = _props.width,
+        footer = _props.footer,
+        footBtnArr = _props.footBtnArr;
 
-    var btnObj = this.getBtnObj();
+    var btnObj = footer && footer.length ? footer : footBtnArr && footBtnArr.length ? this.getBtnObj() : null;
     return _react2['default'].createElement(
       _modal2['default'],
       (0, _extends3['default'])({

package/lib/Easy3wUpload/index.js

@@ -76,16 +76,9 @@ var _Easy3wAESEncrypt = require('../Easy3wAESEncrypt');
 
 var _Easy3wAESEncrypt2 = _interopRequireDefault(_Easy3wAESEncrypt);
 
-var _Easy3wUIConfig = require('../Easy3wUIConfig');
-
-var _Easy3wUIConfig2 = _interopRequireDefault(_Easy3wUIConfig);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { 'default': obj }; }
 
-var objPreviewFileDefault = _Easy3wUIConfig2['default'].objPreviewFileDefault;
-
 // 文件上传配置
-
 var _ref = _comonConfig.objE3wUIFileConfig || {},
     maxSize = _ref.maxSize;
 // maxSizeB 大附件-文件大小限制 单位：MB
@@ -116,7 +109,7 @@ var Easy3wUpload = function (_Component) {
     }
 
     return _ret = (_temp = (_this = (0, _possibleConstructorReturn3['default'])(this, _Component.call.apply(_Component, [this].concat(args))), _this), _this.onPreview = function (file) {
-      var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
+      var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, _this.props.objPreviewFile);
       var previewFileUrl = objPreviewFileNew.previewFileUrl,
           previewFileType = objPreviewFileNew.previewFileType;
       var uid = file.uid,
@@ -231,7 +224,7 @@ var Easy3wUpload = function (_Component) {
     if (isRead) {
       upProps = (0, _extends3['default'])({}, upProps, { children: true, showUploadList: { showDownloadIcon: true, showPreviewIcon: true, showRemoveIcon: false } });
     }
-    var objPreviewFileNew = (0, _extends3['default'])({}, objPreviewFileDefault, _comonConfig.objPreviewFile, this.props.objPreviewFile);
+    var objPreviewFileNew = (0, _extends3['default'])({}, _comonConfig.objPreviewFile, this.props.objPreviewFile);
     var previewFileFlag = objPreviewFileNew.previewFileFlag;
 
     if (previewFileFlag && fileViewFlag !== false) {