From 7871f3db069856d8ed37b34be68628dcc0b5e236 Mon Sep 17 00:00:00 2001
From: chenjianxing <jianxing.chen@fit2cloud.com>
Date: Mon, 5 Dec 2022 15:14:45 +0800
Subject: [PATCH] =?UTF-8?q?fix(=E6=B5=8B=E8=AF=95=E8=B7=9F=E8=B8=AA):=20?=
 =?UTF-8?q?=E7=A6=85=E9=81=93=E5=9B=BE=E7=89=87=E5=90=8C=E6=AD=A5=E5=90=8E?=
 =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

--bug=1020301 --user=陈建星 【测试跟踪】github #20125， 同步禅道缺陷后，缺陷内容中的图片无法展示 https://www.tapd.cn/55049933/s/1312407
---
 .../src/components/MsMarkDownText.vue         |  8 +++---
 .../IssueProxyResourceController.java         |  4 +--
 .../wapper/IssueProxyResourceService.java     |  2 +-
 .../frontend/src/business/issue/IssueList.vue | 28 +++++++++----------
 .../src/business/issue/MsReviewTableItem.vue  | 27 ++++++++++++++++++
 5 files changed, 47 insertions(+), 22 deletions(-)
 create mode 100644 test-track/frontend/src/business/issue/MsReviewTableItem.vue

diff --git a/framework/sdk-parent/frontend/src/components/MsMarkDownText.vue b/framework/sdk-parent/frontend/src/components/MsMarkDownText.vue
index 2dd450f3ad..2a6adb6d7d 100644
--- a/framework/sdk-parent/frontend/src/components/MsMarkDownText.vue
+++ b/framework/sdk-parent/frontend/src/components/MsMarkDownText.vue
@@ -1,5 +1,5 @@
 <template>
-  <mavon-editor :id="id" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpenValue"
+  <mavon-editor v-loading="loading" :id="id" :editable="!disabled" @imgAdd="imgAdd" :default-open="defaultOpenValue"
                 :xss-options="xssOptions" :style="{'min-height': customMinHeight + 'px', 'min-width': '100px'}"
                 @change="change" :image-click="imageClick"
                 :subfield="false" :toolbars="toolbars" :language="language" :toolbarsFlag="!disabled"
