From 794e24e69fb791e3eeaeb9c4d79d6aa7f80bb435 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Sat, 28 Mar 2020 15:45:50 +0800
Subject: [PATCH] release: 1.3.1

---
 .env.jsdelivr                                 |  2 +-
 package-lock.json                             |  2 +-
 package.json                                  |  2 +-
 public/index.html                             |  2 +-
 .../sheet/components/SheetSettingDrawer.vue   |  2 +-
 src/views/system/Installation.vue             | 25 ++++++++++++-------
 6 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/.env.jsdelivr b/.env.jsdelivr
index d1a0cded9..c169b979b 100644
--- a/.env.jsdelivr
+++ b/.env.jsdelivr
@@ -1,2 +1,2 @@
 NODE_ENV=production
-PUBLIC_PATH=https://cdn.jsdelivr.net/npm/halo-admin@1.3.0/dist/
\ No newline at end of file
+PUBLIC_PATH=https://cdn.jsdelivr.net/npm/halo-admin@1.3.1/dist/
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index fd029cb53..468bfb883 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index f87bc525e..d11ac5654 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.3.0",
+  "version": "1.3.1",
   "scripts": {
     "serve": "vue-cli-service serve",
     "build": "vue-cli-service build",
diff --git a/public/index.html b/public/index.html
index 4ffdc8743..ce2673e5d 100644
--- a/public/index.html
+++ b/public/index.html
@@ -6,7 +6,7 @@
   <meta http-equiv="X-UA-Compatible" content="IE=edge" />
   <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1, user-scalable=no" />
   <meta name="robots" content="noindex,nofllow" />
-  <meta name="generator" content="Halo 1.3.0" />
+  <meta name="generator" content="Halo 1.3.1" />
   <link rel="icon" href="<%= BASE_URL %>logo.png" />
   <title>Halo Dashboard</title>
   <style>
diff --git a/src/views/sheet/components/SheetSettingDrawer.vue b/src/views/sheet/components/SheetSettingDrawer.vue
index 4014ba254..c163f2a2d 100644
--- a/src/views/sheet/components/SheetSettingDrawer.vue
+++ b/src/views/sheet/components/SheetSettingDrawer.vue
@@ -26,7 +26,7 @@
               </a-form-item>
               <a-form-item
                 label="页面别名："
-                :help="options.blog_url+'/'+options.sheet_prefix+'/'+ (selectedSheet.slug ? selectedSheet.slug : '{slug}')+options.path_suffix"
+                :help="options.blog_url+'/'+options.sheet_prefix+'/'+ (selectedSheet.slug ? selectedSheet.slug : '{slug}')+(options.path_suffix?options.path_suffix:'')"
               >
                 <a-input v-model="selectedSheet.slug" />
               </a-form-item>
diff --git a/src/views/system/Installation.vue b/src/views/system/Installation.vue
index be34c08cb..172ee97e5 100644
--- a/src/views/system/Installation.vue
+++ b/src/views/system/Installation.vue
@@ -202,6 +202,7 @@
                 type="primary"
                 icon="upload"
                 @click="handleInstall"
+                :loading="installing"
               >安装</a-button>
             </a-row>
           </a-card>
@@ -221,7 +222,8 @@ export default {
       installation: {},
       stepCurrent: 0,
       migrationData: null,
-      bloggerForm: this.$form.createForm(this)
+      bloggerForm: this.$form.createForm(this),
+      installing: false
     }
   },
   created() {
@@ -256,13 +258,18 @@ export default {
       })
     },
     install() {
-      adminApi.install(this.installation).then(response => {
-        this.$log.debug('Installation response', response)
-        this.$message.success('安装成功！')
-        setTimeout(() => {
-          this.$router.push({ name: 'Login' })
-        }, 300)
-      })
+      adminApi
+        .install(this.installation)
+        .then(response => {
+          this.$log.debug('Installation response', response)
+          this.$message.success('安装成功！')
+          setTimeout(() => {
+            this.$router.push({ name: 'Login' })
+          }, 300)
+        })
+        .finally(() => {
+          this.installing = false
+        })
     },
     handleInstall() {
       const password = this.installation.password
@@ -275,7 +282,7 @@ export default {
         this.$message.error('确认密码和密码不匹配')
         return
       }
-
+      this.installing = true
       if (this.migrationData) {
         const hide = this.$message.loading('数据导入中...', 0)
         migrateApi