From 7d7ea96d6536c173f10c04e7accb6cd897797d80 Mon Sep 17 00:00:00 2001
From: guqing <1484563614@qq.com>
Date: Sun, 10 Oct 2021 15:28:48 +0800
Subject: [PATCH 1/4] feat: add work dir backup options

---
 src/api/backup.js                             | 10 ++++-
 .../system/components/BackupWorkDirDrawer.vue | 37 +++++++++++++++----
 2 files changed, 38 insertions(+), 9 deletions(-)

diff --git a/src/api/backup.js b/src/api/backup.js
index a18c60502..3f08ee71d 100644
--- a/src/api/backup.js
+++ b/src/api/backup.js
@@ -15,14 +15,22 @@ backupApi.importMarkdown = (formData, uploadProgress, cancelToken) => {
   })
 }
 
-backupApi.backupWorkDir = () => {
+backupApi.backupWorkDir = backupItems => {
   return service({
     url: `${baseUrl}/work-dir`,
     method: 'post',
+    data: backupItems,
     timeout: 8640000 // 24 hours
   })
 }
 
+backupApi.listWorkDirOptions = () => {
+  return service({
+    url: `${baseUrl}/work-dir/options`,
+    method: 'get'
+  })
+}
+
 backupApi.listWorkDirBackups = () => {
   return service({
     url: `${baseUrl}/work-dir`,
diff --git a/src/views/system/components/BackupWorkDirDrawer.vue b/src/views/system/components/BackupWorkDirDrawer.vue
index 53ecca49b..350d0cd94 100644
--- a/src/views/system/components/BackupWorkDirDrawer.vue
+++ b/src/views/system/components/BackupWorkDirDrawer.vue
@@ -41,20 +41,30 @@
     <a-divider class="divider-transparent" />
     <div class="bottom-control">
       <a-space>
+        <a-button type="primary" icon="download" @click="handleBackupClick">备份</a-button>
+        <a-button type="dashed" icon="reload" :loading="loading" @click="handleListBackups">刷新</a-button>
+      </a-space>
+    </div>
+    <a-modal v-model="backupConfirmModalVisible" title="备份选项">
+      <template slot="footer">
+        <a-button @click="() => (backupConfirmModalVisible = false)">取消</a-button>
         <ReactiveButton
           type="primary"
-          icon="download"
-          @click="handleBackupClick"
+          @click="handleBackupConfirmed"
           @callback="handleBackupedCallback"
           :loading="backuping"
           :errored="backupErrored"
-          text="备份"
+          text="确认"
           loadedText="备份成功"
           erroredText="备份失败"
         ></ReactiveButton>
-        <a-button type="dashed" icon="reload" :loading="loading" @click="handleListBackups">刷新</a-button>
-      </a-space>
-    </div>
+      </template>
+      <a-checkbox-group v-model="backupedItems">
+        <a-checkbox :value="item" v-for="item in workDirOptions" :key="item">
+          {{ item }}
+        </a-checkbox>
+      </a-checkbox-group>
+    </a-modal>
   </a-drawer>
 </template>
 <script>
@@ -68,7 +78,10 @@ export default {
       backuping: false,
       loading: false,
       backupErrored: false,
-      backups: []
+      backups: [],
+      backupConfirmModalVisible: false,
+      workDirOptions: [],
+      backupedItems: []
     }
   },
   model: {
@@ -102,9 +115,16 @@ export default {
         })
     },
     handleBackupClick() {
+      backupApi.listWorkDirOptions().then(res => {
+        this.backupConfirmModalVisible = true
+        this.workDirOptions = res.data.data
+        this.backupedItems = res.data.data
+      })
+    },
+    handleBackupConfirmed() {
       this.backuping = true
       backupApi
-        .backupWorkDir()
+        .backupWorkDir(this.backupedItems)
         .catch(() => {
           this.backupErrored = true
         })
@@ -118,6 +138,7 @@ export default {
       if (this.backupErrored) {
         this.backupErrored = false
       } else {
+        this.backupConfirmModalVisible = false
         this.handleListBackups()
       }
     },

From 276066f23e54463e88ebbcf3641f0c2fba6475a2 Mon Sep 17 00:00:00 2001
From: guqing <1484563614@qq.com>
Date: Sun, 10 Oct 2021 15:38:56 +0800
Subject: [PATCH 2/4] feat: add layout to backup options

---
 src/views/system/components/BackupWorkDirDrawer.vue | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/views/system/components/BackupWorkDirDrawer.vue b/src/views/system/components/BackupWorkDirDrawer.vue
index 350d0cd94..4653e36d7 100644
--- a/src/views/system/components/BackupWorkDirDrawer.vue
+++ b/src/views/system/components/BackupWorkDirDrawer.vue
@@ -60,9 +60,13 @@
         ></ReactiveButton>
       </template>
       <a-checkbox-group v-model="backupedItems">
-        <a-checkbox :value="item" v-for="item in workDirOptions" :key="item">
-          {{ item }}
-        </a-checkbox>
+        <a-row>
+          <a-col :span="8" v-for="item in workDirOptions" :key="item">
+            <a-checkbox :value="item">
+              {{ item }}
+            </a-checkbox>
+          </a-col>
+        </a-row>
       </a-checkbox-group>
     </a-modal>
   </a-drawer>

From 07dbe63564a05eae59cbe5b3ee63db8de38799cc Mon Sep 17 00:00:00 2001
From: guqing <1484563614@qq.com>
Date: Mon, 11 Oct 2021 17:14:42 +0800
Subject: [PATCH 3/4] refactor: modify variable naming

---
 src/api/backup.js                             |  4 +--
 .../system/components/BackupWorkDirDrawer.vue | 28 +++++++++++--------
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/src/api/backup.js b/src/api/backup.js
index 3f08ee71d..6de46a6c0 100644
--- a/src/api/backup.js
+++ b/src/api/backup.js
@@ -15,11 +15,11 @@ backupApi.importMarkdown = (formData, uploadProgress, cancelToken) => {
   })
 }
 
-backupApi.backupWorkDir = backupItems => {
+backupApi.backupWorkDir = options => {
   return service({
     url: `${baseUrl}/work-dir`,
     method: 'post',
-    data: backupItems,
+    data: options,
     timeout: 8640000 // 24 hours
   })
 }
diff --git a/src/views/system/components/BackupWorkDirDrawer.vue b/src/views/system/components/BackupWorkDirDrawer.vue
index 4653e36d7..c50ecc167 100644
--- a/src/views/system/components/BackupWorkDirDrawer.vue
+++ b/src/views/system/components/BackupWorkDirDrawer.vue
@@ -45,9 +45,9 @@
         <a-button type="dashed" icon="reload" :loading="loading" @click="handleListBackups">刷新</a-button>
       </a-space>
     </div>
-    <a-modal v-model="backupConfirmModalVisible" title="备份选项">
+    <a-modal v-model="optionsModal.visible" title="备份选项">
       <template slot="footer">
-        <a-button @click="() => (backupConfirmModalVisible = false)">取消</a-button>
+        <a-button @click="() => (optionsModal.visible = false)">取消</a-button>
         <ReactiveButton
           type="primary"
           @click="handleBackupConfirmed"
@@ -59,9 +59,9 @@
           erroredText="备份失败"
         ></ReactiveButton>
       </template>
-      <a-checkbox-group v-model="backupedItems">
+      <a-checkbox-group v-model="optionsModal.selected" style="width: 100%">
         <a-row>
-          <a-col :span="8" v-for="item in workDirOptions" :key="item">
+          <a-col :span="8" v-for="item in optionsModal.options" :key="item">
             <a-checkbox :value="item">
               {{ item }}
             </a-checkbox>
@@ -83,9 +83,11 @@ export default {
       loading: false,
       backupErrored: false,
       backups: [],
-      backupConfirmModalVisible: false,
-      workDirOptions: [],
-      backupedItems: []
+      optionsModal: {
+        options: [],
+        visible: false,
+        selected: []
+      }
     }
   },
   model: {
@@ -120,15 +122,17 @@ export default {
     },
     handleBackupClick() {
       backupApi.listWorkDirOptions().then(res => {
-        this.backupConfirmModalVisible = true
-        this.workDirOptions = res.data.data
-        this.backupedItems = res.data.data
+        this.optionsModal = {
+          visible: true,
+          options: res.data.data,
+          selected: res.data.data
+        }
       })
     },
     handleBackupConfirmed() {
       this.backuping = true
       backupApi
-        .backupWorkDir(this.backupedItems)
+        .backupWorkDir(this.optionsModal.selected)
         .catch(() => {
           this.backupErrored = true
         })
@@ -142,7 +146,7 @@ export default {
       if (this.backupErrored) {
         this.backupErrored = false
       } else {
-        this.backupConfirmModalVisible = false
+        this.optionsModal.visible = false
         this.handleListBackups()
       }
     },

From 3ac767fb6cd4f44e434fe1246eb11af4feaffc3e Mon Sep 17 00:00:00 2001
From: guqing <1484563614@qq.com>
Date: Mon, 11 Oct 2021 21:50:54 +0800
Subject: [PATCH 4/4] refactor: rename variables

---
 src/views/system/components/BackupWorkDirDrawer.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/views/system/components/BackupWorkDirDrawer.vue b/src/views/system/components/BackupWorkDirDrawer.vue
index c50ecc167..877e3a32d 100644
--- a/src/views/system/components/BackupWorkDirDrawer.vue
+++ b/src/views/system/components/BackupWorkDirDrawer.vue
@@ -121,11 +121,11 @@ export default {
         })
     },
     handleBackupClick() {
-      backupApi.listWorkDirOptions().then(res => {
+      backupApi.listWorkDirOptions().then(response => {
         this.optionsModal = {
           visible: true,
-          options: res.data.data,
-          selected: res.data.data
+          options: response.data.data,
+          selected: response.data.data
         }
       })
     },