From 3b516a3b8349ef54653063872f007fdfb6bafba3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=BB=98=E6=B0=91=E5=BA=B7?= <m18571841023@163.com>
Date: Wed, 19 Mar 2025 19:07:42 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=80=E4=BA=9Bissue=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableSetting/index.vue         | 27 +++++++++++++++++--
 src/views/Jyh/LicenseInfo/index.vue           |  3 ++-
 .../Jyh/Search/Components/BatchVerify.vue     |  1 +
 src/views/Jyh/Version/Detail/SBOM.vue         |  4 ++-
 .../Version/Detail/VulnerabilitiesList.vue    |  4 +--
 .../Version/Detail/VulnerabilityDetail.vue    |  4 +--
 6 files changed, 35 insertions(+), 8 deletions(-)

diff --git a/src/components/TableSetting/index.vue b/src/components/TableSetting/index.vue
index e0424bd..e5e3e28 100644
--- a/src/components/TableSetting/index.vue
+++ b/src/components/TableSetting/index.vue
@@ -2,7 +2,7 @@
   <div class="TableSetting">
     <d-button @click.stop="toggleColumnList" class="output-btn" icon="icon-form-settings" variant="text">设置</d-button>
     <!-- 多选列表 -->
-    <div v-if="showColumnList" class="column-list">
+    <div v-if="showColumnList" ref="columnListRef" class="column-list">
       <div class="column-list-header">
         <span class="title1">展示列设置</span>
         <a class="title2">恢复默认</a>
@@ -20,7 +20,7 @@
   </div>
 </template>
 <script lang="ts" setup>
-import { ref, defineProps, defineEmits } from 'vue';
+import { ref, defineProps, defineEmits,onMounted,onUnmounted  } from 'vue';
 
 
 const props = defineProps({
@@ -42,6 +42,29 @@ const toggleColumnList = () => {
   const newValue = !props.showColumnList;
   emits('update:show-column-list', newValue); // 触发事件，更新父组件的 showColumnList
 };
+
+// 关闭多选列表
+const closeColumnList = () => {
+  emits('update:show-column-list', false);
+};
+
+// 监听点击事件
+const columnListRef = ref<HTMLElement | null>(null);
+
+const handleClickOutside = (event: MouseEvent) => {
+  if (columnListRef.value && !columnListRef.value.contains(event.target as Node)) {
+    closeColumnList();
+  }
+};
+
+onMounted(() => {
+  document.addEventListener('click', handleClickOutside);
+});
+
+onUnmounted(() => {
+  document.removeEventListener('click', handleClickOutside);
+});
+
 </script>
 <style lang="scss" scoped>
 .TableSetting {
diff --git a/src/views/Jyh/LicenseInfo/index.vue b/src/views/Jyh/LicenseInfo/index.vue
index 367fd2a..3ecee9f 100644
--- a/src/views/Jyh/LicenseInfo/index.vue
+++ b/src/views/Jyh/LicenseInfo/index.vue
@@ -3,7 +3,7 @@
     <div class="license-info-content">
       <d-layout>
         <d-content class="dcontent">
-          <d-table :data="list" style="width: 100%;">
+          <d-table class="jyh-table" v-if="list.length>0" :data="list" style="width: 100%;">
             <template #empty>
               <NoData></NoData>
             </template>
@@ -16,6 +16,7 @@
               </template>
             </d-column>
           </d-table>
+          <NoData v-else :small="false"></NoData>
         </d-content>
       </d-layout>
     </div>
diff --git a/src/views/Jyh/Search/Components/BatchVerify.vue b/src/views/Jyh/Search/Components/BatchVerify.vue
index b8b89c0..c288c4a 100644
--- a/src/views/Jyh/Search/Components/BatchVerify.vue
+++ b/src/views/Jyh/Search/Components/BatchVerify.vue
@@ -105,6 +105,7 @@
           <template #default="scope">
             <d-button
               variant="text"
+              v-if="scope.row.validStatus == 0"
               :disabled="scope.row.validStatus !== 0"
             >
               申请入库
diff --git a/src/views/Jyh/Version/Detail/SBOM.vue b/src/views/Jyh/Version/Detail/SBOM.vue
index bcb4229..98aff54 100644
--- a/src/views/Jyh/Version/Detail/SBOM.vue
+++ b/src/views/Jyh/Version/Detail/SBOM.vue
@@ -5,7 +5,7 @@
   </div>
   <Card simple class="jyh-card mt-3">
     <div class="clear-padding">
-      <d-table :indent="32" @check-change="treeCheckChange" :data="baseTreeTableData1" row-key="id">
+      <d-table class="jyh-table" v-if="baseTreeTableData1.length>0"  :indent="32" @check-change="treeCheckChange" :data="baseTreeTableData1" row-key="id">
         <d-column field="firstName" header="组织名称" show-overflow-tooltip>
           <template #default="scope">
             <a class="devui-link" @click="showDetail = true">{{ scope.row.firstName }}</a>
@@ -13,6 +13,7 @@
         </d-column>
         <d-column field="lastName" header="版本"></d-column>
       </d-table>
+      <NoData v-else :small="false"></NoData>
     </div>
   </Card>
   <d-drawer v-model="showDetail" style="width: 800px; padding: 20px">
@@ -22,6 +23,7 @@
 <script setup lang="ts">
 import { ref, reactive, onMounted } from 'vue';
 import SBOMDetail from './SBOMDetail.vue';
+import NoData from '@/components/NoData/NoData.vue';
 import { dependencyTree } from '@/api/jyh';
 import { useRoute } from 'vue-router';
 
diff --git a/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue b/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue
index 8989da5..80bc010 100644
--- a/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue
+++ b/src/views/Jyh/Version/Detail/VulnerabilitiesList.vue
@@ -237,8 +237,8 @@ const fetchVulnList = async () => {
     // softwareId: 47,
     softwareId: propsData.versionId,
     componentId: '',
-    current: 1,
-    size: 10
+    current: pager.value.pageIndex,
+    size: pager.value.pageSize,
   });
   if(data.data.code===200) {
     tableData.value = data?.data?.data?.records || [];
diff --git a/src/views/Jyh/Version/Detail/VulnerabilityDetail.vue b/src/views/Jyh/Version/Detail/VulnerabilityDetail.vue
index 063dc57..a618f60 100644
--- a/src/views/Jyh/Version/Detail/VulnerabilityDetail.vue
+++ b/src/views/Jyh/Version/Detail/VulnerabilityDetail.vue
@@ -130,7 +130,7 @@
 
 <script setup lang="ts">
 import { getVulnDetail } from '@/api/jyh';
-import { ref } from 'vue';
+import { ref,defineProps } from 'vue';
 
 const propsData = defineProps(['softwareId', 'vulnId', 'vulnInfo']);
 const vulnDetail = ref({});
@@ -190,4 +190,4 @@ queryVulnDetail();
     vertical-align: top;
   }
 }
-</style>
\ No newline at end of file
+</style>