easy3wmui 0.0.43-beta2 → 0.0.43-beta4

package/lib/Easy3wMGridPage/index.js

@@ -72,6 +72,20 @@ var Easy3wMGridPage = function (_Component) {
     return _this;
   }
 
+  Easy3wMGridPage.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+    var offset = this.state.offset;
+    var totalResult = nextProps.totalResult;
+    // const { totalResult } = this.props;
+
+    var intTotalPage = Math.ceil(totalResult / 10);
+    // 查询之后发现，当前页数大于最大页数 (情况：1、录入查询条件，直接选择了最后一个分页，最终当前页数大于最大页数)
+    if (totalResult !== this.props.totalResult && offset > intTotalPage) {
+      this.setState({
+        offset: intTotalPage
+      });
+    }
+  };
+
   Easy3wMGridPage.prototype.componentWillUnmount = function componentWillUnmount() {};
   // --------------------------------------------- 分页 start ---------------------------------------------
   // 生成分页数字

package/lib/Easy3wMPagination/index.js

@@ -2,6 +2,10 @@
 
 exports.__esModule = true;
 
+var _toast = require('antd-mobile/es/components/toast');
+
+var _toast2 = _interopRequireDefault(_toast);
+
 var _classCallCheck2 = require('babel-runtime/helpers/classCallCheck');
 
 var _classCallCheck3 = _interopRequireDefault(_classCallCheck2);
@@ -20,6 +24,8 @@ var _react2 = _interopRequireDefault(_react);
 
 var _dva = require('dva');
 
+var _antdMobile = require('antd-mobile');
+
 var _antdMobileIcons = require('antd-mobile-icons');
 
 var _Easy3wMCard = require('../Easy3wMCard');
@@ -37,33 +43,43 @@ var Easy3wMPagination = function (_PureComponent) {
     var _this = (0, _possibleConstructorReturn3['default'])(this, _PureComponent.call(this, props));
 
     _this.onChange = function (num, notFetchFlag) {
-      var _this$props = _this.props,
-          intData = _this$props.intData,
-          touchFetch = _this$props.touchFetch;
+      var globalLoading = _this.props.loading.global;
+      if (globalLoading) {
+        _toast2['default'].show({
+          icon: 'loading',
+          content: '正在后台处理，请稍后！',
+          duration: 3000
+        });
+      } else {
+        // func(e);
+        var _this$props = _this.props,
+            intData = _this$props.intData,
+            touchFetch = _this$props.touchFetch;
 
-      var intTotalPage = Math.ceil(intData / 10);
-      // const intTotalPage = 99999;
-      var offset = _this.state.offset;
+        var intTotalPage = Math.ceil(intData / 10);
+        // const intTotalPage = 99999;
+        var offset = _this.state.offset;
 
-      if (typeof num === 'string') {
-        offset += Number(num);
-      } else {
-        offset = num;
-      }
-      if (offset < 1) {
-        offset = 1;
-      } else if (offset > intTotalPage) {
-        offset = intTotalPage;
-      }
-      _this.setState({
-        offset: offset // 当前页
-      }, function () {
-        if (notFetchFlag) {// true 不查询 false 查询
-          // 不查询
-        } else if (touchFetch && typeof touchFetch === 'function') {
-          touchFetch();
+        if (typeof num === 'string') {
+          offset += Number(num);
+        } else {
+          offset = num;
         }
-      });
+        if (offset < 1) {
+          offset = 1;
+        } else if (offset > intTotalPage) {
+          offset = intTotalPage;
+        }
+        _this.setState({
+          offset: offset // 当前页
+        }, function () {
+          if (notFetchFlag) {// true 不查询 false 查询
+            // 不查询
+          } else if (touchFetch && typeof touchFetch === 'function') {
+            touchFetch();
+          }
+        });
+      }
     };
 
     _this.touchCreatePageNum = function (intTotalPage, offset, index) {

package/lib/Easy3wMTable/index.js

@@ -64,7 +64,9 @@ var Easy3wMTable = function (_PureComponent) {
       var handleSearch = _this.props.handleSearch;
       var offset = _this.state.offset;
 
-      handleSearch(offset, _this.searchInfo, callback);
+      if (handleSearch && typeof handleSearch === 'function') {
+        handleSearch(offset, _this.searchInfo, callback);
+      }
     };
 
     _this.touchCreatePageNum = function (intTotalPage, offset, index) {
@@ -144,7 +146,7 @@ var Easy3wMTable = function (_PureComponent) {
       }
     };
 
-    _this.touchChangePage = function (num) {
+    _this.touchChangePage = function (num, notFetchFlag) {
       var intData = _this.props.intData;
 
       var intTotalPage = Math.ceil(intData / 10);
@@ -163,7 +165,13 @@ var Easy3wMTable = function (_PureComponent) {
       }
       _this.setState({
         offset: offset // 当前页
-      }, _this.touchFetch);
+      }, function () {
+        if (notFetchFlag) {// true 不查询 false 查询
+          // 不查询
+        } else {
+          _this.touchFetch();
+        }
+      });
     };
 
     _this.touchDropUpFlip = function () {
@@ -306,6 +314,20 @@ var Easy3wMTable = function (_PureComponent) {
     }
   };
 
+  Easy3wMTable.prototype.componentWillReceiveProps = function componentWillReceiveProps(nextProps) {
+    var offset = this.state.offset;
+    var intData = nextProps.intData;
+    // const { intData } = this.props;
+
+    var intTotalPage = Math.ceil(intData / 10);
+    // 查询之后发现，当前页数大于最大页数 (情况：1、录入查询条件，直接选择了最后一个分页，最终当前页数大于最大页数)
+    if (intData !== this.props.intData && offset > intTotalPage) {
+      this.setState({
+        offset: intTotalPage
+      });
+    }
+  };
+
   Easy3wMTable.prototype.componentWillUnmount = function componentWillUnmount() {
     var flipContainer = document.querySelector('.flipContainer'); // 翻页主体
     if (flipContainer.removeEventListener) {
@@ -413,8 +435,21 @@ var Easy3wMTable = function (_PureComponent) {
             className: 'queryCriteria',
             extra: arrFilter && arrFilter.length ? _react2['default'].createElement(
               'div',
-              { className: 'more', onClick: this.showModal },
-              '\u66F4\u591A\u7B5B\u9009'
+              { style: { fontSize: '18px' } },
+              _react2['default'].createElement(
+                'span',
+                { style: { marginRight: '12px' }, onClick: function onClick() {
+                    return _this2.deleteFilter();
+                  } },
+                _react2['default'].createElement(_antdMobileIcons.RedoOutline, null)
+              ),
+              _react2['default'].createElement(
+                'span',
+                { onClick: function onClick() {
+                    return _this2.showModal();
+                  } },
+                _react2['default'].createElement(_antdMobileIcons.FilterOutline, null)
+              )
             ) : '',
             title: _react2['default'].createElement(_easy3wmui.Easy3wMSearchBar, {
               onChange: function onChange(value) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "easy3wmui",
-  "version": "0.0.43-beta2",
+  "version": "0.0.43-beta4",
   "description": "easy3wmui components for react",
   "keywords": [
     "react",