Merge pull request #1465 from XiaoMi/hotfix/#1461-3

Hotfix/#1461 3
XiaoMi · Dec 23, 2020 · 2d7af3b · 2d7af3b
2 parents aa597e8 + 7b0d975
commit 2d7af3b
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/components/loading/Loading.js b/components/loading/Loading.js
@@ -17,7 +17,7 @@ class Loading extends Component {
       [`${prefixCls}__mask--hide`]: visible === false
     })
     return (
-      <PortalWrapper mountNode={mountNode} visible={visible}>
+      <PortalWrapper mountNode={mountNode} needWrapper={!!children}>
         {children}
         {children || mountNode ? (
           <div className={maskCls}>
@@ -58,10 +58,10 @@ Loading.defaultProps = {
   size: 'default'
 }
 
-function PortalWrapper({ mountNode, children, visible }) {
+function PortalWrapper({ mountNode, children, needWrapper }) {
   return mountNode ? (
     ReactDOM.createPortal(children, mountNode)
-  ) : visible ? (
+  ) : needWrapper ? (
     <div className={`${prefixCls}__wrapper`}>{children}</div>
   ) : (
     children

diff --git a/components/table/Table.jsx b/components/table/Table.jsx
@@ -275,7 +275,7 @@ const Table = ({
   )
 }
 
-const TableWrapper = ({ columns, uniqueId, standard, data, loading = false, ...settingProps }) => {
+const TableWrapper = ({ columns, uniqueId, standard, data, loading, ...settingProps }) => {
   const _sortCol =
     uniqueId && window.localStorage.getItem(`${uniqueId}_sortCol`)
       ? JSON.parse(window.localStorage.getItem(`${uniqueId}_sortCol`))
@@ -317,8 +317,8 @@ const TableWrapper = ({ columns, uniqueId, standard, data, loading = false, ...s
     : {}
 
   // ***************
-  return loading === true ? (
-    <Loading>
+  return loading !== undefined ? (
+    <Loading visible={loading}>
       <Table
         columns={cacheVisibleCols}
         data={data || []}