easy3wmui 0.0.43-beta5 → 0.0.43-beta6

package/lib/Easy3wMTable/index.js

@@ -2,14 +2,14 @@
 
 exports.__esModule = true;
 
-var _form = require('antd-mobile/es/components/form');
-
-var _form2 = _interopRequireDefault(_form);
-
 var _button = require('antd-mobile/es/components/button');
 
 var _button2 = _interopRequireDefault(_button);
 
+var _form = require('antd-mobile/es/components/form');
+
+var _form2 = _interopRequireDefault(_form);
+
 var _extends2 = require('babel-runtime/helpers/extends');
 
 var _extends3 = _interopRequireDefault(_extends2);
@@ -248,16 +248,23 @@ var Easy3wMTable = function (_PureComponent) {
     };
 
     _this.touchClearSV = function () {
-      _this.searchInfo.keywordsQry = ''; // 关键字
-      _this.setState({
-        offset: 1
-      }, function () {
+      var _this$setState;
+
+      var queryCriteria = _this.props.queryCriteria;
+
+      _this.searchInfo[queryCriteria] = ''; // 关键字
+      _this.setState((_this$setState = {}, _this$setState[queryCriteria] = '', _this$setState.offset = 1, _this$setState), function () {
         return _this.touchFetch();
       });
     };
 
     _this.touchChangeSV = function (keywordsQry) {
-      _this.searchInfo.keywordsQry = keywordsQry;
+      var _this$setState2;
+
+      var queryCriteria = _this.props.queryCriteria;
+
+      _this.searchInfo[queryCriteria] = keywordsQry;
+      _this.setState((_this$setState2 = {}, _this$setState2[queryCriteria] = keywordsQry, _this$setState2));
     };
 
     _this.touchSearch = function () {
@@ -269,12 +276,20 @@ var Easy3wMTable = function (_PureComponent) {
     };
 
     _this.showModal = function () {
+      console.log('queryCriteria', _this.searchInfo);
+      _this.state.form.setFieldsValue((0, _extends3['default'])({}, _this.searchInfo));
       _this.setState({
         visible: true // 显示更多筛选条件Modal
       });
+      // setTimeout(() => {
+      //   this.state.form.setFieldsValue({
+      //     ...this.searchInfo,
+      //   });
+      // }, 3000);
     };
 
     _this.hideModal = function () {
+      _this.state.form.resetFields();
       _this.setState({
         visible: false // 隐藏更多筛选条件Modal
       });
@@ -288,6 +303,17 @@ var Easy3wMTable = function (_PureComponent) {
       _this.hideModal();
     };
 
+    _this.deleteFilter = function () {
+      var _this$setState3;
+
+      var queryCriteria = _this.props.queryCriteria;
+
+      console.log('queryCriteria', queryCriteria);
+      _this.searchInfo = {};
+      _this.touchFetch();
+      _this.setState((_this$setState3 = {}, _this$setState3[queryCriteria] = '', _this$setState3));
+    };
+
     var bidPureComponent = _this.props.bidPureComponent;
 
     if (bidPureComponent && typeof bidPureComponent === 'function') {
@@ -300,6 +326,7 @@ var Easy3wMTable = function (_PureComponent) {
     _this.state = {
       offset: 1, // 分页
       visible: false, // 隐藏更多筛选条件Modal
+      queryCriteria: '', // 关键字
       form: null // 表单实例
     };
     return _this;
@@ -381,8 +408,10 @@ var Easy3wMTable = function (_PureComponent) {
 
   // 确定
 
-
   // --------------------------------------------- 更多筛选条件 end -----------------------------------------------
+  // 清空查询条件
+
+
   Easy3wMTable.prototype.render = function render() {
     var _this2 = this;
 
@@ -425,6 +454,7 @@ var Easy3wMTable = function (_PureComponent) {
     return _react2['default'].createElement(
       'div',
       { id: 'Easy3wMTable' },
+      _react2['default'].createElement(_form2['default'], { ref: this.formRef }),
       _react2['default'].createElement(
         'div',
         { className: 'flipContainer' },
@@ -470,6 +500,7 @@ var Easy3wMTable = function (_PureComponent) {
               , onCancel: function onCancel() {
                 return _this2.touchSearch();
               } // 点击取消按钮时触发
+              , value: this.state[queryCriteria]
             })
           }) : '',
           arrData ? arrData.map(function (item, index) {
@@ -622,7 +653,6 @@ var Easy3wMTable = function (_PureComponent) {
             , bodyStyle: { height: '100vh', overflow: 'auto' },
             getContainer: document.querySelector('.flipContainer')
           },
-          _react2['default'].createElement(_form2['default'], { ref: this.formRef }),
           this.state.form ? _react2['default'].createElement(_easy3wmui.Easy3wMFormPage, {
             rowItems: arrFilter,
             form: this.state.form

package/package.json

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