Browse Source

fix: table emptyText not work

pull/29/head
tjz 7 years ago
parent
commit
17b9dc14f5
  1. 6
      components/table/Table.jsx
  2. 2
      components/vc-pagination/Pager.jsx

6
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 = (

2
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,

Loading…
Cancel
Save