You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ki...@apache.org on 2021/12/03 10:17:09 UTC
[dolphinscheduler] branch 2.0.1-prepare updated: [Feature][Workflow relationship] Format time. (#7142)
This is an automated email from the ASF dual-hosted git repository.
kirs pushed a commit to branch 2.0.1-prepare
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/2.0.1-prepare by this push:
new 1f821ab [Feature][Workflow relationship] Format time. (#7142)
1f821ab is described below
commit 1f821ab1a63a2ca851d5a3800c52da8db2c2316e
Author: songjianet <17...@qq.com>
AuthorDate: Fri Dec 3 18:17:03 2021 +0800
[Feature][Workflow relationship] Format time. (#7142)
---
.../home/pages/projects/pages/kinship/_source/graphGridOption.js | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
index 8846477..b8a5184 100644
--- a/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
+++ b/dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/kinship/_source/graphGridOption.js
@@ -16,6 +16,7 @@
*/
import _ from 'lodash'
import i18n from '@/module/i18n/index.js'
+import dayjs from 'dayjs'
const getCategory = (categoryDic, { workFlowPublishStatus, schedulePublishStatus, code }, sourceWorkFlowCode) => {
if (code === sourceWorkFlowCode) return categoryDic.active
@@ -79,8 +80,8 @@ export default function (locations, links, sourceWorkFlowCode, isShowLabel) {
return `
${i18n.$t('workflowName')}:${name}<br/>
- ${i18n.$t('scheduleStartTime')}:${scheduleStartTime}<br/>
- ${i18n.$t('scheduleEndTime')}:${scheduleEndTime}<br/>
+ ${i18n.$t('scheduleStartTime')}:${dayjs(scheduleStartTime).format('YYYY-MM-DD HH:mm:ss')}<br/>
+ ${i18n.$t('scheduleEndTime')}:${dayjs(scheduleEndTime).format('YYYY-MM-DD HH:mm:ss')}<br/>
${i18n.$t('crontabExpression')}:${crontab}<br/>
${i18n.$t('workflowPublishStatus')}:${publishStatusFormat(workFlowPublishStatus)}<br/>
${i18n.$t('schedulePublishStatus')}:${publishStatusFormat(schedulePublishStatus)}<br/>