From b91268923f2e2fc1024579c9887008a560b4736c Mon Sep 17 00:00:00 2001 From: jason <2667446@qq.com> Date: Thu, 4 Jun 2026 12:40:51 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20[bpm]=20=E8=B6=85=E6=97=B6=E6=97=B6?= =?UTF-8?q?=E9=97=B4=E5=A4=A9=E7=9A=84=E6=A0=BC=E5=BC=8F=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/nodes-config/child-process-node-config.vue | 8 ++++---- .../components/nodes-config/delay-timer-node-config.vue | 8 ++++---- .../components/nodes-config/user-task-node-config.vue | 8 ++++---- .../components/nodes-config/child-process-node-config.vue | 8 ++++---- .../components/nodes-config/delay-timer-node-config.vue | 8 ++++---- .../components/nodes-config/user-task-node-config.vue | 2 +- .../components/nodes-config/child-process-node-config.vue | 8 ++++---- .../components/nodes-config/delay-timer-node-config.vue | 8 ++++---- .../components/nodes-config/user-task-node-config.vue | 2 +- 9 files changed, 30 insertions(+), 30 deletions(-) diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue index 1ac758a6d..b288676f7 100644 --- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue +++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue @@ -293,7 +293,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => { if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) { const strTimeDuration = node.childProcessSetting.timeoutSetting.timeExpression ?? ''; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); @@ -359,12 +359,12 @@ const loadFormInfo = async () => { }; const getIsoTimeDuration = () => { - let strTimeDuration = 'PT'; + let strTimeDuration = 'P'; if (configForm.value.timeUnit === TimeUnitType.MINUTE) { - strTimeDuration += `${configForm.value.timeDuration}M`; + strTimeDuration += `T${configForm.value.timeDuration}M`; } if (configForm.value.timeUnit === TimeUnitType.HOUR) { - strTimeDuration += `${configForm.value.timeDuration}H`; + strTimeDuration += `T${configForm.value.timeDuration}H`; } if (configForm.value.timeUnit === TimeUnitType.DAY) { strTimeDuration += `${configForm.value.timeDuration}D`; diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue index 0e0ac4cc3..6f578229d 100644 --- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue +++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue @@ -84,12 +84,12 @@ function getShowText(): string { // 获取ISO时间格式 function getIsoTimeDuration() { - let strTimeDuration = 'PT'; + let strTimeDuration = 'P'; if (configForm.value.timeUnit === TimeUnitType.MINUTE) { - strTimeDuration += `${configForm.value.timeDuration}M`; + strTimeDuration += `T${configForm.value.timeDuration}M`; } if (configForm.value.timeUnit === TimeUnitType.HOUR) { - strTimeDuration += `${configForm.value.timeDuration}H`; + strTimeDuration += `T${configForm.value.timeDuration}H`; } if (configForm.value.timeUnit === TimeUnitType.DAY) { strTimeDuration += `${configForm.value.timeDuration}D`; @@ -135,7 +135,7 @@ function openDrawer(node: SimpleFlowNode) { // 固定时长 if (configForm.value.delayType === DelayTypeEnum.FIXED_TIME_DURATION) { const strTimeDuration = node.delaySetting.delayTime; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); diff --git a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue index 2afdd6f97..98373821a 100644 --- a/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue +++ b/apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue @@ -417,7 +417,7 @@ function showUserTaskNodeConfig(node: SimpleFlowNode) { configForm.value.timeoutHandlerEnable = node.timeoutHandler?.enable; if (node.timeoutHandler?.enable && node.timeoutHandler?.timeDuration) { const strTimeDuration = node.timeoutHandler.timeDuration; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); timeUnit.value = convertTimeUnit(parseTimeUnit); @@ -563,12 +563,12 @@ function useTimeoutHandler() { if (!configForm.value.timeoutHandlerEnable) { return undefined; } - let strTimeDuration = 'PT'; + let strTimeDuration = 'P'; if (timeUnit.value === TimeUnitType.MINUTE) { - strTimeDuration += `${configForm.value.timeDuration}M`; + strTimeDuration += `T${configForm.value.timeDuration}M`; } if (timeUnit.value === TimeUnitType.HOUR) { - strTimeDuration += `${configForm.value.timeDuration}H`; + strTimeDuration += `T${configForm.value.timeDuration}H`; } if (timeUnit.value === TimeUnitType.DAY) { strTimeDuration += `${configForm.value.timeDuration}D`; diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue index 17efe8160..67cc804dc 100644 --- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue +++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue @@ -292,7 +292,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => { if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) { const strTimeDuration = node.childProcessSetting.timeoutSetting.timeExpression ?? ''; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); @@ -358,12 +358,12 @@ const loadFormInfo = async () => { }; const getIsoTimeDuration = () => { - let strTimeDuration = 'PT'; + let strTimeDuration = 'P'; if (configForm.value.timeUnit === TimeUnitType.MINUTE) { - strTimeDuration += `${configForm.value.timeDuration}M`; + strTimeDuration += `T${configForm.value.timeDuration}M`; } if (configForm.value.timeUnit === TimeUnitType.HOUR) { - strTimeDuration += `${configForm.value.timeDuration}H`; + strTimeDuration += `T${configForm.value.timeDuration}H`; } if (configForm.value.timeUnit === TimeUnitType.DAY) { strTimeDuration += `${configForm.value.timeDuration}D`; diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue index 5a9604333..614935237 100644 --- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue +++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue @@ -83,12 +83,12 @@ function getShowText(): string { // 获取ISO时间格式 function getIsoTimeDuration() { - let strTimeDuration = 'PT'; + let strTimeDuration = 'P'; if (configForm.value.timeUnit === TimeUnitType.MINUTE) { - strTimeDuration += `${configForm.value.timeDuration}M`; + strTimeDuration += `T${configForm.value.timeDuration}M`; } if (configForm.value.timeUnit === TimeUnitType.HOUR) { - strTimeDuration += `${configForm.value.timeDuration}H`; + strTimeDuration += `T${configForm.value.timeDuration}H`; } if (configForm.value.timeUnit === TimeUnitType.DAY) { strTimeDuration += `${configForm.value.timeDuration}D`; @@ -134,7 +134,7 @@ function openDrawer(node: SimpleFlowNode) { // 固定时长 if (configForm.value.delayType === DelayTypeEnum.FIXED_TIME_DURATION) { const strTimeDuration = node.delaySetting.delayTime; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); diff --git a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue index 4c5d8dafa..8b12e01d9 100644 --- a/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue +++ b/apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue @@ -416,7 +416,7 @@ function showUserTaskNodeConfig(node: SimpleFlowNode) { configForm.value.timeoutHandlerEnable = node.timeoutHandler?.enable; if (node.timeoutHandler?.enable && node.timeoutHandler?.timeDuration) { const strTimeDuration = node.timeoutHandler.timeDuration; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); timeUnit.value = convertTimeUnit(parseTimeUnit); diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue index 012328cbf..2f68330cf 100644 --- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue +++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue @@ -280,7 +280,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => { if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) { const strTimeDuration = node.childProcessSetting.timeoutSetting.timeExpression ?? ''; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); @@ -346,12 +346,12 @@ const loadFormInfo = async () => { }; const getIsoTimeDuration = () => { - let strTimeDuration = 'PT'; + let strTimeDuration = 'P'; if (configForm.value.timeUnit === TimeUnitType.MINUTE) { - strTimeDuration += `${configForm.value.timeDuration}M`; + strTimeDuration += `T${configForm.value.timeDuration}M`; } if (configForm.value.timeUnit === TimeUnitType.HOUR) { - strTimeDuration += `${configForm.value.timeDuration}H`; + strTimeDuration += `T${configForm.value.timeDuration}H`; } if (configForm.value.timeUnit === TimeUnitType.DAY) { strTimeDuration += `${configForm.value.timeDuration}D`; diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue index ccf9f45ab..e837251e6 100644 --- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue +++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue @@ -83,12 +83,12 @@ function getShowText(): string { // 获取ISO时间格式 function getIsoTimeDuration() { - let strTimeDuration = 'PT'; + let strTimeDuration = 'P'; if (configForm.value.timeUnit === TimeUnitType.MINUTE) { - strTimeDuration += `${configForm.value.timeDuration}M`; + strTimeDuration += `T${configForm.value.timeDuration}M`; } if (configForm.value.timeUnit === TimeUnitType.HOUR) { - strTimeDuration += `${configForm.value.timeDuration}H`; + strTimeDuration += `T${configForm.value.timeDuration}H`; } if (configForm.value.timeUnit === TimeUnitType.DAY) { strTimeDuration += `${configForm.value.timeDuration}D`; @@ -134,7 +134,7 @@ function openDrawer(node: SimpleFlowNode) { // 固定时长 if (configForm.value.delayType === DelayTypeEnum.FIXED_TIME_DURATION) { const strTimeDuration = node.delaySetting.delayTime; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); diff --git a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue index e46348248..0befb8c67 100644 --- a/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue +++ b/apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue @@ -402,7 +402,7 @@ function showUserTaskNodeConfig(node: SimpleFlowNode) { configForm.value.timeoutHandlerEnable = node.timeoutHandler?.enable; if (node.timeoutHandler?.enable && node.timeoutHandler?.timeDuration) { const strTimeDuration = node.timeoutHandler.timeDuration; - const parseTime = strTimeDuration.slice(2, -1); + const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''; const parseTimeUnit = strTimeDuration.slice(-1); configForm.value.timeDuration = Number.parseInt(parseTime); timeUnit.value = convertTimeUnit(parseTimeUnit);