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

fix(core): print not work when has sub-form or sub-details (#2852)

Browse Source
This commit is contained in:
Dunqing 2023-10-26 07:34:22 -05:00 committed by GitHub
parent 108453f90c
commit 564e0a08c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
packages/core/client/src/block-provider/hooks/index.ts
View File

@ -95,47 +95,6 @@ export function getFormValues({
}
return form.values;
const values = {};
for (const key in form.values) {
if (fieldNames.includes(key)) {
const collectionField = getField(key);
if (filterByTk) {
if (field.added && !field.added.has(key)) {
continue;
}
if (['subTable', 'o2m', 'o2o', 'oho', 'obo', 'm2o'].includes(collectionField.interface)) {
values[key] = form.values[key];
continue;
}
}
const items = form.values[key];
if (['linkTo', 'm2o', 'm2m'].includes(collectionField.interface)) {
const targetKey = collectionField.targetKey || 'id';
if (resource instanceof TableFieldResource) {
if (Array.isArray(items)) {
values[key] = filterValue(items);
} else if (items && typeof items === 'object') {
values[key] = filterValue(items);
} else {
values[key] = items;
}
} else {
if (Array.isArray(items)) {
values[key] = items.map((item) => item[targetKey]);
} else if (items && typeof items === 'object') {
values[key] = items[targetKey];
} else {
values[key] = items;
}
}
} else {
values[key] = form.values[key];
}
} else {
values[key] = form.values[key];
}
}
return values;
}
export const useCreateActionProps = () => {
@ -1040,10 +999,9 @@ export const useDetailPrintActionProps = () => {
* {
margin: 0;
}
div.ant-formily-layout>div:first-child {
:not(.ant-formily-item-control-content-component) > div.ant-formily-layout>div:first-child {
overflow: hidden; height: 0;
}
}`,
});
return {