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

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

pull/354/head
jason 2026-06-04 12:40:51 +08:00
parent 4a597c0806
commit b91268923f
9 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
View File

@ -293,7 +293,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) { if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) {
const strTimeDuration = const strTimeDuration =
node.childProcessSetting.timeoutSetting.timeExpression ?? ''; node.childProcessSetting.timeoutSetting.timeExpression ?? '';
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit);
@ -359,12 +359,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
apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
View File

@ -84,12 +84,12 @@ function getShowText(): string {
// 获取ISO时间格式 // 获取ISO时间格式
function getIsoTimeDuration() { function 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`;
@ -135,7 +135,7 @@ function openDrawer(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;
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit);

8
apps/web-antd/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
View File

@ -417,7 +417,7 @@ function 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;
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
timeUnit.value = convertTimeUnit(parseTimeUnit); timeUnit.value = convertTimeUnit(parseTimeUnit);
@ -563,12 +563,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`;

8
apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
View File

@ -292,7 +292,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) { if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) {
const strTimeDuration = const strTimeDuration =
node.childProcessSetting.timeoutSetting.timeExpression ?? ''; node.childProcessSetting.timeoutSetting.timeExpression ?? '';
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit);
@ -358,12 +358,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
apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
View File

@ -83,12 +83,12 @@ function getShowText(): string {
// 获取ISO时间格式 // 获取ISO时间格式
function getIsoTimeDuration() { function 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`;
@ -134,7 +134,7 @@ function openDrawer(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;
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit);

2
apps/web-antdv-next/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
View File

@ -416,7 +416,7 @@ function 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;
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
timeUnit.value = convertTimeUnit(parseTimeUnit); timeUnit.value = convertTimeUnit(parseTimeUnit);

8
apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/child-process-node-config.vue
View File

@ -280,7 +280,7 @@ const showChildProcessNodeConfig = (node: SimpleFlowNode) => {
if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) { if (configForm.value.timeoutType === DelayTypeEnum.FIXED_TIME_DURATION) {
const strTimeDuration = const strTimeDuration =
node.childProcessSetting.timeoutSetting.timeExpression ?? ''; node.childProcessSetting.timeoutSetting.timeExpression ?? '';
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit);
@ -346,12 +346,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
apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/delay-timer-node-config.vue
View File

@ -83,12 +83,12 @@ function getShowText(): string {
// 获取ISO时间格式 // 获取ISO时间格式
function getIsoTimeDuration() { function 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`;
@ -134,7 +134,7 @@ function openDrawer(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;
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
configForm.value.timeUnit = convertTimeUnit(parseTimeUnit); configForm.value.timeUnit = convertTimeUnit(parseTimeUnit);

2
apps/web-ele/src/views/bpm/components/simple-process-design/components/nodes-config/user-task-node-config.vue
View File

@ -402,7 +402,7 @@ function 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;
const parseTime = strTimeDuration.slice(2, -1); const parseTime = strTimeDuration.match(/\d+/)?.[0] ?? '';
const parseTimeUnit = strTimeDuration.slice(-1); const parseTimeUnit = strTimeDuration.slice(-1);
configForm.value.timeDuration = Number.parseInt(parseTime); configForm.value.timeDuration = Number.parseInt(parseTime);
timeUnit.value = convertTimeUnit(parseTimeUnit); timeUnit.value = convertTimeUnit(parseTimeUnit);