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 @@