From bf3cccfb7d538645bb8e340ac8797da90738c1f7 Mon Sep 17 00:00:00 2001
From: ssc <273702440@qq.com>
Date: Tue, 8 Mar 2022 11:38:50 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20safari=E6=B5=8F=E8=A7=88=E5=99=A8?=
 =?UTF-8?q?=E6=B5=81=E7=A8=8B=E5=9B=BE=E6=97=B6=E9=97=B4=E6=98=BE=E7=A4=BA?=
 =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/plugin/workflow/mixins/ex-form.js           | 10 ++++++++--
 src/views/plugin/workflow/process/components/flow.vue |  2 +-
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/plugin/workflow/mixins/ex-form.js b/src/views/plugin/workflow/mixins/ex-form.js
index 4d152c3..d67faec 100644
--- a/src/views/plugin/workflow/mixins/ex-form.js
+++ b/src/views/plugin/workflow/mixins/ex-form.js
@@ -372,10 +372,16 @@ export default {
       const flows = []
 
       flow.forEach(f => {
-        const { assigneeName, createTime, endTime, comments } = f
+        let { assigneeName, createTime, endTime, comments } = f
+
+        if ((/Safari/.test(navigator.userAgent) && !/Chrome/.test(navigator.userAgent))) { // safari
+          createTime = createTime.replace(/-/g, '/')
+          endTime = endTime.replace(/-/g, '/')
+        }
+
         const ff = {
           id: f.historyActivityId,
-          class: (!endTime && f.historyActivityType != 'candidate') ? 'nodePrimary': ''
+          class: (!endTime && f.historyActivityType != 'candidate') ? 'nodePrimary' : ''
         }
         let tooltip = ''
         if (assigneeName) {
diff --git a/src/views/plugin/workflow/process/components/flow.vue b/src/views/plugin/workflow/process/components/flow.vue
index 3908595..836c295 100644
--- a/src/views/plugin/workflow/process/components/flow.vue
+++ b/src/views/plugin/workflow/process/components/flow.vue
@@ -15,7 +15,7 @@
                 <template v-if="index < 1">
                   <span v-if="commentMap[comment.type]">{{commentMap[comment.type]}}: [{{comment.fullMessage}}]</span>
                   <span style="color: #1989fa; float: right;"
-                        v-if="item.comments.length > 1"
+                        v-if="item.comments.filter(c => c.action === 'AddComment').length > 1"
                         @click="handleClick">{{toggleText}} <i :class="[isFlag ? 'el-icon-arrow-up' : 'el-icon-arrow-down']"></i> </span>
                   <p style="color: gray; font-size: 12px;"
                      v-if="comment.time">{{comment.time}}</p>