From 75b5ea43ce1d7f6784396ed0b6e713bdbf279a62 Mon Sep 17 00:00:00 2001
From: ruibaby <i@ryanc.cc>
Date: Fri, 20 Dec 2019 22:06:31 +0800
Subject: [PATCH] feat: support markdown for journal.

---
 src/components/global.less                    |  7 ++
 .../components/TargetCommentDrawer.vue        |  5 +-
 src/views/dashboard/Dashboard.vue             |  4 +-
 src/views/sheet/internal/JournalList.vue      | 68 ++++++-------------
 src/views/system/components/BackupDrawer.vue  |  2 +-
 .../system/developer/tabs/RuntimeLogs.vue     |  2 +-
 6 files changed, 36 insertions(+), 52 deletions(-)

diff --git a/src/components/global.less b/src/components/global.less
index 14014097..b60716e0 100644
--- a/src/components/global.less
+++ b/src/components/global.less
@@ -874,4 +874,11 @@ body {
   bottom: 0;
   left: 0;
   z-index: 10;
+}
+
+.journal-list-content,
+.comment-drawer-content {
+  img {
+    width: 100%;
+  }
 }
\ No newline at end of file
diff --git a/src/views/comment/components/TargetCommentDrawer.vue b/src/views/comment/components/TargetCommentDrawer.vue
index 101f0bb1..5b01954d 100644
--- a/src/views/comment/components/TargetCommentDrawer.vue
+++ b/src/views/comment/components/TargetCommentDrawer.vue
@@ -14,7 +14,10 @@
       <a-col :span="24">
         <a-list itemLayout="horizontal">
           <a-list-item>
-            <a-list-item-meta :description="description">
+            <a-list-item-meta>
+              <template slot="description">
+                <p v-html="description" class="comment-drawer-content"></p>
+              </template>
               <h3 slot="title">{{ title }}</h3>
             </a-list-item-meta>
           </a-list-item>
diff --git a/src/views/dashboard/Dashboard.vue b/src/views/dashboard/Dashboard.vue
index 3567a068..89d7dbea 100644
--- a/src/views/dashboard/Dashboard.vue
+++ b/src/views/dashboard/Dashboard.vue
@@ -203,7 +203,7 @@
               <a-input
                 type="textarea"
                 :autosize="{ minRows: 8 }"
-                v-model="journal.content"
+                v-model="journal.sourceContent"
                 placeholder="写点什么吧..."
               />
             </a-form-item>
