test/nocobase2
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2024-12-05 05:38:23 +08:00
Code Issues Actions 26 Packages Projects Releases Wiki Activity

refactor(schema-template): Inherit collection using blockTemplate (#2418)

Browse Source 
* refactor: blockTemplate

* refactor: code imrove
This commit is contained in:
katherinehhh 2023-08-10 14:52:29 +08:00 committed by GitHub
parent 5edcaaea4b
commit 9881d69def
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
packages/core/client/src/schema-initializer/items/RecordFormBlockInitializer.tsx
View File

@ -9,7 +9,8 @@ import { createFormBlockSchema, useRecordCollectionDataSourceItems } from '../ut
export const RecordFormBlockInitializer = (props) => {
const { onCreateBlockSchema, componentType, createBlockSchema, insert, targetCollection, ...others } = props;
const { getTemplateSchemaByMode } = useSchemaTemplateManager();
const collection = targetCollection || useCollection();
const currentCollection = useCollection();
const collection = targetCollection || currentCollection;
const association = useBlockAssociationContext();
return (
<SchemaInitializer.Item
@ -48,7 +49,7 @@ export const RecordFormBlockInitializer = (props) => {
);
}
}}
items={useRecordCollectionDataSourceItems('FormItem')}
items={useRecordCollectionDataSourceItems('FormItem', null, collection?.name)}
/>
);
};

5
packages/core/client/src/schema-initializer/items/RecordReadPrettyFormBlockInitializer.tsx
View File

@ -17,7 +17,8 @@ export const RecordReadPrettyFormBlockInitializer = (props) => {
...others
} = props;
const { getTemplateSchemaByMode } = useSchemaTemplateManager();
const collection = targetCollection || useCollection();
const currentCollection = useCollection();
const collection = targetCollection || currentCollection;
const association = useBlockAssociationContext();
const { block } = useBlockRequestContext();
const actionInitializers =
@ -61,7 +62,7 @@ export const RecordReadPrettyFormBlockInitializer = (props) => {
);
}
}}
items={useRecordCollectionDataSourceItems('ReadPrettyFormItem')}
items={useRecordCollectionDataSourceItems('ReadPrettyFormItem', null, collection?.name)}
/>
);
};

6
packages/core/client/src/schema-templates/SchemaTemplateManagerProvider.tsx
View File

@ -5,6 +5,7 @@ import { cloneDeep } from 'lodash';
import React, { createContext, ReactNode, useContext, useMemo } from 'react';
import { useAPIClient, useRequest } from '../api-client';
import { Plugin } from '../application/Plugin';
import { useCollectionManager } from '../collection-manager';
import { BlockTemplate } from './BlockTemplate';
export const SchemaTemplateManagerContext = createContext<any>({});
@ -35,6 +36,7 @@ export const useSchemaTemplate = () => {
};
export const useSchemaTemplateManager = () => {
const { getInheritCollections } = useCollectionManager();
const { refresh, templates = [] } = useContext(SchemaTemplateManagerContext);
const api = useAPIClient();
return {
@ -100,7 +102,9 @@ export const useSchemaTemplateManager = () => {
return templates?.find((template) => template.key === key);
},
getTemplatesByCollection(collectionName: string, resourceName: string = null) {
const items = templates?.filter?.((template) => template.collectionName === collectionName);
const parentCollections = getInheritCollections(collectionName);
const totalCollections = parentCollections.concat([collectionName]);
const items = templates?.filter?.((template) => totalCollections.includes(template.collectionName));
return items || [];
},
getTemplatesByComponentName(componentName: string): Array<any> {