geg-gas/geg-gas-web
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:流程-流程实例的版本问题

Browse Source 
1.流程变更后，新旧流程按版本执行，按各种版本的流程定义和流程配置继续流转
2.可以切换流程实例的版本
This commit is contained in:
lvjunzhao
2025-02-25 18:42:40 +08:00
parent 2850e8abf5
commit 2d240ccf0c
6 changed files with 399 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/views/workflow/design/index.vue
View File

@ -49,6 +49,9 @@
<a-button v-auth="'design:classifyMgt'" @click="handleCategory">{{
t('分类管理')
}}</a-button>
<a-button @click="handleUpdateVersion">{{
t('流程版本变更')
}}</a-button>
</template>
<template #action="{ record }">
@ -79,7 +82,7 @@
@register="registerCategoryModal"
@success="getCategoryTree"
/>
<Preview v-if="data.previewVisible" :xml="data.xml" @close="data.previewVisible = false" />
<Preview v-if="data.previewVisible" :xml="data.xml" @close="() => {data.previewVisible = false}" />
<WorkflowDesignModal
v-if="data.visibleBpmnDesign"
:editData="data.editData"
@ -91,6 +94,7 @@
import { onMounted, reactive, computed, defineAsyncComponent, h, ref } from 'vue';
import { CategoryModal } from '/@/components/CategoryModal';
import { UpdateProcessVersionModal } from '/@/components/UpdateProcessVersion';
import { BasicTree, TreeItem } from '/@/components/Tree';
import { PageWrapper } from '/@/components/Page';
import { LoadingBox } from '/@/components/ModalPanel/index';
@ -114,7 +118,11 @@
import History from './History.vue';
import ImportFlow from './ImportFlow.vue';
import { Tag } from 'ant-design-vue';
import { Row, Tag } from 'ant-design-vue';
import { useRouter } from 'vue-router';
const { currentRoute } = useRouter();
const router = useRouter();
const { t } = useI18n();
const Preview = defineAsyncComponent(() => import('./Preview.vue'));
const WorkflowDesignModal = defineAsyncComponent({
@ -305,6 +313,26 @@
} catch (error) {}
}
}
const versionData = {
definitionKey: '',
schemaId: '',
}
/**
* 更新选中的流程图对应的执行流程的版本
*/
async function handleUpdateVersion() {
let row = checkSelectSingleRow();
if (row) {
router.push({
path: '/task/monitor',
query: {
definitionKey: row.definitionKey,
}
});
}
}
async function forbidden() {
let row = checkSelectSingleRow();

138
src/views/workflow/task/ProcessMonitor.vue
View File

@ -17,13 +17,17 @@
@register="registerTable"
class="w-3/4 xl:w-4/5"
@selection-change="selectionChange"
@row-dbClick="dbClickRow"
>
<template #toolbar>
<LookProcess :taskId="taskId" :processId="processId" @close="reload"
<!-- <LookProcess :taskId="taskId" :processId="processId" @close="reload"
><a-button v-auth="'monitor:view'">{{ t('查看') }}</a-button></LookProcess
>
<a-button v-auth="'monitor:appointedAuditor'" @click="approveUser" v-if="data.type === 0">{{
> -->
<!-- <a-button v-auth="'monitor:appointedAuditor'" @click="approveUser" v-if="data.type === 0">{{
t('指派审核人')
}}</a-button> -->
<a-button @click="handleUpdateVersion">{{
t('流程版本变更')
}}</a-button>
<a-button v-auth="'monitor:pending'" @click="setSuspended" v-if="data.type === 0">{{
suspendedTitle
@ -52,6 +56,8 @@
</template>
</BasicTable>
<!-- 查看 -->
<LookProcess ref="lookProcess" :taskId="taskId" :processId="processId" @close="reload"/>
<!-- 指派审核人 -->
<ApproveProcessMonitorUser
v-if="data.approvedUserVisible"
@ -65,22 +71,54 @@
}
"
/>
<!-- 流程版本变更 -->
<UpdateProcessVersionModal
v-if="data.visibleVersion"
title="流程版本变更"
:processDefinitionKey="versionData.definitionKey"
:schemaId="versionData.schemaId"
:processIds="versionData.processIds"
@register="registerUpdateProcessVersionModal"
@success="() => {
data.visibleVersion = false;
reload();
clearSelectedRowKeys();
}"
@cancel="() => {
data.visibleVersion = false;
reload();
clearSelectedRowKeys();
}"
/>
</PageWrapper>
</template>
<script lang="ts" setup>
import { createVNode, reactive, ref } from 'vue';
import { createVNode, onMounted, reactive, ref } from 'vue';
import { useModal } from '/@/components/Modal';
import { BasicTree } from '/@/components/Tree';
import { PageWrapper } from '/@/components/Page';
import LookProcess from './components/LookProcess.vue';
import ApproveProcessMonitorUser from './components/flow/ApproveProcessMonitorUser.vue';
import { UpdateProcessVersionModal } from '/@/components/UpdateProcessVersion';
import { deleteWorkflow, getProcessMonitorPage, postSetSuspended } from '/@/api/workflow/monitor';
import { getDesignList } from '/@/api/workflow/design';
import { Modal } from 'ant-design-vue';
import { ExclamationCircleOutlined } from '@ant-design/icons-vue';
import { notification, Tag } from 'ant-design-vue';
import { ProcessMonitorStatus } from '/@/enums/workflowEnum';
import { BasicTable, useTable, FormSchema, BasicColumn } from '/@/components/Table';
import { useI18n } from '/@/hooks/web/useI18n';
import { useRouter } from 'vue-router';
import { aW } from '@fullcalendar/core/internal-common';
const { currentRoute } = useRouter();
const router = useRouter();
const definitionKey = ref('');
onMounted(() => {
definitionKey.value = currentRoute.value.query.definitionKey as string;
});
const { t } = useI18n();
const configColumns: BasicColumn[] = [
{
@ -141,6 +179,20 @@
},
];
const searchFormSchema: FormSchema[] = [
{
field: 'definitionKey',
label: '流程',
component: 'ApiSelect',
value: definitionKey,
componentProps: {
mode: 'single',
api: getDesignList,
showSearch: true,
labelField: 'name',
valueField: 'definitionKey',
getPopupContainer: () => document.body,
},
},
{
field: 'keyword',
label: t('关键字'),
@ -172,7 +224,9 @@
icon: 'ant-design:profile-outlined',
},
];
const queryData = ref({});
const selectedKeys = ref([0]);
const lookProcess = ref()
const [registerTable, { reload, getSelectRows, clearSelectedRowKeys }] = useTable({
title: t('流程监控列表'),
api: getProcessMonitorPage,
@ -187,11 +241,17 @@
showResetButton: false,
},
rowSelection: {
type: 'radio',
// type: 'radio',
type: 'group',
},
beforeFetch: (params) => {
//发送请求默认新增 左边树结构所选机构id
return { ...params, type: data.type };
queryData.value = {
...params,
definitionKey: params.definitionKey?params.definitionKey:definitionKey.value,
type: data.type
};
return queryData.value
},
useSearchForm: true,
showTableSetting: true,
@ -207,9 +267,11 @@
let data: {
type: number;
approvedUserVisible: boolean;
visibleVersion: boolean;
} = reactive({
type: 0,
approvedUserVisible: false,
visibleVersion: false,
});
const processId = ref('');
const taskId = ref('');
@ -293,8 +355,15 @@
}
function checkSelectSingleRow(tip?) {
const selectRows: any = getSelectRows();
if (selectRows.length > 0) {
if (selectRows.length == 1) {
return selectRows[0];
} else if (selectRows.length > 1) {
notification.open({
type: 'error',
message: t('流程'),
description: t(tip || '请选择单一一个流程进行'),
});
return false;
} else {
notification.open({
type: 'error',
@ -304,4 +373,59 @@
return false;
}
}
function checkSelectGroupRow(tip?) {
const selectRows: any = getSelectRows();
if (selectRows.length > 0) {
let processDefinitionKey = selectRows[0].processDefinitionKey;
let flagCheck = true;
selectRows.forEach(element => {
if(element.processDefinitionKey != processDefinitionKey) flagCheck = false;
});
if(!flagCheck) {
notification.open({
type: 'error',
message: t('选择了多个流程'),
description: t(tip || '请按单一流程选择后重新批量配置'),
});
return false;
}
return selectRows;
} else {
notification.open({
type: 'error',
message: t('流程'),
description: t(tip || '请选择最少一个流程实例进行'),
});
return false;
}
}
async function dbClickRow(record) {
processId.value = record.processId;
taskId.value = record.taskId;//改版 一个流程中可能有多个taskId 已不返回
await lookProcess.value.look();
}
const [registerUpdateProcessVersionModal, { openModal: openUpdateProcessVersionModal }] = useModal();
const versionData = {
definitionKey: '',
schemaId: '',
processIds: [],
}
/**
* 更新选中的流程图对应的执行流程的版本
*/
async function handleUpdateVersion() {
let selectRows = checkSelectGroupRow();
if (selectRows) {
versionData.definitionKey = selectRows[0].processDefinitionKey;
versionData.schemaId = selectRows[0].schemaId;
versionData.processIds = selectRows.map(selectRows => selectRows.processId);
await nextTick();
openUpdateProcessVersionModal();
}
}
function nextTick () {
data.visibleVersion = true;
}
</script>

31
src/views/workflow/task/components/LookProcess.vue
View File

@ -19,21 +19,23 @@
import LookTask from './flow/LookTask.vue';
import { LoadingBox } from '/@/components/ModalPanel/index';
import { notification } from 'ant-design-vue';
import { onMounted, ref } from 'vue';
import { onActivated, onMounted, ref } from 'vue';
import { useI18n } from '/@/hooks/web/useI18n';
const { t } = useI18n();
const props = withDefaults(
defineProps<{
processId: string;
taskId: string;
visible?: boolean;
}>(),
{
processId: '',
taskId: '',
visible: false,
const props = defineProps({
processId: {
type: String,
default: ''
},
);
taskId: {
type: String,
default: ''
},
visible: {
type: Boolean,
default: false
},
})
let emits = defineEmits(['close']);
let visible = ref(false);
let showLoading = ref(false);
@ -42,7 +44,7 @@
look();
}
});
async function look() {
function look() {
if (props.processId) {
showLoading.value = false;
visible.value = true;
@ -59,4 +61,7 @@
visible.value = false;
emits('close');
}
defineExpose({
look
});
</script>