From 7d71aa96b94a4297d4525a24c967d6253df9df3c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=80=81=E5=B9=BF?= <ibuler@qq.com>
Date: Wed, 2 Sep 2020 10:15:02 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"pref(ticket):=20=E4=BC=98=E5=8C=96?=
 =?UTF-8?q?=E5=B7=A5=E5=8D=95=E8=AF=84=E8=AE=BA=E6=98=BE=E7=A4=BA=EF=BC=8C?=
 =?UTF-8?q?=E6=88=91=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=98=BE=E7=A4=BA=E5=9C=A8?=
 =?UTF-8?q?=E5=8F=B3=E8=BE=B9=EF=BC=8C=E5=85=B6=E5=AE=83=E5=9B=9E=E5=A4=8D?=
 =?UTF-8?q?=E5=9D=87=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=B7=A6=E8=BE=B9=20(#356)?=
 =?UTF-8?q?"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit cea03df4eb5fb878bf4bd0c2639a5c7dfb28f67d.
---
 src/views/tickets/components/Comments.vue | 18 +++---------------
 1 file changed, 3 insertions(+), 15 deletions(-)

diff --git a/src/views/tickets/components/Comments.vue b/src/views/tickets/components/Comments.vue
index f8b50922d..9f2a6631c 100644
--- a/src/views/tickets/components/Comments.vue
+++ b/src/views/tickets/components/Comments.vue
@@ -5,7 +5,7 @@
     </div>
     <template v-if="comments">
       <div v-for="item in comments" :key="item.user_display + item.body" class="feed-activity-list">
-        <div class="feed-element" :class="{'flex-container': isFlexRight(item.user_display)}">
+        <div class="feed-element">
           <a href="#" class="pull-left">
             <el-avatar :src="imageUrl" class="header-avatar" />
           </a>
@@ -13,9 +13,9 @@
             <strong>{{ item.user_display }}</strong> <small class="text-muted">{{ formatTime(item.date_created) }}</small>
             <br>
             <small class="text-muted">{{ toSafeLocalDateStr(item.date_created) }}</small>
-            <div style="padding-top: 10px; white-space: pre-line ">
+            <pre style="padding-top: 10px">
               {{ item.body }}
-            </div>
+            </pre>
           </div>
         </div>
       </div>
@@ -69,8 +69,6 @@
 import IBox from '@/components/IBox'
 import { formatTime, getDateTimeStamp } from '@/utils'
 import { toSafeLocalDateStr } from '@/utils/common'
-import { mapGetters } from 'vuex'
-
 export default {
   name: 'Comments',
   components: { IBox },
@@ -103,9 +101,6 @@ export default {
     }
   },
   computed: {
-    ...mapGetters([
-      'currentUser'
-    ]),
     hasActionPerm() {
       return this.object.assignees.indexOf(this.$store.state.users.profile.id) !== -1
     }
@@ -186,9 +181,6 @@ export default {
     },
     reloadPage() {
       window.location.reload()
-    },
-    isFlexRight(value) {
-      return this.currentUser.name + '(' + this.currentUser.username + ')' === value
     }
   }
 
@@ -228,8 +220,4 @@ export default {
 .text-muted {
   color: #888888;
 }
-.flex-container {
-  display: flex;
-  justify-content: flex-end;
-}
 </style>