From 960fc7851828b1d9a78d454ef467af6156929848 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=80=97=E5=AD=90?= Date: Mon, 10 Feb 2025 00:15:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E4=BF=AE=E6=AD=A3=E6=89=B9=E9=87=8F?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E5=90=8E=E7=9A=84=E5=88=97=E8=A1=A8=E5=88=B7?= =?UTF-8?q?=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- web/src/views/cert/CertView.vue | 6 +- web/src/views/container/ContainerView.vue | 77 +++++++---------------- web/src/views/file/PermissionModal.vue | 6 +- web/src/views/file/ToolBar.vue | 8 +-- web/src/views/firewall/ForwardView.vue | 8 +-- web/src/views/firewall/IpRuleView.vue | 8 +-- web/src/views/firewall/RuleView.vue | 10 +-- web/src/views/website/IndexView.vue | 11 +--- 8 files changed, 39 insertions(+), 95 deletions(-) diff --git a/web/src/views/cert/CertView.vue b/web/src/views/cert/CertView.vue index 2518f488..cbeb0552 100644 --- a/web/src/views/cert/CertView.vue +++ b/web/src/views/cert/CertView.vue @@ -373,16 +373,14 @@ const handleAutoRenewUpdate = (row: any) => { const handleDeployCert = async () => { const promises = deployModel.value.websites.map((website: any) => - useRequest(cert.deploy(deployModel.value.id, website)).onSuccess(() => { - window.$message.success(`部署网站 ${website.name} 成功`) - }) + cert.deploy(deployModel.value.id, website) ) - await Promise.all(promises) deployModal.value = false deployModel.value.id = null deployModel.value.websites = [] + window.$message.success('部署成功') } const handleShowModalClose = () => { diff --git a/web/src/views/container/ContainerView.vue b/web/src/views/container/ContainerView.vue index 17d39987..e37c6f30 100644 --- a/web/src/views/container/ContainerView.vue +++ b/web/src/views/container/ContainerView.vue @@ -291,17 +291,12 @@ const bulkStart = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => - useRequest(container.containerStart(id)).onSuccess(() => { - const container = data.value.find((item: any) => item.id === id) - window.$message.success(`${container?.name} 启动成功`) - }) - ) - + const promises = selectedRowKeys.value.map((id: any) => container.containerStart(id)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('启动成功') } const bulkStop = async () => { @@ -310,17 +305,12 @@ const bulkStop = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => - useRequest(container.containerStop(id)).onSuccess(() => { - const container = data.value.find((item: any) => item.id === id) - window.$message.success(`${container?.name} 停止成功`) - }) - ) - + const promises = selectedRowKeys.value.map((id: any) => container.containerStop(id)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('停止成功') } const bulkRestart = async () => { @@ -329,17 +319,12 @@ const bulkRestart = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => - useRequest(container.containerRestart(id)).onSuccess(() => { - const container = data.value.find((item: any) => item.id === id) - window.$message.success(`${container?.name} 重启成功`) - }) - ) - + const promises = selectedRowKeys.value.map((id: any) => container.containerRestart(id)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('重启成功') } const bulkForceStop = async () => { @@ -348,17 +333,12 @@ const bulkForceStop = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => - useRequest(container.containerKill(id)).onSuccess(() => { - const container = data.value.find((item: any) => item.id === id) - window.$message.success(`${container?.name} 强制停止成功`) - }) - ) - + const promises = selectedRowKeys.value.map((id: any) => container.containerKill(id)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('强制停止成功') } const bulkDelete = async () => { @@ -367,17 +347,12 @@ const bulkDelete = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => - useRequest(container.containerRemove(id)).onSuccess(() => { - const container = data.value.find((item: any) => item.id === id) - window.$message.success(`${container?.name} 删除成功`) - }) - ) - + const promises = selectedRowKeys.value.map((id: any) => container.containerRemove(id)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('删除成功') } const bulkPause = async () => { @@ -386,17 +361,12 @@ const bulkPause = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => - useRequest(container.containerPause(id)).onSuccess(() => { - const container = data.value.find((item: any) => item.id === id) - window.$message.success(`${container?.name} 暂停成功`) - }) - ) - + const promises = selectedRowKeys.value.map((id: any) => container.containerPause(id)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('暂停成功') } const bulkUnpause = async () => { @@ -405,17 +375,12 @@ const bulkUnpause = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => - useRequest(container.containerUnpause(id)).onSuccess(() => { - const container = data.value.find((item: any) => item.id === id) - window.$message.success(`${container?.name} 恢复成功`) - }) - ) - + const promises = selectedRowKeys.value.map((id: any) => container.containerUnpause(id)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('恢复成功') } const closeContainerCreateModal = () => { diff --git a/web/src/views/file/PermissionModal.vue b/web/src/views/file/PermissionModal.vue index bfb6826d..f2e2b05c 100644 --- a/web/src/views/file/PermissionModal.vue +++ b/web/src/views/file/PermissionModal.vue @@ -17,16 +17,14 @@ const checkbox = ref({ const handlePermission = async () => { const promises = selected.value.map((path) => - useRequest(file.permission(path, `0${mode.value}`, owner.value, group.value)).onSuccess(() => { - window.$message.success(`修改 ${path} 成功`) - }) + file.permission(path, `0${mode.value}`, owner.value, group.value) ) - await Promise.all(promises) show.value = false selected.value = [] window.$bus.emit('file:refresh') + window.$message.success('修改成功') } const calculateOctal = (permissions: string[]) => { diff --git a/web/src/views/file/ToolBar.vue b/web/src/views/file/ToolBar.vue index a36ea88a..ad8b0153 100644 --- a/web/src/views/file/ToolBar.vue +++ b/web/src/views/file/ToolBar.vue @@ -170,16 +170,12 @@ const bulkDelete = async () => { return } - const promises = selected.value.map((path) => - useRequest(file.delete(path)).onSuccess(() => { - window.$message.success(`删除 ${path} 成功`) - }) - ) - + const promises = selected.value.map((path) => file.delete(path)) await Promise.all(promises) selected.value = [] window.$bus.emit('file:refresh') + window.$message.success('删除成功') } // 自动填充下载文件名 diff --git a/web/src/views/firewall/ForwardView.vue b/web/src/views/firewall/ForwardView.vue index af89f30e..f3572b4d 100644 --- a/web/src/views/firewall/ForwardView.vue +++ b/web/src/views/firewall/ForwardView.vue @@ -139,15 +139,13 @@ const batchDelete = async () => { const promises = selectedRowKeys.value.map((key: any) => { const rule = JSON.parse(key) - return useRequest(firewall.deleteForward(rule)).onSuccess(() => { - window.$message.success(`${rule.protocol} ${rule.target_ip}:${rule.target_port} 删除成功`) - }) + return firewall.deleteForward(rule) }) - await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('删除成功') } watch(createModalShow, () => { diff --git a/web/src/views/firewall/IpRuleView.vue b/web/src/views/firewall/IpRuleView.vue index 3401177e..07b6301d 100644 --- a/web/src/views/firewall/IpRuleView.vue +++ b/web/src/views/firewall/IpRuleView.vue @@ -181,15 +181,13 @@ const batchDelete = async () => { const promises = selectedRowKeys.value.map((key: any) => { const rule = JSON.parse(key) - return useRequest(firewall.deleteIpRule(rule)).onSuccess(() => { - window.$message.success(`${rule.address} 删除成功`) - }) + return firewall.deleteIpRule(rule) }) - await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('删除成功') } watch(createModalShow, () => { diff --git a/web/src/views/firewall/RuleView.vue b/web/src/views/firewall/RuleView.vue index f6b57dd8..1d5aaab2 100644 --- a/web/src/views/firewall/RuleView.vue +++ b/web/src/views/firewall/RuleView.vue @@ -218,17 +218,13 @@ const batchDelete = async () => { const promises = selectedRowKeys.value.map((key: any) => { const rule = JSON.parse(key) - return useRequest(firewall.deleteRule(rule)).onSuccess(() => { - const port = - rule.port_start == rule.port_end ? rule.port_start : `${rule.port_start}-${rule.port_end}` - window.$message.success(`${rule.family} 规则 ${port}/${rule.protocol} 删除成功`) - }) + return firewall.deleteRule(rule) }) - await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('删除成功') } watch(createModalShow, () => { diff --git a/web/src/views/website/IndexView.vue b/web/src/views/website/IndexView.vue index 673803db..07d885f5 100644 --- a/web/src/views/website/IndexView.vue +++ b/web/src/views/website/IndexView.vue @@ -303,17 +303,12 @@ const bulkDelete = async () => { return } - const promises = selectedRowKeys.value.map((id: any) => { - const site = data.value.find((item: any) => item.id === id) - return useRequest(website.delete(id, true, false)).onSuccess(() => { - window.$message.success('网站 ' + site?.name + ' 删除成功') - }) - }) - + const promises = selectedRowKeys.value.map((id: any) => website.delete(id, true, false)) await Promise.all(promises) selectedRowKeys.value = [] - await refresh() + refresh() + window.$message.success('删除成功') } const formatDbValue = (value: string) => {