@@ -7,10 +7,11 @@ import { getDate, getTimeObj } from '@/utils/date-utils';
7
7
8
8
import type { PickerBasePropsType } from '@/props' ;
9
9
import type { TimeModel , VueEmit } from '@/interfaces' ;
10
+ import { localToTz } from '@/utils/timezone' ;
10
11
11
12
export const useTimePicker = ( props : PickerBasePropsType , emit : VueEmit ) => {
12
13
const { modelValue, time } = useModel ( props , emit ) ;
13
- const { defaultedStartTime, defaultedRange } = useDefaults ( props ) ;
14
+ const { defaultedStartTime, defaultedRange, defaultedTz } = useDefaults ( props ) ;
14
15
const { updateTimeValues, getSetDateTime, setTime, assignStartTime, disabledTimesConfig, validateTime } =
15
16
useTimePickerUtils ( props , time , modelValue , updateFlowStep ) ;
16
17
@@ -39,9 +40,12 @@ export const useTimePicker = (props: PickerBasePropsType, emit: VueEmit) => {
39
40
const assignEmptyModel = ( ) => {
40
41
if ( defaultedRange . value . enabled ) {
41
42
const [ firstStartTime , secondStartTime ] = getDateFromStartTime ( ) as Date [ ] ;
42
- modelValue . value = [ getSetDateTime ( firstStartTime , 0 ) , getSetDateTime ( secondStartTime , 1 ) ] ;
43
+ modelValue . value = [
44
+ localToTz ( getSetDateTime ( firstStartTime , 0 ) , defaultedTz . value . timezone ) ,
45
+ localToTz ( getSetDateTime ( secondStartTime , 1 ) , defaultedTz . value . timezone ) ,
46
+ ] ;
43
47
} else {
44
- modelValue . value = getSetDateTime ( getDateFromStartTime ( ) as Date ) ;
48
+ modelValue . value = localToTz ( getSetDateTime ( getDateFromStartTime ( ) as Date ) , defaultedTz . value . timezone ) ;
45
49
}
46
50
} ;
47
51
0 commit comments