From de95ee77ae0d4f3fa08a658954360e5696eab0e4 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Fri, 6 Sep 2019 16:55:50 +0800
Subject: [PATCH] Support set password to post.

---
 src/api/journal.js                        |  2 +-
 src/api/post.js                           |  5 +++++
 src/views/post/PostList.vue               | 19 +++++++++++++----
 src/views/post/components/PostSetting.vue |  6 ++++++
 src/views/sheet/SheetList.vue             |  2 +-
 src/views/sheet/internal/JournalList.vue  | 19 +++++++++++++----
 src/views/system/OptionForm.vue           | 26 ++++++++++++++++++-----
 7 files changed, 64 insertions(+), 15 deletions(-)

diff --git a/src/api/journal.js b/src/api/journal.js
index 09786d1ee..59472ec83 100644
--- a/src/api/journal.js
+++ b/src/api/journal.js
@@ -46,7 +46,7 @@ journalApi.journalType = {
   PUBLIC: {
     text: '公开'
   },
-  PRIVATE: {
+  INTIMATE: {
     text: '私密'
   }
 }
diff --git a/src/api/post.js b/src/api/post.js
index 0d0a1b326..5709a6a02 100644
--- a/src/api/post.js
+++ b/src/api/post.js
@@ -81,6 +81,11 @@ postApi.postStatus = {
     color: 'red',
     status: 'error',
     text: '回收站'
+  },
+  INTIMATE: {
+    color: 'blue',
+    status: 'success',
+    text: '私密'
   }
 }
 export default postApi
diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue
index a87a6f321..9ef811037 100644
--- a/src/views/post/PostList.vue
+++ b/src/views/post/PostList.vue
@@ -92,7 +92,7 @@
             </a-menu-item>
             <a-menu-item
               key="2"
-              v-if="queryParam.status === 'PUBLISHED' || queryParam.status ==='DRAFT'"
+              v-if="queryParam.status === 'PUBLISHED' || queryParam.status ==='DRAFT' || queryParam.status === 'INTIMATE'"
             >
               <a
                 href="javascript:void(0);"
@@ -149,7 +149,18 @@
               v-if="record.status=='PUBLISHED'"
             >
               <a-tooltip
-                placement="topLeft"
+                placement="top"
+                :title="'点击访问【'+text+'】'"
+              >{{ text }}</a-tooltip>
+            </a>
+            <a
+              :href="options.blog_url+'/archives/'+record.url+'/password'"
+              target="_blank"
+              style="text-decoration: none;"
+              v-else-if="record.status == 'INTIMATE'"
+            >
+              <a-tooltip
+                placement="top"
                 :title="'点击访问【'+text+'】'"
               >{{ text }}</a-tooltip>
             </a>
@@ -250,7 +261,7 @@
             <a
               href="javascript:;"
               @click="handleEditClick(post)"
-              v-if="post.status === 'PUBLISHED' || post.status === 'DRAFT'"
+              v-if="post.status === 'PUBLISHED' || post.status === 'DRAFT' || post.status === 'INTIMATE'"
             >编辑</a>
             <a-popconfirm
               :title="'你确定要发布【' + post.title + '】文章？'"
@@ -269,7 +280,7 @@
               @confirm="handleEditStatusClick(post.id,'RECYCLE')"
               okText="确定"
               cancelText="取消"
-              v-if="post.status === 'PUBLISHED' || post.status === 'DRAFT'"
+              v-if="post.status === 'PUBLISHED' || post.status === 'DRAFT' || post.status === 'INTIMATE'"
             >
               <a href="javascript:;">回收站</a>
             </a-popconfirm>
diff --git a/src/views/post/components/PostSetting.vue b/src/views/post/components/PostSetting.vue
index 6261e121d..bc71cd3c5 100644
--- a/src/views/post/components/PostSetting.vue
+++ b/src/views/post/components/PostSetting.vue
@@ -30,6 +30,12 @@
               >
                 <a-input v-model="selectedPost.url" />
               </a-form-item>
+              <a-form-item label="访问密码：">
+                <a-input
+                  type="password"
+                  v-model="selectedPost.password"
+                />
+              </a-form-item>
 
               <a-form-item label="发表时间：">
                 <a-date-picker
