From 075426471e04401daebd7324c7cebf1178540286 Mon Sep 17 00:00:00 2001 From: chenos Date: Mon, 4 Jul 2022 20:06:18 +0800 Subject: [PATCH] fix(collection-manager): missing collection manager context --- packages/core/client/src/locale/en_US.ts | 1 + packages/core/client/src/locale/zh_CN.ts | 1 + .../src/schema-settings/SchemaSettings.tsx | 21 +++++++++++-------- 3 files changed, 14 insertions(+), 9 deletions(-) diff --git a/packages/core/client/src/locale/en_US.ts b/packages/core/client/src/locale/en_US.ts index c4648a03dd..165c09902f 100644 --- a/packages/core/client/src/locale/en_US.ts +++ b/packages/core/client/src/locale/en_US.ts @@ -177,6 +177,7 @@ export default { "Add filter group": "Add filter group", "is": "is", "is not": "is not", + "is variable": "is variable", "contains": "contains", "does not contain": "does not contain", "starts with": "starts with", diff --git a/packages/core/client/src/locale/zh_CN.ts b/packages/core/client/src/locale/zh_CN.ts index c90ac1b39b..29169a2614 100644 --- a/packages/core/client/src/locale/zh_CN.ts +++ b/packages/core/client/src/locale/zh_CN.ts @@ -197,6 +197,7 @@ export default { "Add filter group": "添加筛选分组", "is": "等于", "is not": "不等于", + "is variable": "为动态变量", "contains": "包含", "does not contain": "不包含", "starts with": "开头是", diff --git a/packages/core/client/src/schema-settings/SchemaSettings.tsx b/packages/core/client/src/schema-settings/SchemaSettings.tsx index 72e5b961cd..f03580fae2 100644 --- a/packages/core/client/src/schema-settings/SchemaSettings.tsx +++ b/packages/core/client/src/schema-settings/SchemaSettings.tsx @@ -11,6 +11,7 @@ import { createPortal } from 'react-dom'; import { useTranslation } from 'react-i18next'; import { ActionContext, + CollectionManagerContext, createDesignable, Designable, FormProvider, @@ -21,7 +22,7 @@ import { useAPIClient, useCollection, useCompile, - useDesignable, + useDesignable } from '..'; import { useSchemaTemplateManager } from '../schema-templates'; import { useBlockTemplateContext } from '../schema-templates/BlockTemplate'; @@ -559,6 +560,7 @@ SchemaSettings.ActionModalItem = React.memo((props: any) => { SchemaSettings.ModalItem = (props) => { const { hidden, title, components, scope, effects, schema, onSubmit, initialValues, ...others } = props; const options = useContext(SchemaOptionsContext); + const cm = useContext(CollectionManagerContext); if (hidden) { return null; } @@ -568,11 +570,13 @@ SchemaSettings.ModalItem = (props) => { onClick={() => { FormDialog(schema.title || title, () => { return ( - - - - - + + + + + + + ); }) .open({ @@ -627,6 +631,5 @@ SchemaSettings.BlockTitleItem = () => { dn.refresh(); }} /> - ) - -} + ); +};