github
/
ant-design-vue
mirror of https://github.com/vueComponent/ant-design-vue
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: table emptyText not work

pull/29/head
tjz 2018-05-26 22:47:19 +08:00
parent e998b59e7d
commit 17b9dc14f5
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
components/table/Table.jsx
View File

@ -925,7 +925,7 @@ export default {
showHeader, showHeader,
expandIconColumnIndex, expandIconColumnIndex,
expandIconAsCell, expandIconAsCell,
emptyText: !(loading.props && loading.spinning) && locale.emptyText, emptyText: !(loading.props && loading.props.spinning) && locale.emptyText,
}, },
on: this.$listeners, on: this.$listeners,
class: classString, class: classString,
@ -949,6 +949,10 @@ export default {
spinning: loading, spinning: loading,
}, },
} }
} else {
loading = {
props: { ...loading },
}
} }
const table = ( const table = (

2
components/vc-pagination/Pager.jsx
View File

@ -2,7 +2,7 @@
import PropTypes from '../_util/vue-types' import PropTypes from '../_util/vue-types'
export default { export default {
name: 'Page', name: 'Pager',
props: { props: {
rootPrefixCls: PropTypes.string, rootPrefixCls: PropTypes.string,
page: PropTypes.number, page: PropTypes.number,