diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/TableBlockInitializer.tsx b/packages/core/client/src/modules/blocks/data-blocks/table/TableBlockInitializer.tsx index bc3695f6df..73258a75e5 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/TableBlockInitializer.tsx +++ b/packages/core/client/src/modules/blocks/data-blocks/table/TableBlockInitializer.tsx @@ -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); }; diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/__tests__/createTableBLockSchema.test.ts b/packages/core/client/src/modules/blocks/data-blocks/table/__tests__/createTableBLockSchema.test.ts index 07e5de14db..2c4ac7473e 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/__tests__/createTableBLockSchema.test.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/__tests__/createTableBLockSchema.test.ts @@ -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": [], diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts b/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts index 2628161034..3fb14295a4 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/createTableBlockUISchema.ts @@ -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, }, diff --git a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts index bc91c97de5..2082be83fd 100644 --- a/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts +++ b/packages/core/client/src/modules/blocks/data-blocks/table/hooks/useTableBlockDecoratorProps.ts @@ -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', }; }; diff --git a/packages/core/client/src/schema-initializer/items/RecordAssociationBlockInitializer.tsx b/packages/core/client/src/schema-initializer/items/RecordAssociationBlockInitializer.tsx index 0bde6547ea..1b89b06071 100644 --- a/packages/core/client/src/schema-initializer/items/RecordAssociationBlockInitializer.tsx +++ b/packages/core/client/src/schema-initializer/items/RecordAssociationBlockInitializer.tsx @@ -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}`, }),