From 8b50999947829484926a199a7c0a0d1daeeacfac Mon Sep 17 00:00:00 2001 From: sheepluo Date: Thu, 27 Jul 2023 17:24:40 +0800 Subject: [PATCH] fix(table): filter table pass value improvement (#2623) * fix(table): filter table pass value * fix(table): empty --- src/checkbox/group.tsx | 2 +- src/table/filter-controller.tsx | 12 ++++-------- 2 files changed, 5 insertions(+), 9 deletions(-) diff --git a/src/checkbox/group.tsx b/src/checkbox/group.tsx index 970269d1d..1847ec60a 100644 --- a/src/checkbox/group.tsx +++ b/src/checkbox/group.tsx @@ -209,7 +209,7 @@ export default defineComponent({ props={option} index={index} data={option} - checked={this.innerValue.includes(option.value)} + checked={this.innerValue?.includes(option.value) || false} storeKey={this.storeKey} scopedSlots={this.$scopedSlots} > diff --git a/src/table/filter-controller.tsx b/src/table/filter-controller.tsx index 66c16aeaa..15293d118 100644 --- a/src/table/filter-controller.tsx +++ b/src/table/filter-controller.tsx @@ -100,8 +100,10 @@ export default defineComponent({ const filterComponentProps: { [key: string]: any } = { options: ['single', 'multiple'].includes(column.filter.type) ? column.filter?.list : undefined, ...(column.filter?.props || {}), - value: this.innerFilterValue?.[column.colKey], }; + if (column.colKey && this.innerFilterValue && column.colKey in this.innerFilterValue) { + filterComponentProps.value = this.innerFilterValue[column.colKey]; + } // 这个代码必须放在这里,没事儿别改 if (column.filter.type === 'single') { filterComponentProps.onChange = (val: any) => { @@ -141,13 +143,7 @@ export default defineComponent({ }); }); } - return ( - - ); + return ; }; return (