ruiling/tachybase_todo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(plugin-workflow): fix expression field in sub-form (#2324)

Browse Source
This commit is contained in:
Junyi 2023-07-26 14:38:51 +07:00 committed by GitHub
parent 0de4458936
commit 80779c3a98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
packages/plugins/workflow/src/client/components/DynamicExpression.tsx
View File

@ -1,5 +1,5 @@
import { onFieldInputValueChange, onFormInitialValuesChange } from '@formily/core'; import { onFieldInputValueChange, onFormInitialValuesChange } from '@formily/core';
import { connect, mapReadPretty, observer, useForm, useFormEffects } from '@formily/react'; import { connect, mapReadPretty, observer, useField, useForm, useFormEffects } from '@formily/react';
import { Tag } from 'antd'; import { Tag } from 'antd';
import React, { useMemo, useState } from 'react'; import React, { useMemo, useState } from 'react';
import { useTranslation } from 'react-i18next'; import { useTranslation } from 'react-i18next';
@ -12,16 +12,20 @@ import { getCollectionFieldOptions } from '../variable';
const InternalExpression = observer( const InternalExpression = observer(
(props: any) => { (props: any) => {
const { onChange } = props; const { onChange } = props;
const { values } = useForm(); const field = useField<any>();
const [collection, setCollection] = useState(values?.sourceCollection); // TODO(refactor): better to provide another context like useFieldset()
const form = useForm();
const basePath = field.path.segments.slice(0, -1);
const collectionPath = [...basePath, 'sourceCollection'].join('.');
const [collection, setCollection] = useState(form.getValuesIn(collectionPath));
const compile = useCompile(); const compile = useCompile();
const { getCollectionFields } = useCollectionManager(); const { getCollectionFields } = useCollectionManager();
useFormEffects(() => { useFormEffects(() => {
onFormInitialValuesChange((form) => { onFormInitialValuesChange((form) => {
setCollection(form.values.sourceCollection); setCollection(form.getValuesIn(collectionPath));
}); });
onFieldInputValueChange('sourceCollection', (f) => { onFieldInputValueChange(collectionPath, (f) => {
setCollection(f.value); setCollection(f.value);
onChange(null); onChange(null);
}); });