easy3wmui 0.0.43-beta3 → 0.0.43-beta5

package/assets/index.css

@@ -449,6 +449,13 @@
 #Easy3wMTable .singleItem .itemAttr.clickable .attrKey {
   color: var(--adm-color-primary);
 }
+#Easy3wMTable .singleItem .itemAttr.itemAttrLong {
+  -ms-flex-direction: column;
+      flex-direction: column;
+}
+#Easy3wMTable .singleItem .itemAttr.itemAttrLong .attrKey {
+  text-align: left;
+}
 #Easy3wMTable .easy3wMGridPageStepper {
   display: -ms-flexbox;
   display: flex;

package/assets/mTable.css

@@ -54,6 +54,13 @@
 #Easy3wMTable .singleItem .itemAttr.clickable .attrKey {
   color: var(--adm-color-primary);
 }
+#Easy3wMTable .singleItem .itemAttr.itemAttrLong {
+  -ms-flex-direction: column;
+      flex-direction: column;
+}
+#Easy3wMTable .singleItem .itemAttr.itemAttrLong .attrKey {
+  text-align: left;
+}
 #Easy3wMTable .easy3wMGridPageStepper {
   display: -ms-flexbox;
   display: flex;

package/lib/Easy3wMFormPage/index.js

@@ -514,7 +514,15 @@ var Easy3wMFormPage = function (_Component) {
           if (readFlag || allReadFlag) {
             return _react2['default'].createElement(
               Item,
-              (0, _extends3['default'])({ label: label, name: fieldId + 'Easy3wView', required: required, initialValue: 'easy3wView', preserve: false }, cmptPros, { rules: addrules }),
+              (0, _extends3['default'])({
+                label: label,
+                name: fieldId + 'Easy3wView',
+                required: required,
+                initialValue: 'easy3wView',
+                preserve: false
+              }, itemProps, cmptPros, {
+                rules: addrules
+              }),
               value
             );
           } else {

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/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) {
@@ -447,9 +482,10 @@ var Easy3wMTable = function (_PureComponent) {
                 columns.map(function (obj) {
                   var title = obj.title,
                       dataIndex = obj.dataIndex,
+                      type = obj.type,
                       render = obj.render,
                       onRow = obj.onRow,
-                      _onClick = obj.onClick;
+                      onClick = obj.onClick;
 
                   var value = item[dataIndex];
                   if (render) {
@@ -457,9 +493,9 @@ var Easy3wMTable = function (_PureComponent) {
                   }
                   return _react2['default'].createElement(
                     'div',
-                    { className: 'itemAttr ' + (onRow ? 'clickable' : ''), onClick: function onClick() {
+                    { className: 'itemAttr ' + (type === 'longText' ? 'itemAttrLong' : '') + ' ' + (onRow ? 'clickable' : ''), onClick: onRow ? function () {
                         return onRow(item[dataIndex], item, index);
-                      } },
+                      } : function () {} },
                     _react2['default'].createElement(
                       'span',
                       { className: 'attrLabel' },
@@ -467,9 +503,9 @@ var Easy3wMTable = function (_PureComponent) {
                     ),
                     _react2['default'].createElement(
                       'span',
-                      { className: 'attrKey ' + (_onClick ? 'clickable' : ''), onClick: function onClick() {
-                          return _onClick(item[dataIndex], item, index);
-                        } },
+                      { className: 'attrKey ' + (onClick ? 'clickable' : ''), onClick: onClick ? function () {
+                          return onClick(item[dataIndex], item, index);
+                        } : function () {} },
                       value
                     )
                   );

package/package.json

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