From 1ddd8585364159f7d7a3e3909731ad2852b73a3b Mon Sep 17 00:00:00 2001 From: sealday Date: Fri, 22 Mar 2024 04:34:29 +0800 Subject: [PATCH] refactor: rename filter-form --- .../components/{FormFilter => filter-form}/FormFilterScope.tsx | 2 +- .../components/{FormFilter => filter-form}/VariableInput.tsx | 0 .../client/components/{FormFilter => filter-form}/context.ts | 0 .../items/CustomFilterFormItemInitializer.tsx | 2 +- .../FormFilter => schema-settings}/SchemaSettingsRemove.tsx | 2 +- .../@hera/plugin-core/src/client/schema-settings/index.tsx | 2 +- 6 files changed, 4 insertions(+), 4 deletions(-) rename packages/plugins/@hera/plugin-core/src/client/components/{FormFilter => filter-form}/FormFilterScope.tsx (98%) rename packages/plugins/@hera/plugin-core/src/client/components/{FormFilter => filter-form}/VariableInput.tsx (100%) rename packages/plugins/@hera/plugin-core/src/client/components/{FormFilter => filter-form}/context.ts (100%) rename packages/plugins/@hera/plugin-core/src/client/{components/FormFilter => schema-settings}/SchemaSettingsRemove.tsx (98%) diff --git a/packages/plugins/@hera/plugin-core/src/client/components/FormFilter/FormFilterScope.tsx b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/FormFilterScope.tsx similarity index 98% rename from packages/plugins/@hera/plugin-core/src/client/components/FormFilter/FormFilterScope.tsx rename to packages/plugins/@hera/plugin-core/src/client/components/filter-form/FormFilterScope.tsx index d26be365d..d0de17910 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/FormFilter/FormFilterScope.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/FormFilterScope.tsx @@ -102,5 +102,5 @@ export const FormFilterScope = observer( ); }, - { displayName: 'FormLinkageRules' }, + { displayName: 'FormFilterScope' }, ); diff --git a/packages/plugins/@hera/plugin-core/src/client/components/FormFilter/VariableInput.tsx b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/VariableInput.tsx similarity index 100% rename from packages/plugins/@hera/plugin-core/src/client/components/FormFilter/VariableInput.tsx rename to packages/plugins/@hera/plugin-core/src/client/components/filter-form/VariableInput.tsx diff --git a/packages/plugins/@hera/plugin-core/src/client/components/FormFilter/context.ts b/packages/plugins/@hera/plugin-core/src/client/components/filter-form/context.ts similarity index 100% rename from packages/plugins/@hera/plugin-core/src/client/components/FormFilter/context.ts rename to packages/plugins/@hera/plugin-core/src/client/components/filter-form/context.ts diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx index 69e37f6a4..04bd9f2af 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-initializer/items/CustomFilterFormItemInitializer.tsx @@ -39,7 +39,7 @@ import { SchemaSettingComponent, } from '../../schema-settings'; import _ from 'lodash'; -import { SchemaSettingsRemove } from '../../components/FormFilter/SchemaSettingsRemove'; +import { SchemaSettingsRemove } from '../../schema-settings/SchemaSettingsRemove'; import { tval, useTranslation } from '../../locale'; import { ContractsController } from 'packages/plugins/@hera/plugin-rental/dist/server/actions'; diff --git a/packages/plugins/@hera/plugin-core/src/client/components/FormFilter/SchemaSettingsRemove.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsRemove.tsx similarity index 98% rename from packages/plugins/@hera/plugin-core/src/client/components/FormFilter/SchemaSettingsRemove.tsx rename to packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsRemove.tsx index 8fa01ba6d..e13e6528c 100644 --- a/packages/plugins/@hera/plugin-core/src/client/components/FormFilter/SchemaSettingsRemove.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-settings/SchemaSettingsRemove.tsx @@ -2,7 +2,7 @@ import { ISchema, useField, useFieldSchema, useForm } from '@formily/react'; import { SchemaSettingsItem, useFormActiveFields, useSchemaSettings } from '@nocobase/client'; import { App, ModalFuncProps } from 'antd'; import { FC } from 'react'; -import { useTranslation } from '../../locale'; +import { useTranslation } from '../locale'; import { Field } from '@formily/core'; import React from 'react'; diff --git a/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx b/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx index 5cdef5392..89776dae8 100644 --- a/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx +++ b/packages/plugins/@hera/plugin-core/src/client/schema-settings/index.tsx @@ -26,7 +26,7 @@ import { import _ from 'lodash'; import React, { useCallback, useContext, useEffect, useMemo } from 'react'; import { useTranslation } from '../locale'; -import { FormFilterScope } from '../components/FormFilter/FormFilterScope'; +import { FormFilterScope } from '../components/filter-form/FormFilterScope'; import { useFieldComponents } from '../schema-initializer'; import { useMemoizedFn } from 'ahooks'; import { fieldsCollection } from '@nocobase/plugin-collection-manager';