From 845bbd34123af28ad2185dca84d6d23b62e31120 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= Date: Mon, 30 Jun 2025 14:05:33 +0800 Subject: [PATCH] =?UTF-8?q?=E5=8F=AF=E4=BF=A1=E4=BB=A3=E7=A0=81=E5=BA=93-?= =?UTF-8?q?=E4=B8=AA=E4=BA=BA=E4=B8=AD=E5=BF=83=E8=AE=A2=E9=98=85=E5=88=97?= =?UTF-8?q?=E8=A1=A8=E5=AD=97=E6=AE=B5=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Jyh/PersonalCenter/Detail/OrgSubscription.vue | 2 +- .../Detail/PersonageSubscription.vue | 2 +- src/views/Jyh/Version/Detail/SBOM.vue | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue b/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue index 96bec34..3bd3132 100644 --- a/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue +++ b/src/views/Jyh/PersonalCenter/Detail/OrgSubscription.vue @@ -58,7 +58,7 @@ const router = useRouter(); const gotoDetail = (row) => { // 后续请换成params，暂时params传参没传过去 router.push({ - path: 'repoDetail/' + row.id + path: 'repoDetail/' + row.softwareId }); }; diff --git a/src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue b/src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue index 64b40a7..31abc04 100644 --- a/src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue +++ b/src/views/Jyh/PersonalCenter/Detail/PersonageSubscription.vue @@ -58,7 +58,7 @@ const router = useRouter(); const gotoDetail = (row) => { // 后续请换成params，暂时params传参没传过去 router.push({ - path: 'repoDetail/' + row.id + path: 'repoDetail/' + row.softwareId }); }; diff --git a/src/views/Jyh/Version/Detail/SBOM.vue b/src/views/Jyh/Version/Detail/SBOM.vue index 754b950..c40231c 100644 --- a/src/views/Jyh/Version/Detail/SBOM.vue +++ b/src/views/Jyh/Version/Detail/SBOM.vue @@ -96,12 +96,14 @@ const renameComponentsToChildren = (obj) => { // 如果对象有 `components` 属性，将其改为 `children` if (obj.hasOwnProperty('component')) { - // 生成随机 UUID 并赋值给 id - obj.id = generateUUID(); // 使用浏览器/Node.js 原生 API - // obj.id = obj.component.id; // 将 components 改为 children - obj.libraryName = obj.component.libraryName; // 将 components 改为 children - obj.latestVersion = obj.component.latestVersion; // 将 components 改为 children - // delete obj.components; // 删除原来的 components 属性 + if(!obj.component.$ref) { + // 生成随机 UUID 并赋值给 id + obj.id = generateUUID(); // 使用浏览器/Node.js 原生 API + // obj.id = obj.component.id; // 将 components 改为 children + obj.libraryName = obj.component.libraryName; // 将 components 改为 children + obj.latestVersion = obj.component.latestVersion; // 将 components 改为 children + // delete obj.components; // 删除原来的 components 属性 + } } // 递归处理对象的子元素 @@ -126,6 +128,7 @@ const fetchDependencyTree = async () => { current: pager.value.pageIndex, size: pager.value.pageSize }); + debugger if (data.data.code === 200 && data?.data?.data?.components) { tableData.value = renameComponentsToChildren(data?.data?.data?.components); pager.value.total = data?.data.data.total || 0;