From bdd85b05ed0c188ff913fa2d392a1c2f44473523 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Wed, 11 Sep 2019 21:26:51 +0800
Subject: [PATCH] release 1.1.0

---
 package-lock.json                             |  2 +-
 package.json                                  |  2 +-
 src/api/theme.js                              |  2 +-
 src/views/comment/components/CommentTab.vue   | 22 ++++++++++--
 .../dashboard/components/RecentCommentTab.vue | 35 ++++++++++++++++++-
 src/views/interface/ThemeEdit.vue             |  4 +--
 src/views/post/PostList.vue                   |  1 +
 src/views/system/About.vue                    |  4 +++
 8 files changed, 64 insertions(+), 8 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index e6323635..59ae1422 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.1.0-beta.3",
+  "version": "1.1.0",
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
diff --git a/package.json b/package.json
index 719d12c6..2d2723a6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "halo-admin",
-  "version": "1.1.0-beta.3",
+  "version": "1.1.0",
   "private": true,
   "scripts": {
     "serve": "vue-cli-service serve",
diff --git a/src/api/theme.js b/src/api/theme.js
index 81463706..2863546b 100644
--- a/src/api/theme.js
+++ b/src/api/theme.js
@@ -182,4 +182,4 @@ themeApi.exists = template => {
   })
 }
 
-export default themeApi
\ No newline at end of file
+export default themeApi
diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
index 1dd697b2..3c67c527 100644
--- a/src/views/comment/components/CommentTab.vue
+++ b/src/views/comment/components/CommentTab.vue
@@ -108,6 +108,22 @@
           :loading="loading"
           :pagination="false"
         >
+          <template
+            slot="author"
+            slot-scope="text,record"
+          >
+            <a-icon
+              type="user"
+              v-if="record.isAdmin"
+              style="margin-right: 3px;"
+            />
+            <a
+              :href="record.authorUrl"
+              target="_blank"
+              v-if="record.authorUrl"
+            >{{ text }}</a>
+            <span v-else>{{ text }}</span>
+          </template>
           <p
             class="comment-content-wrapper"
             slot="content"
@@ -272,7 +288,8 @@ import commentApi from '@/api/comment'
 const postColumns = [
   {
     title: '昵称',
-    dataIndex: 'author'
+    dataIndex: 'author',
+    scopedSlots: { customRender: 'author' }
   },
   {
     title: '内容',
@@ -308,7 +325,8 @@ const postColumns = [
 const sheetColumns = [
   {
     title: '昵称',
-    dataIndex: 'author'
+    dataIndex: 'author',
+    scopedSlots: { customRender: 'author' }
   },
   {
     title: '内容',
diff --git a/src/views/dashboard/components/RecentCommentTab.vue b/src/views/dashboard/components/RecentCommentTab.vue
index 884307fa..20e704e1 100644
--- a/src/views/dashboard/components/RecentCommentTab.vue
+++ b/src/views/dashboard/components/RecentCommentTab.vue
@@ -18,9 +18,22 @@
             :href="item.authorUrl"
             target="_blank"
           >{{ item.author }}</a> 发表在 《<a
+            v-if="item.post.status=='PUBLISHED'"
             :href="options.blog_url+'/archives/'+item.post.url"
             target="_blank"
-          >{{ item.post.title }}</a>》
+          >{{ item.post.title }}</a><a
+            v-else-if="item.post.status=='INTIMATE'"
+            :href="options.blog_url+'/archives/'+item.post.url+'/password'"
+            target="_blank"
+          >{{ item.post.title }}</a><a
+            v-else-if="item.post.status=='DRAFT'"
+            href="javascript:void(0)"
+            @click="handlePostPreview(item.post.id)"
+          >{{ item.post.title }}</a><a
+            v-else
+            href="javascript:void(0)"
+          >{{ item.post.title }}</a>
+          》
         </template>
         <template
           slot="author"
@@ -30,8 +43,16 @@
             :href="item.authorUrl"
             target="_blank"
           >{{ item.author }}</a> 发表在 《<a
+            v-if="item.sheet.status=='PUBLISHED'"
             :href="options.blog_url+'/s/'+item.sheet.url"
             target="_blank"
+          >{{ item.sheet.title }}</a><a
+            v-else-if="item.sheet.status=='DRAFT'"
+            href="javascript:void(0)"
+            @click="handleSheetPreview(item.sheet.id)"
+          >{{ item.sheet.title }}</a><a
+            v-else
+            href="javascript:void(0)"
           >{{ item.sheet.title }}</a>》
         </template>
         <!-- <template slot="actions">
@@ -56,6 +77,8 @@
 <script>
 import { mapGetters } from 'vuex'
 import commentApi from '@/api/comment'
+import postApi from '@/api/post'
+import sheetApi from '@/api/sheet'
 
 import marked from 'marked'
 export default {
@@ -95,6 +118,16 @@ export default {
         this.comments = response.data.data
         this.loading = false
       })
+    },
+    handlePostPreview(postId) {
+      postApi.preview(postId).then(response => {
+        window.open(response.data, '_blank')
+      })
+    },
+    handleSheetPreview(sheetId) {
+      sheetApi.preview(sheetId).then(response => {
+        window.open(response.data, '_blank')
+      })
     }
   }
 }
diff --git a/src/views/interface/ThemeEdit.vue b/src/views/interface/ThemeEdit.vue
index 424fe1b9..c835b949 100644
--- a/src/views/interface/ThemeEdit.vue
+++ b/src/views/interface/ThemeEdit.vue
@@ -143,14 +143,14 @@ export default {
           }
         })
       }
-      themeApi.getContent(this.selectedTheme.id,file.path).then(response => {
+      themeApi.getContent(this.selectedTheme.id, file.path).then(response => {
         this.content = response.data.data
         this.file = file
         this.buttonDisabled = false
       })
     },
     handlerSaveContent() {
-      themeApi.saveContent(this.selectedTheme.id,this.file.path, this.content).then(response => {
+      themeApi.saveContent(this.selectedTheme.id, this.file.path, this.content).then(response => {
         this.$message.success('保存成功！')
       })
     }
diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue
index 997f2455..1278bf31 100644
--- a/src/views/post/PostList.vue
+++ b/src/views/post/PostList.vue
@@ -141,6 +141,7 @@
               v-if="record.topPriority!=0"
               theme="twoTone"
               twoToneColor="red"
+              style="margin-right: 3px;"
             />
             <a
               v-if="record.status=='PUBLISHED'"
diff --git a/src/views/system/About.vue b/src/views/system/About.vue
index 01e23ca3..b46d2a0b 100644
--- a/src/views/system/About.vue
+++ b/src/views/system/About.vue
@@ -155,6 +155,10 @@ export default {
         }
       ],
       steps: [
+        {
+          date: '2019-09-11',
+          content: 'Halo v1.1.0 发布'
+        },
         {
           date: '2019-07-09',
           content: 'Halo v1.0.3 发布'