diff --git a/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx b/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx index d45088c7..94f5c4d6 100644 --- a/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx +++ b/furniture-3d-system/src/app/asset-center/AssetCenterClient.preview-gizmo.test.tsx @@ -26,6 +26,10 @@ jest.mock('next/link', () => ({ ), })) +jest.mock('next/navigation', () => ({ + useRouter: () => ({ push: jest.fn() }), +})) + jest.mock('@/components/ui/Modal', () => ({ __esModule: true, default: () => null, @@ -265,6 +269,7 @@ function createFamily(overrides?: Partial): AssetFamilyDTO { description: null, productCategoryId: null, productCategoryName: null, + assetSeriesId: 'template-1', compatibleSeries: [{ id: 'template-1', code: 'single-board-desk', name: '单板桌' }], connectionRoles: [], metadata: null, diff --git a/furniture-3d-system/src/app/asset-center/AssetCenterClient.test.tsx b/furniture-3d-system/src/app/asset-center/AssetCenterClient.test.tsx index bec90fce..3ca7f576 100644 --- a/furniture-3d-system/src/app/asset-center/AssetCenterClient.test.tsx +++ b/furniture-3d-system/src/app/asset-center/AssetCenterClient.test.tsx @@ -247,6 +247,7 @@ function createFamily(overrides?: Partial): AssetFamilyDTO { description: null, productCategoryId: null, productCategoryName: null, + assetSeriesId: 'template-1', compatibleSeries: [{ id: 'template-1', code: 'single-board-desk', name: '单板桌' }], connectionRoles: [], metadata: null, diff --git a/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx b/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx index ce5c760e..89631c1b 100644 --- a/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx +++ b/furniture-3d-system/src/app/asset-center/AssetCenterClient.tsx @@ -1258,16 +1258,11 @@ function getVisibleFamiliesForTab( function familyBelongsToSeries(family: AssetFamilyDTO, series: AssetSeriesDTO | null): boolean { if (!series) return false - if (family.assetSeriesId) { - return family.assetSeriesId === series.id - } - const compatibleSeries = family.compatibleSeries ?? [] - return compatibleSeries.some((item) => item.id === series.id || item.code === series.code) + return family.assetSeriesId === series.id } function familyVisibleInSeriesContext(family: AssetFamilyDTO, series: AssetSeriesDTO | null): boolean { if (isPackagingMaterialLibraryFamily(family)) return false - if (family.type === 'HARDWARE') return true return familyBelongsToSeries(family, series) } @@ -2250,7 +2245,6 @@ export default function AssetCenterClient({ const count = families.filter( (family) => familyBelongsToSeries(family, series) && - family.type !== 'HARDWARE' && !isPackagingMaterialLibraryFamily(family), ).length map.set(series.id, count) @@ -2824,7 +2818,7 @@ export default function AssetCenterClient({ setFamilyRoleDefinitions( mergeConnectionRoleDefinitions({ assetType: defaultAssetType, - seriesCode: defaultAssetType === 'HARDWARE' ? null : defaultSeriesCode, + seriesCode: defaultSeriesCode, }), ) setFamilyModalOpen(true) @@ -2969,9 +2963,7 @@ export default function AssetCenterClient({ const submittedAssetSeriesId = familyForm.assetSeriesId || null const submittedCompatibleSeriesIds = submittedAssetSeriesId ? [submittedAssetSeriesId] : [] const primarySeriesCode = - familyForm.type === 'HARDWARE' - ? null - : initialAssetSeries.find((series) => series.id === submittedAssetSeriesId)?.code ?? null + initialAssetSeries.find((series) => series.id === submittedAssetSeriesId)?.code ?? null const hiddenRecommendedRoleValues = getStandardConnectionRoleDefinitions({ assetType: familyForm.type, seriesCode: primarySeriesCode, @@ -4485,9 +4477,7 @@ export default function AssetCenterClient({ setFamilyRoleDefinitions((current) => { const primarySeriesCode = - familyForm.type === 'HARDWARE' - ? null - : initialAssetSeries.find((series) => series.id === familyForm.assetSeriesId)?.code ?? null + initialAssetSeries.find((series) => series.id === familyForm.assetSeriesId)?.code ?? null const merged = mergeConnectionRoleDefinitions({ assetType: familyForm.type, seriesCode: primarySeriesCode, @@ -6531,8 +6521,7 @@ export default function AssetCenterClient({ placeholder="例如 单板桌桌面板" /> - {familyForm.type !== 'HARDWARE' ? ( -