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} > + 取消 确定