diff --git a/Exception500/package.json b/Exception500/package.json index 8b4f47fb8223287bb989b6aee605164531220d1f..eedad1fbf26ce528ff5d2b58997027814b6e587b 100644 --- a/Exception500/package.json +++ b/Exception500/package.json @@ -1,5 +1,5 @@ { - "name": "@umi-block/exception-500", + "name": "@pro-blocks/exception-500", "version": "0.0.1", "description": "Exception500", "main": "src/index.js", @@ -8,11 +8,10 @@ }, "repository": { "type": "git", - "url": "https://github.com/umijs/umi-blocks/ant-design-pro/exception500" + "url": "https://github.com/ant-design/pro-blocks/tree/master/Exception500" }, "dependencies": { "react": "^16.6.3", - "ant-design-pro": "^2.1.1", "dva": "^2.4.0", "umi-request": "^1.0.0-beta.1" }, @@ -21,5 +20,5 @@ "umi-plugin-react": "^1.3.0-beta.1", "umi-plugin-block-dev": "^1.0.0" }, - "license": "ISC" + "license": "MIT" } diff --git a/Exception500/src/components/Exception/demo/403.md b/Exception500/src/components/Exception/demo/403.md new file mode 100644 index 0000000000000000000000000000000000000000..c0244ab12046ac98706b893e73ea74748798d4dc --- /dev/null +++ b/Exception500/src/components/Exception/demo/403.md @@ -0,0 +1,29 @@ +--- +order: 2 +title: + zh-CN: 403 页面 + en-US: 403 Page +--- + +## zh-CN + +403 页面，配合自定义操作。 + +## en-US + +403 page with custom operations. + +````jsx +import Exception from 'ant-design-pro/lib/Exception'; +import { Button } from 'antd'; + +const actions = ( +
+ + +
+); +ReactDOM.render( + +, mountNode); +```` diff --git a/Exception500/src/components/Exception/demo/404.md b/Exception500/src/components/Exception/demo/404.md new file mode 100644 index 0000000000000000000000000000000000000000..c54e99d47cc695f456daaa99c652a4f9f8b4ca7c --- /dev/null +++ b/Exception500/src/components/Exception/demo/404.md @@ -0,0 +1,22 @@ +--- +order: 0 +title: + zh-CN: 404 页面 + en-US: 404 Page +--- + +## zh-CN + +404 页面。 + +## en-US + +404 page. + +````jsx +import Exception from 'ant-design-pro/lib/Exception'; + +ReactDOM.render( + +, mountNode); +```` diff --git a/Exception500/src/components/Exception/demo/500.md b/Exception500/src/components/Exception/demo/500.md new file mode 100644 index 0000000000000000000000000000000000000000..2336e41edab14bd86728df8d2f4ad20e2787594b --- /dev/null +++ b/Exception500/src/components/Exception/demo/500.md @@ -0,0 +1,22 @@ +--- +order: 1 +title: + zh-CN: 500 页面 + en-US: 500 Page +--- + +## zh-CN + +500 页面。 + +## en-US + +500 page. + +````jsx +import Exception from 'ant-design-pro/lib/Exception'; + +ReactDOM.render( + +, mountNode); +```` diff --git a/Exception500/src/components/Exception/index.en-US.md b/Exception500/src/components/Exception/index.en-US.md new file mode 100644 index 0000000000000000000000000000000000000000..37e7e80756fb7517239658775e4ce5ef170dcb21 --- /dev/null +++ b/Exception500/src/components/Exception/index.en-US.md @@ -0,0 +1,20 @@ +--- +title: Exception +cols: 1 +order: 5 +--- + +Exceptions page is used to provide feedback on specific abnormal state. Usually, it contains an explanation of the error status, and provides users with suggestions or operations, to prevent users from feeling lost and confused. + +## API + +Property | Description | Type | Default +---------|-------------|------|-------- +| backText | default return button text | ReactNode | back to home | +type | type of exception, the corresponding default `title`, `desc`, `img` will be given if set, which can be overridden by explicit setting of `title`, `desc`, `img` | Enum {'403', '404', '500'} | - +title | title | ReactNode | - +desc | supplementary description | ReactNode | - +img | the url of background image | string | - +actions | suggested operations, a default 'Home' link will show if not set | ReactNode | - +linkElement | to specify the element of link | string\|ReactElement | 'a' +redirect | redirect path | string | '/' \ No newline at end of file diff --git a/Exception500/src/components/Exception/index.less b/Exception500/src/components/Exception/index.less new file mode 100644 index 0000000000000000000000000000000000000000..45a2844b86f369c0df693fbfddea32134d1012c1 --- /dev/null +++ b/Exception500/src/components/Exception/index.less @@ -0,0 +1,89 @@ +@import '~antd/lib/style/themes/default.less'; + +.exception { + display: flex; + align-items: center; + height: 80%; + min-height: 500px; + + .imgBlock { + flex: 0 0 62.5%; + width: 62.5%; + padding-right: 152px; + zoom: 1; + &::before, + &::after { + content: ' '; + display: table; + } + &::after { + clear: both; + height: 0; + font-size: 0; + visibility: hidden; + } + } + + .imgEle { + float: right; + width: 100%; + max-width: 430px; + height: 360px; + background-repeat: no-repeat; + background-position: 50% 50%; + background-size: contain; + } + + .content { + flex: auto; + + h1 { + margin-bottom: 24px; + color: #434e59; + font-weight: 600; + font-size: 72px; + line-height: 72px; + } + + .desc { + margin-bottom: 16px; + color: @text-color-secondary; + font-size: 20px; + line-height: 28px; + } + + .actions { + button:not(:last-child) { + margin-right: 8px; + } + } + } +} + +@media screen and (max-width: @screen-xl) { + .exception { + .imgBlock { + padding-right: 88px; + } + } +} + +@media screen and (max-width: @screen-sm) { + .exception { + display: block; + text-align: center; + .imgBlock { + margin: 0 auto 24px; + padding-right: 0; + } + } +} + +@media screen and (max-width: @screen-xs) { + .exception { + .imgBlock { + margin-bottom: -24px; + overflow: hidden; + } + } +} diff --git a/Exception500/src/components/Exception/index.tsx b/Exception500/src/components/Exception/index.tsx new file mode 100644 index 0000000000000000000000000000000000000000..7a25ebfa1f6d2856390c13d81aad31279857cfe3 --- /dev/null +++ b/Exception500/src/components/Exception/index.tsx @@ -0,0 +1,83 @@ +import { Button } from 'antd'; +import classNames from 'classnames'; +import * as H from 'history'; +import React, { createElement } from 'react'; +import styles from './index.less'; +import config from './typeConfig'; +import Link from 'umi/link'; + +export interface ExceptionProps< + L = { + to: H.LocationDescriptor; + href?: H.LocationDescriptor; + replace?: boolean; + innerRef?: (node: HTMLAnchorElement | null) => void; + } +> { + type?: '403' | '404' | '500'; + title?: React.ReactNode; + desc?: React.ReactNode; + img?: string; + actions?: React.ReactNode; + linkElement?: string | React.ComponentType | typeof Link; + style?: React.CSSProperties; + className?: string; + backText?: React.ReactNode; + redirect?: string; +} + +class Exception extends React.Component { + static defaultProps = { + backText: 'back to home', + redirect: '/', + }; + + constructor(props: ExceptionProps) { + super(props); + this.state = {}; + } + + render() { + const { + className, + backText, + linkElement = 'a', + type = '404', + title, + desc, + img, + actions, + redirect, + ...rest + } = this.props; + const pageType = type in config ? type : '404'; + const clsString = classNames(styles.exception, className); + return ( +
+
+
+
+
+

