feat: #1466

XiaoMi · Dec 23, 2020 · 0404914 · 0404914
1 parent 7b0d975
commit 0404914
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 3 deletions.
diff --git a/components/card/NormalCard.jsx b/components/card/NormalCard.jsx
@@ -1,7 +1,19 @@
 import React from 'react'
 import classNames from 'classnames'
+import Loading from '../loading'
 
-const NormalCard = ({ children, size, title, extra, showHeaderDivider, style, className, hoverable, bordered }) => {
+const NormalCard = ({
+  children,
+  size,
+  title,
+  extra,
+  showHeaderDivider,
+  style,
+  className,
+  hoverable,
+  bordered,
+  loading
+}) => {
   return (
     <div
       className={classNames('hi-card', className, showHeaderDivider ? 'hi-card--standard' : 'hi-card--normal', {
@@ -17,7 +29,13 @@ const NormalCard = ({ children, size, title, extra, showHeaderDivider, style, cl
           {extra}
         </div>
       )}
-      <div className="hi-card__content">{children}</div>
+      {loading !== undefined ? (
+        <Loading visible={loading}>
+          <div className="hi-card__content">{children}</div>
+        </Loading>
+      ) : (
+        <div className="hi-card__content">{children}</div>
+      )}
     </div>
   )
 }

diff --git a/components/card/index.js b/components/card/index.js
@@ -17,7 +17,8 @@ const Card = ({
   children,
   showHeaderDivider,
   type,
-  bordered = true
+  bordered = true,
+  loading
 }) => {
   if (cover || coverUrl) {
     return (
@@ -52,6 +53,7 @@ const Card = ({
         showHeaderDivider={showHeaderDivider}
         hoverable={hoverable}
         bordered={bordered}
+        loading={loading}
       >
         {children}
       </NormalCard>