From 357cd7cee9c592b65c54bc3f1efab195d4996175 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Fri, 6 Sep 2019 22:51:28 +0800
Subject: [PATCH] Refactor attachment handler.

---
 src/views/post/PostEdit.vue     |  21 ++---
 src/views/sheet/SheetEdit.vue   |  21 ++---
 src/views/system/OptionForm.vue | 133 ++++++++++++++++++++++----------
 3 files changed, 104 insertions(+), 71 deletions(-)

diff --git a/src/views/post/PostEdit.vue b/src/views/post/PostEdit.vue
index 519e9e935..f8b21e977 100644
--- a/src/views/post/PostEdit.vue
+++ b/src/views/post/PostEdit.vue
@@ -142,28 +142,17 @@ export default {
       if (!this.postToStage.originalContent) {
         this.postToStage.originalContent = '开始编辑...'
       }
-      this.createOrUpdatePost(
-        () => this.$message.success('保存草稿成功！'),
-        () => this.$message.success('保存草稿成功！'),
-        false
-      )
-    },
-    createOrUpdatePost(createSuccess, updateSuccess, autoSave) {
       if (this.postToStage.id) {
         // Update the post
-        postApi.update(this.postToStage.id, this.postToStage, autoSave).then(response => {
+        postApi.update(this.postToStage.id, this.postToStage, false).then(response => {
           this.$log.debug('Updated post', response.data.data)
-          if (updateSuccess) {
-            updateSuccess()
-          }
+          this.$message.success('保存草稿成功！')
         })
       } else {
         // Create the post
-        postApi.create(this.postToStage, autoSave).then(response => {
+        postApi.create(this.postToStage, false).then(response => {
           this.$log.debug('Created post', response.data.data)
-          if (createSuccess) {
-            createSuccess()
-          }
+          this.$message.success('保存草稿成功！')
           this.postToStage = response.data.data
         })
       }
@@ -177,7 +166,7 @@ export default {
         if (responseObject.status === 200) {
           var HaloEditor = this.$refs.md
           HaloEditor.$img2Url(pos, encodeURI(responseObject.data.path))
-          this.$message.success('图片上传成功')
+          this.$message.success('图片上传成功！')
         } else {
           this.$message.error('图片上传失败：' + responseObject.message)
         }
diff --git a/src/views/sheet/SheetEdit.vue b/src/views/sheet/SheetEdit.vue
index 15aaa2c86..c5c24e42e 100644
--- a/src/views/sheet/SheetEdit.vue
+++ b/src/views/sheet/SheetEdit.vue
@@ -132,26 +132,15 @@ export default {
       if (!this.sheetToStage.originalContent) {
         this.sheetToStage.originalContent = '开始编辑...'
       }
-      this.createOrUpdateSheet(
-        () => this.$message.success('保存草稿成功！'),
-        () => this.$message.success('保存草稿成功！'),
-        false
-      )
-    },
-    createOrUpdateSheet(createSuccess, updateSuccess, autoSave) {
       if (this.sheetToStage.id) {
-        sheetApi.update(this.sheetToStage.id, this.sheetToStage, autoSave).then(response => {
+        sheetApi.update(this.sheetToStage.id, this.sheetToStage, false).then(response => {
           this.$log.debug('Updated sheet', response.data.data)
-          if (updateSuccess) {
-            updateSuccess()
-          }
+          this.$message.success('保存草稿成功！')
         })
       } else {
-        sheetApi.create(this.sheetToStage, autoSave).then(response => {
+        sheetApi.create(this.sheetToStage, false).then(response => {
           this.$log.debug('Created sheet', response.data.data)
-          if (createSuccess) {
-            createSuccess()
-          }
+          this.$message.success('保存草稿成功！')
           this.sheetToStage = response.data.data
         })
       }
@@ -165,7 +154,7 @@ export default {
         if (responseObject.status === 200) {
           var HaloEditor = this.$refs.md
           HaloEditor.$img2Url(pos, encodeURI(responseObject.data.path))
-          this.$message.success('图片上传成功')
+          this.$message.success('图片上传成功！')
         } else {
           this.$message.error('图片上传失败：' + responseObject.message)
         }
diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue
index 440243cf5..72a527977 100644
--- a/src/views/system/OptionForm.vue
+++ b/src/views/system/OptionForm.vue
@@ -95,14 +95,12 @@
                   label="博客描述："
                   :wrapper-col="wrapperCol"
                 >
-                  <a-input v-model="options.seo_description" />
+                  <a-input
+                    type="textarea"
+                    :autosize="{ minRows: 5 }"
+                    v-model="options.seo_description"
+                  />
                 </a-form-item>
-                <!-- <a-form-item
-                  label="百度推送 Token： "
-                  :wrapper-col="wrapperCol"
-                >
-                  <a-input v-model="options.seo_baidu_token" />
-                </a-form-item> -->
                 <a-form-item>
                   <a-button
                     type="primary"
@@ -287,16 +285,13 @@
                   v-show="upyunFormVisible"
                 >
                   <a-form-item
-                    label="域名："
+                    label="绑定域名："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-tooltip
-                      :trigger="['focus']"
-                      placement="right"
-                      title="需要加上 http:// 或者 https://"
-                    >
-                      <a-input v-model="options.oss_upyun_domain" />
-                    </a-tooltip>
+                    <a-input
+                      v-model="options.oss_upyun_domain"
+                      placeholder="需要加上 http:// 或者 https://"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="空间名称："
@@ -329,19 +324,34 @@
                     label="图片处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_upyun_style_rule" />
+                    <a-input
+                      v-model="options.oss_upyun_style_rule"
+                      placeholder="间隔标识符+图片处理版本名称"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="缩略图处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_upyun_thumbnail_style_rule" />
+                    <a-input
+                      v-model="options.oss_upyun_thumbnail_style_rule"
+                      placeholder="间隔标识符+图片处理版本名称，一般为后台展示所用"
+                    />
                   </a-form-item>
                 </div>
                 <div
                   class="qnyunForm"
                   v-show="qnyunFormVisible"
                 >
+                  <a-form-item
+                    label="绑定域名："
+                    :wrapper-col="wrapperCol"
+                  >
+                    <a-input
+                      v-model="options.oss_qiniu_domain"
+                      placeholder="需要加上 http:// 或者 https://"
+                    />
+                  </a-form-item>
                   <a-form-item
                     label="区域："
                     :wrapper-col="wrapperCol"
@@ -355,18 +365,6 @@
                       <a-select-option value="as0">东南亚</a-select-option>
                     </a-select>
                   </a-form-item>
-                  <a-form-item
-                    label="域名："
-                    :wrapper-col="wrapperCol"
-                  >
-                    <a-tooltip
-                      :trigger="['focus']"
-                      placement="right"
-                      title="需要加上 http:// 或者 https://"
-                    >
-                      <a-input v-model="options.oss_qiniu_domain" />
-                    </a-tooltip>
-                  </a-form-item>
                   <a-form-item
                     label="Access Key："
                     :wrapper-col="wrapperCol"
@@ -386,30 +384,51 @@
                     label="Bucket："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_qiniu_bucket" />
+                    <a-input
+                      v-model="options.oss_qiniu_bucket"
+                      placeholder="存储空间名称"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="图片处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_qiniu_style_rule" />
+                    <a-input
+                      v-model="options.oss_qiniu_style_rule"
+                      placeholder="样式分隔符+图片处理样式名称"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="缩略图处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_qiniu_thumbnail_style_rule" />
+                    <a-input
+                      v-model="options.oss_qiniu_thumbnail_style_rule"
+                      placeholder="样式分隔符+图片处理样式名称，一般为后台展示所用"
+                    />
                   </a-form-item>
                 </div>
                 <div
                   class="aliyunForm"
                   v-show="aliyunFormVisible"
                 >
+                  <a-form-item
+                    label="绑定域名："
+                    :wrapper-col="wrapperCol"
+                  >
+                    <a-input
+                      v-model="options.oss_aliyun_domain"
+                      placeholder="如不填写，路径根域名将为 Bucket + EndPoint"
+                    />
+                  </a-form-item>
                   <a-form-item
                     label="Bucket："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_aliyun_bucket_name" />
+                    <a-input
+                      v-model="options.oss_aliyun_bucket_name"
+                      placeholder="存储空间名称"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="EndPoint（地域节点）："
@@ -436,24 +455,42 @@
                     label="图片处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_aliyun_style_rule" />
+                    <a-input
+                      v-model="options.oss_aliyun_style_rule"
+                      placeholder="请到阿里云控制台的图片处理获取"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="缩略图处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_aliyun_thumbnail_style_rule" />
+                    <a-input
+                      v-model="options.oss_aliyun_thumbnail_style_rule"
+                      placeholder="请到阿里云控制台的图片处理获取，一般为后台展示所用"
+                    />
                   </a-form-item>
                 </div>
                 <div
                   class="baiduyunForm"
                   v-show="baiduyunFormVisible"
                 >
+                  <a-form-item
+                    label="绑定域名："
+                    :wrapper-col="wrapperCol"
+                  >
+                    <a-input
+                      v-model="options.bos_baiduyun_domain"
+                      placeholder="如不填写，路径根域名将为 Bucket + EndPoint"
+                    />
+                  </a-form-item>
                   <a-form-item
                     label="Bucket："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.bos_baiduyun_bucket_name" />
+                    <a-input
+                      v-model="options.bos_baiduyun_bucket_name"
+                      placeholder="存储空间名称"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="EndPoint（地域节点）："
@@ -480,24 +517,42 @@
                     label="图片处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.bos_baiduyun_style_rule" />
+                    <a-input
+                      v-model="options.bos_baiduyun_style_rule"
+                      placeholder="请到百度云控制台的图片处理获取"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="缩略图处理策略："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.bos_baiduyun_thumbnail_style_rule" />
+                    <a-input
+                      v-model="options.bos_baiduyun_thumbnail_style_rule"
+                      placeholder="请到百度云控制台的图片处理获取，一般为后台展示所用"
+                    />
                   </a-form-item>
                 </div>
                 <div
                   class="tencentyunForm"
                   v-show="tencentyunFormVisible"
                 >
+                  <a-form-item
+                    label="绑定域名："
+                    :wrapper-col="wrapperCol"
+                  >
+                    <a-input
+                      v-model="options.cos_tencentyun_domain"
+                      placeholder="如不填写，路径根域名将为 Bucket + 区域地址"
+                    />
+                  </a-form-item>
                   <a-form-item
                     label="Bucket："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.cos_tencentyun_bucket_name" />
+                    <a-input
+                      v-model="options.cos_tencentyun_bucket_name"
+                      placeholder="存储桶名称"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="区域："