Merge branch 'dev' of http://git.ycjcjy.com/zhiyuxing/estateagents-admin-manager into dev

src/pages/building/list/add/index.jsx

@@ -5,7 +5,7 @@ import request from '../../../../utils/request';
 import apis from '../../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
-
+import Prompt from 'umi/prompt';
 
 import ImageUpload from '../../../../components/XForm/ImageUpload'
 import Wangedit from '../../../../components/Wangedit/Wangedit'
@@ -77,6 +77,10 @@ function AddBuilding(props) {
         { (tab === 'poster' && <Poster building={buildingData} />)}
         { (tab === 'share' && <Share building={buildingData} />)}
       </div>
+      <Prompt message={location =>
+                          location.pathname.startsWith("/building/list")
+                            ? true
+                            : localStorage.removeItem("pageParams")} />
     </>
     // <Tabs defaultActiveKey="1" onChange={tabsCallback}>
     //   <TabPane tab="基本信息" key="1">

src/pages/building/list/index.jsx

@@ -5,6 +5,7 @@ import request from '../../../utils/request';
 import apis from '../../../services/apis';
 import Styles from './style.less';
 import { router } from 'umi';
+import Prompt from 'umi/prompt';
 import AuthButton from '@/components/AuthButton';
 import SelectCity from '../../../components/SelectButton/CitySelect'
 
@@ -179,7 +180,11 @@ function body(props) {
 
   // eslint-disable-next-line react-hooks/rules-of-hooks
   useEffect(() => {
-    getList({ pageNum: 1, pageSize: 9 })
+    if(localStorage.getItem("pageParams")){
+      getList(JSON.parse(localStorage.getItem("pageParams")))
+    }else{
+      getList({ pageNum: 1, pageSize: 9 })
+    } 
   }, [])
 
   function getList(params) {
@@ -212,6 +217,7 @@ function body(props) {
 
           values.startDate = `${moment(startDate).format('YYYY-MM-DDT00:00:00.000')}Z`
         }
+        localStorage.setItem("pageParams",JSON.stringify({ pageNum: 1, pageSize: 9, ...values }));
         getList({ pageNum: 1, pageSize: 9, ...values })
       }
     });
@@ -225,6 +231,7 @@ function body(props) {
 
   // 分页
   function onChange(pageNumber) {
+    localStorage.setItem("pageParams",JSON.stringify({ pageNum: pageNumber, pageSize: 9, ...props.form.getFieldsValue() }));
     // eslint-disable-next-line react-hooks/rules-of-hooks
     getList({ pageNum: pageNumber, pageSize: 9, ...props.form.getFieldsValue() })
   }
@@ -258,11 +265,16 @@ function body(props) {
    */
   function handleReset() {
     props.form.resetFields();
+    localStorage.setItem("pageParams",JSON.stringify({ pageNum: 1, pageSize: 9 }));
     getList({ pageNum: 1, pageSize: 9 })
   }
 
   function onSuccess() {
-    getList({ pageNum: 1, pageSize: 9 })
+    if(localStorage.getItem("pageParams")){
+      getList(JSON.parse(localStorage.getItem("pageParams")))
+    }else{
+      getList({ pageNum: 1, pageSize: 9 })
+    } 
   }
 
 
@@ -348,8 +360,12 @@ function body(props) {
       </Row>
       {/* 分页 */}
       <div style={{ display: 'flex', justifyContent: 'flex-end', marginTop: '30px' }}>
-        <Pagination showQuickJumper defaultCurrent={1} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
+        <Pagination showQuickJumper current={dataSource.current} total={dataSource.total} onChange={onChange} pageSize={dataSource.size} />
       </div>
+      <Prompt message={location =>
+                          location.pathname.startsWith("/building/list")
+                            ? true
+                            : localStorage.removeItem("pageParams")} />
     </>
   );
 }