diff --git a/src/views/sheet/SheetList.vue b/src/views/sheet/SheetList.vue
index b2c64b690..dc116a3ca 100644
--- a/src/views/sheet/SheetList.vue
+++ b/src/views/sheet/SheetList.vue
@@ -89,7 +89,7 @@
                     v-if="record.status=='PUBLISHED'"
                   >
                     <a-tooltip
-                      placement="topLeft"
+                      placement="top"
                       :title="'点击访问【'+text+'】'"
                     >{{ text }}</a-tooltip>
                   </a>
diff --git a/src/views/sheet/internal/JournalList.vue b/src/views/sheet/internal/JournalList.vue
index 24fd7c3d3..e2521a4af 100644
--- a/src/views/sheet/internal/JournalList.vue
+++ b/src/views/sheet/internal/JournalList.vue
@@ -118,8 +118,11 @@
                       {{ item.commentCount }}
                     </a>
                   </span>
-                  <span v-if="item.type=='PRIVATE'">
-                    <a href="javascript:void(0);" disabled>
+                  <span v-if="item.type=='INTIMATE'">
+                    <a
+                      href="javascript:void(0);"
+                      disabled
+                    >
                       <a-icon type="lock" />
                     </a>
                   </span>
@@ -399,7 +402,7 @@ export default {
     handleEdit(item) {
       this.title = '编辑'
       this.journal = item
-      this.isPublic = item.type !== 'PRIVATE'
+      this.isPublic = item.type !== 'INTIMATE'
       this.visible = true
       // 为编辑时需要回显图片数组赋值,并隐藏图片上传框
       // this.plusPhotoVisible = false
@@ -442,7 +445,15 @@ export default {
     createOrUpdateJournal() {
       // 给属性填充数据
       // this.journal.photos = this.journalPhotos
-      this.journal.type = this.isPublic ? 'PUBLIC' : 'PRIVATE'
+      this.journal.type = this.isPublic ? 'PUBLIC' : 'INTIMATE'
+
+      if (!this.journal.content) {
+        this.$notification['error']({
+          message: '提示',
+          description: '发布内容不能为空！'
+        })
+        return
+      }
 
       if (this.journal.id) {
         journalApi.update(this.journal.id, this.journal).then(response => {
diff --git a/src/views/system/OptionForm.vue b/src/views/system/OptionForm.vue
index 9044f8036..440243cf5 100644
--- a/src/views/system/OptionForm.vue
+++ b/src/views/system/OptionForm.vue
@@ -377,7 +377,10 @@
                     label="Secret Key："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_qiniu_secret_key" />
+                    <a-input
+                      type="password"
+                      v-model="options.oss_qiniu_secret_key"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="Bucket："
@@ -424,7 +427,10 @@
                     label="Access Secret："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.oss_aliyun_access_secret" />
+                    <a-input
+                      type="password"
+                      v-model="options.oss_aliyun_access_secret"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="图片处理策略："
@@ -465,7 +471,10 @@
                     label="Secret Key："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.bos_baiduyun_secret_key" />
+                    <a-input
+                      type="password"
+                      v-model="options.bos_baiduyun_secret_key"
+                    />
                   </a-form-item>
                   <a-form-item
                     label="图片处理策略："
@@ -513,7 +522,10 @@
                     label="Secret Key："
                     :wrapper-col="wrapperCol"
                   >
-                    <a-input v-model="options.cos_tencentyun_secret_key" />
+                    <a-input
+                      type="password"
+                      v-model="options.cos_tencentyun_secret_key"
+                    />
                   </a-form-item>
                 </div>
                 <a-form-item>
@@ -571,6 +583,7 @@
                       >
                         <a-input
                           v-model="options.email_password"
+                          type="password"
                           placeholder="部分邮箱可能是授权码"
                         />
                       </a-form-item>
@@ -660,7 +673,10 @@
                   label="CDN 加速域名："
                   :wrapper-col="wrapperCol"
                 >
-                  <a-input v-model="options.blog_cdn_domain" placeholder="请确保已经正确配置好了 CDN"/>
+                  <a-input
+                    v-model="options.blog_cdn_domain"
+                    placeholder="请确保已经正确配置好了 CDN"
+                  />
                 </a-form-item>
                 <a-form-item
                   label="自定义 head："