diff --git a/package.json b/package.json
index 752b48c9a..b71849a86 100644
--- a/package.json
+++ b/package.json
@@ -65,7 +65,7 @@
     "vue": "^2.6.14",
     "vue-loader": "^15.9.8",
     "vue-template-compiler": "^2.6.14",
-    "webpack": "^5.63.0",
+    "webpack": "^5.91.0",
     "webpack-bundle-analyzer": "^4.5.0",
     "webpack-cli": "^4.9.1",
     "webpack-dev-server": "^4.4.0"
diff --git a/src/client/utils/highlight.js b/src/client/utils/highlight.js
index 8963531e7..3a958b671 100644
--- a/src/client/utils/highlight.js
+++ b/src/client/utils/highlight.js
@@ -12,6 +12,8 @@ const renderCode = (el, theme) => {
     Prism = require('prismjs')
     require('prismjs/plugins/autoloader/prism-autoloader')
     Prism.plugins.autoloader.languages_path = `${prismCdn}/components/`
+    // require('prismjs/plugins/toolbar/prism-toolbar')
+    // require('prismjs/plugins/show-language/prism-show-language')
   }
   loadCss(theme, prismCdn)
   Prism.highlightAllUnder(el)
diff --git a/src/client/view/components/TkComment.vue b/src/client/view/components/TkComment.vue
index 46f77db13..3877d94f0 100644
--- a/src/client/view/components/TkComment.vue
+++ b/src/client/view/components/TkComment.vue
@@ -31,10 +31,20 @@
             @like="onLike"
             @reply="onReply" />
       </div>
-      <div class="tk-content">
+      <div class="tk-content" :class="{ 'tk-content-expand': isContentExpanded || !showContentExpand }" ref="tk-content">
         <span v-if="comment.pid">{{ t('COMMENT_REPLIED') }} <a class="tk-ruser" :href="`#${comment.pid}`">@{{ comment.ruser }}</a> :</span>
         <span v-html="comment.comment" ref="comment" @click="popupLightbox"></span>
       </div>
+      <div class="tk-expand-wrap" v-if="showContentExpand">
+        <div class="tk-expand" @click="onContentExpand">
+            {{ t('COMMENT_EXPAND') }}
+        </div>
+      </div>
+      <div class="tk-collapse-wrap" v-if="showContentCollapse">
+        <div class="tk-expand _collapse" @click="onContentCollapse">
+            {{ t('COMMENT_COLLAPSE') }}
+        </div>
+      </div>
       <div class="tk-extras" v-if="comment.ipRegion || comment.os || comment.browser">
         <div class="tk-extra" v-if="comment.ipRegion">
           <span class="tk-icon __comment" v-html="iconLocation"></span>
@@ -49,25 +59,35 @@
           <span class="tk-extra-text">&nbsp;{{ comment.browser }}</span>
         </div>
       </div>
+      <!-- 回复框 -->
+      <tk-submit v-if="replying && !pid"
+        :reply-id="replyId ? replyId : comment.id"
+        :pid="comment.id"
+        :config="config"
+        @load="onLoad"
+        @cancel="onCancel" />
       <!-- 回复列表 -->
-      <div class="tk-replies" :class="{ 'tk-replies-expand': isExpanded || !showExpand }" ref="tk-replies">
+      <div class="tk-replies" :class="{ 'tk-replies-expand': isExpanded || !showExpand || replying }" ref="tk-replies">
         <tk-comment v-for="reply in comment.replies"
             :key="reply.id"
             :comment="reply"
+            :replyId="comment.id"
+            :replying="replying && pid === reply.id"
             :config="config"
             @expand="onExpand"
             @load="onLoad"
             @reply="onReplyReply" />
       </div>
-      <!-- 回复框 -->
-      <tk-submit v-if="replying"
-          :reply-id="comment.id"
-          :pid="pid"
-          :config="config"
-          @load="onLoad"
-          @cancel="onCancel" />
-      <div class="tk-expand" v-if="showExpand" @click="onExpand">{{ t('COMMENT_EXPAND') }}</div>
-      <div class="tk-expand _collapse" v-if="showCollapse" @click="onCollapse">{{ t('COMMENT_COLLAPSE') }}</div>
+      <div class="tk-expand-wrap" v-if="showExpand && !replying">
+        <div class="tk-expand" @click="onExpand">
+            {{ t('COMMENT_EXPAND') }}
+        </div>
+      </div>
+      <div class="tk-collapse-wrap" v-if="showCollapse && !replying">
+        <div class="tk-expand _collapse" @click="onCollapse">
+            {{ t('COMMENT_COLLAPSE') }}
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -125,11 +145,14 @@ export default {
       likeLoading: false,
       isExpanded: false,
       hasExpand: false,
+      isContentExpanded: false,
+      hasContentExpand: false,
       isLogin: false
     }
   },
   props: {
     comment: Object,
+    replyId: String,
     replying: Boolean,
     config: Object
   },
