fix: table emptyText not work

vueComponent · May 26, 2018 · 17b9dc1 · 17b9dc1
1 parent e998b59
commit 17b9dc1
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/components/table/Table.jsx b/components/table/Table.jsx
@@ -925,7 +925,7 @@ export default {
           showHeader,
           expandIconColumnIndex,
           expandIconAsCell,
-          emptyText: !(loading.props && loading.spinning) && locale.emptyText,
+          emptyText: !(loading.props && loading.props.spinning) && locale.emptyText,
         },
         on: this.$listeners,
         class: classString,
@@ -949,6 +949,10 @@ export default {
           spinning: loading,
         },
       }
+    } else {
+      loading = {
+        props: { ...loading },
+      }
     }
 
     const table = (

diff --git a/components/vc-pagination/Pager.jsx b/components/vc-pagination/Pager.jsx
@@ -2,7 +2,7 @@
 import PropTypes from '../_util/vue-types'
 
 export default {
-  name: 'Page',
+  name: 'Pager',
   props: {
     rootPrefixCls: PropTypes.string,
     page: PropTypes.number,