From 065877547ea55b27170ec6a299a84d2f707a81db Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Thu, 17 Oct 2024 20:17:06 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E5=9B=BA=E5=AE=9A=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E9=98=B2=E6=AD=A2=E9=94=99=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- internal/http/rule/rule.go | 2 +- web/src/views/app/IndexView.vue | 2 +- web/src/views/apps/fail2ban/IndexView.vue | 4 ++-- web/src/views/apps/php/IndexView.vue | 2 +- web/src/views/apps/pureftpd/IndexView.vue | 2 +- web/src/views/apps/rsync/IndexView.vue | 2 +- web/src/views/apps/s3fs/IndexView.vue | 2 +- web/src/views/apps/supervisor/IndexView.vue | 2 +- web/src/views/backup/ListView.vue | 2 +- web/src/views/cert/AccountView.vue | 2 +- web/src/views/cert/CertView.vue | 2 +- web/src/views/cert/DnsView.vue | 2 +- web/src/views/container/ContainerView.vue | 2 +- web/src/views/container/ImageView.vue | 2 +- web/src/views/container/NetworkView.vue | 2 +- web/src/views/container/VolumeView.vue | 2 +- web/src/views/cron/IndexView.vue | 2 +- web/src/views/file/ListTable.vue | 2 +- web/src/views/monitor/IndexView.vue | 10 +++++----- web/src/views/safe/IndexView.vue | 2 +- web/src/views/task/IndexView.vue | 2 +- web/src/views/website/IndexView.vue | 2 +- 22 files changed, 27 insertions(+), 27 deletions(-) diff --git a/internal/http/rule/rule.go b/internal/http/rule/rule.go index 6003ad9b..daf815a4 100644 --- a/internal/http/rule/rule.go +++ b/internal/http/rule/rule.go @@ -53,7 +53,7 @@ func RegisterRules(v *validator.Validate) error { } if err := v.RegisterTranslation("password", *app.Translator, func(ut ut.Translator) error { - return ut.Add("password", "密码不满足要求（8-20位，至少包含大小写字母、数字、特殊字符中的两种）", true) + return ut.Add("password", "密码不满足要求（8-20位，至少包含字母、数字、特殊字符中的两种）", true) }, func(ut ut.Translator, fe validator.FieldError) string { t, _ := ut.T("password") diff --git a/web/src/views/app/IndexView.vue b/web/src/views/app/IndexView.vue index a7d48f83..90a07ae3 100644 --- a/web/src/views/app/IndexView.vue +++ b/web/src/views/app/IndexView.vue @@ -54,7 +54,7 @@ const columns: any = [ { title: t('appIndex.columns.actions'), key: 'actions', - minWidth: 280, + width: 280, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/apps/fail2ban/IndexView.vue b/web/src/views/apps/fail2ban/IndexView.vue index cd34e65a..648ea215 100644 --- a/web/src/views/apps/fail2ban/IndexView.vue +++ b/web/src/views/apps/fail2ban/IndexView.vue @@ -70,7 +70,7 @@ const jailsColumns: any = [ { title: '操作', key: 'actions', - minWidth: 280, + width: 280, align: 'center', hideInExcel: true, render(row: any) { @@ -134,7 +134,7 @@ const banedIPColumns: any = [ { title: '操作', key: 'actions', - minWidth: 100, + width: 100, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/apps/php/IndexView.vue b/web/src/views/apps/php/IndexView.vue index 3ab839a7..a47a1ab9 100644 --- a/web/src/views/apps/php/IndexView.vue +++ b/web/src/views/apps/php/IndexView.vue @@ -41,7 +41,7 @@ const extensionColumns: any = [ { title: '操作', key: 'actions', - minWidth: 240, + width: 240, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/apps/pureftpd/IndexView.vue b/web/src/views/apps/pureftpd/IndexView.vue index 83dd968f..f8f638e1 100644 --- a/web/src/views/apps/pureftpd/IndexView.vue +++ b/web/src/views/apps/pureftpd/IndexView.vue @@ -59,7 +59,7 @@ const userColumns: any = [ { title: '操作', key: 'actions', - minWidth: 240, + width: 240, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/apps/rsync/IndexView.vue b/web/src/views/apps/rsync/IndexView.vue index 6fc9bae3..e582b7ac 100644 --- a/web/src/views/apps/rsync/IndexView.vue +++ b/web/src/views/apps/rsync/IndexView.vue @@ -72,7 +72,7 @@ const processColumns: any = [ { title: '操作', key: 'actions', - minWidth: 200, + width: 200, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/apps/s3fs/IndexView.vue b/web/src/views/apps/s3fs/IndexView.vue index 2617c709..a14d4d15 100644 --- a/web/src/views/apps/s3fs/IndexView.vue +++ b/web/src/views/apps/s3fs/IndexView.vue @@ -37,7 +37,7 @@ const columns: any = [ { title: '操作', key: 'actions', - minWidth: 240, + width: 240, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/apps/supervisor/IndexView.vue b/web/src/views/apps/supervisor/IndexView.vue index 53377180..e54838d1 100644 --- a/web/src/views/apps/supervisor/IndexView.vue +++ b/web/src/views/apps/supervisor/IndexView.vue @@ -71,7 +71,7 @@ const processColumns: any = [ { title: '操作', key: 'actions', - minWidth: 500, + width: 500, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/backup/ListView.vue b/web/src/views/backup/ListView.vue index e1215b2d..66c4422e 100644 --- a/web/src/views/backup/ListView.vue +++ b/web/src/views/backup/ListView.vue @@ -38,7 +38,7 @@ const columns: any = [ { title: '操作', key: 'actions', - minWidth: 200, + width: 200, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/cert/AccountView.vue b/web/src/views/cert/AccountView.vue index f5590846..76d310cc 100644 --- a/web/src/views/cert/AccountView.vue +++ b/web/src/views/cert/AccountView.vue @@ -77,7 +77,7 @@ const accountColumns: any = [ { title: '操作', key: 'actions', - minWidth: 200, + width: 200, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/cert/CertView.vue b/web/src/views/cert/CertView.vue index bae926b3..bf554f88 100644 --- a/web/src/views/cert/CertView.vue +++ b/web/src/views/cert/CertView.vue @@ -168,7 +168,7 @@ const certColumns: any = [ { title: '操作', key: 'actions', - minWidth: 350, + width: 350, align: 'center', hideInExcel: true, resizable: true, diff --git a/web/src/views/cert/DnsView.vue b/web/src/views/cert/DnsView.vue index 7a71abba..cc746af8 100644 --- a/web/src/views/cert/DnsView.vue +++ b/web/src/views/cert/DnsView.vue @@ -75,7 +75,7 @@ const dnsColumns: any = [ { title: '操作', key: 'actions', - minWidth: 200, + width: 200, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/container/ContainerView.vue b/web/src/views/container/ContainerView.vue index 53db3d9b..af027a1d 100644 --- a/web/src/views/container/ContainerView.vue +++ b/web/src/views/container/ContainerView.vue @@ -77,7 +77,7 @@ const columns: any = [ { title: '操作', key: 'actions', - minWidth: 250, + width: 250, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/container/ImageView.vue b/web/src/views/container/ImageView.vue index 81649f07..dc117200 100644 --- a/web/src/views/container/ImageView.vue +++ b/web/src/views/container/ImageView.vue @@ -70,7 +70,7 @@ const columns: any = [ { title: '操作', key: 'actions', - minWidth: 120, + width: 120, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/container/NetworkView.vue b/web/src/views/container/NetworkView.vue index 9c49636a..355a1dcc 100644 --- a/web/src/views/container/NetworkView.vue +++ b/web/src/views/container/NetworkView.vue @@ -109,7 +109,7 @@ const columns: any = [ { title: '操作', key: 'actions', - minWidth: 120, + width: 120, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/container/VolumeView.vue b/web/src/views/container/VolumeView.vue index 3b98e339..61df71e7 100644 --- a/web/src/views/container/VolumeView.vue +++ b/web/src/views/container/VolumeView.vue @@ -63,7 +63,7 @@ const columns: any = [ { title: '操作', key: 'actions', - minWidth: 120, + width: 120, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/cron/IndexView.vue b/web/src/views/cron/IndexView.vue index 79e42234..c8101ce3 100644 --- a/web/src/views/cron/IndexView.vue +++ b/web/src/views/cron/IndexView.vue @@ -111,7 +111,7 @@ const columns: any = [ { title: '操作', key: 'actions', - minWidth: 280, + width: 280, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/file/ListTable.vue b/web/src/views/file/ListTable.vue index 9a9dbfe0..ebc8d829 100644 --- a/web/src/views/file/ListTable.vue +++ b/web/src/views/file/ListTable.vue @@ -106,7 +106,7 @@ const columns: DataTableColumns = [ { title: '操作', key: 'action', - minWidth: 340, + width: 340, render(row) { return h( NSpace, diff --git a/web/src/views/monitor/IndexView.vue b/web/src/views/monitor/IndexView.vue index 9648da55..c4948e41 100644 --- a/web/src/views/monitor/IndexView.vue +++ b/web/src/views/monitor/IndexView.vue @@ -408,13 +408,13 @@ const net = ref({ ] }) -const getData = async () => { +const fetchData = async () => { monitor.list(start.value, end.value).then((res) => { data.value = res.data }) } -const getSetting = async () => { +const fetchSetting = async () => { monitor.setting().then((res) => { monitorSwitch.value = res.data.enabled saveDay.value = res.data.days @@ -459,12 +459,12 @@ watch([start, end], () => { window.$message.error('开始时间不能大于结束时间') return } - getData() + fetchData() }) onMounted(() => { - getSetting() - getData() + fetchSetting() + fetchData() }) diff --git a/web/src/views/safe/IndexView.vue b/web/src/views/safe/IndexView.vue index 3fa5949f..8cb18c27 100644 --- a/web/src/views/safe/IndexView.vue +++ b/web/src/views/safe/IndexView.vue @@ -129,8 +129,8 @@ const columns: any = [ { title: '操作', key: 'actions', + width: 150, align: 'center', - minWidth: 150, hideInExcel: true, render(row: any) { return [ diff --git a/web/src/views/task/IndexView.vue b/web/src/views/task/IndexView.vue index 028a1fab..2a1734a8 100644 --- a/web/src/views/task/IndexView.vue +++ b/web/src/views/task/IndexView.vue @@ -59,7 +59,7 @@ const columns: any = [ { title: t('taskIndex.columns.actions'), key: 'actions', - minWidth: 200, + width: 200, align: 'center', hideInExcel: true, render(row: any) { diff --git a/web/src/views/website/IndexView.vue b/web/src/views/website/IndexView.vue index 842844ec..bb0a5c19 100644 --- a/web/src/views/website/IndexView.vue +++ b/web/src/views/website/IndexView.vue @@ -86,7 +86,7 @@ const columns: any = [ { title: t('websiteIndex.columns.actions'), key: 'actions', - minWidth: 280, + width: 220, align: 'center', hideInExcel: true, render(row: any) {