fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 13:39:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(linkage-rule): linkage rule support empty condiction (#4103)

Browse Source 
* fix: linkage rule support empty condiction

* fix: linkage rule support empty condiction
This commit is contained in:
katherinehhh 2024-04-19 17:30:04 +08:00 committed by GitHub
parent 0af40dfa3e
commit 2093bc0058
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,8 +24,10 @@ import { useTemplateBlockContext } from '../../../block-provider/TemplateBlockPr
export interface FormProps { export interface FormProps {
[key: string]: any; [key: string]: any;
} }
function hasInitialValues(obj) { function hasInitialValues(obj, rule) {
return Object.values(obj).some((value) => value !== null); const type = Object.keys(rule.condition)[0] || '$and';
const conditions = rule.condition[type];
return Object.values(obj).some((value) => value !== null) || !conditions.length;
} }
const FormComponent: React.FC<FormProps> = (props) => { const FormComponent: React.FC<FormProps> = (props) => {
const { form, children, ...others } = props; const { form, children, ...others } = props;
@ -155,7 +157,7 @@ const WithForm = (props: WithFormProps) => {
return result; return result;
}, },
getSubscriber(action, field, rule, variables, localVariables), getSubscriber(action, field, rule, variables, localVariables),
{ fireImmediately: hasInitialValues(form.initialValues) }, { fireImmediately: hasInitialValues(form.initialValues, rule) },
), ),
); );
}); });