Browse Source

feat: add card wrappers to error pages and buttons to sales tabs (#11513)

pull/11527/head
afc163 9 months ago
committed by GitHub
parent
commit
a3e7bf27c4
No known key found for this signature in database GPG Key ID: B5690EEEBB952194
  1. 2
      src/loading.tsx
  2. 4
      src/pages/404.tsx
  3. 22
      src/pages/dashboard/analysis/components/SalesCard.tsx
  4. 1
      src/pages/dashboard/analysis/style.style.ts
  5. 4
      src/pages/exception/403/index.tsx
  6. 4
      src/pages/exception/404/index.tsx
  7. 4
      src/pages/exception/500/index.tsx

2
src/loading.tsx

@ -1,7 +1,7 @@
import { Skeleton } from 'antd'; import { Skeleton } from 'antd';
const Loading: React.FC = () => ( const Loading: React.FC = () => (
<Skeleton style={{ margin: '24px 40px' }} active /> <Skeleton style={{ margin: '24px 40px', height: '60vh' }} active />
); );
export default Loading; export default Loading;

4
src/pages/404.tsx

@ -1,8 +1,9 @@
import { history, useIntl } from '@umijs/max'; import { history, useIntl } from '@umijs/max';
import { Button, Result } from 'antd'; import { Button, Card, Result } from 'antd';
import React from 'react'; import React from 'react';
const NoFoundPage: React.FC = () => ( const NoFoundPage: React.FC = () => (
<Card variant="borderless">
<Result <Result
status="404" status="404"
title="404" title="404"
@ -13,6 +14,7 @@ const NoFoundPage: React.FC = () => (
</Button> </Button>
} }
/> />
</Card>
); );
export default NoFoundPage; export default NoFoundPage;

22
src/pages/dashboard/analysis/components/SalesCard.tsx

@ -1,5 +1,5 @@
import { Column } from '@ant-design/plots'; import { Column } from '@ant-design/plots';
import { Card, Col, DatePicker, Row, Tabs } from 'antd'; import { Button, Card, Col, DatePicker, Row, Tabs } from 'antd';
import type { RangePickerProps } from 'antd/es/date-picker'; import type { RangePickerProps } from 'antd/es/date-picker';
import numeral from 'numeral'; import numeral from 'numeral';
import type { DataItem } from '../data.d'; import type { DataItem } from '../data.d';
@ -51,30 +51,34 @@ const SalesCard = ({
tabBarExtraContent={ tabBarExtraContent={
<div className={styles.salesExtraWrap}> <div className={styles.salesExtraWrap}>
<div className={styles.salesExtra}> <div className={styles.salesExtra}>
<a <Button
type="text"
className={isActive('today')} className={isActive('today')}
onClick={() => selectDate('today')} onClick={() => selectDate('today')}
> >
</a> </Button>
<a <Button
type="text"
className={isActive('week')} className={isActive('week')}
onClick={() => selectDate('week')} onClick={() => selectDate('week')}
> >
</a> </Button>
<a <Button
type="text"
className={isActive('month')} className={isActive('month')}
onClick={() => selectDate('month')} onClick={() => selectDate('month')}
> >
</a> </Button>
<a <Button
type="text"
className={isActive('year')} className={isActive('year')}
onClick={() => selectDate('year')} onClick={() => selectDate('year')}
> >
</a> </Button>
</div> </div>
<RangePicker <RangePicker
value={rangePickerValue} value={rangePickerValue}

1
src/pages/dashboard/analysis/style.style.ts

@ -89,6 +89,7 @@ const useStyles = createStyles(({ token }) => {
}, },
currentDate: { currentDate: {
color: token.colorPrimary, color: token.colorPrimary,
fontWeight: 'bold',
}, },
salesBar: { salesBar: {
padding: '0 0 32px 32px', padding: '0 0 32px 32px',

4
src/pages/exception/403/index.tsx

@ -1,7 +1,8 @@
import { Link } from '@umijs/max'; import { Link } from '@umijs/max';
import { Button, Result } from 'antd'; import { Button, Card, Result } from 'antd';
export default () => ( export default () => (
<Card variant="borderless">
<Result <Result
status="403" status="403"
title="403" title="403"
@ -12,4 +13,5 @@ export default () => (
</Link> </Link>
} }
/> />
</Card>
); );

4
src/pages/exception/404/index.tsx

@ -1,7 +1,8 @@
import { Link } from '@umijs/max'; import { Link } from '@umijs/max';
import { Button, Result } from 'antd'; import { Button, Card, Result } from 'antd';
export default () => ( export default () => (
<Card variant="borderless">
<Result <Result
status="404" status="404"
title="404" title="404"
@ -12,4 +13,5 @@ export default () => (
</Link> </Link>
} }
/> />
</Card>
); );

4
src/pages/exception/500/index.tsx

@ -1,7 +1,8 @@
import { Link } from '@umijs/max'; import { Link } from '@umijs/max';
import { Button, Result } from 'antd'; import { Button, Card, Result } from 'antd';
export default () => ( export default () => (
<Card variant="borderless">
<Result <Result
status="500" status="500"
title="500" title="500"
@ -12,4 +13,5 @@ export default () => (
</Link> </Link>
} }
/> />
</Card>
); );

Loading…
Cancel
Save