@@ -80,7 +80,7 @@ export default {
   },
   data() {
     return {
-      result: {loading: false},
+      loading: false,
       id: getUUID(),
       xssOptions: {
         whiteList: {
@@ -183,13 +183,13 @@ export default {
   },
   methods: {
     imgAdd(pos, file) {
-      this.result.loading = true;
+      this.loading = true;
       uploadMarkDownImg(file)
         .then((r) => {
           this.$success(this.$t('commons.save_success'));
           let url = '/resource/md/get?fileName=' + r.data;
           this.$refs.md.$img2Url(pos, url);
-          this.result.loading = false;
+          this.loading = false;
         });
       this.$emit('imgAdd', file);
     },
diff --git a/test-track/backend/src/main/java/io/metersphere/controller/IssueProxyResourceController.java b/test-track/backend/src/main/java/io/metersphere/controller/IssueProxyResourceController.java
index cc52eacfdd..b02e5eb1fe 100644
--- a/test-track/backend/src/main/java/io/metersphere/controller/IssueProxyResourceController.java
+++ b/test-track/backend/src/main/java/io/metersphere/controller/IssueProxyResourceController.java
@@ -17,7 +17,7 @@ public class IssueProxyResourceController {
 
     @GetMapping(value = "/md/get/url")
     public ResponseEntity<byte[]> getFileByUrl(@RequestParam ("url") String url, @RequestParam (value = "platform", required = false) String platform,
-                                               @RequestParam ("project_id") String projectId, @RequestParam ("workspace_id") String workspaceId) {
-        return issueProxyResourceService.getMdImageByUrl(url, platform, projectId, workspaceId);
+                                               @RequestParam (value = "workspace_id", required = false) String workspaceId) {
+        return issueProxyResourceService.getMdImageByUrl(url, platform, workspaceId);
     }
 }
diff --git a/test-track/backend/src/main/java/io/metersphere/service/wapper/IssueProxyResourceService.java b/test-track/backend/src/main/java/io/metersphere/service/wapper/IssueProxyResourceService.java
index 91a7913235..f50964102a 100644
--- a/test-track/backend/src/main/java/io/metersphere/service/wapper/IssueProxyResourceService.java
+++ b/test-track/backend/src/main/java/io/metersphere/service/wapper/IssueProxyResourceService.java
@@ -29,7 +29,7 @@ public class IssueProxyResourceService {
      * @param platform
      * @return
      */
-    public ResponseEntity<byte[]> getMdImageByUrl(String url, String platform, String projectId, String workspaceId) {
+    public ResponseEntity<byte[]> getMdImageByUrl(String url, String platform, String workspaceId) {
         if (url.contains("md/get/url")) {
             MSException.throwException(Translator.get("invalid_parameter"));
         }
diff --git a/test-track/frontend/src/business/issue/IssueList.vue b/test-track/frontend/src/business/issue/IssueList.vue
index 36bf3f587d..f30620ff71 100644
--- a/test-track/frontend/src/business/issue/IssueList.vue
+++ b/test-track/frontend/src/business/issue/IssueList.vue
@@ -80,6 +80,11 @@
                 </span>
               </span>
 
+              <ms-review-table-item
+                v-else-if="item.id === 'description'"
+                :data="scope.row"
+                prop="description"/>
+
               <span v-else-if="item.id === 'resourceName'">
                  <el-link v-if="scope.row.resourceName"
                           @click="$router.push('/track/plan/view/' + scope.row.resourceId)">
@@ -103,21 +108,12 @@
 
               <!-- 自定义字段 -->
               <span v-else-if="item.isCustom">
-                <span v-if="item.type === 'richText' && scope.row.displayValueMap.get(item.id)">
-                   <el-popover
-                     placement="right"
-                     width="500"
-                     trigger="hover"
-                     popper-class="issues-popover">
-                     <ms-mark-down-text
-                       prop="value"
-                       :disabled="true"
-                       :data="{value: scope.row.displayValueMap.get(item.id)}"/>
-                    <el-button slot="reference" type="text">{{ $t('test_track.issue.preview') }}</el-button>
-                  </el-popover>
+                <span v-if="item.type === 'richText' && scope.row.displayValueMap[item.id]">
+                     <ms-review-table-item
+                       :data="scope.row.displayValueMap" :prop="item.id"/>
                 </span>
                 <span v-else>
-                  {{ scope.row.displayValueMap.get(item.id) }}
+                  {{ scope.row.displayValueMap[item.id] }}
                 </span>
               </span>
 
@@ -185,10 +181,12 @@ import {
 } from "metersphere-frontend/src/components/search/custom-component";
 import MsMarkDownText from "metersphere-frontend/src/components/MsMarkDownText";
 import {hasLicense} from "metersphere-frontend/src/utils/permission";
+import MsReviewTableItem from "@/business/issue/MsReviewTableItem";
 
 export default {
   name: "IssueList",
   components: {
+    MsReviewTableItem,
     MsMarkDownText,
     MsMainContainer,
     MsContainer,
@@ -418,7 +416,7 @@ export default {
         return;
       }
       this.page.data.forEach(item => {
-        let displayValueMap = new Map();
+        let displayValueMap = {};
         let fieldIdSet = new Set(this.fields.map(i => i.id));
         this.issueTemplate.customFields.forEach(field => {
           let displayValue;
@@ -430,7 +428,7 @@ export default {
           } else {
             displayValue = this.getCustomFieldValue(item, field);
           }
-          displayValueMap.set(field.name, displayValue);
+          displayValueMap[field.name] = displayValue;
         });
         item.displayValueMap = displayValueMap;
       });
diff --git a/test-track/frontend/src/business/issue/MsReviewTableItem.vue b/test-track/frontend/src/business/issue/MsReviewTableItem.vue
new file mode 100644
index 0000000000..4f99c8e222
--- /dev/null
+++ b/test-track/frontend/src/business/issue/MsReviewTableItem.vue
@@ -0,0 +1,27 @@
+<template>
+    <el-popover
+      placement="right"
+      width="500"
+      trigger="hover"
+      popper-class="issues-popover">
+      <ms-mark-down-text :prop="prop" :data="data" :disabled="true"/>
+      <el-button slot="reference" type="text">{{ $t('test_track.issue.preview') }}</el-button>
+    </el-popover>
+</template>
+
+<script>
+import MsTableColumn from "metersphere-frontend/src/components/table/MsTableColumn";
+import MsMarkDownText from "metersphere-frontend/src/components/MsMarkDownText";
+export default {
+  name: "MsReviewTableItem",
+  components: {MsMarkDownText, MsTableColumn},
+  props: {
+    data: Object,
+    prop: String,
+  }
+}
+</script>
+
+<style scoped>
+
+</style>