From cea03df4eb5fb878bf4bd0c2639a5c7dfb28f67d Mon Sep 17 00:00:00 2001
From: fit2bot <68588906+fit2bot@users.noreply.github.com>
Date: Tue, 1 Sep 2020 11:34:43 +0800
Subject: [PATCH] =?UTF-8?q?pref(ticket):=20=E4=BC=98=E5=8C=96=E5=B7=A5?=
 =?UTF-8?q?=E5=8D=95=E8=AF=84=E8=AE=BA=E6=98=BE=E7=A4=BA=EF=BC=8C=E6=88=91?=
 =?UTF-8?q?=E7=9A=84=E5=9B=9E=E5=A4=8D=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=8F=B3?=
 =?UTF-8?q?=E8=BE=B9=EF=BC=8C=E5=85=B6=E5=AE=83=E5=9B=9E=E5=A4=8D=E5=9D=87?=
 =?UTF-8?q?=E6=98=BE=E7=A4=BA=E5=9C=A8=E5=B7=A6=E8=BE=B9=20(#356)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* pref(ticket): 优化工单评论显示，我的回复显示在右边，其它回复均显示在左边

* pref(ticket): 优化评论显示

* pref(ticket): 修改方法名

Co-authored-by: jym503558564 <503558564@qq.com>
---
 src/views/tickets/components/Comments.vue | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/src/views/tickets/components/Comments.vue b/src/views/tickets/components/Comments.vue
index 9f2a6631c..f8b50922d 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">
+        <div class="feed-element" :class="{'flex-container': isFlexRight(item.user_display)}">
           <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>
-            <pre style="padding-top: 10px">
+            <div style="padding-top: 10px; white-space: pre-line ">
               {{ item.body }}
-            </pre>
+            </div>
           </div>
         </div>
       </div>
@@ -69,6 +69,8 @@
 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 },
@@ -101,6 +103,9 @@ export default {
     }
   },
   computed: {
+    ...mapGetters([
+      'currentUser'
+    ]),
     hasActionPerm() {
       return this.object.assignees.indexOf(this.$store.state.users.profile.id) !== -1
     }
@@ -181,6 +186,9 @@ export default {
     },
     reloadPage() {
       window.location.reload()
+    },
+    isFlexRight(value) {
+      return this.currentUser.name + '(' + this.currentUser.username + ')' === value
     }
   }
 
@@ -220,4 +228,8 @@ export default {
 .text-muted {
   color: #888888;
 }
+.flex-container {
+  display: flex;
+  justify-content: flex-end;
+}
 </style>