From cce74032ab403710d9cc43bff4534c3b582941bd Mon Sep 17 00:00:00 2001
From: Gaojianli <admin@gaojianli.me>
Date: Wed, 13 Nov 2024 18:54:51 +0800
Subject: [PATCH] fix potential bug for ip query

---
 .../ipList/components/accessHistoryTable.vue  | 23 ++++++++-----------
 .../ipList/components/banHistoryTable.vue     |  1 +
 webui/src/views/data-view/ipList/index.vue    | 14 +++++++++--
 webui/src/views/login/index.vue               |  2 --
 4 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/webui/src/views/data-view/ipList/components/accessHistoryTable.vue b/webui/src/views/data-view/ipList/components/accessHistoryTable.vue
index e980cd5f62..131e8ba25b 100644
--- a/webui/src/views/data-view/ipList/components/accessHistoryTable.vue
+++ b/webui/src/views/data-view/ipList/components/accessHistoryTable.vue
@@ -15,6 +15,7 @@
     }"
     column-resizable
     size="medium"
+    :bordered="false"
     class="banlog-table"
     @page-change="changeCurrent"
     @page-size-change="changePageSize"
@@ -57,6 +58,14 @@
         >
       </a-space>
     </template>
+    <template #offsetTitle>
+      <a-space size="mini">
+        {{ t('page.torrentList.accessHistory.column.offset') }}
+        <a-popover :content="t('page.torrentList.accessHistory.column.offsetDescription')">
+          <icon-info-circle />
+        </a-popover>
+      </a-space>
+    </template>
     <template #flags="{ record }">
       <p>
         {{ record.lastFlags }}
@@ -101,9 +110,7 @@ import { GetIPAccessHistoryList } from '@/service/data'
 import { useEndpointStore } from '@/stores/endpoint'
 import { getColor } from '@/utils/color'
 import { formatFileSize } from '@/utils/file'
-import { Popover, Space } from '@arco-design/web-vue'
 import { IconInfoCircle } from '@arco-design/web-vue/es/icon'
-import { h } from 'vue'
 import { useI18n } from 'vue-i18n'
 import { usePagination } from 'vue-request'
 const { t, d } = useI18n()
@@ -152,17 +159,7 @@ const columns = [
     width: 120
   },
   {
-    title: () =>
-      h(Space, [
-        t('page.torrentList.accessHistory.column.offset'),
-        h(
-          Popover,
-          {
-            content: t('page.torrentList.accessHistory.column.offsetDescription')
-          },
-          () => h(IconInfoCircle)
-        )
-      ]),
+    titleSlotName: 'offsetTitle',
     slotName: 'offset',
     width: 120
   },
diff --git a/webui/src/views/data-view/ipList/components/banHistoryTable.vue b/webui/src/views/data-view/ipList/components/banHistoryTable.vue
index 0c2f9b7e93..668a7e47f1 100644
--- a/webui/src/views/data-view/ipList/components/banHistoryTable.vue
+++ b/webui/src/views/data-view/ipList/components/banHistoryTable.vue
@@ -12,6 +12,7 @@
       baseSize: 4,
       bufferSize: 1
     }"
+    :bordered="false"
     column-resizable
     size="medium"
     class="banlog-table"
diff --git a/webui/src/views/data-view/ipList/index.vue b/webui/src/views/data-view/ipList/index.vue
index 41bef9a56d..49d878926a 100644
--- a/webui/src/views/data-view/ipList/index.vue
+++ b/webui/src/views/data-view/ipList/index.vue
@@ -153,10 +153,9 @@
           </a-descriptions>
           <a-collapse
             v-if="data?.data.found"
-            :active-key="activatedTab"
+            v-model:active-key="activatedTab"
             :bordered="false"
             destroy-on-hide
-            @change="(k) => activatedTab.push(...k)"
           >
             <a-collapse-item
               key="1"
@@ -180,6 +179,7 @@
               key="2"
               :header="t('page.ipList.label.banHistory')"
               :disabled="!plusStatus?.activated"
+              class="collapse-table"
             >
               <template #expand-icon="{ active }">
                 <icon-plus v-if="plusStatus?.activated && !active" />
@@ -257,6 +257,16 @@ onMounted(() => {
   }
 })
 </script>
+<style>
+.collapse-table {
+  .arco-collapse-item-content-expend {
+    padding: 0;
+    .arco-collapse-item-content-box {
+      padding-top: 0px;
+    }
+  }
+}
+</style>
 
 <style scoped>
 .searchContainer {
diff --git a/webui/src/views/login/index.vue b/webui/src/views/login/index.vue
index 5c0ebd8e8c..1fc6810c21 100644
--- a/webui/src/views/login/index.vue
+++ b/webui/src/views/login/index.vue
@@ -113,5 +113,3 @@ onMounted(() => {
   }
 })
 </script>
-
-<style lang="less" scoped></style>