From cefb765d23759f07f85cf064ea9e50f27802e42b Mon Sep 17 00:00:00 2001 From: Jeff <19850462+jeff-fe@users.noreply.github.com> Date: Mon, 8 Dec 2025 14:16:54 +0800 Subject: [PATCH] fix(components): [timepicker] fix `disabled` props (#23022) * fix(components): [timepicker] fix `disabled` attrs Change 'disabled' prop to an object with type and default. * fix: image test checks --------- Co-authored-by: huangjunfeng --- packages/components/image/__tests__/image.test.tsx | 5 +++++ packages/components/time-picker/src/common/props.ts | 5 ++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/packages/components/image/__tests__/image.test.tsx b/packages/components/image/__tests__/image.test.tsx index 9c34696a4c..217210502f 100644 --- a/packages/components/image/__tests__/image.test.tsx +++ b/packages/components/image/__tests__/image.test.tsx @@ -334,6 +334,11 @@ describe('Image.vue', () => { } const wrapper = mount(() => ) await flushPromises() + // Manually trigger the load event if necessary + const img = wrapper.find('img') + if (img.exists()) { + await img.trigger('load') + } expect(wrapper.find('.el-image__inner').exists()).toBe(true) expect(handleLoad).toBeCalled() }) diff --git a/packages/components/time-picker/src/common/props.ts b/packages/components/time-picker/src/common/props.ts index cdb03941f9..406a0de6e0 100644 --- a/packages/components/time-picker/src/common/props.ts +++ b/packages/components/time-picker/src/common/props.ts @@ -123,7 +123,10 @@ export const timePickerDefaultProps = buildProps({ /** * @description whether TimePicker is disabled */ - disabled: Boolean, + disabled: { + type: Boolean, + default: undefined, + }, /** * @description placeholder in non-range mode */