From 32c31fd4df09e75ee12d260c2e868388dc6f5a86 Mon Sep 17 00:00:00 2001 From: Jerry <707344974@qq.com> Date: Fri, 11 Oct 2024 21:42:49 +0800 Subject: [PATCH] =?UTF-8?q?commit=EF=BC=9A=E6=B5=81=E7=A8=8B=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E8=87=AA=E5=8A=A8=E5=8C=96=E4=BB=BB=E5=8A=A1?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- OrangeFormsOpen-VUE3/components.d.ts | 1 + .../src/api/flow/FlowDblinkController.ts | 53 ++ .../src/api/flow/FlowOperationController.ts | 4 + OrangeFormsOpen-VUE3/src/api/flow/index.ts | 2 + .../src/common/http/request.ts | 3 +- .../src/common/staticDict/combined.ts | 3 - .../src/common/staticDict/flow.ts | 71 ++ .../src/common/staticDict/index.ts | 63 ++ .../src/components/DeptSelect/index.vue | 9 - .../src/components/RichEditor/index.vue | 33 +- .../src/components/UserSelect/index.vue | 9 - .../AttributeCollapse/editWidgetAttribute.vue | 7 +- .../CustomWidgetDictSetting/index.vue | 7 - .../OnlineCustomListOrderSetting/index.vue | 7 - .../index.vue | 6 - .../OnlineTableColumnSetting/index.vue | 7 - .../src/online/config/index.ts | 14 +- .../OnlineTabPanelSetting/index.vue | 7 - .../OnlineTableColumnSetting/index.vue | 7 - .../CopyForSelect/addCopyForItem.vue | 9 - .../CopyForSelect/copyForSetting.vue | 7 - .../workflow/components/ProcessDesigner.vue | 5 + .../pages/workflow/components/TaskCommit.vue | 7 - .../components/TaskMultipleSelect.vue | 1 + .../components/UserTaskSelect/index.vue | 7 - .../flowCategory/formFlowCategory.vue | 6 - .../workflow/flowEntry/formEditFlowEntry.vue | 99 ++- .../workflow/flowEntry/formFlowEntry.vue | 50 +- .../formFlowDblink/editFlowDblink.vue | 422 ++++++++++++ .../pages/workflow/formFlowDblink/index.vue | 204 ++++++ .../pages/workflow/handlerFlowTask/index.vue | 10 - .../process-designer/ProcessDesigner.vue | 3 +- .../process-designer/plugins/defaultEmpty.ts | 12 +- .../package/refactor/PropertiesPanel.vue | 17 +- .../refactor/form/AutoDeleteTaskSetting.vue | 275 ++++++++ .../refactor/form/AutoHttpTaskSetting.vue | 631 ++++++++++++++++++ .../refactor/form/AutoInsertTaskSetting.vue | 404 +++++++++++ .../form/AutoQuerySingleDataSetting.vue | 293 ++++++++ .../refactor/form/AutoUpdateTaskSetting.vue | 324 +++++++++ .../package/refactor/form/ServiceTask.vue | 311 +++++++-- .../package/refactor/form/editHttpHeader.vue | 153 +++++ .../refactor/form/editHttpParameter.vue | 153 +++++ .../package/refactor/form/editInsertData.vue | 226 +++++++ .../refactor/form/editResponseData.vue | 148 ++++ .../refactor/form/editSrcTableFilter.vue | 192 ++++++ .../package/refactor/form/flowFormConfig.vue | 11 +- .../refactor/form/formEditOperation.vue | 29 +- .../task/task-components/ReceiveTask.vue | 2 +- .../task/task-components/UserTask.vue | 13 - .../workflow/taskManager/formAllInstance.vue | 19 +- .../taskManager/formTaskProcessViewer.vue | 1 + .../src/router/systemRouters.ts | 45 +- 52 files changed, 4093 insertions(+), 309 deletions(-) create mode 100644 OrangeFormsOpen-VUE3/src/api/flow/FlowDblinkController.ts create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/formFlowDblink/editFlowDblink.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/formFlowDblink/index.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoDeleteTaskSetting.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoHttpTaskSetting.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoInsertTaskSetting.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoQuerySingleDataSetting.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoUpdateTaskSetting.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpHeader.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpParameter.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editInsertData.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editResponseData.vue create mode 100644 OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editSrcTableFilter.vue diff --git a/OrangeFormsOpen-VUE3/components.d.ts b/OrangeFormsOpen-VUE3/components.d.ts index da3cfcc6..4817e45a 100644 --- a/OrangeFormsOpen-VUE3/components.d.ts +++ b/OrangeFormsOpen-VUE3/components.d.ts @@ -52,6 +52,7 @@ declare module 'vue' { ElMenu: typeof import('element-plus/es')['ElMenu'] ElMenuItem: typeof import('element-plus/es')['ElMenuItem'] ElOption: typeof import('element-plus/es')['ElOption'] + ElOptionGroup: typeof import('element-plus/es')['ElOptionGroup'] ElPagination: typeof import('element-plus/es')['ElPagination'] ElPopover: typeof import('element-plus/es')['ElPopover'] ElRadio: typeof import('element-plus/es')['ElRadio'] diff --git a/OrangeFormsOpen-VUE3/src/api/flow/FlowDblinkController.ts b/OrangeFormsOpen-VUE3/src/api/flow/FlowDblinkController.ts new file mode 100644 index 00000000..ee4cb86a --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/api/flow/FlowDblinkController.ts @@ -0,0 +1,53 @@ +import { BaseController } from '@/api/BaseController'; +import { RequestOption } from '@/common/http/types'; +import { ANY_OBJECT } from '@/types/generic'; +import { TableData } from '@/common/types/table'; +import { DBLink } from '@/types/online/dblink'; +import { TableInfo } from '@/types/online/table'; +import { API_CONTEXT } from '../config'; + +export default class FlowDblinkController extends BaseController { + static list(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.post>( + API_CONTEXT + '/flow/flowDblink/list', + params, + httpOptions, + ); + } + + static listDblinkTables(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.get( + API_CONTEXT + '/flow/flowDblink/listDblinkTables', + params, + httpOptions, + ); + } + + static listDblinkTableColumns(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.get( + API_CONTEXT + '/flow/flowDblink/listDblinkTableColumns', + params, + httpOptions, + ); + } + + static view(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.get(API_CONTEXT + '/flow/flowDblink/view', params, httpOptions); + } + + static add(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.post(API_CONTEXT + '/flow/flowDblink/add', params, httpOptions); + } + + static update(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.post(API_CONTEXT + '/flow/flowDblink/update', params, httpOptions); + } + + static delete(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.post(API_CONTEXT + '/flow/flowDblink/delete', params, httpOptions); + } + + static testConnection(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.get(API_CONTEXT + '/flow/flowDblink/testConnection', params, httpOptions); + } +} diff --git a/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts b/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts index dc82777d..56856554 100644 --- a/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts +++ b/OrangeFormsOpen-VUE3/src/api/flow/FlowOperationController.ts @@ -286,4 +286,8 @@ export default class FlowOperationController extends BaseController { httpOptions, ); } + // 启动自动化任务 + static startAutoTask(params: ANY_OBJECT, httpOptions?: RequestOption) { + return super.post(API_CONTEXT + '/flow/flowOperation/startAuto', params, httpOptions); + } } diff --git a/OrangeFormsOpen-VUE3/src/api/flow/index.ts b/OrangeFormsOpen-VUE3/src/api/flow/index.ts index 632dfd35..8a6b362b 100644 --- a/OrangeFormsOpen-VUE3/src/api/flow/index.ts +++ b/OrangeFormsOpen-VUE3/src/api/flow/index.ts @@ -2,10 +2,12 @@ import FlowOperationController from './FlowOperationController'; import FlowDictionaryController from './FlowDictionaryController'; import FlowEntryController from './FlowEntryController'; import FlowEntryVariableController from './FlowEntryVariableController'; +import FlowDblinkController from './FlowDblinkController'; export { FlowOperationController, FlowEntryController, FlowDictionaryController, FlowEntryVariableController, + FlowDblinkController, }; diff --git a/OrangeFormsOpen-VUE3/src/common/http/request.ts b/OrangeFormsOpen-VUE3/src/common/http/request.ts index 8d933e03..37d63c70 100644 --- a/OrangeFormsOpen-VUE3/src/common/http/request.ts +++ b/OrangeFormsOpen-VUE3/src/common/http/request.ts @@ -293,8 +293,7 @@ export const downloadBlob = ( commonRequest(requestUrl(url), params, method, options, axiosOption) .then(res => { if (res instanceof Blob) { - const blobData = new Blob([res.data], { type: 'application/octet-stream' }); - resolve(blobData); + resolve(res); } else { console.warn('下载文件失败', res); reject(new Error('下载文件失败')); diff --git a/OrangeFormsOpen-VUE3/src/common/staticDict/combined.ts b/OrangeFormsOpen-VUE3/src/common/staticDict/combined.ts index 92eb0d82..db1c5c18 100644 --- a/OrangeFormsOpen-VUE3/src/common/staticDict/combined.ts +++ b/OrangeFormsOpen-VUE3/src/common/staticDict/combined.ts @@ -1,8 +1,5 @@ -// eslint-disable-next-line import/namespace -import * as generatedDict from './generated'; import * as baseDict from './index'; export default { ...baseDict, - ...generatedDict, }; diff --git a/OrangeFormsOpen-VUE3/src/common/staticDict/flow.ts b/OrangeFormsOpen-VUE3/src/common/staticDict/flow.ts index 5c0cdecf..10806080 100644 --- a/OrangeFormsOpen-VUE3/src/common/staticDict/flow.ts +++ b/OrangeFormsOpen-VUE3/src/common/staticDict/flow.ts @@ -164,6 +164,16 @@ const SysFlowVariableType = new DictionaryBase('工作流变量类型', [ name: '任务变量', symbol: 'TASK', }, + { + id: 2, + name: '系统内置变量', + symbol: 'SYSTEM', + }, + { + id: 4, + name: '自定义变量', + symbol: 'CUSTOM', + }, ]); const SysFlowWorkOrderStatus = new DictionaryBase('工单状态', [ @@ -340,6 +350,64 @@ const SysAutoCodeType = new DictionaryBase('自动编码类型', [ symbol: 'SECONDS', }, ]); +const FlowEntryType = new DictionaryBase('流程类型', [ + { + id: 0, + name: '审批流程', + symbol: 'NORMAL', + }, + { + id: 1, + name: '自动化任务', + symbol: 'AUTO_TASK', + }, +]); + +const AutoTaskValueType = new DictionaryBase('自动化任务值类型', [ + { + id: 0, + name: '固定值', + symbol: 'FIXED', + }, + { + id: 1, + name: '源表字段', + symbol: 'FIELD', + }, + { + id: 2, + name: '流程变量', + symbol: 'VARIABLE', + }, +]); + +const AutoTaskActionType = new DictionaryBase('自动化任务动作类型', [ + { + id: 0, + name: '数据插入', + symbol: 'INSERT', + }, + { + id: 1, + name: '数据更新', + symbol: 'UPDATE', + }, + { + id: 2, + name: '数据删除', + symbol: 'DELETE', + }, + { + id: 3, + name: '数据查询', + symbol: 'QUERY_SINGLE_DATA', + }, + { + id: 10, + name: 'HTTP请求', + symbol: 'HTTP', + }, +]); export { SysFlowEntryPublishedStatus, @@ -353,4 +421,7 @@ export { DiagramType, FlowNodeType, SysAutoCodeType, + FlowEntryType, + AutoTaskValueType, + AutoTaskActionType, }; diff --git a/OrangeFormsOpen-VUE3/src/common/staticDict/index.ts b/OrangeFormsOpen-VUE3/src/common/staticDict/index.ts index e74c3dc4..944fff75 100644 --- a/OrangeFormsOpen-VUE3/src/common/staticDict/index.ts +++ b/OrangeFormsOpen-VUE3/src/common/staticDict/index.ts @@ -924,6 +924,68 @@ const DblinkType = new DictionaryBase('数据库连接类型', [ */ ]); +const CriteriaFilterType = new DictionaryBase('条件过滤类型', [ + { + id: 0, + name: '等于', + symbol: 'EQ', + }, + { + id: 1, + name: '不等于', + symbol: 'NOT_EQ', + }, + { + id: 2, + name: '大于等于', + symbol: 'GE', + }, + { + id: 3, + name: '大于', + symbol: 'GT', + }, + { + id: 4, + name: '小于等于', + symbol: 'LE', + }, + { + id: 5, + name: '小于', + symbol: 'LT', + }, + { + id: 6, + name: 'LIKE', + symbol: 'LIKE', + }, + { + id: 7, + name: 'IN', + symbol: 'IN', + }, + { + id: 8, + name: 'NOT IN', + symbol: 'NOT_IN', + }, + { + id: 9, + name: 'BETWEEN', + symbol: 'BETWEEN', + }, + { + id: 100, + name: '不为空', + symbol: 'NOT_NULL', + }, + { + id: 101, + name: '为空', + symbol: 'IS_NULL', + }, +]); export { SysUserStatus, SysUserType, @@ -943,4 +1005,5 @@ export { SysCustomWidgetBindDataType, DirectionType, DblinkType, + CriteriaFilterType, }; diff --git a/OrangeFormsOpen-VUE3/src/components/DeptSelect/index.vue b/OrangeFormsOpen-VUE3/src/components/DeptSelect/index.vue index da29ddd4..ca944b99 100644 --- a/OrangeFormsOpen-VUE3/src/components/DeptSelect/index.vue +++ b/OrangeFormsOpen-VUE3/src/components/DeptSelect/index.vue @@ -66,11 +66,6 @@ const widgetId = ref(getUUID()); const selectedItems = ref([]); const pps = computed(() => props.props); -const refreshData = (data: ANY_OBJECT) => { - if (data.path === 'thirdSelectDept/' + widgetId.value && data.isSuccess) { - handlerEditOperate(data.data); - } -}; const handlerEditOperate = (items: Ref) => { selectedItems.value = []; if (props.multiple) { @@ -187,10 +182,6 @@ watch( immediate: true, }, ); - -defineExpose({ - refreshData, -}); diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/formFlowDblink/index.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/formFlowDblink/index.vue new file mode 100644 index 00000000..da5ca956 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/formFlowDblink/index.vue @@ -0,0 +1,204 @@ + + + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/handlerFlowTask/index.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/handlerFlowTask/index.vue index 59760be4..59d411bf 100644 --- a/OrangeFormsOpen-VUE3/src/pages/workflow/handlerFlowTask/index.vue +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/handlerFlowTask/index.vue @@ -544,16 +544,6 @@ const initFormData = () => { onMounted(() => { initFormData(); }); - -const refreshData = (data: ANY_OBJECT) => { - if (data.path === 'thirdTaskCommit' && data.isSuccess) { - preHandlerOperationThen(data.rowData.operation, data.rowData.copyItemList, data.data); - } -}; - -defineExpose({ - refreshData, -}); diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoHttpTaskSetting.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoHttpTaskSetting.vue new file mode 100644 index 00000000..6d983eb1 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoHttpTaskSetting.vue @@ -0,0 +1,631 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoInsertTaskSetting.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoInsertTaskSetting.vue new file mode 100644 index 00000000..db13b838 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoInsertTaskSetting.vue @@ -0,0 +1,404 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoQuerySingleDataSetting.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoQuerySingleDataSetting.vue new file mode 100644 index 00000000..999fdc4b --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoQuerySingleDataSetting.vue @@ -0,0 +1,293 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoUpdateTaskSetting.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoUpdateTaskSetting.vue new file mode 100644 index 00000000..75f2b9f6 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/AutoUpdateTaskSetting.vue @@ -0,0 +1,324 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/ServiceTask.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/ServiceTask.vue index 711d70fc..63c5203b 100644 --- a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/ServiceTask.vue +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/ServiceTask.vue @@ -1,71 +1,240 @@ - - - - - + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpHeader.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpHeader.vue new file mode 100644 index 00000000..01457d39 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpHeader.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpParameter.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpParameter.vue new file mode 100644 index 00000000..32a8add2 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editHttpParameter.vue @@ -0,0 +1,153 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editInsertData.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editInsertData.vue new file mode 100644 index 00000000..7e819c24 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editInsertData.vue @@ -0,0 +1,226 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editResponseData.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editResponseData.vue new file mode 100644 index 00000000..c63efe71 --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editResponseData.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editSrcTableFilter.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editSrcTableFilter.vue new file mode 100644 index 00000000..3e9e53bb --- /dev/null +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/editSrcTableFilter.vue @@ -0,0 +1,192 @@ + + + + + diff --git a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/flowFormConfig.vue b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/flowFormConfig.vue index 86a2fc78..9d2c694a 100644 --- a/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/flowFormConfig.vue +++ b/OrangeFormsOpen-VUE3/src/pages/workflow/package/refactor/form/flowFormConfig.vue @@ -261,15 +261,6 @@ const onSetOnlineFormAuth = () => { console.warn(e); }); }; - -const refreshData = (data: ANY_OBJECT) => { - if (data.path === 'thirdEditOperation' && data.isSuccess) { - updateEditOperation(data.data); - } else if (data.path === 'thirdSetOnlineFormAuth' && data.isSuccess) { - formData.value.formAuth = data.data; - updateElementFormKey(); - } -}; const resetFormList = () => { bpmnElement = win.bpmnInstances.bpmnElement; let formKey = bpmnElement.businessObject.formKey; @@ -420,7 +411,7 @@ watch( }, ); -defineExpose({ refreshData, onEditOperation }); +defineExpose({ onEditOperation });