Pre Merge pull request !135 from Jason/dev

pull/135/MERGE
Jason 2025-06-09 10:21:01 +00:00 committed by Gitee
commit 06d19b81a7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
4 changed files with 73 additions and 7 deletions

View File

@ -1074,7 +1074,7 @@ onMounted(() => {
</FormItem>
</div>
<div v-if="currentNode.type === NodeType.USER_TASK_NODE">
<div v-if="currentNode.type === BpmNodeTypeEnum.USER_TASK_NODE">
<Divider content-position="left">是否需要签名</Divider>
<FormItem name="signEnable">
<Switch

View File

@ -391,7 +391,7 @@ defineExpose({ validate });
</div>
</Form.Item>
<Form.Item label="流程管理员" name="managerUserIds" class="mb-5">
<div class="flex flex-wrap gap-2">
<div class="flex flex-wrap gap-1">
<div
v-for="user in selectedManagerUsers"
:key="user.id"

View File

@ -170,7 +170,9 @@ async function handleCategorySortSubmit() {
<Dropdown class="ml-2" placement="bottomRight" arrow>
<Button>
<template #icon>
<IconifyIcon icon="lucide:settings" />
<div class="flex items-center justify-center">
<IconifyIcon icon="lucide:settings" />
</div>
</template>
</Button>
<template #overlay>

View File

@ -24,7 +24,13 @@ import {
} from 'ant-design-vue';
import { deleteCategory } from '#/api/bpm/category';
import { deployModel, updateModelSortBatch } from '#/api/bpm/model';
import {
cleanModel,
deleteModel,
deployModel,
updateModelSortBatch,
updateModelState,
} from '#/api/bpm/model';
import { DictTag } from '#/components/dict-tag';
import { $t } from '#/locales';
import { DICT_TYPE } from '#/utils';
@ -225,11 +231,11 @@ async function handleDeploy(row: any) {
function handleModelCommand(command: string, row: any) {
switch (command) {
case 'handleChangeState': {
console.warn('停用/启用待实现', row);
handleChangeState(row);
break;
}
case 'handleClean': {
console.warn('清理待实现', row);
handleClean(row);
break;
}
case 'handleCopy': {
@ -241,7 +247,7 @@ function handleModelCommand(command: string, row: any) {
break;
}
case 'handleDelete': {
console.warn('删除待实现', row);
handleDelete(row);
break;
}
case 'handleReport': {
@ -253,6 +259,64 @@ function handleModelCommand(command: string, row: any) {
}
}
}
/** 更新状态操作 */
function handleChangeState(row: any) {
const state = row.processDefinition.suspensionState;
const newState = state === 1 ? 2 : 1;
const statusState = state === 1 ? '停用' : '启用';
confirm({
beforeClose: async ({ isConfirm }) => {
if (!isConfirm) return;
//
await updateModelState(row.id, newState);
return true;
},
content: `确认要${statusState}流程: "${row.name}" 吗?`,
icon: 'question',
}).then(async () => {
message.success(`${statusState} 流程: "${row.name}" 成功`);
//
emit('success');
});
}
/** 清理流程操作 */
function handleClean(row: any) {
confirm({
beforeClose: async ({ isConfirm }) => {
if (!isConfirm) return;
//
await cleanModel(row.id);
return true;
},
content: `确认要清理流程: "${row.name}" 吗?`,
icon: 'question',
}).then(async () => {
message.success(`清理流程: "${row.name}" 成功`);
//
emit('success');
});
}
/** 删除流程操作 */
function handleDelete(row: any) {
confirm({
beforeClose: async ({ isConfirm }) => {
if (!isConfirm) return;
//
await deleteModel(row.id);
return true;
},
content: `确认要删除流程: "${row.name}" 吗?`,
icon: 'question',
}).then(async () => {
message.success(`删除流程: "${row.name}" 成功`);
//
emit('success');
});
}
/** 更新 modelList 模型列表 */
const updateModelList = useDebounceFn(() => {
const newModelList = props.categoryInfo.modelList;