From 7afbe8fa3f05a1b235fc6cc0e48811fb01f4cc7e Mon Sep 17 00:00:00 2001
From: wenyann <64353056+wenyann@users.noreply.github.com>
Date: Wed, 26 Aug 2020 13:29:29 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E4=BF=AE=E5=A4=8D=E7=BC=BA=E9=99=B7?=
 =?UTF-8?q?=E6=8F=8F=E8=BF=B0=EF=BC=8C=E6=B5=8B=E8=AF=95=E7=BB=93=E6=9E=9C?=
 =?UTF-8?q?=E5=88=97=E8=A1=A8=E8=A1=A8=E6=A0=BC=E5=A4=AA=E9=95=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TemplateComponent/DefectListComponent.vue | 25 ++++++++++++++++---
 .../TemplateComponent/TestResultComponent.vue | 22 ++++++++--------
 2 files changed, 34 insertions(+), 13 deletions(-)

diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue
index 14a74d201b..65ecc7e01c 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/DefectListComponent.vue
@@ -21,9 +21,20 @@
           show-overflow-tooltip>
         </el-table-column>
         <el-table-column
-                prop="description"
-                :label="$t('test_track.module.describe')"
-                show-overflow-tooltip>
+          prop="description"
+          :label="$t('test_track.module.describe')"
+          show-overflow-tooltip>
+          <template v-slot:default="scope">
+            <el-popover
+              placement="left"
+              width="400"
+              trigger="hover"
+            >
+              <ckeditor :editor="editor" disabled :config="readConfig"
+                        v-model="scope.row.description"/>
+              <el-button slot="reference" type="text">{{$t('test_track.issue.preview')}}</el-button>
+            </el-popover>
+          </template>
         </el-table-column>
 
         <el-table-column
@@ -57,6 +68,7 @@
   import TypeTableItem from "../../../../../common/tableItems/planview/TypeTableItem";
   import MethodTableItem from "../../../../../common/tableItems/planview/MethodTableItem";
   import StatusTableItem from "../../../../../common/tableItems/planview/StatusTableItem";
+  import ClassicEditor from "@ckeditor/ckeditor5-build-classic";
     export default {
       name: "DefectListComponent",
       components: {StatusTableItem, MethodTableItem, TypeTableItem, PriorityTableItem, CommonComponent},
@@ -77,6 +89,13 @@
             ]
           }
         }
+      },
+      data() {
+        return {
+          editor: ClassicEditor,
+          readConfig: {toolbar: []},
+
+        }
       }
     }
 </script>
diff --git a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultComponent.vue b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultComponent.vue
index 8bca789386..81423403d9 100644
--- a/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultComponent.vue
+++ b/frontend/src/business/components/track/plan/view/comonents/report/TemplateComponent/TestResultComponent.vue
@@ -11,53 +11,55 @@
         <el-table-column
           prop="moduleName"
           :label="$t('test_track.module.module')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="caseCount"
           :label="$t('test_track.plan_view.case_count')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="passCount"
           :label="$t('test_track.plan_view.pass')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="failureCount"
           :label="$t('test_track.plan_view.failure')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="blockingCount"
           :label="$t('test_track.plan_view.blocking')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="skipCount"
           :label="$t('test_track.plan_view.skip')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="underwayCount"
           :label="$t('test_track.plan.plan_status_running')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="prepareCount"
           :label="$t('test_track.plan.plan_status_prepare')"
-          width="180">
+          width="102">
         </el-table-column>
         <el-table-column
           prop="passRate"
-          :label="$t('test_track.pass_rate')">
+          :label="$t('test_track.pass_rate')"
+          width="102">
           <template v-slot:default="scope">
             {{scope.row.passRate}}%
           </template>
         </el-table-column>
         <el-table-column
           prop="issuesCount"
-          :label="$t('test_track.plan_view.issues_count')">
+          :label="$t('test_track.plan_view.issues_count')"
+          width="102">
         </el-table-column>
       </el-table>
     </template>