From 8dfba82a70be56d11029678c6037b80064376ca0 Mon Sep 17 00:00:00 2001
From: zhengkunwang223 <31820853+zhengkunwang223@users.noreply.github.com>
Date: Wed, 31 May 2023 14:01:01 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=A4=87=E4=BB=BD?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E8=BF=87=E5=A4=A7=E5=AF=BC=E8=87=B4=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BD=E8=B6=85=E6=97=B6=E9=97=AE=E9=A2=98=20(#1199)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Refs https://github.com/1Panel-dev/1Panel/issues/1191
---
 frontend/src/components/backup/index.vue          | 13 +++----------
 frontend/src/utils/util.ts                        |  5 +++++
 frontend/src/views/host/file-management/index.vue |  8 ++------
 frontend/src/views/website/website/index.vue      |  1 +
 4 files changed, 11 insertions(+), 16 deletions(-)

diff --git a/frontend/src/components/backup/index.vue b/frontend/src/components/backup/index.vue
index 238c63b8b..ce8bf05bd 100644
--- a/frontend/src/components/backup/index.vue
+++ b/frontend/src/components/backup/index.vue
@@ -49,7 +49,7 @@
 
 <script lang="ts" setup>
 import { reactive, ref } from 'vue';
-import { dateFormat } from '@/utils/util';
+import { dateFormat, downloadFile } from '@/utils/util';
 import { useDeleteData } from '@/hooks/use-delete-data';
 import { handleBackup, handleRecover } from '@/api/modules/setting';
 import i18n from '@/lang';
@@ -57,7 +57,7 @@ import DrawerHeader from '@/components/drawer-header/index.vue';
 import { deleteBackupRecord, downloadBackupRecord, searchBackupRecords } from '@/api/modules/setting';
 import { Backup } from '@/api/interface/backup';
 import { MsgSuccess } from '@/utils/message';
-import { DownloadByPath } from '@/api/modules/files';
+// import { DownloadByPath } from '@/api/modules/files';
 
 const selects = ref<any>([]);
 const loading = ref();
@@ -147,14 +147,7 @@ const onDownload = async (row: Backup.RecordInfo) => {
         fileName: row.fileName,
     };
     await downloadBackupRecord(params).then(async (res) => {
-        const file = await DownloadByPath(res.data);
-        const downloadUrl = window.URL.createObjectURL(new Blob([file]));
-        const a = document.createElement('a');
-        a.style.display = 'none';
-        a.href = downloadUrl;
-        a.download = row.fileName;
-        const event = new MouseEvent('click');
-        a.dispatchEvent(event);
+        downloadFile(res.data);
     });
 };
 
diff --git a/frontend/src/utils/util.ts b/frontend/src/utils/util.ts
index bccd6d18a..2509b6f66 100644
--- a/frontend/src/utils/util.ts
+++ b/frontend/src/utils/util.ts
@@ -236,3 +236,8 @@ export function isJson(str: string) {
 export function toLowerCase(str: string) {
     return str.toLowerCase();
 }
+
+export function downloadFile(filePath: string) {
+    let url = `${import.meta.env.VITE_API_URL as string}/files/download?`;
+    window.open(url + 'path=' + filePath, '_blank');
+}
diff --git a/frontend/src/views/host/file-management/index.vue b/frontend/src/views/host/file-management/index.vue
index 4ca03f0c2..5d849348a 100644
--- a/frontend/src/views/host/file-management/index.vue
+++ b/frontend/src/views/host/file-management/index.vue
@@ -183,7 +183,7 @@
 <script setup lang="ts">
 import { nextTick, onMounted, reactive, ref } from '@vue/runtime-core';
 import { GetFilesList, DeleteFile, GetFileContent, ComputeDirSize } from '@/api/modules/files';
-import { computeSize, dateFormat, getIcon, getRandomStr } from '@/utils/util';
+import { computeSize, dateFormat, downloadFile, getIcon, getRandomStr } from '@/utils/util';
 import { File } from '@/api/interface/file';
 import { useDeleteData } from '@/hooks/use-delete-data';
 import i18n from '@/lang';
@@ -207,8 +207,6 @@ import { MsgSuccess, MsgWarning } from '@/utils/message';
 import { ElMessageBox } from 'element-plus';
 import { useSearchable } from './hooks/searchable';
 import { ResultData } from '@/api/interface';
-// import streamSaver from 'streamsaver';
-// import axios from 'axios';
 
 interface FilePaths {
     url: string;
@@ -245,7 +243,6 @@ const fileRename = reactive({ path: '', oldName: '' });
 const fileWget = reactive({ path: '' });
 const fileMove = reactive({ oldPaths: [''], type: '', path: '' });
 const processPage = reactive({ open: false });
-// const fileDownload = reactive({ path: '', name: '' });
 
 const createRef = ref();
 const roleRef = ref();
@@ -573,8 +570,7 @@ const openPaste = () => {
 };
 
 const openDownload = (file: File.File) => {
-    let url = `${import.meta.env.VITE_API_URL as string}/files/download?`;
-    window.open(url + 'path=' + file.path, '_blank');
+    downloadFile(file.path);
 };
 
 const openDetail = (row: File.File) => {
diff --git a/frontend/src/views/website/website/index.vue b/frontend/src/views/website/website/index.vue
index 02c33f385..50340ef4d 100644
--- a/frontend/src/views/website/website/index.vue
+++ b/frontend/src/views/website/website/index.vue
@@ -323,6 +323,7 @@ const submitDate = (row: any) => {
         remark: row.remark,
         webSiteGroupId: row.webSiteGroupId,
         expireDate: reqDate,
+        IPV6: row.IPV6,
     };
 
     UpdateWebsite(req).then(() => {