Skip to content

#FIX: removeHiddenData为true时，validateFields返回的值包含hidden的项 #1683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

#FIX: removeHiddenData为true时，validateFields返回的值包含hidden的项 #1683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions packages/form-render-mobile/src/models/useForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -285,12 +285,18 @@ const useForm = () => {
}

// 触发表单验证
xform.validateFields = (pathList?: string[]) => {
xform.validateFields = async (pathList?: string[]) => {
const nameList = (pathList || []).map(path => getFieldName(path));
if (nameList.length > 0) {
return validateFields(nameList);
let values = await (
nameList.length > 0 ? validateFields(nameList) : validateFields()
);
// 参考 getValues的步骤
const { removeHiddenData } = storeRef.current?.getState() || {};
if (removeHiddenData) {
values = filterValuesHidden(values, flattenSchemaRef.current);
}
return validateFields();
values = filterValuesUndefined(values);
return parseValuesToBind(values, flattenSchemaRef.current);
}

// 获取扁平化 schema
Expand Down
17 changes: 11 additions & 6 deletions packages/form-render/src/models/useForm.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -326,14 +326,19 @@ const useForm = () => {
}

// 触发表单验证
xform.validateFields = (pathList?: string[], config?: object) => {
xform.validateFields = async (pathList?: string[], config?: object) => {
const nameList = (pathList || []).map(path => getFieldName(path));
if (nameList.length > 0) {
return validateFields(nameList, config);
let values = await (
nameList.length > 0 ? validateFields(nameList, config) : validateFields()
);
// 参考 getValues的步骤
const { removeHiddenData } = storeRef.current?.getState() || {};
if (removeHiddenData) {
values = filterValuesHidden(values, flattenSchemaRef.current);
}
return validateFields();
};

values = filterValuesUndefined(values);
return parseValuesToBind(values, flattenSchemaRef.current);
}

xform.getFlattenSchema = (path?: string) => {
if (!path) {
Expand Down