:bug: 修复高级筛选功能翻页丢失记忆bug

src/routes/Campus/CampusList.js

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-destructuring */
 import React, { Component } from 'react';
 import moment from 'moment';
 import { connect } from 'dva';
@@ -26,7 +27,7 @@ function merchantDataFormatter(data) {
   return data.map((item) => {
     return {
       text: item.name,
-      value: item.id,
+      value: `${item.name}||${item.id}`,
     };
   });
 }
@@ -45,13 +46,19 @@ export default class CampusListPage extends Component {
     this.state = {
       UIParams: (state || {}).UIParams, // 组件的状态参数
       Queryers: (state || {}).Queryers, // 查询的条件参数
+      merchants: (state || {}).merchants || [], // 记录筛选渠道
       filterModalDestroy: true,
     };
   }
   componentDidMount() {
+    const { merchants } = this.state;
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
     this.props.dispatch({
       type: 'campus/fetchCampusList',
-      payload: { ...this.state.Queryers },
+      payload: { merchantId, ...this.state.Queryers },
     });
   }
   handleCreateOperation = () => {
@@ -59,44 +66,54 @@ export default class CampusListPage extends Component {
       pathname: '/campus/create',
       state: this.state,
     }));
-  }
+  };
   handleEditOperation = (item) => {
     this.props.dispatch(routerRedux.push({
       pathname: `/campus/edit/${item.id}`,
       state: this.state,
     }));
-  }
+  };
   handleFilterOperation = (params, states) => {
+    const { merchants } = this.state;
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
     this.props.dispatch({
       type: 'campus/fetchCampusList',
-      payload: params,
+      payload: { merchantId, ...params },
     });
     this.setState({
       UIParams: states,
       Queryers: params,
     });
-  }
+  };
   handleModalFilterOperation = () => {
     const { getFieldValue } = this.props.form;
-    const value = getFieldValue('merchantId');
+    const merchants = getFieldValue('merchants');
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
     this.props.dispatch({
       type: 'campus/fetchCampusList',
       payload: {
+        merchantId,
         ...this.state.Queryers,
-        merchantId: value[0],
       },
     });
+    this.setState({ merchants });
     this.handleFilterModalDestroy();
-  }
+  };
   handleBatchOperation = () => {
     Message.info('暂不支持批量操作!');
-  }
+  };
   handleFilterModalShow = () => {
     this.setState({ filterModalDestroy: false });
-  }
+  };
   handleFilterModalDestroy = () => {
     this.setState({ filterModalDestroy: true });
-  }
+  };
   handleRemoteSelectSearch = (value) => {
     this.props.dispatch({
       type: 'merchant/fetchMerchantList',
@@ -105,9 +122,10 @@ export default class CampusListPage extends Component {
         name: value,
       },
     });
-  }
+  };
 
   render() {
+    const { merchants } = this.state;
     const { loading, fetching, form, campus, merchant } = this.props;
     const { list, totalSize, pageSize, pageNo } = campus;
     const { getFieldDecorator } = form;
@@ -218,8 +236,8 @@ export default class CampusListPage extends Component {
             >
               <Form>
                 <Form.Item label="所属商户" {...formItemLayout}>
-                  {getFieldDecorator('merchantId', {
-                      initialValue: [],
+                  {getFieldDecorator('merchants', {
+                      initialValue: merchants,
                     })(
                       <AXRemoteSelect
                         fetching={fetching}

src/routes/System/CmsUser/CmsUserEdit.js

@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Card, Form, Table, Input, Button, Radio, Icon, Switch } from 'antd';
+import { Card, Form, Table, Input, Button, Radio, Icon, Switch, message } from 'antd';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import FooterToolbar from '../../../components/FooterToolbar';
@@ -139,17 +139,22 @@ export default class CmsUserEditPage extends PureComponent {
   handlePageSubmit = () => {
     this.props.form.validateFieldsAndScroll((error, values) => {
       const { currentItem, passwordEdit } = this.state;
+      if (error) {
+        return;
+      }
+      if (passwordEdit) {
+        message.error('请保存密码!');
+        return;
+      }
       const { id } = currentItem;
       const { status, ...restProps } = values;
       restProps.status = boolToStatus(status);
       restProps.id = id;
-      if (!error && !passwordEdit) {
-        this.props.dispatch({
-          type: 'cmsUser/updateCmsUserItem',
-          payload: restProps,
-          states: this.props.location.state,
-        });
-      }
+      this.props.dispatch({
+        type: 'cmsUser/updateCmsUserItem',
+        payload: restProps,
+        states: this.props.location.state,
+      });
     });
   };
   handlePageBack = () => {

src/routes/Terminal/User/TerminalEdit.js

@@ -1,5 +1,5 @@
 import React, { PureComponent } from 'react';
-import { Card, Form, Table, Input, Button, Icon, Switch } from 'antd';
+import { Card, Form, Table, Input, Button, Icon, Switch, message } from 'antd';
 import { connect } from 'dva';
 import { routerRedux } from 'dva/router';
 import FooterToolbar from '../../../components/FooterToolbar';
@@ -117,17 +117,22 @@ export default class TerminalEditPage extends PureComponent {
   handlePageSubmit = () => {
     this.props.form.validateFieldsAndScroll((error, values) => {
       const { currentItem, passwordEdit } = this.state;
+      if (error) {
+        return;
+      }
+      if (passwordEdit) {
+        message.error('请保存密码!');
+        return;
+      }
       const { id } = currentItem;
       const { status, ...restProps } = values;
       restProps.id = id;
       restProps.status = boolToStatus(status);
-      if (!error && !passwordEdit) {
-        this.props.dispatch({
-          type: 'terminal/updateTerminalItem',
-          payload: restProps,
-          states: this.props.location.state,
-        });
-      }
+      this.props.dispatch({
+        type: 'terminal/updateTerminalItem',
+        payload: restProps,
+        states: this.props.location.state,
+      });
     });
   };
   handlePageBack = () => {

src/routes/Terminal/User/TerminalList.js

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-destructuring */
 import React, { Component } from 'react';
 import moment from 'moment';
 import { connect } from 'dva';
@@ -26,7 +27,7 @@ function arrayDataFormatter(data) {
   return data.map((item) => {
     return {
       text: item.name,
-      value: item.id,
+      value: `${item.name}||${item.id}`,
     };
   });
 }
@@ -47,13 +48,28 @@ export default class TerminalListPage extends Component {
     this.state = {
       UIParams: (state || {}).UIParams, // 组件的状态参数
       Queryers: (state || {}).Queryers, // 查询的条件参数
+      merchants: (state || {}).merchants || [], // 记录筛选的渠道
+      campuses: (state || {}).campuses || [], // 记录筛选的校区
       filterModalDestroy: true,
     };
   }
   componentDidMount() {
+    const { merchants, campuses } = this.state;
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
+    let campusId;
+    if (campuses && campuses.length) {
+      campusId = campuses[0].split('||')[1];
+    }
     this.props.dispatch({
       type: 'terminal/fetchTerminalList',
-      payload: { ...this.state.Queryers },
+      payload: {
+        campusId,
+        merchantId,
+        ...this.state.Queryers,
+      },
     });
   }
   handleCreateOperation = () => {
@@ -119,26 +135,48 @@ export default class TerminalListPage extends Component {
     }));
   };
   handleFilterOperation = (params, states) => {
-    this.props.dispatch({
-      type: 'terminal/fetchTerminalList',
-      payload: params,
-    });
     this.setState({
       UIParams: states,
       Queryers: params,
     });
+    const { merchants, campuses } = this.state;
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
+    let campusId;
+    if (campuses && campuses.length) {
+      campusId = campuses[0].split('||')[1];
+    }
+    this.props.dispatch({
+      type: 'terminal/fetchTerminalList',
+      payload: {
+        campusId,
+        merchantId,
+        ...params,
+      },
+    });
   };
   handleModalFilterOperation = () => {
     const { getFieldsValue } = this.props.form;
-    const { merchantIds, campusIds } = getFieldsValue();
+    const { merchants, campuses } = getFieldsValue();
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
+    let campusId;
+    if (campuses && campuses.length) {
+      campusId = campuses[0].split('||')[1];
+    }
     this.props.dispatch({
       type: 'terminal/fetchTerminalList',
       payload: {
         ...this.state.Queryers,
-        merchantId: merchantIds[0],
-        campusId: campusIds[0],
+        merchantId,
+        campusId,
       },
     });
+    this.setState({ merchants, campuses });
     this.handleFilterModalDestroy();
   };
   handleBatchOperation = () => {
@@ -170,6 +208,7 @@ export default class TerminalListPage extends Component {
   };
 
   render() {
+    const { merchants, campuses } = this.state;
     const { loading, fetching1, fetching2, form, campus, merchant, terminal } = this.props;
     const { list, totalSize, pageSize, pageNo } = terminal;
     const { getFieldDecorator } = form;
@@ -318,8 +357,8 @@ export default class TerminalListPage extends Component {
           >
             <Form>
               <Form.Item label="所属商户" {...formItemLayout}>
-                {getFieldDecorator('merchantIds', {
-                    initialValue: [],
+                {getFieldDecorator('merchants', {
+                    initialValue: merchants,
                   })(
                     <AXRemoteSelect
                       fetching={fetching1}
@@ -329,8 +368,8 @@ export default class TerminalListPage extends Component {
                   )}
               </Form.Item>
               <Form.Item label="所属校区" {...formItemLayout}>
-                {getFieldDecorator('campusIds', {
-                    initialValue: [],
+                {getFieldDecorator('campuses', {
+                    initialValue: campuses,
                   })(
                     <AXRemoteSelect
                       fetching={fetching2}

src/routes/Trade/ShopCart/ShopCartList.js

@@ -1,3 +1,4 @@
+/* eslint-disable prefer-destructuring */
 import React, { Component } from 'react';
 import moment from 'moment';
 import { connect } from 'dva';
@@ -25,7 +26,7 @@ function arrayDataFormatter(data) {
   return data.map((item) => {
     return {
       text: item.name,
-      value: item.id,
+      value: `${item.name}||${item.id}`,
     };
   });
 }
@@ -46,36 +47,73 @@ export default class ShopCartListPage extends Component {
     this.state = {
       UIParams: (state || {}).UIParams, // 组件的状态参数
       Queryers: (state || {}).Queryers, // 查询的条件参数
+      merchants: (state || {}).merchants || [], // 记录筛选的渠道
+      campuses: (state || {}).campuses || [], // 记录筛选的校区
       filterModalDestroy: true,
     };
   }
   componentDidMount() {
+    const { merchants, campuses } = this.state;
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
+    let campusId;
+    if (campuses && campuses.length) {
+      campusId = campuses[0].split('||')[1];
+    }
     this.props.dispatch({
       type: 'terminal/fetchTerminalList',
-      payload: { ...this.state.Queryers },
+      payload: {
+        campusId,
+        merchantId,
+        ...this.state.Queryers,
+      },
     });
   }
   handleFilterOperation = (params, states) => {
-    this.props.dispatch({
-      type: 'terminal/fetchTerminalList',
-      payload: params,
-    });
     this.setState({
       UIParams: states,
       Queryers: params,
     });
+    const { merchants, campuses } = this.state;
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
+    let campusId;
+    if (campuses && campuses.length) {
+      campusId = campuses[0].split('||')[1];
+    }
+    this.props.dispatch({
+      type: 'terminal/fetchTerminalList',
+      payload: {
+        campusId,
+        merchantId,
+        ...params,
+      },
+    });
   };
   handleModalFilterOperation = () => {
     const { getFieldsValue } = this.props.form;
-    const { merchantIds, campusIds } = getFieldsValue();
+    const { merchants, campuses } = getFieldsValue();
+    let merchantId;
+    if (merchants && merchants.length) {
+      merchantId = merchants[0].split('||')[1];
+    }
+    let campusId;
+    if (campuses && campuses.length) {
+      campusId = campuses[0].split('||')[1];
+    }
     this.props.dispatch({
       type: 'terminal/fetchTerminalList',
       payload: {
         ...this.state.Queryers,
-        merchantId: merchantIds[0],
-        campusId: campusIds[0],
+        merchantId,
+        campusId,
       },
     });
+    this.setState({ merchants, campuses });
     this.handleFilterModalDestroy();
   };
   handleBatchOperation = () => {
@@ -116,6 +154,7 @@ export default class ShopCartListPage extends Component {
   };
 
   render() {
+    const { merchants, campuses } = this.state;
     const { loading, fetching1, fetching2, form, campus, merchant, terminal } = this.props;
     const { list, totalSize, pageSize, pageNo } = terminal;
     const { getFieldDecorator } = form;
@@ -229,8 +268,8 @@ export default class ShopCartListPage extends Component {
           >
             <Form>
               <Form.Item label="所属商户" {...formItemLayout}>
-                {getFieldDecorator('merchantIds', {
-                  initialValue: [],
+                {getFieldDecorator('merchants', {
+                  initialValue: merchants,
                 })(
                   <AXRemoteSelect
                     fetching={fetching1}
@@ -240,8 +279,8 @@ export default class ShopCartListPage extends Component {
                 )}
               </Form.Item>
               <Form.Item label="所属校区" {...formItemLayout}>
-                {getFieldDecorator('campusIds', {
-                  initialValue: [],
+                {getFieldDecorator('campuses', {
+                  initialValue: campuses,
                 })(
                   <AXRemoteSelect
                     fetching={fetching2}