From 9d67637727d9c53428dc95a6eb1cb4cb10e40975 Mon Sep 17 00:00:00 2001 From: chenos <chenlinxh@gmail.com> Date: Wed, 31 Mar 2021 09:28:35 +0800 Subject: [PATCH] feat: add a clear button to the filter box --- .../app/src/components/pages/AdminLoader/Actions/index.tsx | 2 +- .../src/components/pages/AdminLoader/View/FilterForm.tsx | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/packages/app/src/components/pages/AdminLoader/Actions/index.tsx b/packages/app/src/components/pages/AdminLoader/Actions/index.tsx index 81af956ff..0d4ef7048 100644 --- a/packages/app/src/components/pages/AdminLoader/Actions/index.tsx +++ b/packages/app/src/components/pages/AdminLoader/Actions/index.tsx @@ -249,7 +249,7 @@ export function Filter(props) { onFinish={async values => { if (values) { const items = values.filter.and || values.filter.or; - setFilterCount(Object.keys(items).length); + setFilterCount(Array.isArray(items) ? items.length : 0); setData(values); onFinish && (await onFinish(values)); } diff --git a/packages/app/src/components/pages/AdminLoader/View/FilterForm.tsx b/packages/app/src/components/pages/AdminLoader/View/FilterForm.tsx index 56204e1de..2acd78220 100644 --- a/packages/app/src/components/pages/AdminLoader/View/FilterForm.tsx +++ b/packages/app/src/components/pages/AdminLoader/View/FilterForm.tsx @@ -41,6 +41,13 @@ export function FilterForm(props: any) { expressionScope={scopes} > <FormButtonGroup align={'end'}> + <Button onClick={async () => { + if (onFinish) { + await onFinish({ + filter: {}, + }); + } + }}>清空</Button> <Reset>取消</Reset> <Submit>确定</Submit> </FormButtonGroup>