Explorar o código

style: Card should not use Spin

陈帅 %!s(int64=7) %!d(string=hai) anos
pai
achega
e1e0a7d22e

+ 3 - 7
src/components/Charts/ChartCard/index.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import { Card, Spin } from 'antd';
+import { Card } from 'antd';
 import classNames from 'classnames';
 
 import styles from './index.less';
@@ -64,12 +64,8 @@ const ChartCard = ({
   );
 
   return (
-    <Card bodyStyle={{ padding: '20px 24px 8px 24px' }} {...rest}>
-      {
-        <Spin spinning={loading} wrapperClassName={styles.spin}>
-          {content}
-        </Spin>
-      }
+    <Card loading={loading} bodyStyle={{ padding: '20px 24px 8px 24px' }} {...rest}>
+      {content}
     </Card>
   );
 };

+ 0 - 4
src/components/Charts/ChartCard/index.less

@@ -72,7 +72,3 @@
     margin-top: 20px;
   }
 }
-
-.spin :global(.ant-spin-container) {
-  overflow: visible;
-}

+ 4 - 0
src/routes/Dashboard/Analysis.js

@@ -261,6 +261,7 @@ export default class Analysis extends Component {
             <ChartCard
               bordered={false}
               title="总销售额"
+              loading={loading}
               action={
                 <Tooltip title="指标说明">
                   <Icon type="info-circle-o" />
@@ -284,6 +285,7 @@ export default class Analysis extends Component {
             <ChartCard
               bordered={false}
               title="访问量"
+              loading={loading}
               action={
                 <Tooltip title="指标说明">
                   <Icon type="info-circle-o" />
@@ -300,6 +302,7 @@ export default class Analysis extends Component {
             <ChartCard
               bordered={false}
               title="支付笔数"
+              loading={loading}
               action={
                 <Tooltip title="指标说明">
                   <Icon type="info-circle-o" />
@@ -316,6 +319,7 @@ export default class Analysis extends Component {
             <ChartCard
               bordered={false}
               title="运营活动效果"
+              loading={loading}
               action={
                 <Tooltip title="指标说明">
                   <Icon type="info-circle-o" />