mirrors/nocobase
1
0
Fork 0
mirror of https://github.com/nocobase/nocobase synced 2024-11-15 23:36:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

perf(wip): add custom RecursionField component

Browse Source
This commit is contained in:
Zeke Zhang 2024-11-08 18:23:40 +08:00
parent a0d131bd39
commit 06c86ddbd1
2 changed files with 30 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1628,8 +1628,6 @@ export const useAssociationNames = (dataSource?: string) => {
});
appends = fillParentFields(appends);
console.log('appends', appends);
return { appends: [...appends], updateAssociationValues: [...updateAssociationValues] };
};

44
packages/core/client/src/formily/NocoBaseRecursionField.tsx
View File

@ -47,33 +47,49 @@ const useBasePath = (props: IRecursionFieldProps) => {
return props.basePath || parent?.address;
};
const createSchemaInstance = _.memoize((schema: ISchema): Schema => {
return new Schema(schema);
});
const toJSON = _.memoize((schema: Schema) => {
return schema.toJSON();
});
const createMergedSchemaInstance = _.memoize((schema: Schema, uiSchema: ISchema, onlyRenderProperties: boolean) => {
const clonedSchema = toJSON(schema);
if (onlyRenderProperties) {
if (!clonedSchema.properties) {
throw new Error('[NocoBaseRecursionField]: properties is required');
}
const firstPropertyKey = Object.keys(clonedSchema.properties)[0];
const firstPropertyValue = Object.values(clonedSchema.properties)[0];
// Some uiSchema's type value is "void", which can cause exceptions, so we need to ignore the type field
clonedSchema.properties[firstPropertyKey] = merge(_.omit(uiSchema, 'type'), firstPropertyValue);
return new Schema(clonedSchema);
}
// Some uiSchema's type value is "void", which can cause exceptions, so we need to ignore the type field
return new Schema(merge(_.omit(uiSchema, 'type'), clonedSchema));
});
/**
* Based on @formily/react v2.3.2 RecursionField component
* Modified to better adapt to NocoBase's needs
*/
export const NocoBaseRecursionField: ReactFC<INocoBaseRecursionFieldProps> = React.memo((props) => {
const basePath = useBasePath(props);
const fieldSchema = useMemo(() => new Schema(props.schema), [props.schema]);
const fieldSchema = createSchemaInstance(props.schema);
// Merge default Schema of collection fields
const mergedFieldSchema = useMemo(() => {
if (props.uiSchema) {
const clonedSchema = _.cloneDeep(props.schema);
if (props.onlyRenderProperties) {
if (!clonedSchema.properties) {
throw new Error('[NocoBaseRecursionField]: properties is required');
}
const firstPropertyKey = Object.keys(clonedSchema.properties)[0];
const firstPropertyValue = Object.values(clonedSchema.properties)[0];
clonedSchema.properties[firstPropertyKey] = merge(props.uiSchema, firstPropertyValue);
return new Schema(clonedSchema);
}
return new Schema(merge(props.uiSchema, clonedSchema));
return createMergedSchemaInstance(fieldSchema, props.uiSchema, props.onlyRenderProperties);
}
return fieldSchema;
}, [fieldSchema, props.onlyRenderProperties, props.schema, props.uiSchema]);
}, [fieldSchema, props.onlyRenderProperties, props.uiSchema]);
const fieldProps = useFieldProps(mergedFieldSchema);
const renderProperties = (field?: GeneralField) => {