gitY
/
LanLingXiangMu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

优化流程中的子流程。主流程里的子流程发起时，获取之前主流程的数据。

main
刘妍 2025-05-20 08:53:30 +08:00
parent 4ab3a83a75
commit 9ce7599ad2
9 changed files with 275 additions and 146 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.env.lanling
View File

@ -12,7 +12,7 @@ VITE_BUILD_COMPRESS = 'none'
# Basic interface address SPA
# 天空地项目
VITE_GLOB_API_URL=http://120.222.154.7:6050
VITE_GLOB_API_URL=http://192.168.10.163:9040
VITE_GLOB_INFO_IMAGE_URL=http://120.222.154.48:6050

12
src/api/permission/data.ts
View File

@ -1,12 +1,12 @@
import { defHttp } from '@/utils/http/axios';
import { AccountListGetResultModel, AccountListItem, AccountParams } from './model/index';
enum Api {
tableList = '/api/BaseDataAuthGetPageList/permission/data/page',
getDetailData = '/api/BaseDataAuthGetEntity/permission/data',
addData = '/api/BaseDataAuthAddForm/permission/data',
editData = '/api/BaseDataAuthUpdateForm/permission/data/',
delData = '/api/BaseDataAuthDeleteForm/permission/data/',
fieldOptions = '/api/BaseDataAuthGetEntityByCode',
tableList = '/api/BaseDataAuth/GetPageList/permission/data/page',
getDetailData = '/api/BaseDataAuth/GetEntity/permission/data',
addData = '/api/BaseDataAuth/AddForm/permission/data',
editData = '/api/BaseDataAuth/UpdateForm/permission/data/',
delData = '/api/BaseDataAuth/DeleteForm/permission/data/',
fieldOptions = '/api/BaseDataAuth/GetEntityByCode',
}
export const getTablesListData = (params?: AccountParams) => {
return defHttp.get<AccountListGetResultModel>({

278
src/components/Bwflow/src/js/translations.js
View File

@ -1,12 +1,12 @@
export default {
// hong
// Labels
'Activate the global connect tool' : '激活全局连接工具',
'Activate the global connect tool': '激活全局连接工具',
'Append {type}': '追加 {type}',
'Append EndEvent': '追加 结束事件 ',
'Append Task':'追加 任务',
'Append Gateway':'追加 网关',
'Append Intermediate/Boundary Event':'追加 中间/边界 事件',
'Append Task': '追加 任务',
'Append Gateway': '追加 网关',
'Append Intermediate/Boundary Event': '追加 中间/边界 事件',
'Add Lane above': '在上面添加道',
'Divide into two Lanes': '分割成两个道',
'Divide into three Lanes': '分割成三个道',
@ -16,25 +16,25 @@ export default {
'Connect using Association': '使用关联连接',
'Connect using Sequence/MessageFlow or Association': '使用顺序/消息流或者关联连接',
'Connect using DataInputAssociation': '使用数据输入关联连接',
'Remove': '移除',
Remove: '移除',
'Activate the hand tool': '激活抓手工具',
'Activate the lasso tool': '激活套索工具',
'Activate the create/remove space tool': '激活创建/删除空间工具',
'Create expanded SubProcess': '创建扩展子过程',
'Create IntermediateThrowEvent/BoundaryEvent' : '创建中间抛出事件/边界事件',
'Create IntermediateThrowEvent/BoundaryEvent': '创建中间抛出事件/边界事件',
'Create Pool/Participant': '创建池/参与者',
'Parallel Multi Instance': '并行多重事件',
'Sequential Multi Instance': '时序多重事件',
'DataObjectReference':'数据对象参考',
'DataStoreReference':'数据存储参考',
'Loop': '循环',
DataObjectReference: '数据对象参考',
DataStoreReference: '数据存储参考',
Loop: '循环',
'Ad-hoc': '即席',
'Create {type}': '创建 {type}',
'Create Task':'创建任务',
'Create StartEvent':'创建开始事件',
'Create EndEvent':'创建结束事件',
'Create Group':'创建组',
'Task': '任务',
'Create Task': '创建任务',
'Create StartEvent': '创建开始事件',
'Create EndEvent': '创建结束事件',
'Create Group': '创建组',
Task: '任务',
'Send Task': '发送任务',
'Receive Task': '接收任务',
'User Task': '用户任务',
@ -46,12 +46,12 @@ export default {
'Sub Process (collapsed)': '子流程（折叠的）',
'Sub Process (expanded)': '子流程（展开的）',
'Start Event': '开始事件',
'StartEvent': '开始事件',
StartEvent: '开始事件',
'Intermediate Throw Event': '中间事件',
'End Event': '结束事件',
'EndEvent': '结束事件',
EndEvent: '结束事件',
'Create Gateway': '创建网关',
'GateWay':'网关',
GateWay: '网关',
'Create Intermediate/Boundary Event': '创建中间/边界事件',
'Message Start Event': '消息开始事件',
'Timer Start Event': '定时开始事件',
@ -100,7 +100,7 @@ export default {
'Inclusive Gateway': '相容网关',
'Complex Gateway': '复杂网关',
'Event based Gateway': '事件网关',
'Transaction': '转运',
Transaction: '转运',
'Sub Process': '子流程',
'Event Sub Process': '事件子流程',
'Collapsed Pool': '折叠池',
@ -115,126 +115,130 @@ export default {
'diagram not part of bpmn:Definitions': '流程图不符合bpmn规范',
'no diagram to display': '没有可展示的流程图',
'no process or collaboration to display': '没有可展示的流程/协作',
'element {element} referenced by {referenced}#{property} not yet drawn': '由{referenced}#{property}引用的{element}元素仍未绘制',
'element {element} referenced by {referenced}#{property} not yet drawn':
'由{referenced}#{property}引用的{element}元素仍未绘制',
'already rendered {element}': '{element} 已被渲染',
'failed to import {element}': '导入{element}失败',
//属性面板的参数
'Id':'编号',
'Name':'名称',
'General':'常规',
'Details':'详情',
'Message Name':'消息名称',
'Message':'消息',
'Initiator':'创建者',
'Asynchronous Continuations':'持续异步',
'Asynchronous Before':'异步前',
'Asynchronous After':'异步后',
'Job Configuration':'工作配置',
'Exclusive':'排除',
'Job Priority':'工作优先级',
'Retry Time Cycle':'重试时间周期',
'Documentation':'文档',
'Element Documentation':'元素文档',
'History Configuration':'历史配置',
'History Time To Live':'历史的生存时间',
'Forms':'表单',
'Form Key':'表单key',
'Form Fields':'表单字段',
'Business Key':'业务key',
'Form Field':'表单字段',
'ID':'编号',
'Type':'类型',
'Label':'名称',
'Default Value':'默认值',
'Validation':'校验',
'Add Constraint':'添加约束',
'Config':'配置',
'Properties':'属性',
'Add Property':'添加属性',
'Value':'值',
'Add':'添加',
'Values':'值',
'Add Value':'添加值',
'Listeners':'监听器',
'Execution Listener':'执行监听',
'Event Type':'事件类型',
'Listener Type':'监听器类型',
'Java Class':'Java类',
'Expression':'表达式',
'Must provide a value':'必须提供一个值',
'Delegate Expression':'代理表达式',
'Script':'脚本',
'Script Format':'脚本格式',
'Script Type':'脚本类型',
'Inline Script':'内联脚本',
'External Script':'外部脚本',
'Resource':'资源',
'Field Injection':'字段注入',
'Extensions':'扩展',
'Input/Output':'输入/输出',
'Input Parameters':'输入参数',
'Output Parameters':'输出参数',
'Parameters':'参数',
'Output Parameter':'输出参数',
'Timer Definition Type':'定时器定义类型',
'Timer Definition':'定时器定义',
'Date':'日期',
'Duration':'持续',
'Cycle':'循环',
'Signal':'信号',
'Signal Name':'信号名称',
'Escalation':'升级',
'Error':'错误',
'Link Name':'链接名称',
'Condition':'条件名称',
'Variable Name':'变量名称',
'Variable Event':'变量事件',
'Specify more than one variable change event as a comma separated list.':'多个变量事件以逗号隔开',
'Wait for Completion':'等待完成',
'Activity Ref':'活动参考',
'Version Tag':'版本标签',
'Executable':'可执行文件',
'External Task Configuration':'扩展任务配置',
'Task Priority':'任务优先级',
'External':'外部',
'Connector':'连接器',
'Must configure Connector':'必须配置连接器',
'Connector Id':'连接器编号',
'Implementation':'实现方式',
'Field Injections':'字段注入',
'Fields':'字段',
'Result Variable':'结果变量',
'Topic':'主题',
'Configure Connector':'配置连接器',
'Input Parameter':'输入参数',
'Assignee':'代理人',
'Candidate Users':'候选用户',
'Candidate Groups':'候选组',
'Due Date':'到期时间',
'Follow Up Date':'跟踪日期',
'Priority':'优先级',
'The follow up date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)':'跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
'The due date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)':'跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
'Variables':'变量',
'Candidate Starter Configuration':'候选开始配置',
'Task Listener':'任务监听器',
'Candidate Starter Groups':'候选开始组',
'Candidate Starter Users':'候选开始用户',
'Tasklist Configuration':'任务列表配置',
'Startable':'启动',
'Specify more than one group as a comma separated list.':'指定多个组,用逗号分隔',
'Specify more than one user as a comma separated list.':'指定多个用户,用逗号分隔',
'This maps to the process definition key.':'这会映射为流程定义的键',
'CallActivity Type':'调用活动类型',
'Condition Type':'条件类型',
'Create UserTask':'创建用户任务',
'Create CallActivity':'创建调用活动',
'Called Element':'调用元素',
'Create DataObjectReference':'创建数据对象引用',
'Create DataStoreReference':'创建数据存储引用',
'Multi Instance':'多实例',
'Loop Cardinality':'实例数量',
'Collection':'任务参与人列表',
'Element Variable':'元素变量',
'Completion Condition':'完成条件'
Id: '编号',
Name: '名称',
General: '常规',
Details: '详情',
'Message Name': '消息名称',
Message: '消息',
Initiator: '创建者',
'Asynchronous Continuations': '持续异步',
'Asynchronous Before': '异步前',
'Asynchronous After': '异步后',
'Job Configuration': '工作配置',
Exclusive: '排除',
'Job Priority': '工作优先级',
'Retry Time Cycle': '重试时间周期',
Documentation: '文档',
'Element Documentation': '元素文档',
'History Configuration': '历史配置',
'History Time To Live': '历史的生存时间',
Forms: '表单',
'Form Key': '表单key',
'Form Fields': '表单字段',
'Business Key': '业务key',
'Form Field': '表单字段',
ID: '编号',
Type: '类型',
Label: '名称',
'Default Value': '默认值',
Validation: '校验',
'Add Constraint': '添加约束',
Config: '配置',
Properties: '属性',
'Add Property': '添加属性',
Value: '值',
Add: '添加',
Values: '值',
'Add Value': '添加值',
Listeners: '监听器',
'Execution Listener': '执行监听',
'Event Type': '事件类型',
'Listener Type': '监听器类型',
'Java Class': 'Java类',
Expression: '表达式',
'Must provide a value': '必须提供一个值',
'Delegate Expression': '代理表达式',
Script: '脚本',
'Script Format': '脚本格式',
'Script Type': '脚本类型',
'Inline Script': '内联脚本',
'External Script': '外部脚本',
Resource: '资源',
'Field Injection': '字段注入',
Extensions: '扩展',
'Input/Output': '输入/输出',
'Input Parameters': '输入参数',
'Output Parameters': '输出参数',
Parameters: '参数',
'Output Parameter': '输出参数',
'Timer Definition Type': '定时器定义类型',
'Timer Definition': '定时器定义',
Date: '日期',
Duration: '持续',
Cycle: '循环',
Signal: '信号',
'Signal Name': '信号名称',
Escalation: '升级',
Error: '错误',
'Link Name': '链接名称',
Condition: '条件名称',
'Variable Name': '变量名称',
'Variable Event': '变量事件',
'Specify more than one variable change event as a comma separated list.':
'多个变量事件以逗号隔开',
'Wait for Completion': '等待完成',
'Activity Ref': '活动参考',
'Version Tag': '版本标签',
Executable: '可执行文件',
'External Task Configuration': '扩展任务配置',
'Task Priority': '任务优先级',
External: '外部',
Connector: '连接器',
'Must configure Connector': '必须配置连接器',
'Connector Id': '连接器编号',
Implementation: '实现方式',
'Field Injections': '字段注入',
Fields: '字段',
'Result Variable': '结果变量',
Topic: '主题',
'Configure Connector': '配置连接器',
'Input Parameter': '输入参数',
Assignee: '代理人',
'Candidate Users': '候选用户',
'Candidate Groups': '候选组',
'Due Date': '到期时间',
'Follow Up Date': '跟踪日期',
Priority: '优先级',
'The follow up date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)':
'跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
'The due date as an EL expression (e.g. ${someDate} or an ISO date (e.g. 2015-06-26T09:54:00)':
'跟踪日期必须符合EL表达式，如： ${someDate} ,或者一个ISO标准日期，如：2015-06-26T09:54:00',
Variables: '变量',
'Candidate Starter Configuration': '候选开始配置',
'Task Listener': '任务监听器',
'Candidate Starter Groups': '候选开始组',
'Candidate Starter Users': '候选开始用户',
'Tasklist Configuration': '任务列表配置',
Startable: '启动',
'Specify more than one group as a comma separated list.': '指定多个组,用逗号分隔',
'Specify more than one user as a comma separated list.': '指定多个用户,用逗号分隔',
'This maps to the process definition key.': '这会映射为流程定义的键',
'CallActivity Type': '调用活动类型',
'Condition Type': '条件类型',
'Create UserTask': '创建用户任务',
'Create CallActivity': '创建调用活动',
'Called Element': '调用元素',
'Create DataObjectReference': '创建数据对象引用',
'Create DataStoreReference': '创建数据存储引用',
'Multi Instance': '多实例',
'Loop Cardinality': '实例数量',
Collection: '任务参与人列表',
'Element Variable': '元素变量',
'Completion Condition': '完成条件',
};

5
src/components/ProcessDesigner/package/designer/plugins/translate/zh.ts
View File

@ -44,6 +44,11 @@ export default {
'Business rule task': '业务规则任务',
'Script task': '脚本任务',
'Call activity': '调用活动',
Transaction: '转运',
'Sub Process': '子流程',
'Sub-process': '子流程',
'Event Sub Process': '事件子流程',
'Event sub-process': '事件子流程',
'Sub-process (collapsed)': '子流程(已折叠)',
'Sub-process (expanded)': '子流程(扩大)',
'Intermediate throw event': '中间抛出事件',

18
src/components/ProcessDesigner/package/penal/PropertiesPanel.vue
View File

@ -31,6 +31,13 @@
:pageType="props.pageType"
:class="data.currentWfNode.type == 'bpmn:SubProcess' ? '' : 'hidden'"
/>
<!-- 转运子流程 -->
<transaction-option
ref="transactionRef"
:element="data.currentWfNode"
:pageType="props.pageType"
:class="data.currentWfNode.type == 'bpmn:Transaction' ? '' : 'hidden'"
/>
<!-- 排他网关 -->
<exclusive-gateway-option
ref="exclusiveGatewayRef"
@ -105,6 +112,7 @@
subprocessOption,
mylineOption,
scriptOption,
transactionOption,
} from './page';
import { flowStore } from '@/store/modules/flow';
@ -140,6 +148,7 @@
const taskRef = ref<any>();
const endRef = ref<any>();
const subprocessRef = ref<any>();
const transactionRef = ref<any>();
const exclusiveGatewayRef = ref<any>();
const parallelGatewayRef = ref<any>();
const inclusiveGatewayRef = ref<any>();
@ -231,7 +240,7 @@
isInit: true,
formTitle: '',
issueCode: '',
mapConfig:{},
mapConfig: {},
};
break;
case 'bpmn:EndEvent':
@ -310,6 +319,13 @@
isInit: true,
};
break;
case 'bpmn:Transaction':
data.wfNodeName = '子流程转运';
data.currentWfNode = {
id: element.id,
type: element.type,
};
break;
case 'bpmn:ExclusiveGateway':
data.wfNodeName = '排他网关';
data.currentWfNode = {

1
src/components/ProcessDesigner/package/penal/page.ts
View File

@ -7,5 +7,6 @@ export { default as parallelGatewayOption } from './parallelGateway/index.vue';
export { default as exclusiveGatewayOption } from './exclusiveGateway/index.vue';
export { default as inclusiveGatewayOption } from './inclusiveGateway/index.vue';
export { default as subprocessOption } from './subprocess/index.vue';
export { default as transactionOption } from './transaction/index.vue';
export { default as mylineOption } from './myline/index.vue';
export { default as scriptOption } from './script/index.vue';

82
src/components/ProcessDesigner/package/penal/transaction/index.vue Normal file
View File

@ -0,0 +1,82 @@
<!-- 开始节点配置 -->
<template>
<div class="subprocess">
<a-form
ref="formRef"
:model="node"
labelAlign="left"
:label-col="labelCol"
:wrapper-col="wrapperCol"
:disabled="data.componentDisabled"
>
<a-form-item label="节点标识">
<a-input v-model:value="node.id" placeholder="请输入" readonly />
</a-form-item>
</a-form>
</div>
</template>
<script lang="ts" setup>
import { reactive, defineProps, ref, watch, onMounted } from 'vue';
import { getLoad, getVerisonsLoad } from '@/api/sys/WFSchemeInfo';
import { flowStore } from '@/store/modules/flow';
const flowWfDataStore = flowStore();
const labelCol = { span: 7 };
const wrapperCol = { span: 17 };
const props = defineProps({
element: {
type: Object,
default: () => {
return {};
},
},
schemeCode: String,
pageType: String,
pageView: String,
});
let node: any = ref({});
const data = reactive({
componentDisabled: props.pageType == 'detail' ? true : false,
});
const list: any = ref([]);
const verisons: any = ref([]);
watch(
() => props.element,
(newVal) => {
if (newVal.type == 'bpmn:Transaction') {
const currentNode = flowWfDataStore.getWfDataNode(newVal.id);
if (currentNode) {
node.value = currentNode;
} else {
node.value = newVal;
}
}
},
);
async function getSchemeList() {
const data = await getLoad();
list.value = data;
}
async function changeScheme() {
const data = await getVerisonsLoad({ id: node.value.wfschemeId });
verisons.value = data;
}
onMounted(() => {
getSchemeList();
if (props.element.type == 'bpmn:SubProcess') {
const currentNode = flowWfDataStore.getWfDataNode(props.element.id);
if (currentNode) {
node.value = currentNode;
} else {
node.value = props.element;
}
}
});
defineExpose({});
</script>
<style></style>

20
src/views/demo/workflow/create/preview.vue
View File

@ -31,6 +31,9 @@
ref="formBoxRef"
:formConfig="formConfig"
:formVerison="designerData.formCurrentNode.formVerison"
:processId="designerData.process.id"
:formRelationId="designerData.formCurrentNode.formRelationId"
:instanceInfo="designerData.process.instanceInfo"
v-if="formVisble"
/>
</div>
@ -112,6 +115,7 @@
import { buildGUID } from '@/utils/uuid';
import { IFormConfig } from '@/views/demo/form-design/typings/v-form-component';
import { useMessage } from '@/hooks/web/useMessage';
import { getBPMNTask } from '@/api/sys/WFTask';
const MapboxMap = defineAsyncComponent(() => import('@/components/MapboxMaps/MapComponent.vue'));
const mapConfig = ref({});
@ -133,7 +137,10 @@
ParentNodeId: String,
ParentTaskId: String,
ParentProcessId: String,
type: Number,
taskId: String,
});
console.log(props, 'props');
const emit = defineEmits(['closeModel']);
const keyValue = ref('');
const pcForm = ref();
@ -169,6 +176,7 @@
formVerison: '',
formCode: '',
formCurrentNode: {},
process: {},
});
const activeName = ref('form');
const formData = reactive({
@ -310,7 +318,7 @@
for (var item in res) {
if (res[item] == undefined) {
res[item] = '';
if (item.search('_input_guid') != -1) {
if (item.search('_input_guid') != -1 && res[item] == '') {
res[item] = buildGUID();
}
}
@ -413,7 +421,17 @@
onBeforeMount(() => {
getDetailInfo();
getDelegateUsers();
if (props.type == 3) {
getTaskInfo();
}
});
async function getTaskInfo() {
let query: any = {
id: props.taskId,
};
let data = await getBPMNTask(query);
designerData.process = data.process;
}
</script>
<style lang="less" scoped>
.preview-box {

3
src/views/demo/workflow/task/uncompletedTask.vue
View File

@ -46,6 +46,8 @@
:ParentNodeId="childRecord.unitId"
:ParentTaskId="childRecord.id"
:ParentProcessId="childRecord.processId"
:type="childRecord.type"
:taskId="taskId"
@closeModel="closeMolder"
/>
</a-modal>
@ -160,6 +162,7 @@
if (record.type == 3) {
previewOpen.value = true;
childRecord.value = record;
taskId.value = record.id;
} else {
let data = await getDetail({ code: record.processCode });
let scheme = JSON.parse(data.scheme.content);