fm453/nocobase
1
0
Fork 0
mirror of https://gitee.com/nocobase/nocobase.git synced 2025-07-02 11:12:20 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix(plugin-workflow-manual): fix task status (#6676)

Browse Source
This commit is contained in:
Junyi 2025-04-16 09:48:48 +08:00 committed by GitHub
parent 5808ee57e2
commit 63a842aab3
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
packages/plugins/@nocobase/plugin-workflow-manual/src/client/WorkflowTodo.tsx
View File

@ -44,14 +44,13 @@ import WorkflowPlugin, {
useAvailableUpstreams, useAvailableUpstreams,
useFlowContext, useFlowContext,
EXECUTION_STATUS, EXECUTION_STATUS,
JOB_STATUS,
WorkflowTitle, WorkflowTitle,
} from '@nocobase/plugin-workflow/client'; } from '@nocobase/plugin-workflow/client';
import { NAMESPACE, useLang } from '../locale'; import { NAMESPACE, useLang } from '../locale';
import { FormBlockProvider } from './instruction/FormBlockProvider'; import { FormBlockProvider } from './instruction/FormBlockProvider';
import { ManualFormType, manualFormTypes } from './instruction/SchemaConfig'; import { ManualFormType, manualFormTypes } from './instruction/SchemaConfig';
import { TaskStatusOptionsMap } from '../common/constants'; import { TaskStatusOptionsMap, TASK_STATUS } from '../common/constants';
function TaskStatusColumn(props) { function TaskStatusColumn(props) {
const recordData = useCollectionRecordData(); const recordData = useCollectionRecordData();
@ -667,11 +666,11 @@ function TaskItem() {
const StatusFilterMap = { const StatusFilterMap = {
pending: { pending: {
status: JOB_STATUS.PENDING, status: TASK_STATUS.PENDING,
'execution.status': EXECUTION_STATUS.STARTED, 'execution.status': EXECUTION_STATUS.STARTED,
}, },
completed: { completed: {
status: JOB_STATUS.RESOLVED, status: [TASK_STATUS.RESOLVED, TASK_STATUS.REJECTED],
}, },
}; };

2
packages/plugins/@nocobase/plugin-workflow-manual/src/common/constants.ts
View File

@ -14,7 +14,7 @@ export const MANUAL_TASK_TYPE = 'manual';
export const TASK_STATUS = { export const TASK_STATUS = {
PENDING: 0, PENDING: 0,
RESOLVED: 1, RESOLVED: 1,
REJECTED: -1, REJECTED: -5,
}; };
export const TaskStatusOptions = [ export const TaskStatusOptions = [