From a617ea164ca6d8e90cc6eddfd4aefa631d5202a5 Mon Sep 17 00:00:00 2001 From: Ryan Wang Date: Wed, 26 Jul 2023 14:44:23 +0800 Subject: [PATCH] feat: require confirmation before restoring backup (#4300) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit #### What type of PR is this? /area console /kind improvement /milestone 2.8.x #### What this PR does / why we need it: 在恢复备份的界面,改为需要先点击开始恢复按钮再显示上传区域。 #### Which issue(s) this PR fixes: Fixes #4295 #### Does this PR introduce a user-facing change? ```release-note None ``` --- console/src/locales/en.yaml | 1 + console/src/locales/zh-CN.yaml | 1 + console/src/locales/zh-TW.yaml | 1 + console/src/modules/system/backup/tabs/Restore.vue | 10 ++++++++-- 4 files changed, 11 insertions(+), 2 deletions(-) diff --git a/console/src/locales/en.yaml b/console/src/locales/en.yaml index 728da7ee2..b550e8008 100644 --- a/console/src/locales/en.yaml +++ b/console/src/locales/en.yaml @@ -1013,6 +1013,7 @@ core: first: 1. The restore process may last for a long time, please do not refresh the page during this period. second: 2. During the restore process, although the existing data will not be cleaned up, if there is a conflict, the data will be overwritten. third: 3. After the restore is completed, you will be prompted to stop running Halo, and you may need to run it manually after stopping. + start: Start restore exception: not_found: message: Page not found diff --git a/console/src/locales/zh-CN.yaml b/console/src/locales/zh-CN.yaml index ac3d1c4e9..303cfbf67 100644 --- a/console/src/locales/zh-CN.yaml +++ b/console/src/locales/zh-CN.yaml @@ -1013,6 +1013,7 @@ core: first: 1. 恢复过程可能会持续较长时间,期间请勿刷新页面。 second: 2. 在恢复的过程中,虽然已有的数据不会被清理掉,但如果有冲突的数据将被覆盖。 third: 3. 恢复完成之后会提示停止运行 Halo,停止之后可能需要手动运行。 + start: 开始恢复 exception: not_found: message: 没有找到该页面 diff --git a/console/src/locales/zh-TW.yaml b/console/src/locales/zh-TW.yaml index 1f991360a..0254a9cfa 100644 --- a/console/src/locales/zh-TW.yaml +++ b/console/src/locales/zh-TW.yaml @@ -1013,6 +1013,7 @@ core: first: 1. 還原過程可能需要較長時間,期間請勿重新整理頁面。 second: 2. 在還原過程中,雖然已有的資料不會被清除,但若有衝突的資料將被覆蓋。 third: 3. 還原完成後會提示停止運行 Halo,停止後可能需要手動啟動。 + start: 開始還原 exception: not_found: message: 沒有找到該頁面 diff --git a/console/src/modules/system/backup/tabs/Restore.vue b/console/src/modules/system/backup/tabs/Restore.vue index 8b38ddbfa..0ab8ff924 100644 --- a/console/src/modules/system/backup/tabs/Restore.vue +++ b/console/src/modules/system/backup/tabs/Restore.vue @@ -1,6 +1,6 @@