From d2db9a42b06ad6c84b449e7eff5223c35498eded Mon Sep 17 00:00:00 2001 From: lixiang Date: Fri, 25 Oct 2024 11:11:50 +0800 Subject: [PATCH 1/2] submit some changes --- packages/opendesign/src/date-picker/picker/TimePicker.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opendesign/src/date-picker/picker/TimePicker.vue b/packages/opendesign/src/date-picker/picker/TimePicker.vue index 456189b9..c6c0bd09 100644 --- a/packages/opendesign/src/date-picker/picker/TimePicker.vue +++ b/packages/opendesign/src/date-picker/picker/TimePicker.vue @@ -100,14 +100,14 @@ const getTimeList = (date: Date) => { label: v.toString().padStart(2, '0'), })); - const mlist = isFunction(props.displayHourList) + const mlist = isFunction(props.displayMinuteList) ? props.displayHourList(date) : getNumberList(0, 60, (v: number) => ({ value: v, label: v.toString().padStart(2, '0'), })); - const slist = isFunction(props.displayHourList) + const slist = isFunction(props.displaySecondList) ? props.displayHourList(date) : getNumberList(0, 60, (v: number) => ({ value: v, -- Gitee From 3868dcb69f402205f4f75f84bbf0fd2ea3f26c3d Mon Sep 17 00:00:00 2001 From: lixiang Date: Fri, 25 Oct 2024 11:14:26 +0800 Subject: [PATCH 2/2] submit some changes --- packages/opendesign/src/date-picker/picker/TimePicker.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/opendesign/src/date-picker/picker/TimePicker.vue b/packages/opendesign/src/date-picker/picker/TimePicker.vue index c6c0bd09..9a6e437e 100644 --- a/packages/opendesign/src/date-picker/picker/TimePicker.vue +++ b/packages/opendesign/src/date-picker/picker/TimePicker.vue @@ -101,14 +101,14 @@ const getTimeList = (date: Date) => { })); const mlist = isFunction(props.displayMinuteList) - ? props.displayHourList(date) + ? props.displayMinuteList(date) : getNumberList(0, 60, (v: number) => ({ value: v, label: v.toString().padStart(2, '0'), })); const slist = isFunction(props.displaySecondList) - ? props.displayHourList(date) + ? props.displaySecondList(date) : getNumberList(0, 60, (v: number) => ({ value: v, label: v.toString().padStart(2, '0'), -- Gitee