Browse Source

[Fix][UI] Fix timing modal start time and end time bug (#9815)

3.0.0/version-upgrade
Devosend 3 years ago committed by GitHub
parent
commit
d3c53af100
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 12
      dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-modal.ts
  2. 4
      dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/process-instance-condition.tsx

12
dolphinscheduler-ui-next/src/views/projects/workflow/definition/components/use-modal.ts

@ -95,11 +95,11 @@ export function useModal(
if (state.startForm.startEndTime) { if (state.startForm.startEndTime) {
const start = format( const start = format(
new Date(state.startForm.startEndTime[0]), new Date(state.startForm.startEndTime[0]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
const end = format( const end = format(
new Date(state.startForm.startEndTime[1]), new Date(state.startForm.startEndTime[1]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
state.startForm.scheduleTime = `${start},${end}` state.startForm.scheduleTime = `${start},${end}`
} }
@ -186,11 +186,11 @@ export function useModal(
const getTimingData = () => { const getTimingData = () => {
const start = format( const start = format(
parseTime(state.timingForm.startEndTime[0]), parseTime(state.timingForm.startEndTime[0]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
const end = format( const end = format(
parseTime(state.timingForm.startEndTime[1]), parseTime(state.timingForm.startEndTime[1]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
const data = { const data = {
@ -260,11 +260,11 @@ export function useModal(
const start = format( const start = format(
new Date(state.timingForm.startEndTime[0]), new Date(state.timingForm.startEndTime[0]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
const end = format( const end = format(
new Date(state.timingForm.startEndTime[1]), new Date(state.timingForm.startEndTime[1]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
const schedule = JSON.stringify({ const schedule = JSON.stringify({

4
dolphinscheduler-ui-next/src/views/projects/workflow/instance/components/process-instance-condition.tsx

@ -46,11 +46,11 @@ export default defineComponent({
if (startEndTimeRef.value) { if (startEndTimeRef.value) {
startDate = format( startDate = format(
new Date(startEndTimeRef.value[0]), new Date(startEndTimeRef.value[0]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
endDate = format( endDate = format(
new Date(startEndTimeRef.value[1]), new Date(startEndTimeRef.value[1]),
'yyyy-MM-dd hh:mm:ss' 'yyyy-MM-dd HH:mm:ss'
) )
} }

Loading…
Cancel
Save