From 8eb3eb1830b71d2ce0298c6a227b9fe2cbbd06b7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E6=9D=8E=E6=B1=9F=E8=BE=B0?= Date: Wed, 5 Jun 2024 14:47:14 +0800 Subject: [PATCH] fix(time-picker): fix issue with read-only mode still being editable --- packages/web-vue/components/time-picker/README.en-US.md | 2 +- packages/web-vue/components/time-picker/README.zh-CN.md | 2 +- packages/web-vue/components/time-picker/time-picker.vue | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/web-vue/components/time-picker/README.en-US.md b/packages/web-vue/components/time-picker/README.en-US.md index 4241c404b..4950aa1bc 100644 --- a/packages/web-vue/components/time-picker/README.en-US.md +++ b/packages/web-vue/components/time-picker/README.en-US.md @@ -47,7 +47,7 @@ description: Select the time on the pop-up panel to conveniently complete the ti |readonly|Whether it is read-only mode|`boolean`|`false`| |error|Whether it is an error state|`boolean`|`false`| |format|Display the format of the date, refer to [String Parsing Format](#String Parsing Format)|`string`|`'HH:mm:ss'`| -|placeholder|Prompt copy|`string`|`-`| +|placeholder|Prompt copy|`string \| string[]`|`-`| |size|Input box size|`'mini' \| 'small' \| 'medium' \| 'large'`|`'medium'`| |popup-container|Mount container for pop-up box|`string \| HTMLElement`|`-`| |use12-hours|12 hour clock|`boolean`|`false`| diff --git a/packages/web-vue/components/time-picker/README.zh-CN.md b/packages/web-vue/components/time-picker/README.zh-CN.md index c6eb8b669..226ed1cc7 100644 --- a/packages/web-vue/components/time-picker/README.zh-CN.md +++ b/packages/web-vue/components/time-picker/README.zh-CN.md @@ -45,7 +45,7 @@ description: 在弹出面板上选择时间,以便捷完成时间输入的控 |readonly|是否为只读模式|`boolean`|`false`| |error|是否为错误状态|`boolean`|`false`| |format|展示日期的格式,参考[字符串解析格式](#字符串解析格式)|`string`|`'HH:mm:ss'`| -|placeholder|提示文案|`string`|`-`| +|placeholder|提示文案|`string \| string[]`|`-`| |size|输入框尺寸|`'mini' \| 'small' \| 'medium' \| 'large'`|`'medium'`| |popup-container|弹出框的挂载容器|`string \| HTMLElement`|`-`| |use12-hours|12 小时制|`boolean`|`false`| diff --git a/packages/web-vue/components/time-picker/time-picker.vue b/packages/web-vue/components/time-picker/time-picker.vue index 354d9fd56..5266650bd 100644 --- a/packages/web-vue/components/time-picker/time-picker.vue +++ b/packages/web-vue/components/time-picker/time-picker.vue @@ -28,6 +28,7 @@ :visible="panelVisible" :disabled="mergedDisabled" :error="error" + :readonly="readonly" :editable="!readonly" :allow-clear="allowClear && !readonly" :placeholder="computedPlaceholder" @@ -93,7 +94,6 @@ import Trigger, { TriggerProps } from '../trigger'; import DateInput from '../_components/picker/input.vue'; import DateRangeInput from '../_components/picker/input-range.vue'; import IconClockCircle from '../icon/icon-clock-circle'; -import { TimePickerProps } from './interface'; import useState from '../_hooks/use-state'; import useTimeFormat from './hooks/use-time-format'; import useTimeState from './hooks/use-time-state'; @@ -190,7 +190,7 @@ export default defineComponent({ * @en Prompt copy * */ placeholder: { - type: String, + type: [String, Array] as PropType, }, /** * @zh 输入框尺寸