diff --git a/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx index 8730b493fa..6c6f2af2d8 100644 --- a/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/CascadeSelect/cascadeSelectComponentFieldSettings.tsx @@ -17,6 +17,7 @@ import { useDesignable, useFieldModeOptions, useIsAddNewForm } from '../../../.. import { isSubMode } from '../../../../schema-component/antd/association-field/util'; import { useTitleFieldOptions } from '../../../../schema-component/antd/form-item/FormItem.Settings'; import { ellipsisSettingsItem } from '../Input/inputComponentSettings'; +import { setTheDataScope } from '../Select/selectComponentFieldSettings'; const fieldComponent: any = { name: 'fieldComponent', @@ -100,5 +101,5 @@ const titleField: any = { export const cascadeSelectComponentFieldSettings = new SchemaSettings({ name: 'fieldSettings:component:CascadeSelect', - items: [fieldComponent, titleField, ellipsisSettingsItem], + items: [fieldComponent, titleField, ellipsisSettingsItem, setTheDataScope], }); diff --git a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx index 2823e9d62f..dc3ff40a10 100644 --- a/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx +++ b/packages/core/client/src/modules/fields/component/Select/selectComponentFieldSettings.tsx @@ -228,7 +228,7 @@ const setDefaultSortingRules = { Component: SchemaSettingsSortingRule, }; -const setTheDataScope: any = { +export const setTheDataScope: any = { name: 'setTheDataScope', Component: SchemaSettingsDataScope, useComponentProps() { diff --git a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx index a03c545b2d..1d1be90a8c 100644 --- a/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx +++ b/packages/core/client/src/schema-component/antd/association-field/InternalCascadeSelect.tsx @@ -130,7 +130,7 @@ const CascadeSelect = connect((props) => { const response = await resource.list({ pageSize: 200, params: service?.params, - filter: mergeFilter([filter]), + filter: mergeFilter([filter, service?.params?.filter]), tree: !filter.parentId ? true : undefined, }); return response?.data?.data;