diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue index bc5e98df0..e4cb2fe0b 100644 --- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue +++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/ElementListeners.vue @@ -16,7 +16,7 @@ import { } from 'element-plus'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; -// import ProcessListenerSelectModal from '#/views/bpm/processListener/components/process-listener-select-modal.vue'; +import { ProcessListenerSelectModal } from '#/views/bpm/processListener/components'; import { createListenerObject, updateElementExtensions } from '../../utils'; import ListenerFieldModal from './ListenerFieldModal.vue'; @@ -268,15 +268,15 @@ const [FieldModal, fieldModalApi] = useVbenModal({ }); // 配置选择监听器 Modal -// const [ProcessListenerSelectModalComp, processListenerSelectModalApi] = -// useVbenModal({ -// connectedComponent: ProcessListenerSelectModal, -// destroyOnClose: true, -// }); +const [ProcessListenerSelectModalComp, processListenerSelectModalApi] = + useVbenModal({ + connectedComponent: ProcessListenerSelectModal, + destroyOnClose: true, + }); // 打开监听器弹窗 const openProcessListenerDialog = async () => { - // processListenerSelectModalApi.setData({ type: 'execution' }).open(); + processListenerSelectModalApi.setData({ type: 'execution' }).open(); }; const selectProcessListener = (listener: any) => { const instances = bpmnInstances(); diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue index c35b1926d..af7a1c6e4 100644 --- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue +++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/listeners/UserTaskListeners.vue @@ -16,7 +16,7 @@ import { } from 'element-plus'; import { useVbenVxeGrid } from '#/adapter/vxe-table'; -// import ProcessListenerSelectModal from '#/views/bpm/processListener/components/process-listener-select-modal.vue'; +import { ProcessListenerSelectModal } from '#/views/bpm/processListener/components'; import { createListenerObject, updateElementExtensions } from '../../utils'; import ListenerFieldModal from './ListenerFieldModal.vue'; @@ -220,7 +220,7 @@ const removeListenerField = (_: any, index: number) => { }; const openProcessListenerDialog = async () => { - // processListenerSelectModalApi.setData({ type: 'task' }).open(); + processListenerSelectModalApi.setData({ type: 'task' }).open(); }; const selectProcessListener = (listener: any) => { const instances = bpmnInstances(); @@ -253,11 +253,11 @@ const [FieldModal, fieldModalApi] = useVbenModal({ connectedComponent: ListenerFieldModal, }); -// const [ProcessListenerSelectModalComp, processListenerSelectModalApi] = -// useVbenModal({ -// connectedComponent: ProcessListenerSelectModal, -// destroyOnClose: true, -// }); +const [ProcessListenerSelectModalComp, processListenerSelectModalApi] = + useVbenModal({ + connectedComponent: ProcessListenerSelectModal, + destroyOnClose: true, + }); const [FieldsGrid, fieldsGridApi] = useVbenVxeGrid({ gridOptions: { diff --git a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue index 4d9436723..632505a83 100644 --- a/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue +++ b/apps/web-ele/src/views/bpm/components/bpmn-process-designer/package/penal/task/task-components/UserTask.vue @@ -1,4 +1,5 @@ + + diff --git a/apps/web-ele/src/views/bpm/processListener/components/data.ts b/apps/web-ele/src/views/bpm/processListener/components/data.ts new file mode 100644 index 000000000..37725d839 --- /dev/null +++ b/apps/web-ele/src/views/bpm/processListener/components/data.ts @@ -0,0 +1,36 @@ +import type { VxeTableGridOptions } from '#/adapter/vxe-table'; + +import { DICT_TYPE } from '@vben/constants'; + +/** 选择监听器弹窗的列表字段 */ +export function useGridColumns(): VxeTableGridOptions['columns'] { + return [ + { field: 'name', title: '名字', minWidth: 120 }, + { + field: 'type', + title: '类型', + minWidth: 200, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.BPM_PROCESS_LISTENER_TYPE }, + }, + }, + { field: 'event', title: '事件', minWidth: 200 }, + { + field: 'valueType', + title: '值类型', + minWidth: 200, + cellRender: { + name: 'CellDict', + props: { type: DICT_TYPE.BPM_PROCESS_LISTENER_VALUE_TYPE }, + }, + }, + { field: 'value', title: '值', minWidth: 150 }, + { + title: '操作', + width: 100, + slots: { default: 'action' }, + fixed: 'right', + }, + ]; +} diff --git a/apps/web-ele/src/views/bpm/processListener/components/index.ts b/apps/web-ele/src/views/bpm/processListener/components/index.ts new file mode 100644 index 000000000..04dbccf3d --- /dev/null +++ b/apps/web-ele/src/views/bpm/processListener/components/index.ts @@ -0,0 +1 @@ +export { default as ProcessListenerSelectModal } from './select-modal.vue'; diff --git a/apps/web-ele/src/views/bpm/processListener/components/select-modal.vue b/apps/web-ele/src/views/bpm/processListener/components/select-modal.vue new file mode 100644 index 000000000..ef1237eca --- /dev/null +++ b/apps/web-ele/src/views/bpm/processListener/components/select-modal.vue @@ -0,0 +1,96 @@ + + + diff --git a/apps/web-ele/tsconfig.json b/apps/web-ele/tsconfig.json index 02c287fe6..33f79aaf8 100644 --- a/apps/web-ele/tsconfig.json +++ b/apps/web-ele/tsconfig.json @@ -5,7 +5,8 @@ "baseUrl": ".", "paths": { "#/*": ["./src/*"] - } + }, + "allowJs": true }, "references": [{ "path": "./tsconfig.node.json" }], "include": ["src/**/*.ts", "src/**/*.tsx", "src/**/*.vue"]