From 2d240ccf0cb34c12ca6de84387ca16b802a849ec Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Tue, 25 Feb 2025 18:42:40 +0800 Subject: [PATCH 1/4] =?UTF-8?q?feat:=E6=B5=81=E7=A8=8B-=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E7=9A=84=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=201.=E6=B5=81=E7=A8=8B=E5=8F=98=E6=9B=B4=E5=90=8E=EF=BC=8C?= =?UTF-8?q?=E6=96=B0=E6=97=A7=E6=B5=81=E7=A8=8B=E6=8C=89=E7=89=88=E6=9C=AC?= =?UTF-8?q?=E6=89=A7=E8=A1=8C=EF=BC=8C=E6=8C=89=E5=90=84=E7=A7=8D=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E7=9A=84=E6=B5=81=E7=A8=8B=E5=AE=9A=E4=B9=89=E5=92=8C?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E9=85=8D=E7=BD=AE=E7=BB=A7=E7=BB=AD=E6=B5=81?= =?UTF-8?q?=E8=BD=AC=202.=E5=8F=AF=E4=BB=A5=E5=88=87=E6=8D=A2=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E5=AE=9E=E4=BE=8B=E7=9A=84=E7=89=88=E6=9C=AC?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/workflow/design.ts | 33 +++- src/components/UpdateProcessVersion/index.ts | 3 + .../src/UpdateProcessVersionModal.vue | 185 ++++++++++++++++++ src/views/workflow/design/index.vue | 32 ++- src/views/workflow/task/ProcessMonitor.vue | 138 ++++++++++++- .../workflow/task/components/LookProcess.vue | 31 +-- 6 files changed, 399 insertions(+), 23 deletions(-) create mode 100644 src/components/UpdateProcessVersion/index.ts create mode 100644 src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue diff --git a/src/api/workflow/design.ts b/src/api/workflow/design.ts index 1059356..699140d 100644 --- a/src/api/workflow/design.ts +++ b/src/api/workflow/design.ts @@ -4,6 +4,7 @@ import { WorkflowPageParams, WorkflowPageResult, ChangeResultModel, + WorkflowPageModel, } from './model/index'; import { defHttp } from '/@/utils/http/axios'; @@ -22,6 +23,7 @@ enum Api { HistoryList = '/workflow/schema-history/list', HistorySetCurrent = '/workflow/schema-history/set-current', PreviewProcess = '/workflow/execute/preview', + UpdateVersion = '/workflow/schema/updateVersion', } /** * @description: 导出流程设计 @@ -51,7 +53,19 @@ export async function getDesignPage(params: WorkflowPageParams, mode: ErrorMessa }, ); } - +/** + * @description: 查询Workflow全量 + */ +export async function getDesignList(mode: ErrorMessageMode = 'modal') { + return defHttp.get>( + { + url: Api.List, + }, + { + errorMessageMode: mode, + }, + ); +} /** * @description: 获取Workflow信息 */ @@ -191,3 +205,20 @@ export async function getPreviewProcess(schemaId: string, mode: ErrorMessageMode }, ); } +/** + * updateVersion 更新流程 + */ +export async function updateProcessVersionApi( + updateVersionDto: Recordable, + mode: ErrorMessageMode = 'modal', +) { + return defHttp.post( + { + url: Api.UpdateVersion, + params: updateVersionDto, + }, + { + errorMessageMode: mode, + }, + ); +} \ No newline at end of file diff --git a/src/components/UpdateProcessVersion/index.ts b/src/components/UpdateProcessVersion/index.ts new file mode 100644 index 0000000..3420205 --- /dev/null +++ b/src/components/UpdateProcessVersion/index.ts @@ -0,0 +1,3 @@ +import { withInstall } from '/@/utils'; +import updateProcessVersionModal from './src/UpdateProcessVersionModal.vue'; +export const UpdateProcessVersionModal = withInstall(updateProcessVersionModal); //流程版本变更 \ No newline at end of file diff --git a/src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue b/src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue new file mode 100644 index 0000000..f8177db --- /dev/null +++ b/src/components/UpdateProcessVersion/src/UpdateProcessVersionModal.vue @@ -0,0 +1,185 @@ + + + + \ No newline at end of file diff --git a/src/views/workflow/design/index.vue b/src/views/workflow/design/index.vue index 3ed3c49..f9d8ab7 100644 --- a/src/views/workflow/design/index.vue +++ b/src/views/workflow/design/index.vue @@ -49,6 +49,9 @@ {{ t('分类管理') }} + {{ + t('流程版本变更') + }} diff --git a/src/views/workflow/task/components/LookProcess.vue b/src/views/workflow/task/components/LookProcess.vue index 098b347..2dc2f4f 100644 --- a/src/views/workflow/task/components/LookProcess.vue +++ b/src/views/workflow/task/components/LookProcess.vue @@ -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 + }); From 3c30812aad01a3bee998abfe5c3275d9ab91b73d Mon Sep 17 00:00:00 2001 From: lvjunzhao <967725@dms.yudean.com> Date: Wed, 26 Feb 2025 10:31:39 +0800 Subject: [PATCH 2/4] =?UTF-8?q?feat:=E6=B5=81=E7=A8=8B-=E6=B5=81=E7=A8=8B?= =?UTF-8?q?=E5=AE=9E=E4=BE=8B=E7=9A=84=E7=89=88=E6=9C=AC=E9=97=AE=E9=A2=98?= =?UTF-8?q?=203.=E7=94=A8vue.nextTick=20=E6=9D=A5=E6=9B=B4=E6=96=B0props?= =?UTF-8?q?=20=E8=B5=8B=E5=80=BC=E5=BB=B6=E5=90=8E=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/workflow/task/ProcessMonitor.vue | 10 +++++----- src/views/workflow/task/components/LookProcess.vue | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/views/workflow/task/ProcessMonitor.vue b/src/views/workflow/task/ProcessMonitor.vue index fafbc8f..cde2a0e 100644 --- a/src/views/workflow/task/ProcessMonitor.vue +++ b/src/views/workflow/task/ProcessMonitor.vue @@ -20,7 +20,7 @@ @row-dbClick="dbClickRow" >