From 72c39772520208c24578fe4d725a147518d172ed Mon Sep 17 00:00:00 2001
From: johnniang <johnniang@riseup.net>
Date: Sun, 28 Apr 2019 22:28:22 +0800
Subject: [PATCH] Perfect installation

---
 src/components/Upload/Upload.vue  | 14 ++++++--
 src/views/system/Installation.vue | 56 ++++++++++++++++++++++---------
 2 files changed, 52 insertions(+), 18 deletions(-)

diff --git a/src/components/Upload/Upload.vue b/src/components/Upload/Upload.vue
index 3afdb7b3..31006ac8 100644
--- a/src/components/Upload/Upload.vue
+++ b/src/components/Upload/Upload.vue
@@ -6,6 +6,7 @@
       :multiple="multiple"
       :accept="accept"
       :customRequest="handleUpload"
+      :remove="handleRemove"
       @change="handleChange"
     >
       <slot
@@ -19,6 +20,7 @@
       :multiple="multiple"
       :accept="accept"
       :customRequest="handleUpload"
+      :remove="handleRemove"
       @change="handleChange"
     >
       <slot />
@@ -61,13 +63,17 @@ export default {
     handleChange(info) {
       this.$emit('change', info)
     },
+    handleRemove(file) {
+      this.$log.debug('Removed file', file)
+      this.$emit('remove', file)
+    },
     handleUpload(option) {
       this.$log.debug('Uploading option', option)
       const CancelToken = axios.CancelToken
       const source = CancelToken.source()
 
       const data = new FormData()
-      data.append('file', option.file)
+      data.append(this.name, option.file)
 
       this.uploadHandler(
         data,
@@ -78,18 +84,22 @@ export default {
           this.$log.debug('Uploading percent: ', progressEvent.percent)
           option.onProgress(progressEvent)
         },
-        source.token
+        source.token,
+        option.file
       )
         .then(response => {
+          this.$log.debug('Uploaded successfully', response)
           option.onSuccess(response, option.file)
           this.$emit('success', response, option.file)
         })
         .catch(error => {
+          this.$log.debug('Failed to upload file', error)
           option.onError(error, error.response)
           this.$emit('failure', error, option.file)
         })
       return {
         abort: () => {
+          this.$log.debug('Upload operation aborted by the user')
           source.cancel('Upload operation canceled by the user.')
         }
       }
diff --git a/src/views/system/Installation.vue b/src/views/system/Installation.vue
index a964307e..5f4a66e1 100644
--- a/src/views/system/Installation.vue
+++ b/src/views/system/Installation.vue
@@ -117,6 +117,26 @@
               layout="horizontal"
               v-show="stepCurrent == 1"
             >
+              <a-form-item>
+                <a-input
+                  v-model="installation.url"
+                  placeholder="博客地址（选填）"
+                >
+                  <a-icon
+                    slot="prefix"
+                    type="link"
+                    style="color: rgba(0,0,0,.25)"
+                  />
+                  <a-select
+                    slot="addonBefore"
+                    defaultValue="http://"
+                    style="width: 90px"
+                  >
+                    <a-select-option value="http://">http://</a-select-option>
+                    <a-select-option value="https://">https://</a-select-option>
+                  </a-select>
+                </a-input>
+              </a-form-item>
               <a-form-item>
                 <a-input
                   v-model="installation.title"
@@ -129,25 +149,20 @@
                   />
                 </a-input>
               </a-form-item>
-              <a-form-item>
-                <a-input
-                  v-model="installation.url"
-                  placeholder="博客地址"
-                >
-                  <a-icon
-                    slot="prefix"
-                    type="link"
-                    style="color: rgba(0,0,0,.25)"
-                  />
-                </a-input>
-              </a-form-item>
             </a-form>
 
             <!-- Data migration -->
             <div v-show="stepCurrent == 2">
+              <a-alert
+                style="margin-bottom: 1rem"
+                message="如果有迁移需求，请点击并选择'迁移文件'"
+                type="info"
+              />
               <Upload
-                :uploadHandler="handleMigrationUpload"
+                :name="migrationUploadName"
                 accept="application/json"
+                :uploadHandler="handleMigrationUpload"
+                @remove="handleMigrationFileRemove"
               >
                 <p class="ant-upload-drag-icon">
                   <a-icon type="inbox" />
@@ -212,6 +227,7 @@ export default {
         }
       },
       installation: {},
+      migrationUploadName: 'file',
       migrationData: null,
       stepCurrent: 0
     }
@@ -220,11 +236,19 @@ export default {
     handleMigrationUpload(data) {
       this.$log.debug('Selected data', data)
       this.migrationData = data
-      return new Promise(resolve => {
+      return new Promise((resolve, reject) => {
         this.$log.debug('Handle uploading')
-        resolve.resolve()
+        resolve()
       })
     },
+    handleMigrationFileRemove(file) {
+      this.$log.debug('Removed file', file)
+      this.$log.debug('Migration file from data', this.migrationData.get(this.migrationUploadName))
+      if (this.migrationData.get(this.migrationUploadName).uid === file.uid) {
+        this.migrationData = null
+        this.migrationFile = null
+      }
+    },
     install() {
       adminApi.install(this.installation).then(response => {
         this.$log.debug('Installation response', response)
@@ -247,7 +271,7 @@ export default {
       }
 
       // Handle migration
-      if (this.migrationData) {
+      if (this.migrationFile) {
         recoveryApi.migrate(this.migrationData).then(response => {
           this.$log.debug('Migrated successfullly')
           this.$message.success('数据迁移成功')