diff --git a/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue b/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
index fdaf62d242..9a21c10b23 100644
--- a/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
+++ b/test-track/frontend/src/business/case/components/BaseEditItemComponent.vue
@@ -27,7 +27,7 @@
       <div class="readonly" v-show="!edit">
         <div
           class="text"
-          v-if="contentObject.content && contentObject.contentType == 'TEXT'"
+          v-if="contentObject.content && contentObject.contentType === 'TEXT'"
           @click="handleReadTextClick"
         >
           {{ contentObject.content }}
@@ -35,7 +35,7 @@
         <div
           class="select"
           v-else-if="
-            contentObject.content && contentObject.contentType == 'INPUT'
+            contentObject.content && contentObject.contentType === 'INPUT'
           "
           @click="handleReadTextClick"
           @mouseenter="mouseEnterEvent"
@@ -46,7 +46,7 @@
           class="tag-wrap"
           v-else-if="
             contentObject.content &&
-            contentObject.contentType == 'TAG' &&
+            contentObject.contentType === 'TAG' &&
             Array.isArray(contentObject.content) &&
             contentObject.content.length > 0
           "
@@ -67,7 +67,7 @@
           v-else-if="
             contentObject.content &&
             contentObject.content.demandId &&
-            contentObject.contentType == 'STORY'
+            contentObject.contentType === 'STORY'
           "
           @click="handleReadTextClick"
         >
@@ -81,7 +81,7 @@
         <div
           class="select"
           v-else-if="
-            contentObject.content && contentObject.contentType == 'SELECT'
+            contentObject.content && contentObject.contentType === 'SELECT'
           "
           @mouseenter="mouseEnterEvent"
         >
@@ -90,21 +90,35 @@
         <div
           class="select"
           v-else-if="
-            contentObject.content && contentObject.contentType == 'RICHTEXT'
+            contentObject.content && contentObject.contentType === 'RICHTEXT'
           "
           @click="handleReadTextClick"
         >
-          {{ contentObject.content }}
+          <ms-mark-down-text
+            v-if="contentObject.contentType === 'RICHTEXT'"
+            class="rich-text"
+            prop="content"
+            :disabled="true"
+            :data="contentObject"/>
         </div>
         <div
           v-else-if="
-            contentObject.content && contentObject.contentType == 'CUSTOM'
+            contentObject.content && contentObject.contentType === 'CUSTOM'
           "
           :class="getCustomComponentType()"
           @click="handleReadTextClick"
           @mouseenter="mouseEnterEvent"
         >
-          {{ getCustomText() }}
+          <span v-if="contentObject.content.type !== 'richText'">
+            {{ getCustomText() }}
+          </span>
+          <span v-else>
+             <ms-mark-down-text
+               class="rich-text"
+               prop="defaultValue"
+               :disabled="true"
+               :data="contentObject.content"/>
+          </span>
         </div>
         <div class="empty" v-else @click="handleReadTextClick">
           {{ $t("case.none") }}
@@ -115,8 +129,10 @@
 </template>
 <script>
 import { getProjectMemberOption } from "metersphere-frontend/src/api/user";
