From f33c63ac01c72b47bd1e7acf367d3231c7523651 Mon Sep 17 00:00:00 2001 From: chenos Date: Sat, 14 Jan 2023 10:31:22 +0800 Subject: [PATCH] fix: filter error --- .../antd/association-filter/AssociationFilter.Item.tsx | 2 +- .../src/server/migrations/20230110103214-alert-field.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx index d011c13bb..6065f04f2 100644 --- a/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx +++ b/packages/core/client/src/schema-component/antd/association-filter/AssociationFilter.Item.tsx @@ -82,7 +82,7 @@ export const AssociationFilterItem = (props) => { ...service.params?.[0], pageSize: 200, page: 1, - filter: mergeFilter([Object.values(filters), blockProps?.params?.filter]), + filter: mergeFilter([...Object.values(filters), blockProps?.params?.filter]), }, { filters }, ); diff --git a/packages/plugins/math-formula-field/src/server/migrations/20230110103214-alert-field.ts b/packages/plugins/math-formula-field/src/server/migrations/20230110103214-alert-field.ts index e3db4f804..418067c70 100644 --- a/packages/plugins/math-formula-field/src/server/migrations/20230110103214-alert-field.ts +++ b/packages/plugins/math-formula-field/src/server/migrations/20230110103214-alert-field.ts @@ -2,7 +2,7 @@ import { Migration } from '@nocobase/server'; export default class extends Migration { async up() { - const result = await this.app.version.satisfies('<=0.8.1-alpha.4'); + const result = await this.app.version.satisfies('<=0.8.3-alpha.1'); if (!result) { return; }