mirror/1Panel
1
0
Fork 0
mirror of https://github.com/1Panel-dev/1Panel.git synced 2024-12-03 00:49:07 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

feat: 网站过期时间增加排序 (#5833)

Browse Source
This commit is contained in:
zhengkunwang 2024-07-16 12:03:28 +08:00 committed by GitHub
parent 74bd997f07
commit b562d9f8e8
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
backend/app/dto/request/website.go
View File

@ -7,7 +7,7 @@ import (
type WebsiteSearch struct { type WebsiteSearch struct {
dto.PageInfo dto.PageInfo
Name string `json:"name"` Name string `json:"name"`
OrderBy string `json:"orderBy" validate:"required,oneof=primary_domain type status created_at"` OrderBy string `json:"orderBy" validate:"required,oneof=primary_domain type status created_at expire_date"`
Order string `json:"order" validate:"required,oneof=null ascending descending"` Order string `json:"order" validate:"required,oneof=null ascending descending"`
WebsiteGroupID uint `json:"websiteGroupId"` WebsiteGroupID uint `json:"websiteGroupId"`
} }
@ -55,7 +55,7 @@ type WebsiteUpdate struct {
ID uint `json:"id" validate:"required"` ID uint `json:"id" validate:"required"`
PrimaryDomain string `json:"primaryDomain" validate:"required"` PrimaryDomain string `json:"primaryDomain" validate:"required"`
Remark string `json:"remark"` Remark string `json:"remark"`
WebsiteGroupID uint `json:"webSiteGroupID" validate:"required"` WebsiteGroupID uint `json:"webSiteGroupID"`
ExpireDate string `json:"expireDate"` ExpireDate string `json:"expireDate"`
IPV6 bool `json:"IPV6"` IPV6 bool `json:"IPV6"`
} }

2
backend/app/repo/website.go
View File

@ -96,7 +96,7 @@ func (w *WebsiteRepo) Page(page, size int, opts ...DBOption) (int64, []model.Web
db := getDb(opts...).Model(&model.Website{}) db := getDb(opts...).Model(&model.Website{})
count := int64(0) count := int64(0)
db = db.Count(&count) db = db.Count(&count)
err := db.Limit(size).Offset(size * (page - 1)).Preload("WebsiteSSL").Find(&websites).Error err := db.Debug().Limit(size).Offset(size * (page - 1)).Preload("WebsiteSSL").Find(&websites).Error
return count, websites, err return count, websites, err
} }

3
frontend/src/views/website/website/index.vue
View File

@ -128,7 +128,7 @@
prop="protocol" prop="protocol"
width="90px" width="90px"
></el-table-column> ></el-table-column>
<el-table-column :label="$t('website.expireDate')"> <el-table-column :label="$t('website.expireDate')" prop="expireDate" sortable>
<template #default="{ row, $index }"> <template #default="{ row, $index }">
<div v-show="row.showdate"> <div v-show="row.showdate">
<el-date-picker <el-date-picker
@ -271,6 +271,7 @@ const mobile = computed(() => {
const changeSort = ({ prop, order }) => { const changeSort = ({ prop, order }) => {
if (order) { if (order) {
req.orderBy = prop == 'primaryDomain' ? 'primary_domain' : prop; req.orderBy = prop == 'primaryDomain' ? 'primary_domain' : prop;
req.orderBy = prop == 'expireDate' ? 'expire_date' : prop;
req.order = order; req.order = order;
} else { } else {
req.orderBy = 'created_at'; req.orderBy = 'created_at';