Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix(banned): adapt infinity #2975

Merged
merged 1 commit into from
Sep 25, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions src/common/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -339,3 +339,5 @@ export const DEFAULT_CLIENT_TABLE_COLUMNS = [
'expiry_interval',
'connected_at',
]

export const BANNED_NEVER_EXPIRE_VALUE = 'infinity'
18 changes: 15 additions & 3 deletions src/views/General/BannedClient.vue
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,11 @@
</template>
</el-table-column>
<el-table-column prop="reason" min-width="120px" :label="tl('reason')" />
<el-table-column prop="until" :formatter="formatterUntil" :label="tl('until')" />
<el-table-column prop="until" :formatter="formatterUntil" :label="tl('until')">
<template #default="{ row }">
{{ expiredAt(row.until) }}
</template>
</el-table-column>
<el-table-column prop="oper" :label="$t('Base.operation')">
<template #default="{ row }">
<el-button plain size="small" @click="deleteConfirm(row)">
Expand All @@ -42,18 +46,20 @@
</template>

<script setup lang="ts">
import { deleteBannedClient, loadBannedClient, clearAllBannedClients } from '@/api/function'
import { clearAllBannedClients, deleteBannedClient, loadBannedClient } from '@/api/function'
import { BANNED_NEVER_EXPIRE_VALUE } from '@/common/constants'
import { dateFormat } from '@/common/tools'
import useBannedType from '@/hooks/Auth/useBannedType'
import useI18nTl from '@/hooks/useI18nTl'
import usePaginationWithHasNext from '@/hooks/usePaginationWithHasNext'
import { BannedItem } from '@/types/systemModule'
import { Plus, Remove } from '@element-plus/icons-vue'
import moment from 'moment'
import { ElMessage, ElMessageBox } from 'element-plus'
import { Banned } from 'src/types/auth'
import { ref } from 'vue'
import CommonPagination from '../../components/commonPagination.vue'
import BannedDialog from './components/BannedDialog.vue'
import { BannedItem } from '@/types/systemModule'

const { t, tl } = useI18nTl('General')

Expand Down Expand Up @@ -84,6 +90,12 @@ const refreshListData = () => {
listBlackList()
}

const expiredAt = (value: string) => {
return value === BANNED_NEVER_EXPIRE_VALUE
? tl('neverExpire')
: moment(value).format('YYYY-MM-DD HH:mm')
}

const { getLabelFromValue } = useBannedType()

const deleteConfirm = async (item: Banned) => {
Expand Down
1 change: 1 addition & 0 deletions src/views/General/components/BannedDialog.vue
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
popper-class="datepicker-until"
:shortcuts="datePickerShortcuts"
:disabledDate="isItEarlierThanToday"
:placeholder="tl('neverExpire')"
/>
</el-form-item>
</el-col>
Expand Down
Loading