Commit d22f29960bfb6b1b0dda25f5c9ef0d4c981f6a6e
1 parent
3b579acc
fix: table style
Showing
3 changed files
with
26 additions
and
1 deletions
pnpm-lock.yaml
@@ -26,6 +26,9 @@ dependencies: | @@ -26,6 +26,9 @@ dependencies: | ||
26 | lodash: | 26 | lodash: |
27 | specifier: ^4.17.21 | 27 | specifier: ^4.17.21 |
28 | version: registry.npmjs.org/lodash@4.17.21 | 28 | version: registry.npmjs.org/lodash@4.17.21 |
29 | + print-js: | ||
30 | + specifier: ^1.6.0 | ||
31 | + version: registry.npmjs.org/print-js@1.6.0 | ||
29 | 32 | ||
30 | devDependencies: | 33 | devDependencies: |
31 | '@inspir/pluto': | 34 | '@inspir/pluto': |
@@ -12591,6 +12594,12 @@ packages: | @@ -12591,6 +12594,12 @@ packages: | ||
12591 | renderkid: registry.npmjs.org/renderkid@3.0.0 | 12594 | renderkid: registry.npmjs.org/renderkid@3.0.0 |
12592 | dev: false | 12595 | dev: false |
12593 | 12596 | ||
12597 | + registry.npmjs.org/print-js@1.6.0: | ||
12598 | + resolution: {integrity: sha512-BfnOIzSKbqGRtO4o0rnj/K3681BSd2QUrsIZy/+WdCIugjIswjmx3lDEZpXB2ruGf9d4b3YNINri81+J0FsBWg==, registry: https://registry.npmjs.com/, tarball: https://registry.npmjs.org/print-js/-/print-js-1.6.0.tgz} | ||
12599 | + name: print-js | ||
12600 | + version: 1.6.0 | ||
12601 | + dev: false | ||
12602 | + | ||
12594 | registry.npmjs.org/process-nextick-args@2.0.1: | 12603 | registry.npmjs.org/process-nextick-args@2.0.1: |
12595 | resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==, registry: https://registry.npmjs.com/, tarball: https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz} | 12604 | resolution: {integrity: sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==, registry: https://registry.npmjs.com/, tarball: https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz} |
12596 | name: process-nextick-args | 12605 | name: process-nextick-args |
src/app.ts
@@ -17,6 +17,8 @@ export async function getInitialState(): Promise<{ name: string }> { | @@ -17,6 +17,8 @@ export async function getInitialState(): Promise<{ name: string }> { | ||
17 | 17 | ||
18 | export const layout = () => { | 18 | export const layout = () => { |
19 | return { | 19 | return { |
20 | + menuRender: false, | ||
21 | + | ||
20 | menu: { | 22 | menu: { |
21 | locale: false, | 23 | locale: false, |
22 | // header: true, | 24 | // header: true, |
@@ -30,6 +32,11 @@ export const layout = () => { | @@ -30,6 +32,11 @@ export const layout = () => { | ||
30 | export const request: RequestConfig = { | 32 | export const request: RequestConfig = { |
31 | // 错误处理 | 33 | // 错误处理 |
32 | errorHandler: (error) => { | 34 | errorHandler: (error) => { |
35 | + console.log( | ||
36 | + '%c [ error ]-35', | ||
37 | + 'font-size:13px; background:pink; color:#bf2c9f;', | ||
38 | + error, | ||
39 | + ); | ||
33 | const { response, data } = error; | 40 | const { response, data } = error; |
34 | if (response && response.status) { | 41 | if (response && response.status) { |
35 | // 401重定向 | 42 | // 401重定向 |
@@ -98,7 +105,15 @@ export const request: RequestConfig = { | @@ -98,7 +105,15 @@ export const request: RequestConfig = { | ||
98 | // do something | 105 | // do something |
99 | return response; | 106 | return response; |
100 | }, | 107 | }, |
101 | - (error) => { | 108 | + (error: any) => { |
109 | + if (error?.response?.status === 401) { | ||
110 | + if (!location.pathname.includes('login')) { | ||
111 | + localStorage.removeItem('token'); | ||
112 | + localStorage.removeItem('userInfo'); | ||
113 | + message.error('token失效,请重新登录!'); | ||
114 | + history.push('/login'); | ||
115 | + } | ||
116 | + } | ||
102 | return Promise.reject(error); | 117 | return Promise.reject(error); |
103 | }, | 118 | }, |
104 | ], | 119 | ], |
src/pages/Order/index.tsx
@@ -640,6 +640,7 @@ const OrderPage = () => { | @@ -640,6 +640,7 @@ const OrderPage = () => { | ||
640 | }} | 640 | }} |
641 | > | 641 | > |
642 | <ProTable | 642 | <ProTable |
643 | + scroll={{ x: true }} | ||
643 | actionRef={mainTableRef} | 644 | actionRef={mainTableRef} |
644 | expandIconColumnIndex={-1} | 645 | expandIconColumnIndex={-1} |
645 | columns={mainOrdersColumns} | 646 | columns={mainOrdersColumns} |