diff --git a/packages/plugins/workflow/src/client/WorkflowCanvas.tsx b/packages/plugins/workflow/src/client/WorkflowCanvas.tsx index 088da651c..706184b83 100644 --- a/packages/plugins/workflow/src/client/WorkflowCanvas.tsx +++ b/packages/plugins/workflow/src/client/WorkflowCanvas.tsx @@ -8,11 +8,12 @@ import { useResourceActionContext, useResourceContext, } from '@nocobase/client'; +import { str2moment } from '@nocobase/utils/client'; import { App, Breadcrumb, Button, Dropdown, Switch, message } from 'antd'; -import classnames from 'classnames'; import React, { useEffect, useState } from 'react'; import { useTranslation } from 'react-i18next'; import { Link, useNavigate } from 'react-router-dom'; + import { CanvasContent } from './CanvasContent'; import { ExecutionLink } from './ExecutionLink'; import { FlowContext, useFlowContext } from './FlowContext'; @@ -164,17 +165,16 @@ export function WorkflowCanvas() { .map((item, index) => ({ key: `${item.id}`, icon: item.current ? : null, + className: cx({ + executed: item.executed, + unexecuted: !item.executed, + enabled: item.enabled, + }), label: ( - + <> {`#${item.id}`} - - + + ), })), }} diff --git a/packages/plugins/workflow/src/client/style.tsx b/packages/plugins/workflow/src/client/style.tsx index 7415ab148..eeee355a0 100644 --- a/packages/plugins/workflow/src/client/style.tsx +++ b/packages/plugins/workflow/src/client/style.tsx @@ -57,11 +57,15 @@ const useStyles = createStyles(({ css, token }) => { workflowVersionDropdownClass: css` .ant-dropdown-menu-item { + justify-content: flex-end; .ant-dropdown-menu-title-content { + display: flex; + align-items: baseline; + justify-content: flex-end; text-align: right; time { - margin-left: 0.5rem; + width: 14em; color: ${token.colorText}; font-size: 80%; } @@ -101,7 +105,6 @@ const useStyles = createStyles(({ css, token }) => { time { width: 12em; - margin-left: 0.5rem; color: ${token.colorText}; font-size: 80%; }