From f13f4aa9d8a63e301ab37ab49376652f3a5532f3 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 09:37:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=BD=AF=E4=BB=B6=E5=88=97=E8=A1=A8=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=E5=AF=B9=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/components/TableSetting/index.vue        |  2 +
 src/views/Jyh/Search/Components/OssQuery.vue | 40 +++++++++++---------
 2 files changed, 25 insertions(+), 17 deletions(-)

diff --git a/src/components/TableSetting/index.vue b/src/components/TableSetting/index.vue
index b1e2c19..e0424bd 100644
--- a/src/components/TableSetting/index.vue
+++ b/src/components/TableSetting/index.vue
@@ -51,6 +51,8 @@ const toggleColumnList = () => {
 }
 
 .column-list {
+  max-height: 400px;
+  overflow: auto;
   position: absolute;
   top: 40px;
   left: -222px;
diff --git a/src/views/Jyh/Search/Components/OssQuery.vue b/src/views/Jyh/Search/Components/OssQuery.vue
index a5ee19e..97503ff 100644
--- a/src/views/Jyh/Search/Components/OssQuery.vue
+++ b/src/views/Jyh/Search/Components/OssQuery.vue
@@ -2,21 +2,19 @@
   <div class="secret-container">
     <div class="search-form">
       <AdvanceSearch v-model="newFormData" class="px-20">
-        <template #operation>
-          <gc-form-operation class="jyh-form-operation">
-            <d-button class="mr-2" variant="solid">搜索</d-button>
-            <d-button variant="solid" color="secondary">清空</d-button>
-          </gc-form-operation>
-          <div class="left-btn">
-            <d-button v-if="isLogin" class="output-btn" icon="icon-share" variant="text">导出</d-button>
-            <span v-if="isLogin" style="height: 14px" class="split"></span>
-            <TableSetting :columns="columns" :show-column-list="showColumnList" @update:show-column-list="updateShowColumnList"/>
-          </div>
-
-        </template>
+        <template #operation><div></div></template>
       </AdvanceSearch>
+      <div class="jyh-form-operation">
+        <d-button @click="getReleaseList" class="mr-2" variant="solid">搜索</d-button>
+        <d-button variant="solid" color="secondary">清空</d-button>
+      </div>
+      <div class="left-btn">
+        <d-button v-if="isLogin" class="output-btn" icon="icon-share" variant="text">导出</d-button>
+        <span v-if="isLogin" style="height: 14px" class="split"></span>
+        <TableSetting :columns="columns" :show-column-list="showColumnList" @update:show-column-list="updateShowColumnList"/>
+      </div>
     </div>
-    <div class="mt-3 px-20 min-h-[600px]">
+    <div class="mt-3 px-20">
       <d-table :key="tableKey" class="jyh-table" v-if="tableData.length" :striped="false" :data="tableData" table-layout="auto">
         <!-- 索引列 -->
         <d-column type="index" width="40"></d-column>
@@ -138,9 +136,10 @@ const riskOptions = reactive(['低', '中', '高']);
 const useTypeOptions = reactive(['软件', '文档', '文档+软件']);
 const isUseOptions = reactive(['是', '否']);
 const newFormData = ref({
-  license: '',
+  licenseName: '',
+  searchType: 'software',
   searchWord: '',
-  version: '',
+  softwareVersion: '',
   dependentSoftware: '',
   programmingLanguage: '',
   dateRange: ['', '']
@@ -301,9 +300,12 @@ const signCla = (row: any) => {
 };
 
 const getReleaseList = async() => {
-  const { data, error } = await releasePage({ ...newFormData.value, current: pager.value.pageIndex,size: pager.value.pageSize  });
+  const { data, error } = await releasePage({
+    ...newFormData.value,
+    releaseDateStart: newFormData.value.dateRange&&newFormData.value.dateRange.length>0?newFormData.value.dateRange[0]:'',
+    releaseDateEnd: newFormData.value.dateRange&&newFormData.value.dateRange.length>0?newFormData.value.dateRange[1]:'',
+    current: pager.value.pageIndex,size: pager.value.pageSize  });
   if (!error && data) {
-    debugger
     tableData.value = data.data.records;
     pager.value.total = data.data.total;
   }
@@ -326,6 +328,7 @@ onMounted(() => {
 
 .secret-container {
   position: relative;
+  min-height: 600px;
 
   .secret-op {
     position: absolute;
@@ -394,7 +397,10 @@ onMounted(() => {
     line-height: 22px;
     letter-spacing: 0px;
     text-align: left;
+  }
 
+  .jyh-form-operation {
+    margin-left: 20px !important;
   }
 }