+import MsMarkDownText from "@/business/case/components/richtext/MsMarkDownText";
 export default {
   name: "BaseEditItemComponent",
+  components: {MsMarkDownText},
   data() {
     return {
       selfEditable: false,
@@ -149,7 +165,7 @@ export default {
     contentClickEvent: {
       type: Boolean,
       default: true,
-    },
+    }
   },
   computed: {
     edit() {
@@ -403,6 +419,20 @@ export default {
 </script>
 <style scoped lang="scss">
 @import "@/business/style/index.scss";
+
+.rich-text {
+  border: 0px !important;
+  box-sizing: border-box;
+  border-radius: 4px;
+  box-shadow: none !important;
+  padding: 0 !important;
+}
+
+.rich-text :deep(.v-show-content) {
+  background-color: #fff !important;
+  padding: 0 !important;
+}
+
 .text {
   font-family: "PingFang SC";
   font-style: normal;
diff --git a/test-track/frontend/src/business/case/components/TestCaseEdit.vue b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
index d5e6726e9e..98de9be503 100644
--- a/test-track/frontend/src/business/case/components/TestCaseEdit.vue
+++ b/test-track/frontend/src/business/case/components/TestCaseEdit.vue
@@ -2102,8 +2102,6 @@ export default {
             border-bottom: 1px solid #bbbfc4;
           }
           :deep(.v-note-wrapper) {
-            box-sizing: border-box;
-            border: 1px solid #bbbfc4 !important;
             border-radius: 4px;
             box-shadow: none !important;
           }
diff --git a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
index 13c58ee724..f474e0d31d 100644
--- a/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseBaseInfo.vue
@@ -840,7 +840,6 @@ export default {
           }
           :deep(.v-note-wrapper) {
             box-sizing: border-box;
-            border: 1px solid #bbbfc4 !important;
             border-radius: 4px;
             box-shadow: none !important;
           }
diff --git a/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue b/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue
index 9442608ce5..1470456645 100644
--- a/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseCommentEdit.vue
@@ -126,9 +126,6 @@ export default {
       :deep(.v-right-item) {
         display: none;
       }
-      :deep(.v-note-wrapper:hover) {
-        border: 1px solid #783887 !important;
-      }
       :deep(.v-note-wrapper .v-note-op) {
         height: 34px !important;
         min-height: 34px !important;
diff --git a/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue b/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue
index 79b4773ef5..050bb51649 100644
--- a/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseDetailComponent.vue
@@ -432,13 +432,9 @@ export default {
           }
           :deep(.v-note-wrapper) {
             box-sizing: border-box;
-            border: 1px solid #bbbfc4 !important;
             border-radius: 4px;
             box-shadow: none !important;
           }
-          :deep(.v-note-wrapper:hover) {
-            border: 1px solid #783887 !important;
-          }
 
           :deep(.v-note-show) {
             min-height: 65px;
diff --git a/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue b/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
index e4d694eec2..7ead72528e 100644
--- a/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseEditInfoComponent.vue
@@ -149,6 +149,7 @@
     <el-scrollbar>
       <div class="content-container editable-container" v-if="editable">
         <case-detail-component
+          :class="{ 'edit-component' : (editableState || editable) }"
           :type="type"
           :case-id="caseId"
           :read-only="readOnly"
@@ -516,6 +517,10 @@ export default {
 <style scoped lang="scss">
 @import "@/business/style/index.scss";
 
+.edit-component :deep(.v-note-wrapper) {
+  border: 1px solid #bbbfc4 !important;
+}
+
 .case-edit-wrap {
   :deep(.el-form-item__content) {
     line-height: px2rem(32);
@@ -619,7 +624,6 @@ export default {
           }
           :deep(.v-note-wrapper) {
             box-sizing: border-box;
-            border: 1px solid #bbbfc4 !important;
             border-radius: 4px;
             box-shadow: none !important;
           }
diff --git a/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue b/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue
index cff2103ca1..cfc7083bef 100644
--- a/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue
+++ b/test-track/frontend/src/business/case/components/case/CaseTestRelate.vue
@@ -253,7 +253,6 @@ export default {
 @import "@/business/style/index.scss";
 .el-button.el-button--default.el-button--small {
   background: #ffffff;
-  border: 1px solid #783887 !important;
   border-radius: 4px;
 }
 .relate-container {
diff --git a/test-track/frontend/src/business/case/components/richtext/FormRichTextItem.vue b/test-track/frontend/src/business/case/components/richtext/FormRichTextItem.vue
index 5a591827c4..8a7b6bb25d 100644
--- a/test-track/frontend/src/business/case/components/richtext/FormRichTextItem.vue
+++ b/test-track/frontend/src/business/case/components/richtext/FormRichTextItem.vue
@@ -53,7 +53,6 @@ export default {
 }
 :deep(.v-note-wrapper) {
   box-sizing: border-box;
-  border: 1px solid #bbbfc4 !important;
   border-radius: 4px;
   box-shadow: none !important;
 }
diff --git a/test-track/frontend/src/business/review/commom/ReviewCommentItem.vue b/test-track/frontend/src/business/review/commom/ReviewCommentItem.vue
index 8d100a0ee6..e50567c6dc 100644
--- a/test-track/frontend/src/business/review/commom/ReviewCommentItem.vue
+++ b/test-track/frontend/src/business/review/commom/ReviewCommentItem.vue
@@ -18,20 +18,11 @@
         <el-link icon="el-icon-close" v-prevent-link-re-click="1300" @click="deleteComment" :disabled="readOnly"/>
       </span>
       <br/>
-
-      <div v-if="!isImage" class="comment-desc" style="font-size: 10px;color: #303133">
-        <pre>{{ comment.description }}</pre>
-      </div>
-      <div v-if="isImage" class="demo-image__preview">
-        <pre>{{ imgDescription }}</pre>
-        <el-image
-          :z-index="imageIndex"
-          style="width: 100px; height: 100px;"
-          fit="contain"
-          :src="src"
-          :preview-src-list="srcList">
-        </el-image>
-      </div>
+      <ms-mark-down-text
+        class="rich-text"
+        prop="description"
+        :disabled="true"
+        :data="comment"/>
     </div>
 
     <el-dialog :visible.sync="visible"
@@ -80,11 +71,9 @@ export default {
     return {
       visible: false,
       imgDescription: '',
-      imageIndex: 99999,
       originDesc: '',
       src: "",
       srcList: [],
-      imgNameList: [],
       description: "",
       imageMatchPattern: "(\\!\\[)\\S+]\\(\\S+\\)",
       toolbars: {
@@ -124,22 +113,12 @@ export default {
       }
     }
   },
-  computed: {
-    isImage() {
-      return this.checkImage(this.comment.description);
-    }
-  },
   methods: {
     deleteComment() {
       if (getCurrentUser().id !== this.comment.author) {
         this.$warning(this.$t('test_track.comment.cannot_delete'));
         return;
       }
-      if (this.imgNameList.length > 0) {
-        this.imgNameList.forEach(imgName => {
-          deleteMarkDownImgByName(imgName);
-        });
-      }
       this.$get(this.apiUrl + "/comment/delete/" + this.comment.id)
         .then(() => {
           this.$success(this.$t('commons.delete_success'));
@@ -166,107 +145,6 @@ export default {
     },
     handleClose() {
       this.comment.description = this.originDesc;
-    },
-    checkImage() {
-      this.srcList = [];
-      let param = this.comment.description;
-      let returnFlag = false;
-      if (param) {
-        let message = param + "";
-        let matchIndex = message.indexOf("](/resource/md/get");
-        if (matchIndex > 0) {
-          let messageSplitArr = message.split("](/resource/md/get");
-          for (let itemIndex = 0; itemIndex < messageSplitArr.length; itemIndex++) {
-            let itemStr = messageSplitArr[itemIndex];
-            let picNameIndex = itemStr.indexOf("![");
-            if (picNameIndex < 0) {
-              let endUrlIndex = itemStr.indexOf(")");
-              if (endUrlIndex > 0) {
-                let itemStrArr = itemStr.substr(0, endUrlIndex);
-                //if(imgNameList.)
-                if (this.imgNameList.indexOf(itemStrArr) < 0) {
-                  this.imgNameList.push(itemStrArr);
-                }
-
-                let imgUrl = "/resource/md/get" + itemStrArr;
-                this.src = imgUrl;
-                if (this.srcList.indexOf(itemStrArr) < 0) {
-                  this.srcList.push(imgUrl);
-                }
-                if (endUrlIndex !== itemStr.length - 1) {
-                  let inputStr = itemStr.substr(endUrlIndex + 1, itemStr.length - 1);
-                  if (this.imgDescription === "") {
-                    this.imgDescription = inputStr;
-                  } else {
-                    this.imgDescription = "\n" + inputStr;
-                  }
-                }
-                if (endUrlIndex !== itemStr.length - 1) {
-                  let inputStr = itemStr.substr(endUrlIndex + 1, itemStr.length - 1);
-                  if (this.imgDescription === "") {
-                    this.imgDescription = inputStr;
-                  } else {
-                    this.imgDescription = "\n" + inputStr;
-                  }
-                }
-              }
-            } else {
-              let inputStr = itemStr.substr(0, picNameIndex);
-              if (this.imgDescription === "") {
-                this.imgDescription = inputStr;
-              } else {
-                this.imgDescription = "\n" + inputStr;
-              }
-            }
-          }
-        } else {
-          let imgUrlIndex = message.indexOf("](http");
-          if (imgUrlIndex > 0) {
-            let imgUrlSplitArr = message.split("](http");
-            for (let itemIndex = 0; itemIndex < imgUrlSplitArr.length; itemIndex++) {
-              let itemStr = imgUrlSplitArr[itemIndex];
-              let picNameIndex = itemStr.indexOf("![");
-              if (picNameIndex < 0) {
-                let endUrlIndex = itemStr.indexOf(")");
-                if (endUrlIndex > 0) {
-                  let itemStrArr = itemStr.substr(0, endUrlIndex);
-                  //if(imgNameList.)
-                  if (this.imgNameList.indexOf(itemStrArr) < 0) {
-                    this.imgNameList.push(itemStrArr);
-                  }
-                  let imgUrl = "http" + itemStrArr;
-                  this.src = imgUrl;
-                  if (this.srcList.indexOf(itemStrArr) < 0) {
-                    this.srcList.push(imgUrl);
-                  }
-                }
-              } else {
-                let inputStr = itemStr.substr(0, picNameIndex);
-                if (this.imgDescription === "") {
-                  this.imgDescription = inputStr;
-                } else {
-                  this.imgDescription = "\n" + inputStr;
-                }
-              }
-            }
-          }
-        }
-        if (this.srcList.length > 0) {
-          returnFlag = true;
-        }
-      }
-      return returnFlag;
-    },
-    checkByUrls(url) {
-      let checkResultFlag = false;
-      if (this.imgNameList.length > 0) {
-        this.imgNameList.forEach(imgName => {
-          if (imgName === url) {
-            checkResultFlag = true;
-          }
-        });
-      }
-      return checkResultFlag;
     }
   }
 }
@@ -304,13 +182,6 @@ export default {
   font-size: 14px;
 }
 
-
-.comment-desc {
-  overflow-wrap: break-word;
-  word-break: break-all;
-  border-bottom: 1px solid #ced3de;
-}
-
 pre {
   margin: 0 0;
   white-space: pre-wrap;
diff --git a/test-track/frontend/src/business/review/view/components/commnet/CommentEditInput.vue b/test-track/frontend/src/business/review/view/components/commnet/CommentEditInput.vue
index 458617f238..edd11d0464 100644
--- a/test-track/frontend/src/business/review/view/components/commnet/CommentEditInput.vue
+++ b/test-track/frontend/src/business/review/view/components/commnet/CommentEditInput.vue
@@ -120,7 +120,6 @@ export default {
   width: 30px !important;
   height: 30px !important;
   background: #FFFFFF !important;
-  border: 1px solid #BBBFC4 !important;
   border-radius: 4px !important;
   padding: 5px 4px 4px 3px !important;
 }