3
3
This commit is contained in:
@ -3971,6 +3971,7 @@ export default function App() {
|
|||||||
if (shouldForceEndTimeTo18(result) && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
|
if (shouldForceEndTimeTo18(result) && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
|
||||||
nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
|
nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
|
||||||
}
|
}
|
||||||
|
nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, nodeWeekendDays, nodeExcludedDates);
|
||||||
let nodeStartTime: Date;
|
let nodeStartTime: Date;
|
||||||
|
|
||||||
if (adjustedTimelineValue !== 0) {
|
if (adjustedTimelineValue !== 0) {
|
||||||
@ -4369,6 +4370,7 @@ export default function App() {
|
|||||||
if (shouldForceEndTimeTo18(result) && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
|
if (shouldForceEndTimeTo18(result) && nodeEndTime && !isNaN(nodeEndTime.getTime())) {
|
||||||
nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
|
nodeEndTime = setTimeOfDay(nodeEndTime, 18, 0);
|
||||||
}
|
}
|
||||||
|
nodeEndTime = adjustToNextWorkingHour(nodeEndTime, nodeCalculationMethod, nodeWeekendDays, nodeExcludedDates);
|
||||||
|
|
||||||
// 计算跳过的天数
|
// 计算跳过的天数
|
||||||
const adjustedStartTime = adjustToNextWorkingHour(nodeStartTime, nodeCalculationMethod, nodeWeekendDays, nodeExcludedDates);
|
const adjustedStartTime = adjustToNextWorkingHour(nodeStartTime, nodeCalculationMethod, nodeWeekendDays, nodeExcludedDates);
|
||||||
|
|||||||
Reference in New Issue
Block a user