Browse Source

Remove spinning of analysis page cards

pull/53/merge
afc163 9 years ago
parent
commit
3047229998
  1. 10
      src/components/Charts/ChartCard/index.js
  2. 10
      src/routes/Dashboard/Analysis.js

10
src/components/Charts/ChartCard/index.js

@ -3,7 +3,9 @@ import { Card, Spin } from 'antd';
import styles from './index.less';
const ChartCard = ({ loading, contentHeight, title, action, total, footer, children, ...rest }) => {
const ChartCard = ({
loading = false, contentHeight, title, action, total, footer, children, ...rest
}) => {
const content = (
<div className={styles.chartCard}>
<div className={styles.meta}>
@ -34,11 +36,7 @@ const ChartCard = ({ loading, contentHeight, title, action, total, footer, child
bodyStyle={{ padding: '20px 24px 8px 24px' }}
{...rest}
>
{
loading ? (
<Spin size="large">{content}</Spin>
) : content
}
{<Spin spinning={loading}>{content}</Spin>}
</Card>
);
};

10
src/routes/Dashboard/Analysis.js

@ -36,11 +36,7 @@ export default class Analysis extends Component {
componentDidMount() {
this.props.dispatch({
type: 'chart/fetch',
}).then(() => {
this.setState({
loading: false,
});
});
}).then(() => this.setState({ loading: false }));
}
componentWillUnmount() {
@ -226,7 +222,6 @@ export default class Analysis extends Component {
<Row gutter={24}>
<Col {...topColResponsiveProps}>
<ChartCard
loading={loading}
bordered={false}
title="总销售额"
action={<Tooltip title="指标说明"><Icon type="info-circle-o" /></Tooltip>}
@ -244,7 +239,6 @@ export default class Analysis extends Component {
</Col>
<Col {...topColResponsiveProps}>
<ChartCard
loading={loading}
bordered={false}
title="访问量"
action={<Tooltip title="指标说明"><Icon type="info-circle-o" /></Tooltip>}
@ -261,7 +255,6 @@ export default class Analysis extends Component {
</Col>
<Col {...topColResponsiveProps}>
<ChartCard
loading={loading}
bordered={false}
title="支付笔数"
action={<Tooltip title="指标说明"><Icon type="info-circle-o" /></Tooltip>}
@ -277,7 +270,6 @@ export default class Analysis extends Component {
</Col>
<Col {...topColResponsiveProps}>
<ChartCard
loading={loading}
bordered={false}
title="运营活动效果"
action={<Tooltip title="指标说明"><Icon type="info-circle-o" /></Tooltip>}

Loading…
Cancel
Save