diff --git a/jero-web/src/components/table/index.js b/jero-web/src/components/table/index.js index 6907cee3..6300efa4 100644 --- a/jero-web/src/components/table/index.js +++ b/jero-web/src/components/table/index.js @@ -1,5 +1,6 @@ import T from 'ant-design-vue/es/table/Table' import get from 'lodash.get' + export default { data () { return { @@ -84,12 +85,10 @@ export default { }, loadData (pagination, filters, sorter) { this.localLoading = true - var result = this.data( + const result = this.data( Object.assign({ - pageNo: (pagination && pagination.current) || - this.localPagination.current, - pageSize: (pagination && pagination.pageSize) || - this.localPagination.pageSize + pageNo: (pagination && pagination.current) || this.localPagination.current, + pageSize: (pagination && pagination.pageSize) || this.localPagination.pageSize }, (sorter && sorter.field && { sortField: sorter.field @@ -98,8 +97,7 @@ export default { sortOrder: sorter.order }) || {}, { ...filters - } - ) + }) ) if (result instanceof Promise) { @@ -112,7 +110,7 @@ export default { this.localPagination.pageSize }); // update--begin--autor:wangshuai-----date:20200724------for:判断showPagination是否为false------ - (!this.showPagination || !r.totalCount && this.showPagination === 'auto') && (this.localPagination = false) + ((!this.showPagination || !r.totalCount) && this.showPagination === 'auto') && (this.localPagination = false) // update--end--autor:wangshuai-----date:20200724------for:判断showPagination是否为false----- this.localDataSource = r.data // 返回结果中的数组数据 this.localLoading = false @@ -217,9 +215,11 @@ export default { Object.keys(T.props).forEach(k => { const localKey = `local${k.substring(0, 1).toUpperCase()}${k.substring(1)}` if (localKeys.includes(localKey)) { - return props[k] = _vm[localKey] + const tempItem = props[k] = _vm[localKey] + return tempItem } - return props[k] = _vm[k] + const tempItemA = props[k] = _vm[k] + return tempItemA }) // 显示信息提示