mirror of
https://github.com/nocobase/nocobase
synced 2024-11-15 06:15:11 +00:00
fix: current object variavle can not be selected (#2201)
This commit is contained in:
parent
44adf53c11
commit
a266367105
@ -18,7 +18,10 @@ export const ChildDynamicComponent = observer(
|
||||
});
|
||||
|
||||
const compile = useCompile();
|
||||
const result = useMemo(() => [formVariabele, iterationVariabele].filter(Boolean), [formVariabele]);
|
||||
const result = useMemo(
|
||||
() => [formVariabele, iterationVariabele].filter(Boolean),
|
||||
[formVariabele, iterationVariabele],
|
||||
);
|
||||
const scope = compile(result);
|
||||
useEffect(() => {
|
||||
onChange(fieldSchema.default);
|
||||
|
@ -1,5 +1,5 @@
|
||||
import { Schema } from '@formily/react';
|
||||
import { useMemo } from 'react';
|
||||
import { useTranslation } from 'react-i18next';
|
||||
import { useCompile, useGetFilterOptions } from '../../../schema-component';
|
||||
import { FieldOption, Option } from '../type';
|
||||
|
||||
@ -27,7 +27,7 @@ const getChildren = (
|
||||
label: compile(option.title),
|
||||
depth,
|
||||
// TODO: 现在是通过组件的名称来过滤能够被选择的选项,这样的坏处是不够精确,后续可以优化
|
||||
disabled: schema?.['x-component'] !== option.schema?.['x-component'],
|
||||
disabled: schema && schema?.['x-component'] !== option.schema?.['x-component'],
|
||||
};
|
||||
}
|
||||
|
||||
@ -64,6 +64,7 @@ export const useIterationVariable = ({
|
||||
schema?: any;
|
||||
level?: number;
|
||||
}) => {
|
||||
const { t } = useTranslation();
|
||||
const compile = useCompile();
|
||||
const getFilterOptions = useGetFilterOptions();
|
||||
const loadChildren = (option: any): Promise<void> => {
|
||||
@ -103,15 +104,14 @@ export const useIterationVariable = ({
|
||||
}, 5);
|
||||
});
|
||||
};
|
||||
|
||||
const label = t('Current object');
|
||||
const result = useMemo(() => {
|
||||
return (
|
||||
blockForm &&
|
||||
currentCollection !== rootCollection && {
|
||||
label: `{{t("Current object")}}`,
|
||||
label: label,
|
||||
value: '$iteration',
|
||||
key: '$iteration',
|
||||
children: [],
|
||||
isLeaf: false,
|
||||
field: {
|
||||
target: currentCollection,
|
||||
|
Loading…
Reference in New Issue
Block a user