diff --git a/src/components/global.less b/src/components/global.less
index 24c61ca0..daae476c 100644
--- a/src/components/global.less
+++ b/src/components/global.less
@@ -597,6 +597,9 @@ body {
       p {
         margin-top: 1rem;
         margin-bottom: 0;
+        img {
+          width: 100%;
+        }
       }
     }
   }
diff --git a/src/views/attachment/AttachmentList.vue b/src/views/attachment/AttachmentList.vue
index 1d78741e..42e2ca34 100644
--- a/src/views/attachment/AttachmentList.vue
+++ b/src/views/attachment/AttachmentList.vue
@@ -22,7 +22,7 @@
                   :sm="24"
                 >
                   <a-form-item label="关键词">
-                    <a-input v-model="queryParam.keyword" />
+                    <a-input v-model="queryParam.keyword" @keyup.enter="handleQuery()"/>
                   </a-form-item>
                 </a-col>
                 <a-col
diff --git a/src/views/comment/components/CommentTab.vue b/src/views/comment/components/CommentTab.vue
index 66658950..952ff11c 100644
--- a/src/views/comment/components/CommentTab.vue
+++ b/src/views/comment/components/CommentTab.vue
@@ -12,7 +12,7 @@
               :sm="24"
             >
               <a-form-item label="关键词">
-                <a-input v-model="queryParam.keyword" />
+                <a-input v-model="queryParam.keyword" @keyup.enter="handleQuery()"/>
               </a-form-item>
             </a-col>
             <a-col
diff --git a/src/views/comment/components/TargetCommentDrawer.vue b/src/views/comment/components/TargetCommentDrawer.vue
index 53fe3f82..6108022a 100644
--- a/src/views/comment/components/TargetCommentDrawer.vue
+++ b/src/views/comment/components/TargetCommentDrawer.vue
@@ -25,7 +25,7 @@
         <a-empty v-if="comments.length==0" />
         <TargetCommentTree
           v-else
-          v-for="(comment, index) in comments"
+          v-for="(comment, index) in formattedComments"
           :key="index"
           :comment="comment"
           @reply="handleCommentReply"
@@ -48,6 +48,7 @@
 import { mixin, mixinDevice } from '@/utils/mixin.js'
 import TargetCommentTree from './TargetCommentTree'
 import commentApi from '@/api/comment'
+import marked from 'marked'
 export default {
   name: 'TargetCommentDrawer',
   mixins: [mixin, mixinDevice],
@@ -104,6 +105,14 @@ export default {
       }
     }
   },
+  computed: {
+    formattedComments() {
+      return this.comments.map(comment => {
+        comment.content = marked(comment.content, { sanitize: true })
+        return comment
+      })
+    }
+  },
   methods: {
     loadComments() {
       this.queryParam.page = this.pagination.page - 1
@@ -123,6 +132,12 @@ export default {
     handleCommentDelete() {},
 
     onClose() {
+      this.comments = []
+      this.pagination = {
+        page: 1,
+        size: 10,
+        sort: ''
+      }
       this.$emit('close', false)
     }
   }
diff --git a/src/views/comment/components/TargetCommentTree.vue b/src/views/comment/components/TargetCommentTree.vue
index 3b0e6c88..a169a2d4 100644
--- a/src/views/comment/components/TargetCommentTree.vue
+++ b/src/views/comment/components/TargetCommentTree.vue
@@ -18,7 +18,7 @@
         :src="avatar"
         :alt="comment.author"
       />
-      <p slot="content">{{ comment.content }}</p>
+      <p slot="content" v-html="comment.content"></p>
       <template v-if="comment.children">
         <TargetCommentTree
           v-for="(child, index) in comment.children"
diff --git a/src/views/post/PostList.vue b/src/views/post/PostList.vue
index fc049ed4..9ca18e35 100644
--- a/src/views/post/PostList.vue
+++ b/src/views/post/PostList.vue
@@ -12,7 +12,7 @@
               :sm="24"
             >
               <a-form-item label="关键词">
-                <a-input v-model="queryParam.keyword" />
+                <a-input v-model="queryParam.keyword" @keyup.enter="handleQuery()"/>
               </a-form-item>
             </a-col>
             <a-col
diff --git a/src/views/sheet/internal/JournalList.vue b/src/views/sheet/internal/JournalList.vue
index c5e1ea3a..1da3189c 100644
--- a/src/views/sheet/internal/JournalList.vue
+++ b/src/views/sheet/internal/JournalList.vue
@@ -14,7 +14,7 @@
                   :sm="24"
                 >
                   <a-form-item label="关键词">
-                    <a-input v-model="queryParam.keyword" />
+                    <a-input v-model="queryParam.keyword" @keyup.enter="handleQuery()"/>
                   </a-form-item>
                 </a-col>
                 <a-col