fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-05-05 05:29:26 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'main' into next

Browse Source
This commit is contained in:
nocobase[bot] 2025-04-28 06:08:18 +00:00
commit ca182a9cb5
5 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/modules/blocks/data-blocks/table/TableBlockInitializer.tsx
View File

@ -61,14 +61,11 @@ export const TableBlockInitializer = ({
export const useCreateTableBlock = () => {
const { insert } = useSchemaInitializer();
const { getCollection } = useCollectionManager_deprecated();
const createTableBlock = ({ item }) => {
const collection = getCollection(item.name, item.dataSource);
const schema = createTableBlockUISchema({
collectionName: item.name,
dataSource: item.dataSource,
rowKey: collection.filterTargetKey || 'id',
});
insert(schema);
};

3
packages/core/client/src/modules/blocks/data-blocks/table/__tests__/createTableBLockSchema.test.ts
View File

@ -17,7 +17,7 @@ vi.mock('@formily/shared', () => {
describe('createTableBLockSchemaV2', () => {
it('should create a default table block schema with minimum options', () => {
const options = { dataSource: 'abc', collectionName: 'users', association: 'users.roles', rowKey: 'rowKey' };
const options = { dataSource: 'abc', collectionName: 'users', association: 'users.roles' };
const schema = createTableBlockUISchema(options);
expect(schema).toMatchInlineSnapshot(`
@ -85,7 +85,6 @@ describe('createTableBLockSchemaV2', () => {
"params": {
"pageSize": 20,
},
"rowKey": "rowKey",
"showIndex": true,
},
"x-filter-targets": [],

4
packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts
View File

@ -13,10 +13,9 @@ import { uid } from '@formily/shared';
export const createTableBlockUISchema = (options: {
dataSource: string;
collectionName?: string;
rowKey?: string;
association?: string;
}): ISchema => {
const { collectionName, dataSource, rowKey, association } = options;
const { collectionName, dataSource, association } = options;
if (!dataSource) {
throw new Error('dataSource is required');
@ -35,7 +34,6 @@ export const createTableBlockUISchema = (options: {
params: {
pageSize: 20,
},
rowKey,
showIndex: true,
dragSort: false,
},

4
packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts
View File

@ -11,15 +11,19 @@ import { useFieldSchema } from '@formily/react';
import { useMemo } from 'react';
import { useParsedFilter } from '../../../../../block-provider/hooks/useParsedFilter';
import { useParentRecordCommon } from '../../../useParentRecordCommon';
import { useDataSourceManager } from '../../../../../data-source';
export const useTableBlockDecoratorProps = (props) => {
const { params, parseVariableLoading } = useTableBlockParams(props);
const parentRecord = useParentRecordCommon(props.association);
const dm = useDataSourceManager();
const collection = dm.getDataSource(props.dataSource)?.collectionManager.getCollection(props.collection);
return {
params,
parentRecord,
parseVariableLoading,
rowKey: collection?.filterTargetKey || 'id',
};
};

2
packages/core/client/src/schema-initializer/items/RecordAssociationBlockInitializer.tsx
View File

@ -39,7 +39,6 @@ export const RecordAssociationBlockInitializer = () => {
} else {
insert(
createTableBlockUISchema({
rowKey: collection.filterTargetKey,
dataSource: collection.dataSource,
association: association,
}),
@ -62,7 +61,6 @@ export function useCreateAssociationTableBlock() {
insert(
createTableBlockUISchema({
rowKey: collection.filterTargetKey,
dataSource: collection.dataSource,
association: `${field.collectionName}.${field.name}`,
}),