@@ -156,6 +179,12 @@ export default {
     showCollapse () {
       return this.hasExpand && this.isExpanded
     },
+    showContentExpand () {
+      return this.hasContentExpand && !this.isContentExpanded
+    },
+    showContentCollapse () {
+      return this.hasContentExpand && this.isContentExpanded
+    },
     convertedLink () {
       return convertLink(this.comment.link)
     }
@@ -173,12 +202,22 @@ export default {
       if (this.comment.replies && this.comment.replies.length > 0 && this.$refs['tk-replies']) {
         // 200 是回复区域最大高度
         // 36 是展开按钮高度
-        this.hasExpand = this.$refs['tk-replies'].scrollHeight > 200 + 36
+        this.hasExpand = parseFloat(getComputedStyle(this.$refs['tk-replies'], null).height.replace('px', '')) > 501  // 200 + 36
       }
     },
+    showContentExpandIfNeed () {
+      this.hasContentExpand = parseFloat(getComputedStyle(this.$refs['tk-content'], null).height.replace('px', '')) > 301 // window.innerHeight * 0.75
+      this.$refs['tk-content'].querySelectorAll('img').forEach(img => {
+        img.onload = () => {
+          this.hasContentExpand = parseFloat(getComputedStyle(this.$refs['tk-content'], null).height.replace('px', '')) > 301
+        }
+      });
+    },
     scrollToComment () {
       if (window.location.hash.indexOf(this.comment.id) !== -1) {
-        this.$refs['tk-comment'].scrollIntoView()
+        this.$refs['tk-comment'].scrollIntoView({
+          "behavier": "smooth"
+        })
         this.$emit('expand')
       }
     },
@@ -194,19 +233,32 @@ export default {
       this.liked = !this.liked
       this.likeLoading = false
     },
-    onReply () {
+    onReply (id) {
+      this.pid = id
       this.$emit('reply', this.comment.id)
     },
     onReplyReply (id) {
       // 楼中楼回复
       this.pid = id
-      this.$emit('reply', this.comment.id)
+      if (id) {
+        // action 回复按钮 触发
+        this.$emit('reply', this.comment.id)
+      } else {
+        // submit 取消按钮 触发
+        this.$emit('reply', '')
+      }
     },
     onCancel () {
       this.pid = ''
       this.$emit('reply', '')
     },
     onLoad () {
+      if (this.comment.replies.length > 0) {
+        this.$refs["tk-replies"].lastElementChild.scrollIntoView({
+          "behavier": "smooth",
+          "block": "center"
+        })
+      }
       this.pid = ''
       this.$emit('reply', '')
       this.$emit('load')
@@ -218,6 +270,12 @@ export default {
     onCollapse () {
       this.isExpanded = false
     },
+    onContentExpand () {
+      this.isContentExpanded = true
+    },
+    onContentCollapse () {
+      this.isContentExpanded = false
+    },
     async checkAuth () {
       // 检查用户身份
       if (this.$tcb) {
@@ -262,6 +320,7 @@ export default {
     }
   },
   mounted () {
+    this.$nextTick(this.showContentExpandIfNeed)
     this.$nextTick(this.showExpandIfNeed)
     this.$nextTick(this.scrollToComment)
     this.$nextTick(() => {
@@ -389,12 +448,21 @@ export default {
   vertical-align: middle;
 }
 .tk-replies {
-  max-height: 200px;
+  max-height: 500px;
   overflow: hidden;
   position: relative;
 }
 .tk-replies-expand {
   max-height: none;
+  overflow: unset;
+}
+.tk-content {
+  max-height: 300px;
+  overflow: hidden;
+  position: relative;
+}
+.tk-content-expand {
+  max-height: none;
 }
 .tk-submit {
   margin-top: 1rem;
diff --git a/src/client/view/components/TkComments.vue b/src/client/view/components/TkComments.vue
index 1a478a2cc..fdb9a9317 100644
--- a/src/client/view/components/TkComments.vue
+++ b/src/client/view/components/TkComments.vue
@@ -24,7 +24,11 @@
         :config="config"
         @reply="onReply"
         @load="initComments" />
-      <div class="tk-expand" v-if="showExpand && !loading" @click="onExpand" v-loading="loadingMore">{{ t('COMMENTS_EXPAND') }}</div>
+      <div class="tk-expand-wrap" v-if="showExpand && !loading">
+        <div class="tk-expand" @click="onExpand" v-loading="loadingMore">
+            {{ t('COMMENTS_EXPAND') }}
+        </div>
+      </div>
     </div>
   </div>
 </template>
diff --git a/src/client/view/components/TkSubmit.vue b/src/client/view/components/TkSubmit.vue
index 528f04dd1..430321ae9 100644
--- a/src/client/view/components/TkSubmit.vue
+++ b/src/client/view/components/TkSubmit.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="tk-submit">
+  <div class="tk-submit" ref="tk-submit">
     <div class="tk-row">
       <tk-avatar :config="config" :mail="mail" />
       <div class="tk-col">
@@ -372,6 +372,12 @@ export default {
     }
   },
   mounted () {
+    if (this.pid) {
+      this.$refs["tk-submit"].scrollIntoView({
+        "behavier": "smooth",
+        "block": "center"
+      })
+    }
     this.initDraft()
     this.initOwo()
     this.addEventListener()