diff --git a/src/components/table/index.ts b/src/components/table/index.ts index b726144..aaaeb93 100644 --- a/src/components/table/index.ts +++ b/src/components/table/index.ts @@ -40,7 +40,7 @@ export type TableFilterColumn = { key: string; title: string; component?: Component | VNode; - componentProps?: Record; + componentProps?: Record | ((form: Record) => Record); }; export type TableFilterColumns = Array; diff --git a/src/components/table/table-base.vue b/src/components/table/table-base.vue index edb42b5..fd52483 100644 --- a/src/components/table/table-base.vue +++ b/src/components/table/table-base.vue @@ -31,6 +31,7 @@ const props = withDefaults( { title: '', showHeaderOperation: true, + filterColumnsCount: 4, filterColumns: () => [], headerOperations: () => ({ add: true, diff --git a/src/components/table/table-filter.vue b/src/components/table/table-filter.vue index e4aad7b..991b216 100644 --- a/src/components/table/table-filter.vue +++ b/src/components/table/table-filter.vue @@ -1,7 +1,7 @@ + + + + diff --git a/src/views/user/components/wallet.vue b/src/views/user/components/wallet.vue index 15916c4..113fff7 100644 --- a/src/views/user/components/wallet.vue +++ b/src/views/user/components/wallet.vue @@ -13,7 +13,9 @@ const props = defineProps<{ const tableInst = useTemplateRef('tableInst'); const fetchData: TableFetchData = ({ pagination, filter }) => { - return safeClient(() => client.api.admin.wallet.wallets.get({ query: { userId: props.userId } })); + return safeClient(() => + client.api.admin.wallet.wallets.get({ query: { userId: props.userId, ...pagination, ...filter } }) + ); }; const columns: TableBaseColumns = [