diff --git a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue index e804e32c..c904d44c 100644 --- a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue +++ b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ElementListeners.vue @@ -1,311 +1,43 @@ - - - - - - - - - 编辑 - - 移除 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 注入字段: - - - - - - - - - - 编辑 - - 移除 - - - - - - 取 消 - 保 存 - - - - - - - - - - - - - - - - - - - - - - - 取 消 - 确 定 - - - - - - - + + + + + + {{ index + 1 }} + + + + + + + + 编辑 + + + + 移除 + + + + + + + + + + 添加监听器 + + + + + + 选择监听器 + + + + + + + + + start + end + + + + + + {{ listenerTypeObject[i as keyof typeof listenerType] }} + + + + + + + + + + + + + + + + + + + 内联脚本 + 外部脚本 + + + + + + + + + + + + + 注入字段: + + 添加字段 + + + + + + {{ index + 1 }} + + + + + + + + + 编辑 + + + + 移除 + + + + + + + 取 消 + 保 存 + + + + + + + + + + + + + {{ fieldTypeObject[i as keyof typeof fieldType] }} + + + + + + + + + + + + + 取 消 + + + 确 定 + + + + + + + + diff --git a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue index 2d8557df..6a732fae 100644 --- a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue +++ b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/ProcessListenerDialog.vue @@ -1,64 +1,26 @@ - - - - - - - - - - - - - - - - - - - - - 选择 - - - - - - - - - + + + + + + + + + + + + + + + + + + + + 选择 + + + + + + + + + + diff --git a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue index 1652399b..bbea2d62 100644 --- a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue +++ b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/UserTaskListeners.vue @@ -1,380 +1,45 @@ - - - - - - - - - - 编辑 - - 移除 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 注入字段: - 添加字段 - - - - - - - - - 编辑 - - 移除 - - - - - - 取 消 - 保 存 - - - - - - - - - - - - - - - - - - - - - - - 取 消 - 确 定 - - - - - - - + + + + + + + + + + + 编辑 + + + + 移除 + + + + + + + + 添加监听器 + + + + 选择监听器 + + + + + + + + + + {{ listenerEventTypeObject[i as keyof typeof eventType] }} + + + + + + + + + + {{ listenerTypeObject[i as keyof typeof listenerType] }} + + + + + + + + + + + + + + + + + + + 内联脚本 + 外部脚本 + + + + + + + + + + + + + + 日期 + 持续时长 + 循环 + 无 + + + + + + + + + + + 注入字段: + + 添加字段 + + + + + + + + + + + 编辑 + + + + 移除 + + + + + + + + 取 消 + + + 保 存 + + + + + + + + + + + + + + {{ fieldTypeObject[i as keyof typeof fieldType] }} + + + + + + + + + + + + + 取 消 + + + 确 定 + + + + + + + + diff --git a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts index 0d4609dc..8e256672 100644 --- a/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts +++ b/apps/web-antd/src/components/bpmnProcessDesigner/package/penal/listeners/utilSelf.ts @@ -1,5 +1,5 @@ // 初始化表单数据 -export function initListenerForm(listener) { +export function initListenerForm(listener: any) { let self = { ...listener, }; @@ -17,33 +17,33 @@ export function initListenerForm(listener) { ) { let k = ''; for (const key in listener.eventDefinitions[0]) { - console.log(listener.eventDefinitions, key); + // console.log(listener.eventDefinitions, key); if (key.includes('time')) { k = key; self.eventDefinitionType = key.replace('time', '').toLowerCase(); } } - console.log(k); + // console.log(k); self.eventTimeDefinitions = listener.eventDefinitions[0][k].body; } return self; } -export function initListenerType(listener) { +export function initListenerType(listener: any) { let listenerType; if (listener.class) listenerType = 'classListener'; if (listener.expression) listenerType = 'expressionListener'; if (listener.delegateExpression) listenerType = 'delegateExpressionListener'; if (listener.script) listenerType = 'scriptListener'; return { - ...JSON.parse(JSON.stringify(listener)), + ...structuredClone(listener), ...listener.script, listenerType, }; } /** 将 ProcessListenerDO 转换成 initListenerForm 想同的 Form 对象 */ -export function initListenerForm2(processListener) { +export function initListenerForm2(processListener: any) { switch (processListener.valueType) { case 'class': { return { diff --git a/packages/icons/src/iconify/index.ts b/packages/icons/src/iconify/index.ts index acf42e43..784a746b 100644 --- a/packages/icons/src/iconify/index.ts +++ b/packages/icons/src/iconify/index.ts @@ -55,3 +55,9 @@ export const AlignLeftOutlined = createIconifyIcon( export const WarningOutlined = createIconifyIcon('ant-design:warning-outlined'); export const RiDingding = createIconifyIcon('ri:dingding-fill'); + +export const MenuOutlined = createIconifyIcon('ant-design:menu-outlined'); + +export const PlusOutlined = createIconifyIcon('ant-design:plus-outlined'); + +export const SelectOutlined = createIconifyIcon('ant-design:select-outlined');
- 注入字段: - -
+ 注入字段: + + 添加字段 + +
- 注入字段: - 添加字段 -