Skip to content

Commit

Permalink
fix potential bug for ip query
Browse files Browse the repository at this point in the history
  • Loading branch information
Gaojianli committed Nov 13, 2024
1 parent a449a4d commit cce7403
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 17 deletions.
23 changes: 10 additions & 13 deletions webui/src/views/data-view/ipList/components/accessHistoryTable.vue
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@
}"
column-resizable
size="medium"
:bordered="false"
class="banlog-table"
@page-change="changeCurrent"
@page-size-change="changePageSize"
Expand Down Expand Up @@ -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 }}
Expand Down Expand Up @@ -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()
Expand Down Expand Up @@ -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
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
baseSize: 4,
bufferSize: 1
}"
:bordered="false"
column-resizable
size="medium"
class="banlog-table"
Expand Down
14 changes: 12 additions & 2 deletions webui/src/views/data-view/ipList/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand All @@ -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" />
Expand Down Expand Up @@ -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 {
Expand Down
2 changes: 0 additions & 2 deletions webui/src/views/login/index.vue
Original file line number Diff line number Diff line change
Expand Up @@ -113,5 +113,3 @@ onMounted(() => {
}
})
</script>

<style lang="less" scoped></style>

0 comments on commit cce7403

Please sign in to comment.