github/lina
1
0
Fork 0
mirror of https://github.com/jumpserver/lina.git synced 2025-09-20 18:49:19 +00:00
Code Issues Projects Releases Wiki Activity

[fix]修复el-render-table 组件 Bug

Browse Source
This commit is contained in:
OrangeM21
2020-06-01 14:46:59 +08:00
parent 7341a955b4
commit d7341c13a1
1 changed files with 4 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/components/DataTable/compenents/el-data-table/el-data-table.vue
View File

@@ -162,7 +162,7 @@ import getSelectStrategy from './utils/select-strategy'
import getLocatedSlotKeys from './utils/extract-keys' import getLocatedSlotKeys from './utils/extract-keys'
import transformSearchImmediatelyItem from './utils/search-immediately-item' import transformSearchImmediatelyItem from './utils/search-immediately-item'
import isFalsey from './utils/is-falsey' import isFalsey from './utils/is-falsey'
import merge from 'deepmerge'
const defaultFirstPage = 0 const defaultFirstPage = 0
const noPaginationDataPath = 'payload' const noPaginationDataPath = 'payload'
@@ -845,9 +845,8 @@ export default {
formValue = this.$refs.searchForm.getFormValue() formValue = this.$refs.searchForm.getFormValue()
Object.assign(query, formValue) Object.assign(query, formValue)
} }
Object.assign(query, this.innerQuery)
Object.assign(query, this._extraQuery) Object.assign(query, this._extraQuery)
Object.assign(query, this.innerQuery)
query[this.pageSizeKey] = this.hasPagination query[this.pageSizeKey] = this.hasPagination
? this.size ? this.size
: this.noPaginationSize : this.noPaginationSize
@@ -882,7 +881,6 @@ export default {
} }
const query = this.getQuery() const query = this.getQuery()
let formValue = {} let formValue = {}
if (this.$refs.searchForm) { if (this.$refs.searchForm) {
formValue = this.$refs.searchForm.getFormValue() formValue = this.$refs.searchForm.getFormValue()
@@ -958,12 +956,11 @@ export default {
}, },
search(attrs) { search(attrs) {
// Orange 重置查询对象 // Orange 重置查询对象
this.innerQuery = Object.assign(this.innerQuery, attrs) this.innerQuery = merge(this.innerQuery, attrs)
return this.getList() return this.getList()
}, },
searchDate(attrs) { searchDate(attrs) {
this.innerQuery = Object.assign(this.innerQuery, attrs) this.innerQuery = merge(this.innerQuery, attrs)
console.log(this.innerQuery)
return this.getList() return this.getList()
}, },