mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 12:56:13 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: useExpressionScope (#3805)

Browse Source
This commit is contained in:
chenos 2024-03-24 12:51:41 +08:00 committed by GitHub
parent 5ee278557d
commit 921696f40b
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/client/src/application/hoc/withDynamicSchemaProps.tsx
View File

@ -1,6 +1,7 @@
import { useExpressionScope } from '@formily/react';
import { merge, omit } from 'lodash'; import { merge, omit } from 'lodash';
import React, { ComponentType, useMemo } from 'react'; import React, { ComponentType, useMemo } from 'react';
import { useDesignable, useSchemaComponentContext } from '../../schema-component'; import { useDesignable } from '../../schema-component';
const useDefaultSchemaProps = () => undefined; const useDefaultSchemaProps = () => undefined;
@ -12,7 +13,7 @@ export function withDynamicSchemaProps<T = any>(Component: ComponentType<T>, opt
const displayName = options.displayName || Component.displayName || Component.name; const displayName = options.displayName || Component.displayName || Component.name;
const ComponentWithProps: ComponentType<T> = (props) => { const ComponentWithProps: ComponentType<T> = (props) => {
const { dn, findComponent } = useDesignable(); const { dn, findComponent } = useDesignable();
const { scope } = useSchemaComponentContext(); const scope = useExpressionScope();
const useComponentPropsStr = useMemo(() => { const useComponentPropsStr = useMemo(() => {
const xComponent = dn.getSchemaAttribute('x-component'); const xComponent = dn.getSchemaAttribute('x-component');
const xDecorator = dn.getSchemaAttribute('x-decorator'); const xDecorator = dn.getSchemaAttribute('x-decorator');