Merge pull request #5 from hopeu/master

搜索和重置的时候跳到第一页

Author: tangtanglove

src/app.tsx

@@ -5,6 +5,7 @@ import { ResponseError } from 'umi-request';
 import { queryQuarkInfo, queryQuarkLayout, queryQuarkMenus, queryAccountInfo } from '@/services/quark';
 import defaultSettings from '../config/defaultSettings';
 import logo from './assets/logo.png';
+import {Response} from "express";
 
 export async function getInitialState(): Promise<{
   accountInfo?: API.AccountInfo;
@@ -118,6 +119,17 @@ const errorHandler = (error: ResponseError) => {
 
 export const request: RequestConfig = {
   errorHandler: errorHandler,
+  responseInterceptors: [
+    (response, options) => {
+      if(response.status == 208){ //跳转新的url
+        const locationUrl = response.headers.get('Location');
+        if(locationUrl){
+          window.open(locationUrl, response.headers.get('Target') || '_blank');
+        }
+      }
+      return response;
+    }
+  ],
   // 请求拦截器
   requestInterceptors: [
     (url: string, options) => {

src/pages/Quark/components/DrawerForm.tsx

@@ -39,6 +39,7 @@ const DrawerForm: React.FC<any> = (props:any) => {
   });
 
   const [visible, setVisible] = useState(false);
+  const [loading, setLoading] = useState(false);
 
   const getComponent = async () => {
     const result = await get({
@@ -55,7 +56,7 @@ const DrawerForm: React.FC<any> = (props:any) => {
         }
       }
     });
-    
+
     form.setFieldsValue(initialValues);
     setVisible(true);
   }
@@ -68,7 +69,7 @@ const DrawerForm: React.FC<any> = (props:any) => {
     if(data.hasOwnProperty('content')) {
       return findFormComponent(data.content);
     }
-  
+
     let conmpontent = [];
 
     if(data.hasOwnProperty(0)) {
@@ -120,16 +121,20 @@ const DrawerForm: React.FC<any> = (props:any) => {
     if(formComponent.disabledSubmitButton === true) {
       return null;
     }
-    
+
     return (
       <Space>
         <Button onClick={()=>setVisible(false)}>
           取消
         </Button>
         <Button
+          loading={loading}
           onClick={() => {
             form.validateFields().then((values:any) => {
-                onFinish(values);
+                setLoading(true);
+                onFinish(values).finally(() => {
+                  setLoading(false);
+                });
               }).catch((info:any) => {
                 console.log('Validate Failed:', info);
               });
@@ -204,4 +209,4 @@ const DrawerForm: React.FC<any> = (props:any) => {
   );
 }
 
-export default DrawerForm;
+export default DrawerForm;

src/pages/Quark/components/QueryFilter.tsx

@@ -31,7 +31,6 @@ const QueryFilter: React.FC<Action> = (props) => {
     let query = {};
 
     query['api'] = history.location.query.api;
-    query['page'] = history.location.query.page;
     query['pageSize'] = history.location.query.pageSize;
 
     query['search'] = values;
@@ -47,8 +46,11 @@ const QueryFilter: React.FC<Action> = (props) => {
     query['random'] = Math.random();
 
     history.push({ pathname: history.location.pathname, query: query });
-    
+
+
+
     if (props.current) {
+      props.current.pageInfo.current = 1;
       props.current.reload();
     }
   };
@@ -57,7 +59,6 @@ const QueryFilter: React.FC<Action> = (props) => {
     let query = {};
 
     query['api'] = history.location.query.api;
-    query['page'] = history.location.query.page;
     query['pageSize'] = history.location.query.pageSize;
 
     if(history.location.query.sorter) {
@@ -71,9 +72,12 @@ const QueryFilter: React.FC<Action> = (props) => {
     // hack random
     query['random'] = Math.random();
 
+    console.log(JSON.stringify(query));
+    console.log('on_reset');
     history.push({ pathname: history.location.pathname, query: query });
 
     if (props.current) {
+      props.current.pageInfo.current = 1;
       props.current.reload();
     }
   };