From d7341c13a14ba45b6ffd56dfe3df940f10ba3c2c Mon Sep 17 00:00:00 2001 From: OrangeM21 Date: Mon, 1 Jun 2020 14:46:59 +0800 Subject: [PATCH] =?UTF-8?q?[fix]=E4=BF=AE=E5=A4=8Del-render-table=20?= =?UTF-8?q?=E7=BB=84=E4=BB=B6=20Bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../compenents/el-data-table/el-data-table.vue | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/components/DataTable/compenents/el-data-table/el-data-table.vue b/src/components/DataTable/compenents/el-data-table/el-data-table.vue index 320344e40..7364afb8d 100644 --- a/src/components/DataTable/compenents/el-data-table/el-data-table.vue +++ b/src/components/DataTable/compenents/el-data-table/el-data-table.vue @@ -162,7 +162,7 @@ import getSelectStrategy from './utils/select-strategy' import getLocatedSlotKeys from './utils/extract-keys' import transformSearchImmediatelyItem from './utils/search-immediately-item' import isFalsey from './utils/is-falsey' - +import merge from 'deepmerge' const defaultFirstPage = 0 const noPaginationDataPath = 'payload' @@ -845,9 +845,8 @@ export default { formValue = this.$refs.searchForm.getFormValue() Object.assign(query, formValue) } - Object.assign(query, this.innerQuery) Object.assign(query, this._extraQuery) - + Object.assign(query, this.innerQuery) query[this.pageSizeKey] = this.hasPagination ? this.size : this.noPaginationSize @@ -882,7 +881,6 @@ export default { } const query = this.getQuery() - let formValue = {} if (this.$refs.searchForm) { formValue = this.$refs.searchForm.getFormValue() @@ -958,12 +956,11 @@ export default { }, search(attrs) { // Orange 重置查询对象 - this.innerQuery = Object.assign(this.innerQuery, attrs) + this.innerQuery = merge(this.innerQuery, attrs) return this.getList() }, searchDate(attrs) { - this.innerQuery = Object.assign(this.innerQuery, attrs) - console.log(this.innerQuery) + this.innerQuery = merge(this.innerQuery, attrs) return this.getList() },