fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-01 18:52:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix: sub-table-appends

Browse Source
This commit is contained in:
katherinehhh 2023-05-12 11:10:58 +08:00
parent d8551a1acf
commit 0c8d096571
2 changed files with 6 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
packages/core/client/src/block-provider/BlockProvider.tsx
View File

@ -51,14 +51,13 @@ const useResource = (props: UseResourceProps) => {
const api = useAPIClient();
const association = useAssociation(props);
const sourceId = useSourceId?.();
const field = useField<Field>();
if (block === 'TableField') {
const options = {
field,
api,
resource,
sourceId: sourceId || record[association?.sourceKey || 'id'],
sourceId: sourceId || record[association?.sourceKey || 'id'] || record.__parent[association?.sourceKey || 'id'],
};
return new TableFieldResource(options);
}

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

@ -1099,27 +1099,25 @@ export const useAssociationNames = (collection) => {
const getAssociationAppends = (schema, arr = []) => {
const data = schema.reduceProperties((buf, s) => {
const collectionfield =
(s['x-collection-field'] && getCollectionJoinField(s['x-collection-field']))|| getField(s.name);
const collectionfield = s['x-collection-field'] && getCollectionJoinField(s['x-collection-field']);
if (
collectionfield &&
['createdBy', 'updatedBy', 'o2m', 'obo', 'oho', 'm2o', 'm2m'].includes(collectionfield.interface)
) {
buf.push(s.name);
if (['Nester', 'SubTable'].includes(s['x-component-props']?.mode)) {
associationValues.push(s.name);
}
buf.push(s.name);
if (s['x-component-props'].mode === 'Nester' || s['x-component'] === 'TableField') {
if (s['x-component-props'].mode === 'Nester') {
return getAssociationAppends(s, buf);
}
return buf;
} else {
if (s['x-component'] === 'Grid' || s['x-component'] === 'TableV2') {
if (s['x-component'] === 'Grid') {
const kk = buf?.concat?.();
return getNesterAppends(s, kk || []);
} else {
return !s['x-component']?.includes('Action.') && getAssociationAppends(s, buf);
return !s['x-component']?.includes('Action.') ? getAssociationAppends(s, buf) : buf;
}
}
}, arr);
@ -1153,6 +1151,5 @@ export const useAssociationNames = (collection) => {
const data = getAssociationAppends(formSchema);
const associations = data.filter((g) => g.length);
const appends = flattenNestedList(associations);
console.log(appends,associations)
return { appends, updateAssociationValues: appends.filter((v) => associationValues.includes(v)) };
};