yudao
/
admin-vue3
mirror of https://gitee.com/yudaocode/yudao-ui-admin-vue3.git
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix :[bpm] 超时时间为天时格式问题修复

master-bpm-bug-fix
jason 2026-06-20 21:57:40 +08:00
parent 2ea2d9b18f
commit e55613edc6
3 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/components/SimpleProcessDesignerV2/src/nodes-config/ChildProcessNodeConfig.vue
View File

@ -529,7 +529,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
// 固定时长 // 固定时长
if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) { if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) {
const strTimeDuration = node.childProcessSetting.timeoutSetting.timeExpression ?? '' const strTimeDuration = node.childProcessSetting.timeoutSetting.timeExpression ?? ''
let parseTime = strTimeDuration.slice(2, strTimeDuration.length - 1) let parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''
let parseTimeUnit = strTimeDuration.slice(strTimeDuration.length - 1) let parseTimeUnit = strTimeDuration.slice(strTimeDuration.length - 1)
configForm.value.timeDuration = parseInt(parseTime) configForm.value.timeDuration = parseInt(parseTime)
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit) configForm.value.timeUnit = convertTimeUnit(parseTimeUnit)
@ -586,12 +586,12 @@ const loadFormInfo = async () => {
} }
} }
const getIsoTimeDuration = () => { const getIsoTimeDuration = () => {
let strTimeDuration = 'PT' let strTimeDuration = 'P'
if (configForm.value.timeUnit === TimeUnitType.MINUTE) { if (configForm.value.timeUnit === TimeUnitType.MINUTE) {
strTimeDuration += configForm.value.timeDuration + 'M' strTimeDuration += 'T' + configForm.value.timeDuration + 'M'
} }
if (configForm.value.timeUnit === TimeUnitType.HOUR) { if (configForm.value.timeUnit === TimeUnitType.HOUR) {
strTimeDuration += configForm.value.timeDuration + 'H' strTimeDuration += 'T' + configForm.value.timeDuration + 'H'
} }
if (configForm.value.timeUnit === TimeUnitType.DAY) { if (configForm.value.timeUnit === TimeUnitType.DAY) {
strTimeDuration += configForm.value.timeDuration + 'D' strTimeDuration += configForm.value.timeDuration + 'D'

8
src/components/SimpleProcessDesignerV2/src/nodes-config/DelayTimerNodeConfig.vue
View File

@ -152,12 +152,12 @@ const getShowText = (): string => {
return showText return showText
} }
const getIsoTimeDuration = () => { const getIsoTimeDuration = () => {
let strTimeDuration = 'PT' let strTimeDuration = 'P'
if (configForm.value.timeUnit === TimeUnitType.MINUTE) { if (configForm.value.timeUnit === TimeUnitType.MINUTE) {
strTimeDuration += configForm.value.timeDuration + 'M' strTimeDuration += 'T' + configForm.value.timeDuration + 'M'
} }
if (configForm.value.timeUnit === TimeUnitType.HOUR) { if (configForm.value.timeUnit === TimeUnitType.HOUR) {
strTimeDuration += configForm.value.timeDuration + 'H' strTimeDuration += 'T' + configForm.value.timeDuration + 'H'
} }
if (configForm.value.timeUnit === TimeUnitType.DAY) { if (configForm.value.timeUnit === TimeUnitType.DAY) {
strTimeDuration += configForm.value.timeDuration + 'D' strTimeDuration += configForm.value.timeDuration + 'D'
@ -172,7 +172,7 @@ const showDelayTimerNodeConfig = (node: SimpleFlowNode) => {
// 固定时长 // 固定时长
if (configForm.value.delayType === DelayTypeEnum.FIXED_TIME_DURATION) { if (configForm.value.delayType === DelayTypeEnum.FIXED_TIME_DURATION) {
const strTimeDuration = node.delaySetting.delayTime const strTimeDuration = node.delaySetting.delayTime
let parseTime = strTimeDuration.slice(2, strTimeDuration.length - 1) let parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''
let parseTimeUnit = strTimeDuration.slice(strTimeDuration.length - 1) let parseTimeUnit = strTimeDuration.slice(strTimeDuration.length - 1)
configForm.value.timeDuration = parseInt(parseTime) configForm.value.timeDuration = parseInt(parseTime)
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit) configForm.value.timeUnit = convertTimeUnit(parseTimeUnit)

8
src/components/SimpleProcessDesignerV2/src/nodes-config/UserTaskNodeConfig.vue
View File

@ -816,7 +816,7 @@ const showUserTaskNodeConfig = (node: SimpleFlowNode) => {
configForm.value.timeoutHandlerEnable = node.timeoutHandler?.enable configForm.value.timeoutHandlerEnable = node.timeoutHandler?.enable
if (node.timeoutHandler?.enable && node.timeoutHandler?.timeDuration) { if (node.timeoutHandler?.enable && node.timeoutHandler?.timeDuration) {
const strTimeDuration = node.timeoutHandler.timeDuration const strTimeDuration = node.timeoutHandler.timeDuration
let parseTime = strTimeDuration.slice(2, strTimeDuration.length - 1) let parseTime = strTimeDuration.match(/\d+/)?.[0] ?? ''
let parseTimeUnit = strTimeDuration.slice(strTimeDuration.length - 1) let parseTimeUnit = strTimeDuration.slice(strTimeDuration.length - 1)
configForm.value.timeDuration = parseInt(parseTime) configForm.value.timeDuration = parseInt(parseTime)
timeUnit.value = convertTimeUnit(parseTimeUnit) timeUnit.value = convertTimeUnit(parseTimeUnit)
@ -938,12 +938,12 @@ function useTimeoutHandler() {
if (!configForm.value.timeoutHandlerEnable) { if (!configForm.value.timeoutHandlerEnable) {
return undefined return undefined
} }
let strTimeDuration = 'PT' let strTimeDuration = 'P'
if (timeUnit.value === TimeUnitType.MINUTE) { if (timeUnit.value === TimeUnitType.MINUTE) {
strTimeDuration += configForm.value.timeDuration + 'M' strTimeDuration += 'T' + configForm.value.timeDuration + 'M'
} }
if (timeUnit.value === TimeUnitType.HOUR) { if (timeUnit.value === TimeUnitType.HOUR) {
strTimeDuration += configForm.value.timeDuration + 'H' strTimeDuration += 'T' + configForm.value.timeDuration + 'H'
} }
if (timeUnit.value === TimeUnitType.DAY) { if (timeUnit.value === TimeUnitType.DAY) {
strTimeDuration += configForm.value.timeDuration + 'D' strTimeDuration += configForm.value.timeDuration + 'D'