From c95889aec2f90a50e30f630b5da2a6c4e1684801 Mon Sep 17 00:00:00 2001 From: chenos Date: Fri, 20 May 2022 12:16:46 +0800 Subject: [PATCH] fix(client): [#398] [#399] reset page number to first page --- .../core/client/src/schema-component/antd/action/Action.tsx | 3 ++- .../client/src/schema-component/antd/filter/FilterAction.tsx | 2 +- .../src/schema-component/antd/filter/useFilterActionProps.ts | 4 ++-- .../src/schema-component/antd/table-v2/TableBlockDesigner.tsx | 4 ++-- .../schema-component/antd/table-v2/TableSelectorDesigner.tsx | 4 ++-- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/action/Action.tsx b/packages/core/client/src/schema-component/antd/action/Action.tsx index 082abc6c7..841f28562 100644 --- a/packages/core/client/src/schema-component/antd/action/Action.tsx +++ b/packages/core/client/src/schema-component/antd/action/Action.tsx @@ -76,6 +76,7 @@ export const Action: ComposedAction = observer((props: any) => { className, disabled, icon, + title, ...others } = props; const { onClick } = useProps(props); @@ -113,7 +114,7 @@ export const Action: ComposedAction = observer((props: any) => { component={component || Button} className={classnames(className, actionDesignerCss)} > - {compile(fieldSchema.title)} + {title || compile(fieldSchema.title)} ); diff --git a/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx b/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx index 2269d6528..5bf7b89bc 100644 --- a/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx +++ b/packages/core/client/src/schema-component/antd/filter/FilterAction.tsx @@ -83,7 +83,7 @@ export const FilterAction = observer((props: any) => { } > - + ); diff --git a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts index e3bc604fd..4b6acbe69 100644 --- a/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts +++ b/packages/core/client/src/schema-component/antd/filter/useFilterActionProps.ts @@ -103,7 +103,7 @@ export const useFilterActionProps = () => { const defaultFilter = removeNullCondition(props.params.filter); // filter parameter for the filter action const filter = removeNullCondition(values?.filter); - service.run({ ...service.params?.[0], filter: mergeFilter(defaultFilter, filter) }); + service.run({ ...service.params?.[0], page: 1, filter: mergeFilter(defaultFilter, filter) }); const items = filter?.$and || filter?.$or; if (items?.length) { field.title = t('{{count}} filter items', { count: items?.length || 0 }); @@ -113,7 +113,7 @@ export const useFilterActionProps = () => { }, onReset() { const filter = removeNullCondition(props.params.filter); - service.run({ ...service.params?.[0], filter }); + service.run({ ...service.params?.[0], filter, page: 1 }); field.title = t('Filter'); }, }; diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx index aee9e3b4e..748006be1 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableBlockDesigner.tsx @@ -72,7 +72,7 @@ export const TableBlockDesigner = () => { params.filter = filter; field.decoratorProps.params = params; fieldSchema['x-decorator-props']['params'] = params; - service.run({ ...service.params?.[0], filter }); + service.run({ ...service.params?.[0], filter, page: 1 }); dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'], @@ -190,7 +190,7 @@ export const TableBlockDesigner = () => { params.pageSize = pageSize; field.decoratorProps.params = params; fieldSchema['x-decorator-props']['params'] = params; - service.run({ ...service.params?.[0], pageSize }); + service.run({ ...service.params?.[0], pageSize, page: 1 }); dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'], diff --git a/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx b/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx index 7fba25d0f..a304f7233 100644 --- a/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx +++ b/packages/core/client/src/schema-component/antd/table-v2/TableSelectorDesigner.tsx @@ -57,7 +57,7 @@ export const TableSelectorDesigner = () => { params.filter = filter; field.decoratorProps.params = params; fieldSchema['x-decorator-props']['params'] = params; - service.run({ ...service.params?.[0], filter }); + service.run({ ...service.params?.[0], filter, page: 1 }); dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'], @@ -175,7 +175,7 @@ export const TableSelectorDesigner = () => { params.pageSize = pageSize; field.decoratorProps.params = params; fieldSchema['x-decorator-props']['params'] = params; - service.run({ ...service.params?.[0], pageSize }); + service.run({ ...service.params?.[0], pageSize, page: 1 }); dn.emit('patch', { schema: { ['x-uid']: fieldSchema['x-uid'],