mirror/ant-design
1
0
Fork 0
mirror of https://github.com/ant-design/ant-design.git synced 2024-11-27 20:49:53 +08:00
Code Issues Actions 39 Packages Projects Releases Wiki Activity

cross -> close

Browse Source
This commit is contained in:
HeskeyBaozi 2018-08-30 20:43:03 +08:00 committed by 偏右
parent 4f4713748e
commit ef54d3fbb7
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
components/icon/index.tsx
View File

@ -1,12 +1,12 @@
import * as React from 'react';
import classNames from 'classnames';
import { antDesignIcons } from '@ant-design/icons';
import * as allIcons from '@ant-design/icons';
import ReactIcon from '@ant-design/icons-react';
import createFromIconfontCN from './IconFont';
import { svgBaseProps } from './utils';
import warning from '../_util/warning';
ReactIcon.add(...antDesignIcons);
ReactIcon.add(...Object.keys(allIcons).map((key) => (allIcons as any)[key]));
export interface CustomIconComponentProps {
width: string | number;

2
components/message/index.tsx
View File

@ -58,7 +58,7 @@ function notice(args: ArgsProps): MessageType {
const iconType = ({
info: 'info-circle',
success: 'check-circle',
error: 'cross-circle',
error: 'close-circle',
warning: 'exclamation-circle',
loading: 'loading',
})[args.type];

2
components/notification/index.tsx
View File

@ -95,7 +95,7 @@ function getNotificationInstance(prefixCls: string, placement: NotificationPlace
const typeToIcon = {
success: 'check-circle-o',
info: 'info-circle-o',
error: 'cross-circle-o',
error: 'close-circle-o',
warning: 'exclamation-circle-o',
};

2
components/progress/progress.tsx
View File

@ -89,7 +89,7 @@ export default class Progress extends React.Component<ProgressProps, {}> {
if (format || (progressStatus !== 'exception' && progressStatus !== 'success')) {
text = textFormatter(validProgress(percent), validProgress(successPercent));
} else if (progressStatus === 'exception') {
text = <Icon type={`cross${iconType}`} />;
text = <Icon type={`close${iconType}`} />;
} else if (progressStatus === 'success') {
text = <Icon type={`check${iconType}`} />;
}

4
package.json
View File

@ -39,8 +39,8 @@
"react-dom": ">=16.0.0"
},
"dependencies": {
"@ant-design/icons": "~0.3.0-beta.3",
"@ant-design/icons-react": "~0.3.0-beta.3",
"@ant-design/icons": "~1.0.0-alpha.5",
"@ant-design/icons-react": "~1.0.0-alpha.1",
"array-tree-filter": "^2.0.0",
"babel-runtime": "6.x",
"classnames": "~2.2.0",