diff --git a/packages/dropdown/src/dropdown.vue b/packages/dropdown/src/dropdown.vue index b47f2144ed..78002f50b3 100644 --- a/packages/dropdown/src/dropdown.vue +++ b/packages/dropdown/src/dropdown.vue @@ -103,7 +103,7 @@ export default defineComponent({ default: 150, }, tabindex: { - type: Number, + type: [Number, String], default: 0, }, effect: { diff --git a/packages/input/src/index.vue b/packages/input/src/index.vue index 68d5f6c95a..0aeae2a838 100644 --- a/packages/input/src/index.vue +++ b/packages/input/src/index.vue @@ -210,7 +210,7 @@ export default defineComponent({ type: String, }, tabindex: { - type: String, + type: [Number, String], }, validateEvent: { type: Boolean, diff --git a/packages/popover/src/directive.ts b/packages/popover/src/directive.ts index 83fc03842d..9c25cf4fce 100644 --- a/packages/popover/src/directive.ts +++ b/packages/popover/src/directive.ts @@ -4,7 +4,7 @@ import { on } from '@element-plus/utils/dom' interface PopoverInstance { events: Record triggerRef: HTMLElement - tabindex: string + tabindex: string | number } const attachEvents = (el: HTMLElement, binding: DirectiveBinding, vnode: VNode) => { @@ -12,7 +12,7 @@ const attachEvents = (el: HTMLElement, binding: DirectiveBinding, vnode: VNode) const popover = vnode.dirs[0].instance.$refs[_ref] as PopoverInstance if (popover) { popover.triggerRef = el - el.setAttribute('tabindex', popover.tabindex) + el.setAttribute('tabindex', popover.tabindex as string) // because v-popover cannot modify the vnode itself due to it has already been Object.entries(popover.events).forEach(([eventName, e]) => { on(el, eventName.toLowerCase().slice(2), e) diff --git a/packages/popover/src/index.vue b/packages/popover/src/index.vue index 363b93bb60..bfccedaee8 100644 --- a/packages/popover/src/index.vue +++ b/packages/popover/src/index.vue @@ -45,7 +45,7 @@ export default defineComponent({ type: Boolean, default: true, }, - tabindex: Number, + tabindex: [String, Number], }, emits, setup(props, ctx) { diff --git a/packages/tooltip/src/index.ts b/packages/tooltip/src/index.ts index 932ec2c9a2..a3ac1179a3 100644 --- a/packages/tooltip/src/index.ts +++ b/packages/tooltip/src/index.ts @@ -39,8 +39,8 @@ export default defineComponent({ default: true, }, tabindex: { - type: Number, - default: 0, + type: [String, Number], + default: '0', }, }, emits: [UPDATE_MODEL_EVENT], diff --git a/website/docs/en-US/input.md b/website/docs/en-US/input.md index dd66ff96a3..da90b2804c 100644 --- a/website/docs/en-US/input.md +++ b/website/docs/en-US/input.md @@ -631,7 +631,7 @@ export default defineComponent ({ |autofocus | same as `autofocus` in native input | boolean | — | false | |form | same as `form` in native input | string | — | — | | label | label text | string | — | — | -| tabindex | input tabindex | string | - | - | +| tabindex | input tabindex | string / number | - | - | | validate-event | whether to trigger form validation | boolean | - | true | ### Input slots diff --git a/website/docs/fr-FR/input.md b/website/docs/fr-FR/input.md index 7ea9f48183..eb7804d936 100644 --- a/website/docs/fr-FR/input.md +++ b/website/docs/fr-FR/input.md @@ -630,7 +630,7 @@ export default defineComponent ({ | autofocus | Identique à `autofocus` dans l'input natif. | boolean | — | false | | form | Identique à `form` dans l'input natif. | string | — | — | | label | Texte du label. | string | — | — | -| tabindex | tabindex de l'input. | string | - | - | +| tabindex | tabindex de l'input. | string / number | - | - | | validate-event | Si la validation doit avoir lieu. | boolean | - | true | ### Slots de l'Input diff --git a/website/docs/jp/input.md b/website/docs/jp/input.md index b3c0a93f9c..8fd2b08b2b 100644 --- a/website/docs/jp/input.md +++ b/website/docs/jp/input.md @@ -631,7 +631,7 @@ export default defineComponent ({ |autofocus | ネイティブインプットの `autofocus` と同じ | boolean | — | false | |form | ネイティブインプットの `form` と同じ | string | — | — | | label | ラベルインデックス | string | — | — | -| tabindex | インプットタビインデックス | string | - | - | +| tabindex | インプットタビインデックス | string / number | - | - | | validate-event | フォームバリデーションをトリガするかどうか | boolean | - | true | ### インプットスロット diff --git a/website/docs/zh-CN/input.md b/website/docs/zh-CN/input.md index f5dab753f6..0a36224e73 100644 --- a/website/docs/zh-CN/input.md +++ b/website/docs/zh-CN/input.md @@ -973,7 +973,7 @@ export default defineComponent ({ | autofocus | 原生属性,自动获取焦点 | boolean | true, false | false | | form | 原生属性 | string | — | — | | label | 输入框关联的label文字 | string | — | — | -| tabindex | 输入框的tabindex | string | - | - | +| tabindex | 输入框的tabindex | string / number | - | - | | validate-event | 输入时是否触发表单的校验 | boolean | - | true | ### Input Slots