@@ -446,7 +446,7 @@ export default {
       this.$router.push({ name: 'PostEdit', query: { postId: post.id } })
     },
     handleCreateJournalClick() {
-      if (!this.journal.content) {
+      if (!this.journal.sourceContent) {
         this.$notification['error']({
           message: '提示',
           description: '内容不能为空！'
diff --git a/src/views/sheet/internal/JournalList.vue b/src/views/sheet/internal/JournalList.vue
index 1cc356a2..19e740a9 100644
--- a/src/views/sheet/internal/JournalList.vue
+++ b/src/views/sheet/internal/JournalList.vue
@@ -14,7 +14,10 @@
                   :sm="24"
                 >
                   <a-form-item label="关键词">
-                    <a-input v-model="queryParam.keyword" @keyup.enter="handleQuery()"/>
+                    <a-input
+                      v-model="queryParam.keyword"
+                      @keyup.enter="handleQuery()"
+                    />
                   </a-form-item>
                 </a-col>
                 <a-col
@@ -121,7 +124,10 @@
                   </a-popconfirm>
                 </template>
 
-                <a-list-item-meta :description="item.content">
+                <a-list-item-meta>
+                  <template slot="description">
+                    <p v-html="item.content" class="journal-list-content"></p>
+                  </template>
                   <span slot="title">{{ item.createTime | moment }}</span>
                   <a-avatar
                     slot="avatar"
@@ -160,6 +166,10 @@
         </a-tooltip>
       </template>
       <template slot="footer">
+        <a-button
+          type="dashed"
+          @click="()=>this.attachmentDrawerVisible = true"
+        >附件库</a-button>
         <a-button
           key="submit"
           type="primary"
@@ -171,7 +181,7 @@
           <a-input
             type="textarea"
             :autosize="{ minRows: 8 }"
-            v-model="journal.content"
+            v-model="journal.sourceContent"
           />
         </a-form-item>
         <a-form-item>
@@ -185,49 +195,29 @@
       </a-form>
     </a-modal>
 
-    <!-- 评论回复弹窗 -->
-    <a-modal
-      v-if="selectComment"
-      :title="'回复给：'+selectComment.author"
-      v-model="selectCommentVisible"
-    >
-      <template slot="footer">
-        <a-button
-          key="submit"
-          type="primary"
-          @click="handleReplyComment"
-        >回复</a-button>
-      </template>
-      <a-form layout="vertical">
-        <a-form-item>
-          <a-input
-            type="textarea"
-            :autosize="{ minRows: 8 }"
-            v-model="replyComment.content"
-          />
-        </a-form-item>
-      </a-form>
-    </a-modal>
     <TargetCommentDrawer
       :visible="journalCommentVisible"
-      :title="journal.content"
-      :description="``"
+      :title="journal.title"
+      :description="journal.content"
       :target="`journals`"
       :id="journal.id"
       @close="onJournalCommentsClose"
     />
+
+    <AttachmentDrawer v-model="attachmentDrawerVisible" />
   </div>
 </template>
 
 <script>
 import TargetCommentDrawer from '../../comment/components/TargetCommentDrawer'
+import AttachmentDrawer from '../../attachment/components/AttachmentDrawer'
 import { mixin, mixinDevice } from '@/utils/mixin.js'
 import { mapGetters } from 'vuex'
 import journalApi from '@/api/journal'
 import journalCommentApi from '@/api/journalComment'
 export default {
   mixins: [mixin, mixinDevice],
-  components: { TargetCommentDrawer },
+  components: { TargetCommentDrawer, AttachmentDrawer },
   data() {
     return {
       journalType: journalApi.journalType,
@@ -235,7 +225,7 @@ export default {
       listLoading: false,
       visible: false,
       journalCommentVisible: false,
-      selectCommentVisible: false,
+      attachmentDrawerVisible: false,
       pagination: {
         page: 1,
         size: 10,
@@ -252,7 +242,6 @@ export default {
       comments: [],
       journal: {},
       isPublic: true,
-      selectComment: null,
       replyComment: {}
     }
   },
@@ -298,21 +287,6 @@ export default {
       this.journal = journal
       this.journalCommentVisible = true
     },
-    handleCommentReplyClick(comment) {
-      this.selectComment = comment
-      this.selectCommentVisible = true
-      this.replyComment.parentId = comment.id
-      this.replyComment.postId = this.journal.id
-    },
-    handleReplyComment() {
-      journalCommentApi.create(this.replyComment).then(response => {
-        this.$message.success('回复成功！')
-        this.replyComment = {}
-        this.selectComment = {}
-        this.selectCommentVisible = false
-        this.handleCommentShow(this.journal)
-      })
-    },
     handleCommentDelete(comment) {
       journalCommentApi.delete(comment.id).then(response => {
         this.$message.success('删除成功！')
@@ -322,7 +296,7 @@ export default {
     createOrUpdateJournal() {
       this.journal.type = this.isPublic ? 'PUBLIC' : 'INTIMATE'
 
-      if (!this.journal.content) {
+      if (!this.journal.sourceContent) {
         this.$notification['error']({
           message: '提示',
           description: '发布内容不能为空！'
diff --git a/src/views/system/components/BackupDrawer.vue b/src/views/system/components/BackupDrawer.vue
index cc81f9f3..7a613c47 100644
--- a/src/views/system/components/BackupDrawer.vue
+++ b/src/views/system/components/BackupDrawer.vue
@@ -91,7 +91,7 @@
         @click="handleBackupClick"
       >备份</a-button>
       <a-button
-        type="dash"
+        type="dashed"
         icon="reload"
         :loading="loading"
         @click="handleBAckupRefreshClick"
diff --git a/src/views/system/developer/tabs/RuntimeLogs.vue b/src/views/system/developer/tabs/RuntimeLogs.vue
index 6c5046aa..2bc02532 100644
--- a/src/views/system/developer/tabs/RuntimeLogs.vue
+++ b/src/views/system/developer/tabs/RuntimeLogs.vue
@@ -28,7 +28,7 @@
         style="margin-right: 8px;"
         @click="()=>this.loadLogs()"
       >刷新</a-button>
-      <a-button type="dash" @click="handleDownloadLogFile()">下载</a-button>
+      <a-button type="dashed" @click="handleDownloadLogFile()">下载</a-button>
     </a-form-item>
   </a-form>
 </template>