{title || config[pageType].title}

+
{desc || config[pageType].desc}
+
+ {actions || + createElement( + linkElement as any, + { + to: redirect, + href: redirect, + }, + + )} +
+
+
+ ); + } +} + +export default Exception; diff --git a/Exception500/src/components/Exception/index.zh-CN.md b/Exception500/src/components/Exception/index.zh-CN.md new file mode 100644 index 0000000000000000000000000000000000000000..2e64399fcbe4fe2c0eca7b9c4cb7742ccef3ed9a --- /dev/null +++ b/Exception500/src/components/Exception/index.zh-CN.md @@ -0,0 +1,21 @@ +--- +title: Exception +subtitle: 异常 +cols: 1 +order: 5 +--- + +异常页用于对页面特定的异常状态进行反馈。通常，它包含对错误状态的阐述，并向用户提供建议或操作，避免用户感到迷失和困惑。 + +## API + +| 参数 | 说明| 类型 | 默认值 | +|-------------|------------------------------------------|-------------|-------| +| backText| 默认的返回按钮文本 | ReactNode| back to home | +| type| 页面类型，若配置，则自带对应类型默认的 `title`，`desc`，`img`，此默认设置可以被 `title`，`desc`，`img` 覆盖 | Enum {'403', '404', '500'} | - | +| title | 标题 | ReactNode| -| +| desc| 补充描述| ReactNode| -| +| img | 背景图片地址 | string| -| +| actions | 建议操作，配置此属性时默认的『返回首页』按钮不生效| ReactNode| -| +| linkElement | 定义链接的元素 | string\|ReactElement | 'a' | +| redirect | 返回按钮的跳转地址 | string | '/' diff --git a/Exception500/src/components/Exception/typeConfig.ts b/Exception500/src/components/Exception/typeConfig.ts new file mode 100644 index 0000000000000000000000000000000000000000..453a5edcecb0b01f7f2cb720be3b0dfcc2302da4 --- /dev/null +++ b/Exception500/src/components/Exception/typeConfig.ts @@ -0,0 +1,36 @@ +interface Config { + 403: { + img: string; + title: string; + desc: string; + }; + 404: { + img: string; + title: string; + desc: string; + }; + 500: { + img: string; + title: string; + desc: string; + }; +} +const config: Config = { + 403: { + img: 'https://gw.alipayobjects.com/zos/rmsportal/wZcnGqRDyhPOEYFcZDnb.svg', + title: '403', + desc: '抱歉，你无权访问该页面', + }, + 404: { + img: 'https://gw.alipayobjects.com/zos/rmsportal/KpnpchXsobRgLElEozzI.svg', + title: '404', + desc: '抱歉，你访问的页面不存在', + }, + 500: { + img: 'https://gw.alipayobjects.com/zos/rmsportal/RVRUAYdCGeYNBWoKiIwB.svg', + title: '500', + desc: '抱歉，服务器出错了', + }, +}; + +export default config; diff --git a/Exception500/src/index.js b/Exception500/src/index.tsx similarity index 64% rename from Exception500/src/index.js rename to Exception500/src/index.tsx index bef7707fecb97257f396d2b4bc46eeb70fcedd90..edbf668546644e0fdc0c33d35b6104f83f3ea289 100644 --- a/Exception500/src/index.js +++ b/Exception500/src/index.tsx @@ -1,9 +1,9 @@ import React from 'react'; -import { formatMessage } from 'umi/locale'; +import { formatMessage } from 'umi-plugin-react/locale'; import Link from 'umi/link'; -import { Exception } from 'ant-design-pro'; +import Exception from './components/Exception'; -const PAGE_NAME_UPPER_CAMEL_CASE = () => ( +const PAGE_NAME_UPPER_CAMEL_CASE: React.FC = () => (