Skip to content

Commit 17b9dc1

Browse files
committed
fix: table emptyText not work
1 parent e998b59 commit 17b9dc1

File tree

2 files changed

+6
-2
lines changed

2 files changed

+6
-2
lines changed

Diff for: components/table/Table.jsx

+5-1
Original file line numberDiff line numberDiff line change
@@ -925,7 +925,7 @@ export default {
925925
showHeader,
926926
expandIconColumnIndex,
927927
expandIconAsCell,
928-
emptyText: !(loading.props && loading.spinning) && locale.emptyText,
928+
emptyText: !(loading.props && loading.props.spinning) && locale.emptyText,
929929
},
930930
on: this.$listeners,
931931
class: classString,
@@ -949,6 +949,10 @@ export default {
949949
spinning: loading,
950950
},
951951
}
952+
} else {
953+
loading = {
954+
props: { ...loading },
955+
}
952956
}
953957

954958
const table = (

Diff for: components/vc-pagination/Pager.jsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
import PropTypes from '../_util/vue-types'
33

44
export default {
5-
name: 'Page',
5+
name: 'Pager',
66
props: {
77
rootPrefixCls: PropTypes.string,
88
page: PropTypes.number,

0 commit comments

Comments
 (0)