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

fix: linkage rule title config clear exception (#1665)

Browse Source 
* fix: linkage rule title config clear exception

* fix: form linkage rules disabled without immediate effect

* refactor: improve translation
This commit is contained in:
katherinehhh 2023-04-07 18:05:00 +08:00 committed by GitHub
parent 1d6417f7f9
commit 59326dbf90
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
packages/core/client/src/schema-component/antd/form-v2/Form.tsx
View File

@ -71,6 +71,7 @@ const WithForm = (props) => {
const { setFormValueChanged } = useActionContext(); const { setFormValueChanged } = useActionContext();
const linkageRules = const linkageRules =
(getLinkageRules(fieldSchema) || fieldSchema.parent?.['x-linkage-rules'])?.filter((k) => !k.disabled) || []; (getLinkageRules(fieldSchema) || fieldSchema.parent?.['x-linkage-rules'])?.filter((k) => !k.disabled) || [];
form.clearFormGraph();
useEffect(() => { useEffect(() => {
const id = uid(); const id = uid();
form.addEffects(id, () => { form.addEffects(id, () => {
@ -117,7 +118,6 @@ const WithForm = (props) => {
if (linkageRules.length > 0) { if (linkageRules.length > 0) {
const id = uid(); const id = uid();
const linkagefields = []; const linkagefields = [];
const formGraph = form.getFormGraph();
form.addEffects(id, () => { form.addEffects(id, () => {
return linkageRules.map((v, index) => { return linkageRules.map((v, index) => {
return v.actions?.map((h) => { return v.actions?.map((h) => {
@ -140,8 +140,6 @@ const WithForm = (props) => {
}); });
return () => { return () => {
form.removeEffects(id); form.removeEffects(id);
form.clearFormGraph();
form.setFormGraph(formGraph);
}; };
} }
}, [linkageRules]); }, [linkageRules]);

3
packages/core/client/src/schema-settings/LinkageRules/components/LinkageHeader.tsx
View File

@ -16,7 +16,8 @@ const LinkageRulesTitle = (props) => {
const value = array?.field?.value[index]; const value = array?.field?.value[index];
return ( return (
<Input.TextArea <Input.TextArea
value={value.title || t('linkage rule')} value={value.title}
defaultValue={t('Linkage rule')}
onChange={(ev) => { onChange={(ev) => {
ev.stopPropagation(); ev.stopPropagation();
array.field.value.splice(index, 1, { ...value, title: ev.target.value }); array.field.value.splice(index, 1, { ...value, title: ev.target.value });