element-plus 2.3.8 → 2.3.10

package/dist/index.full.mjs

@@ -1,4 +1,4 @@
-/*! Element Plus v2.3.8 */
+/*! Element Plus v2.3.10 */
 
 import { getCurrentScope, onScopeDispose, unref, readonly, shallowRef, watchEffect, ref, watch, getCurrentInstance, onMounted, nextTick, computed as computed$1, openBlock, createElementBlock, createElementVNode, warn, isVNode, Fragment, Comment, onBeforeUnmount, isRef, inject, onUnmounted, h as h$1, Teleport, onBeforeMount, provide, defineComponent, renderSlot, normalizeClass, normalizeStyle, mergeProps, useSlots, createBlock, Transition, withCtx, withDirectives, resolveDynamicComponent, createCommentVNode, createTextVNode, toDisplayString, createVNode, vShow, toRef, reactive, toRefs, onUpdated, TransitionGroup, useAttrs as useAttrs$1, withModifiers, cloneVNode, Text as Text$1, onDeactivated, renderList, withKeys, createSlots, normalizeProps, toRaw as toRaw$1, vModelCheckbox, vModelRadio, resolveComponent, onBeforeUpdate, vModelText, toHandlers, guardReactiveProps, markRaw, effectScope, triggerRef, resolveDirective, createApp, shallowReactive, render } from 'vue';
 
@@ -9254,7 +9254,7 @@ const _bem = (namespace, block, blockSuffix, element, modifier) => {
 };
 const namespaceContextKey = Symbol("namespaceContextKey");
 const useGetDerivedNamespace = (namespaceOverrides) => {
-  const derivedNamespace = namespaceOverrides || inject(namespaceContextKey, ref(defaultNamespace));
+  const derivedNamespace = namespaceOverrides || (getCurrentInstance() ? inject(namespaceContextKey, ref(defaultNamespace)) : ref(defaultNamespace));
   const namespace = computed$1(() => {
     return unref(derivedNamespace) || defaultNamespace;
   });
@@ -9953,7 +9953,7 @@ const zIndex = ref(0);
 const defaultInitialZIndex = 2e3;
 const zIndexContextKey = Symbol("zIndexContextKey");
 const useZIndex = (zIndexOverrides) => {
-  const zIndexInjection = zIndexOverrides || inject(zIndexContextKey, void 0);
+  const zIndexInjection = zIndexOverrides || (getCurrentInstance() ? inject(zIndexContextKey, void 0) : void 0);
   const initialZIndex = computed$1(() => {
     const zIndexFromInjection = unref(zIndexInjection);
     return isNumber(zIndexFromInjection) ? zIndexFromInjection : defaultInitialZIndex;
@@ -11110,7 +11110,6 @@ function useFocusController(target, { afterFocus, afterBlur } = {}) {
   };
   watch(wrapperRef, (el) => {
     if (el) {
-      el.setAttribute("role", "button");
       el.setAttribute("tabindex", "-1");
     }
   });
@@ -11243,7 +11242,7 @@ const ConfigProvider = defineComponent({
 
 const ElConfigProvider = withInstall(ConfigProvider);
 
-const version$1 = "2.3.8";
+const version$1 = "2.3.10";
 
 const makeInstaller = (components = []) => {
   const install = (app, options) => {
@@ -12980,8 +12979,8 @@ var FormLabelWrap = defineComponent({
     const getLabelWidth = () => {
       var _a;
       if ((_a = el.value) == null ? void 0 : _a.firstElementChild) {
-        const width = window.getComputedStyle(el.value.firstElementChild).width;
-        return Math.ceil(Number.parseFloat(width));
+        const width = getStyle(el.value.firstElementChild, "width");
+        return Math.ceil(Number.parseFloat(width)) || 0;
       } else {
         return 0;
       }
@@ -13530,7 +13529,7 @@ const inputEmits = {
 
 const _hoisted_1$11 = ["role"];
 const _hoisted_2$G = ["id", "type", "disabled", "formatter", "parser", "readonly", "autocomplete", "tabindex", "aria-label", "placeholder", "form"];
-const _hoisted_3$l = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
+const _hoisted_3$m = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
 const __default__$1x = defineComponent({
   name: "ElInput",
   inheritAttrs: false
@@ -13944,7 +13943,7 @@ const _sfc_main$2d = /* @__PURE__ */ defineComponent({
             onBlur: _cache[3] || (_cache[3] = (...args) => unref(handleBlur) && unref(handleBlur)(...args)),
             onChange: handleChange,
             onKeydown: handleKeydown
-          }), null, 16, _hoisted_3$l),
+          }), null, 16, _hoisted_3$m),
           unref(isWordLimitVisible) ? (openBlock(), createElementBlock("span", {
             key: 0,
             style: normalizeStyle(countStyle.value),
@@ -15040,7 +15039,7 @@ const _sfc_main$26 = defineComponent({
         if (!releasedEvent.defaultPrevented && (focusReason.value == "keyboard" || !isFocusCausedByUserEvent() || trapContainer.contains(document.activeElement))) {
           tryFocus(lastFocusBeforeTrapped != null ? lastFocusBeforeTrapped : document.body);
         }
-        trapContainer.removeEventListener(FOCUS_AFTER_RELEASED, trapOnFocus);
+        trapContainer.removeEventListener(FOCUS_AFTER_RELEASED, releaseOnFocus);
         focusableStack.remove(focusLayer);
       }
     }
@@ -15871,10 +15870,11 @@ const _sfc_main$22 = /* @__PURE__ */ defineComponent({
         open.value = false;
       }
     });
-    const isFocusInsideContent = () => {
+    const isFocusInsideContent = (event) => {
       var _a, _b;
       const popperContent = (_b = (_a = contentRef.value) == null ? void 0 : _a.contentRef) == null ? void 0 : _b.popperContentRef;
-      return popperContent && popperContent.contains(document.activeElement);
+      const activeElement = (event == null ? void 0 : event.relatedTarget) || document.activeElement;
+      return popperContent && popperContent.contains(activeElement);
     };
     onDeactivated(() => open.value && hide());
     expose({
@@ -16038,7 +16038,7 @@ const autocompleteEmits = {
 
 const _hoisted_1$$ = ["aria-expanded", "aria-owns"];
 const _hoisted_2$E = { key: 0 };
-const _hoisted_3$k = ["id", "aria-selected", "onClick"];
+const _hoisted_3$l = ["id", "aria-selected", "onClick"];
 const COMPONENT_NAME$i = "ElAutocomplete";
 const __default__$1o = defineComponent({
   name: COMPONENT_NAME$i,
@@ -16079,8 +16079,7 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
       }
       return [];
     });
-    const onSuggestionShow = async () => {
-      await nextTick();
+    const onSuggestionShow = () => {
       if (suggestionVisible.value) {
         dropdownWidth.value = `${inputRef.value.$el.offsetWidth}px`;
       }
@@ -16261,6 +16260,7 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
         trigger: "click",
         transition: `${unref(ns).namespace.value}-zoom-in-top`,
         persistent: "",
+        role: "listbox",
         onBeforeShow: onSuggestionShow,
         onHide
       }, {
@@ -16304,7 +16304,7 @@ const _sfc_main$21 = /* @__PURE__ */ defineComponent({
                     renderSlot(_ctx.$slots, "default", { item }, () => [
                       createTextVNode(toDisplayString(item[_ctx.valueKey]), 1)
                     ])
-                  ], 10, _hoisted_3$k);
+                  ], 10, _hoisted_3$l);
                 }), 128))
               ]),
               _: 3
@@ -16714,7 +16714,6 @@ const _sfc_main$1Y = /* @__PURE__ */ defineComponent({
     const instance = getCurrentInstance();
     const breadcrumbContext = inject(breadcrumbKey, void 0);
     const ns = useNamespace("breadcrumb");
-    const { separator, separatorIcon } = toRefs(breadcrumbContext);
     const router = instance.appContext.config.globalProperties.$router;
     const link = ref();
     const onClick = () => {
@@ -16723,6 +16722,7 @@ const _sfc_main$1Y = /* @__PURE__ */ defineComponent({
       props.replace ? router.replace(props.to) : router.push(props.to);
     };
     return (_ctx, _cache) => {
+      var _a, _b;
       return openBlock(), createElementBlock("span", {
         class: normalizeClass(unref(ns).e("item"))
       }, [
@@ -16735,19 +16735,19 @@ const _sfc_main$1Y = /* @__PURE__ */ defineComponent({
         }, [
           renderSlot(_ctx.$slots, "default")
         ], 2),
-        unref(separatorIcon) ? (openBlock(), createBlock(unref(ElIcon), {
+        ((_a = unref(breadcrumbContext)) == null ? void 0 : _a.separatorIcon) ? (openBlock(), createBlock(unref(ElIcon), {
           key: 0,
           class: normalizeClass(unref(ns).e("separator"))
         }, {
           default: withCtx(() => [
-            (openBlock(), createBlock(resolveDynamicComponent(unref(separatorIcon))))
+            (openBlock(), createBlock(resolveDynamicComponent(unref(breadcrumbContext).separatorIcon)))
           ]),
           _: 1
         }, 8, ["class"])) : (openBlock(), createElementBlock("span", {
           key: 1,
           class: normalizeClass(unref(ns).e("separator")),
           role: "presentation"
-        }, toDisplayString(unref(separator)), 3))
+        }, toDisplayString((_b = unref(breadcrumbContext)) == null ? void 0 : _b.separator), 3))
       ], 2);
     };
   }
@@ -20717,6 +20717,7 @@ const cardProps = buildProps({
     type: definePropType([String, Object, Array]),
     default: ""
   },
+  bodyClass: String,
   shadow: {
     type: String,
     values: ["always", "hover", "never"],
@@ -20745,7 +20746,7 @@ const _sfc_main$1P = /* @__PURE__ */ defineComponent({
           ])
         ], 2)) : createCommentVNode("v-if", true),
         createElementVNode("div", {
-          class: normalizeClass(unref(ns).e("body")),
+          class: normalizeClass([unref(ns).e("body"), _ctx.bodyClass]),
           style: normalizeStyle(_ctx.bodyStyle)
         }, [
           renderSlot(_ctx.$slots, "default")
@@ -21612,7 +21613,7 @@ const useCheckbox = (props, slots) => {
 
 const _hoisted_1$T = ["tabindex", "role", "aria-checked"];
 const _hoisted_2$z = ["id", "aria-hidden", "name", "tabindex", "disabled", "true-value", "false-value"];
-const _hoisted_3$j = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
+const _hoisted_3$k = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
 const __default__$1a = defineComponent({
   name: "ElCheckbox"
 });
@@ -21681,13 +21682,15 @@ const _sfc_main$1M = /* @__PURE__ */ defineComponent({
               "false-value": _ctx.falseLabel,
               onChange: _cache[1] || (_cache[1] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
               onFocus: _cache[2] || (_cache[2] = ($event) => isFocused.value = true),
-              onBlur: _cache[3] || (_cache[3] = ($event) => isFocused.value = false)
+              onBlur: _cache[3] || (_cache[3] = ($event) => isFocused.value = false),
+              onClick: _cache[4] || (_cache[4] = withModifiers(() => {
+              }, ["stop"]))
             }, null, 42, _hoisted_2$z)), [
               [vModelCheckbox, unref(model)]
             ]) : withDirectives((openBlock(), createElementBlock("input", {
               key: 1,
               id: unref(inputId),
-              "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => isRef(model) ? model.value = $event : null),
+              "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => isRef(model) ? model.value = $event : null),
               class: normalizeClass(unref(ns).e("original")),
               type: "checkbox",
               "aria-hidden": _ctx.indeterminate ? "true" : "false",
@@ -21695,10 +21698,12 @@ const _sfc_main$1M = /* @__PURE__ */ defineComponent({
               value: _ctx.label,
               name: _ctx.name,
               tabindex: _ctx.tabindex,
-              onChange: _cache[5] || (_cache[5] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
-              onFocus: _cache[6] || (_cache[6] = ($event) => isFocused.value = true),
-              onBlur: _cache[7] || (_cache[7] = ($event) => isFocused.value = false)
-            }, null, 42, _hoisted_3$j)), [
+              onChange: _cache[6] || (_cache[6] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
+              onFocus: _cache[7] || (_cache[7] = ($event) => isFocused.value = true),
+              onBlur: _cache[8] || (_cache[8] = ($event) => isFocused.value = false),
+              onClick: _cache[9] || (_cache[9] = withModifiers(() => {
+              }, ["stop"]))
+            }, null, 42, _hoisted_3$k)), [
               [vModelCheckbox, unref(model)]
             ]),
             createElementVNode("span", {
@@ -21779,21 +21784,25 @@ const _sfc_main$1L = /* @__PURE__ */ defineComponent({
           "false-value": _ctx.falseLabel,
           onChange: _cache[1] || (_cache[1] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
           onFocus: _cache[2] || (_cache[2] = ($event) => isFocused.value = true),
-          onBlur: _cache[3] || (_cache[3] = ($event) => isFocused.value = false)
+          onBlur: _cache[3] || (_cache[3] = ($event) => isFocused.value = false),
+          onClick: _cache[4] || (_cache[4] = withModifiers(() => {
+          }, ["stop"]))
         }, null, 42, _hoisted_1$S)), [
           [vModelCheckbox, unref(model)]
         ]) : withDirectives((openBlock(), createElementBlock("input", {
           key: 1,
-          "onUpdate:modelValue": _cache[4] || (_cache[4] = ($event) => isRef(model) ? model.value = $event : null),
+          "onUpdate:modelValue": _cache[5] || (_cache[5] = ($event) => isRef(model) ? model.value = $event : null),
           class: normalizeClass(unref(ns).be("button", "original")),
           type: "checkbox",
           name: _ctx.name,
           tabindex: _ctx.tabindex,
           disabled: unref(isDisabled),
           value: _ctx.label,
-          onChange: _cache[5] || (_cache[5] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
-          onFocus: _cache[6] || (_cache[6] = ($event) => isFocused.value = true),
-          onBlur: _cache[7] || (_cache[7] = ($event) => isFocused.value = false)
+          onChange: _cache[6] || (_cache[6] = (...args) => unref(handleChange) && unref(handleChange)(...args)),
+          onFocus: _cache[7] || (_cache[7] = ($event) => isFocused.value = true),
+          onBlur: _cache[8] || (_cache[8] = ($event) => isFocused.value = false),
+          onClick: _cache[9] || (_cache[9] = withModifiers(() => {
+          }, ["stop"]))
         }, null, 42, _hoisted_2$y)), [
           [vModelCheckbox, unref(model)]
         ]),
@@ -22016,7 +22025,9 @@ const _sfc_main$1J = /* @__PURE__ */ defineComponent({
             type: "radio",
             onFocus: _cache[1] || (_cache[1] = ($event) => focus.value = true),
             onBlur: _cache[2] || (_cache[2] = ($event) => focus.value = false),
-            onChange: handleChange
+            onChange: handleChange,
+            onClick: _cache[3] || (_cache[3] = withModifiers(() => {
+            }, ["stop"]))
           }, null, 42, _hoisted_1$R), [
             [vModelRadio, unref(modelValue)]
           ]),
@@ -22026,7 +22037,7 @@ const _sfc_main$1J = /* @__PURE__ */ defineComponent({
         ], 2),
         createElementVNode("span", {
           class: normalizeClass(unref(ns).e("label")),
-          onKeydown: _cache[3] || (_cache[3] = withModifiers(() => {
+          onKeydown: _cache[4] || (_cache[4] = withModifiers(() => {
           }, ["stop"]))
         }, [
           renderSlot(_ctx.$slots, "default", {}, () => [
@@ -22087,14 +22098,16 @@ const _sfc_main$1I = /* @__PURE__ */ defineComponent({
           name: _ctx.name || ((_a = unref(radioGroup)) == null ? void 0 : _a.name),
           disabled: unref(disabled),
           onFocus: _cache[1] || (_cache[1] = ($event) => focus.value = true),
-          onBlur: _cache[2] || (_cache[2] = ($event) => focus.value = false)
+          onBlur: _cache[2] || (_cache[2] = ($event) => focus.value = false),
+          onClick: _cache[3] || (_cache[3] = withModifiers(() => {
+          }, ["stop"]))
         }, null, 42, _hoisted_1$Q), [
           [vModelRadio, unref(modelValue)]
         ]),
         createElementVNode("span", {
           class: normalizeClass(unref(ns).be("button", "inner")),
           style: normalizeStyle(unref(modelValue) === _ctx.label ? unref(activeStyle) : {}),
-          onKeydown: _cache[3] || (_cache[3] = withModifiers(() => {
+          onKeydown: _cache[4] || (_cache[4] = withModifiers(() => {
           }, ["stop"]))
         }, [
           renderSlot(_ctx.$slots, "default", {}, () => [
@@ -22946,7 +22959,11 @@ const _sfc_main$1E = defineComponent({
         expandingNode.value = null;
       }
       oldNodes.forEach((node) => node.doCheck(false));
-      newNodes.forEach((node) => node.doCheck(true));
+      if (props.props.multiple) {
+        reactive(newNodes).forEach((node) => node.doCheck(true));
+      } else {
+        newNodes.forEach((node) => node.doCheck(true));
+      }
       checkedNodes.value = newNodes;
       nextTick(scrollToExpandingNode);
     };
@@ -23199,6 +23216,10 @@ const cascaderProps = buildProps({
     default: true
   },
   collapseTags: Boolean,
+  maxCollapseTags: {
+    type: Number,
+    default: 1
+  },
   collapseTagsTooltip: {
     type: Boolean,
     default: false
@@ -23234,7 +23255,7 @@ const cascaderEmits = {
 
 const _hoisted_1$N = { key: 0 };
 const _hoisted_2$w = ["placeholder", "onKeydown"];
-const _hoisted_3$i = ["onClick"];
+const _hoisted_3$j = ["onClick"];
 const COMPONENT_NAME$e = "ElCascader";
 const __default__$13 = defineComponent({
   name: COMPONENT_NAME$e
@@ -23395,9 +23416,9 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
       nodes.forEach((node) => allTags.push(genTag(node)));
       allPresentTags.value = allTags;
       if (nodes.length) {
-        const [first, ...rest] = nodes;
+        nodes.slice(0, props.maxCollapseTags).forEach((node) => tags.push(genTag(node)));
+        const rest = nodes.slice(props.maxCollapseTags);
         const restCount = rest.length;
-        tags.push(genTag(first));
         if (restCount) {
           if (props.collapseTags) {
             tags.push({
@@ -23590,15 +23611,22 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
         return;
       val ? handleFilter() : hideSuggestionPanel();
     };
+    const getInputInnerHeight = (inputInner) => Number.parseFloat(useCssVar(nsInput.cssVarName("input-height"), inputInner).value) - 2;
     watch(filtering, updatePopperPosition);
     watch([checkedNodes, isDisabled], calculatePresentTags);
     watch(presentTags, () => {
       nextTick(() => updateStyle());
     });
+    watch(realSize, async () => {
+      await nextTick();
+      const inputInner = input.value.input;
+      inputInitialHeight = getInputInnerHeight(inputInner) || inputInitialHeight;
+      updateStyle();
+    });
     watch(presentText, syncPresentTextValue, { immediate: true });
     onMounted(() => {
       const inputInner = input.value.input;
-      const inputInnerHeight = Number.parseFloat(useCssVar(nsInput.cssVarName("input-height"), inputInner).value) - 2;
+      const inputInnerHeight = getInputInnerHeight(inputInner);
       inputInitialHeight = inputInner.offsetHeight || inputInnerHeight;
       useResizeObserver(inputInner, updateStyle);
     });
@@ -23715,7 +23743,7 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
                         createElementVNode("div", {
                           class: normalizeClass(unref(nsCascader).e("collapse-tags"))
                         }, [
-                          (openBlock(true), createElementBlock(Fragment, null, renderList(allPresentTags.value.slice(1), (tag2, idx) => {
+                          (openBlock(true), createElementBlock(Fragment, null, renderList(allPresentTags.value.slice(_ctx.maxCollapseTags), (tag2, idx) => {
                             return openBlock(), createElementBlock("div", {
                               key: idx,
                               class: normalizeClass(unref(nsCascader).e("collapse-tag"))
@@ -23809,7 +23837,7 @@ const _sfc_main$1C = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   })) : createCommentVNode("v-if", true)
-                ], 10, _hoisted_3$i);
+                ], 10, _hoisted_3$j);
               }), 128)) : renderSlot(_ctx.$slots, "empty", { key: 1 }, () => [
                 createElementVNode("li", {
                   class: normalizeClass(unref(nsCascader).e("empty-text"))
@@ -23902,8 +23930,7 @@ const rowProps = buildProps({
   },
   align: {
     type: String,
-    values: RowAlign,
-    default: "top"
+    values: RowAlign
   }
 });
 
@@ -23931,7 +23958,7 @@ const _sfc_main$1A = /* @__PURE__ */ defineComponent({
     const rowKls = computed$1(() => [
       ns.b(),
       ns.is(`justify-${props.justify}`, props.justify !== "start"),
-      ns.is(`align-${props.align}`, props.align !== "top")
+      ns.is(`align-${props.align}`, !!props.align)
     ]);
     return (_ctx, _cache) => {
       return openBlock(), createBlock(resolveDynamicComponent(_ctx.tag), {
@@ -24144,6 +24171,12 @@ const _sfc_main$1x = /* @__PURE__ */ defineComponent({
   ...__default__$_,
   setup(__props) {
     const ns = useNamespace("collapse-transition");
+    const reset = (el) => {
+      el.style.maxHeight = "";
+      el.style.overflow = el.dataset.oldOverflow;
+      el.style.paddingTop = el.dataset.oldPaddingTop;
+      el.style.paddingBottom = el.dataset.oldPaddingBottom;
+    };
     const on = {
       beforeEnter(el) {
         if (!el.dataset)
@@ -24158,19 +24191,20 @@ const _sfc_main$1x = /* @__PURE__ */ defineComponent({
         el.dataset.oldOverflow = el.style.overflow;
         if (el.scrollHeight !== 0) {
           el.style.maxHeight = `${el.scrollHeight}px`;
-          el.style.paddingTop = el.dataset.oldPaddingTop;
-          el.style.paddingBottom = el.dataset.oldPaddingBottom;
         } else {
           el.style.maxHeight = 0;
-          el.style.paddingTop = el.dataset.oldPaddingTop;
-          el.style.paddingBottom = el.dataset.oldPaddingBottom;
         }
+        el.style.paddingTop = el.dataset.oldPaddingTop;
+        el.style.paddingBottom = el.dataset.oldPaddingBottom;
         el.style.overflow = "hidden";
       },
       afterEnter(el) {
         el.style.maxHeight = "";
         el.style.overflow = el.dataset.oldOverflow;
       },
+      enterCancelled(el) {
+        reset(el);
+      },
       beforeLeave(el) {
         if (!el.dataset)
           el.dataset = {};
@@ -24188,10 +24222,10 @@ const _sfc_main$1x = /* @__PURE__ */ defineComponent({
         }
       },
       afterLeave(el) {
-        el.style.maxHeight = "";
-        el.style.overflow = el.dataset.oldOverflow;
-        el.style.paddingTop = el.dataset.oldPaddingTop;
-        el.style.paddingBottom = el.dataset.oldPaddingBottom;
+        reset(el);
+      },
+      leaveCancelled(el) {
+        reset(el);
       }
     };
     return (_ctx, _cache) => {
@@ -24293,7 +24327,7 @@ const useCollapseItemDOM = (props, { focusing, isActive, id }) => {
 
 const _hoisted_1$M = ["aria-expanded", "aria-controls", "aria-describedby"];
 const _hoisted_2$v = ["id", "tabindex"];
-const _hoisted_3$h = ["id", "aria-hidden", "aria-labelledby"];
+const _hoisted_3$i = ["id", "aria-hidden", "aria-labelledby"];
 const __default__$Z = defineComponent({
   name: "ElCollapseItem"
 });
@@ -24369,7 +24403,7 @@ const _sfc_main$1w = /* @__PURE__ */ defineComponent({
               }, [
                 renderSlot(_ctx.$slots, "default")
               ], 2)
-            ], 10, _hoisted_3$h), [
+            ], 10, _hoisted_3$i), [
               [vShow, unref(isActive)]
             ])
           ]),
@@ -25995,7 +26029,7 @@ const _hoisted_2$t = {
   key: 0,
   scope: "col"
 };
-const _hoisted_3$g = ["aria-label"];
+const _hoisted_3$h = ["aria-label"];
 const _hoisted_4$b = ["aria-current", "aria-selected", "tabindex"];
 const _sfc_main$1l = /* @__PURE__ */ defineComponent({
   __name: "basic-date-table",
@@ -26313,7 +26347,7 @@ const _sfc_main$1l = /* @__PURE__ */ defineComponent({
                 key,
                 scope: "col",
                 "aria-label": unref(t)("el.datepicker.weeksFull." + week)
-              }, toDisplayString(unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$g);
+              }, toDisplayString(unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$h);
             }), 128))
           ]),
           (openBlock(true), createElementBlock(Fragment, null, renderList(unref(rows), (row, rowKey) => {
@@ -26351,7 +26385,7 @@ const basicMonthTableProps = buildProps({
 
 const _hoisted_1$H = ["aria-label"];
 const _hoisted_2$s = ["aria-selected", "aria-label", "tabindex", "onKeydown"];
-const _hoisted_3$f = { class: "cell" };
+const _hoisted_3$g = { class: "cell" };
 const _sfc_main$1k = /* @__PURE__ */ defineComponent({
   __name: "basic-month-table",
   props: basicMonthTableProps,
@@ -26534,7 +26568,7 @@ const _sfc_main$1k = /* @__PURE__ */ defineComponent({
                   ]
                 }, [
                   createElementVNode("div", null, [
-                    createElementVNode("span", _hoisted_3$f, toDisplayString(unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
+                    createElementVNode("span", _hoisted_3$g, toDisplayString(unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
                   ])
                 ], 42, _hoisted_2$s);
               }), 128))
@@ -26556,7 +26590,7 @@ const basicYearTableProps = buildProps({
 
 const _hoisted_1$G = ["aria-label"];
 const _hoisted_2$r = ["aria-selected", "tabindex", "onKeydown"];
-const _hoisted_3$e = { class: "cell" };
+const _hoisted_3$f = { class: "cell" };
 const _hoisted_4$a = { key: 1 };
 const _sfc_main$1j = /* @__PURE__ */ defineComponent({
   __name: "basic-year-table",
@@ -26641,7 +26675,7 @@ const _sfc_main$1j = /* @__PURE__ */ defineComponent({
                       withKeys(withModifiers(handleYearTableClick, ["prevent", "stop"]), ["enter"])
                     ]
                   }, [
-                    createElementVNode("span", _hoisted_3$e, toDisplayString(unref(startYear) + i * 4 + j), 1)
+                    createElementVNode("span", _hoisted_3$f, toDisplayString(unref(startYear) + i * 4 + j), 1)
                   ], 42, _hoisted_2$r)) : (openBlock(), createElementBlock("td", _hoisted_4$a))
                 ], 64);
               }), 64))
@@ -26656,7 +26690,7 @@ var YearTable = /* @__PURE__ */ _export_sfc(_sfc_main$1j, [["__file", "basic-yea
 
 const _hoisted_1$F = ["onClick"];
 const _hoisted_2$q = ["aria-label"];
-const _hoisted_3$d = ["aria-label"];
+const _hoisted_3$e = ["aria-label"];
 const _hoisted_4$9 = ["aria-label"];
 const _hoisted_5$7 = ["aria-label"];
 const _sfc_main$1i = /* @__PURE__ */ defineComponent({
@@ -26673,11 +26707,12 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
     const { t, lang } = useLocale();
     const pickerBase = inject("EP_PICKER_BASE");
     const popper = inject(TOOLTIP_INJECTION_KEY);
-    const { shortcuts, disabledDate, cellClassName, defaultTime, arrowControl } = pickerBase.props;
+    const { shortcuts, disabledDate, cellClassName, defaultTime } = pickerBase.props;
     const defaultValue = toRef(pickerBase.props, "defaultValue");
     const currentViewRef = ref();
     const innerDate = ref(dayjs().locale(lang.value));
     const isChangeToNow = ref(false);
+    let isShortcut = false;
     const defaultTimeD = computed$1(() => {
       return dayjs(defaultTime).locale(lang.value);
     });
@@ -26694,7 +26729,7 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
       return selectableRange.value.length > 0 ? timeWithinRange(date, selectableRange.value, props.format || "HH:mm:ss") : true;
     };
     const formatEmit = (emitDayjs) => {
-      if (defaultTime && !visibleTime.value && !isChangeToNow.value) {
+      if (defaultTime && !visibleTime.value && !isChangeToNow.value && !isShortcut) {
         return defaultTimeD.value.year(emitDayjs.year()).month(emitDayjs.month()).date(emitDayjs.date());
       }
       if (showTime.value)
@@ -26713,6 +26748,7 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
       userInputDate.value = null;
       userInputTime.value = null;
       isChangeToNow.value = false;
+      isShortcut = false;
     };
     const handleDatePick = (value, keepOpen) => {
       if (selectionMode.value === "date") {
@@ -26755,6 +26791,7 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
     const handleShortcutClick = (shortcut) => {
       const shortcutValue = isFunction$1(shortcut.value) ? shortcut.value() : shortcut.value;
       if (shortcutValue) {
+        isShortcut = true;
         emit(dayjs(shortcutValue).locale(lang.value));
         return;
       }
@@ -26814,6 +26851,16 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
     const footerVisible = computed$1(() => {
       return showTime.value || selectionMode.value === "dates";
     });
+    const disabledConfirm = computed$1(() => {
+      if (!disabledDate)
+        return false;
+      if (!props.parsedValue)
+        return true;
+      if (isArray$1(props.parsedValue)) {
+        return disabledDate(props.parsedValue[0].toDate());
+      }
+      return disabledDate(props.parsedValue.toDate());
+    });
     const onConfirm = () => {
       if (selectionMode.value === "dates") {
         emit(props.parsedValue);
@@ -26828,6 +26875,11 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
         emit(result);
       }
     };
+    const disabledNow = computed$1(() => {
+      if (!disabledDate)
+        return false;
+      return disabledDate(dayjs().locale(lang.value).toDate());
+    });
     const changeToNow = () => {
       const now = dayjs().locale(lang.value);
       const nowDate = now.toDate();
@@ -27105,10 +27157,9 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
                 createVNode(unref(TimePickPanel), {
                   visible: timePickerVisible.value,
                   format: unref(timeFormat),
-                  "time-arrow-control": unref(arrowControl),
                   "parsed-value": innerDate.value,
                   onPick: handleTimePick
-                }, null, 8, ["visible", "format", "time-arrow-control", "parsed-value"])
+                }, null, 8, ["visible", "format", "parsed-value"])
               ], 2)), [
                 [unref(ClickOutside), handleTimePickClose]
               ])
@@ -27147,7 +27198,7 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   })
-                ], 10, _hoisted_3$d), [
+                ], 10, _hoisted_3$e), [
                   [vShow, currentView.value === "date"]
                 ])
               ], 2),
@@ -27250,26 +27301,28 @@ const _sfc_main$1i = /* @__PURE__ */ defineComponent({
             text: "",
             size: "small",
             class: normalizeClass(unref(ppNs).e("link-btn")),
+            disabled: unref(disabledNow),
             onClick: changeToNow
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString(unref(t)("el.datepicker.now")), 1)
             ]),
             _: 1
-          }, 8, ["class"]), [
+          }, 8, ["class", "disabled"]), [
             [vShow, unref(selectionMode) !== "dates"]
           ]),
           createVNode(unref(ElButton), {
             plain: "",
             size: "small",
             class: normalizeClass(unref(ppNs).e("link-btn")),
+            disabled: unref(disabledConfirm),
             onClick: onConfirm
           }, {
             default: withCtx(() => [
               createTextVNode(toDisplayString(unref(t)("el.datepicker.confirm")), 1)
             ]),
             _: 1
-          }, 8, ["class"])
+          }, 8, ["class", "disabled"])
         ], 2), [
           [vShow, unref(footerVisible) && currentView.value === "date"]
         ])
@@ -27386,7 +27439,7 @@ const useRangePicker = (props, {
 
 const _hoisted_1$E = ["onClick"];
 const _hoisted_2$p = ["disabled"];
-const _hoisted_3$c = ["disabled"];
+const _hoisted_3$d = ["disabled"];
 const _hoisted_4$8 = ["disabled"];
 const _hoisted_5$6 = ["disabled"];
 const unit$1 = "month";
@@ -27402,14 +27455,7 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
   setup(__props, { emit }) {
     const props = __props;
     const pickerBase = inject("EP_PICKER_BASE");
-    const {
-      disabledDate,
-      cellClassName,
-      format,
-      defaultTime,
-      arrowControl,
-      clearable
-    } = pickerBase.props;
+    const { disabledDate, cellClassName, format, defaultTime, clearable } = pickerBase.props;
     const shortcuts = toRef(pickerBase.props, "shortcuts");
     const defaultValue = toRef(pickerBase.props, "defaultValue");
     const { lang } = useLocale();
@@ -27494,6 +27540,9 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
     const dateFormat = computed$1(() => {
       return extractDateFormat(format);
     });
+    const isValidValue = (date) => {
+      return isValidRange(date) && (disabledDate ? !disabledDate(date[0].toDate()) && !disabledDate(date[1].toDate()) : true);
+    };
     const leftPrevYear = () => {
       leftDate.value = leftDate.value.subtract(1, "year");
       if (!props.unlinkPanels) {
@@ -27704,7 +27753,7 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
         }
       }
     }
-    emit("set-picker-option", ["isValidValue", isValidRange]);
+    emit("set-picker-option", ["isValidValue", isValidValue]);
     emit("set-picker-option", ["parseUserInput", parseUserInput]);
     emit("set-picker-option", ["formatToString", formatToString]);
     emit("set-picker-option", ["handleClear", handleClear]);
@@ -27780,10 +27829,9 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
                     visible: minTimePickerVisible.value,
                     format: unref(timeFormat),
                     "datetime-role": "start",
-                    "time-arrow-control": unref(arrowControl),
                     "parsed-value": leftDate.value,
                     onPick: handleMinTimePick
-                  }, null, 8, ["visible", "format", "time-arrow-control", "parsed-value"])
+                  }, null, 8, ["visible", "format", "parsed-value"])
                 ], 2)), [
                   [unref(ClickOutside), handleMinTimeClose]
                 ])
@@ -27833,10 +27881,9 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
                     "datetime-role": "end",
                     visible: maxTimePickerVisible.value,
                     format: unref(timeFormat),
-                    "time-arrow-control": unref(arrowControl),
                     "parsed-value": rightDate.value,
                     onPick: handleMaxTimePick
-                  }, null, 8, ["visible", "format", "time-arrow-control", "parsed-value"])
+                  }, null, 8, ["visible", "format", "parsed-value"])
                 ], 2)), [
                   [unref(ClickOutside), handleMaxTimeClose]
                 ])
@@ -27902,7 +27949,7 @@ const _sfc_main$1h = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   })
-                ], 10, _hoisted_3$c)) : createCommentVNode("v-if", true),
+                ], 10, _hoisted_3$d)) : createCommentVNode("v-if", true),
                 createElementVNode("div", null, toDisplayString(unref(leftLabel)), 1)
               ], 2),
               createVNode(DateTable, {
@@ -28086,7 +28133,7 @@ const useMonthRangeHeader = ({
 
 const _hoisted_1$D = ["onClick"];
 const _hoisted_2$o = ["disabled"];
-const _hoisted_3$b = ["disabled"];
+const _hoisted_3$c = ["disabled"];
 const unit = "year";
 const __default__$R = defineComponent({
   name: "DatePickerMonthRange"
@@ -28263,7 +28310,7 @@ const _sfc_main$1g = /* @__PURE__ */ defineComponent({
                     ]),
                     _: 1
                   })
-                ], 10, _hoisted_3$b)) : createCommentVNode("v-if", true),
+                ], 10, _hoisted_3$c)) : createCommentVNode("v-if", true),
                 createElementVNode("button", {
                   type: "button",
                   class: normalizeClass([unref(ppNs).e("icon-btn"), "d-arrow-right"]),
@@ -28764,14 +28811,8 @@ const ElOverlay = Overlay$1;
 const dialogInjectionKey = Symbol("dialogInjectionKey");
 
 const dialogContentProps = buildProps({
-  center: {
-    type: Boolean,
-    default: false
-  },
-  alignCenter: {
-    type: Boolean,
-    default: false
-  },
+  center: Boolean,
+  alignCenter: Boolean,
   closeIcon: {
     type: iconPropType
   },
@@ -28779,14 +28820,8 @@ const dialogContentProps = buildProps({
     type: String,
     default: ""
   },
-  draggable: {
-    type: Boolean,
-    default: false
-  },
-  fullscreen: {
-    type: Boolean,
-    default: false
-  },
+  draggable: Boolean,
+  fullscreen: Boolean,
   showClose: {
     type: Boolean,
     default: true
@@ -28794,14 +28829,19 @@ const dialogContentProps = buildProps({
   title: {
     type: String,
     default: ""
+  },
+  ariaLevel: {
+    type: String,
+    default: "2"
   }
 });
 const dialogContentEmits = {
   close: () => true
 };
 
-const _hoisted_1$B = ["aria-label"];
-const _hoisted_2$n = ["id"];
+const _hoisted_1$B = ["aria-level"];
+const _hoisted_2$n = ["aria-label"];
+const _hoisted_3$b = ["id"];
 const __default__$O = defineComponent({ name: "ElDialogContent" });
 const _sfc_main$1d = /* @__PURE__ */ defineComponent({
   ...__default__$O,
@@ -28813,20 +28853,21 @@ const _sfc_main$1d = /* @__PURE__ */ defineComponent({
     const { Close } = CloseComponents;
     const { dialogRef, headerRef, bodyId, ns, style } = inject(dialogInjectionKey);
     const { focusTrapRef } = inject(FOCUS_TRAP_INJECTION_KEY);
+    const dialogKls = computed$1(() => [
+      ns.b(),
+      ns.is("fullscreen", props.fullscreen),
+      ns.is("draggable", props.draggable),
+      ns.is("align-center", props.alignCenter),
+      { [ns.m("center")]: props.center },
+      props.customClass
+    ]);
     const composedDialogRef = composeRefs(focusTrapRef, dialogRef);
     const draggable = computed$1(() => props.draggable);
     useDraggable(dialogRef, headerRef, draggable);
     return (_ctx, _cache) => {
       return openBlock(), createElementBlock("div", {
         ref: unref(composedDialogRef),
-        class: normalizeClass([
-          unref(ns).b(),
-          unref(ns).is("fullscreen", _ctx.fullscreen),
-          unref(ns).is("draggable", unref(draggable)),
-          unref(ns).is("align-center", _ctx.alignCenter),
-          { [unref(ns).m("center")]: _ctx.center },
-          _ctx.customClass
-        ]),
+        class: normalizeClass(unref(dialogKls)),
         style: normalizeStyle(unref(style)),
         tabindex: "-1"
       }, [
@@ -28838,8 +28879,9 @@ const _sfc_main$1d = /* @__PURE__ */ defineComponent({
           renderSlot(_ctx.$slots, "header", {}, () => [
             createElementVNode("span", {
               role: "heading",
+              "aria-level": _ctx.ariaLevel,
               class: normalizeClass(unref(ns).e("title"))
-            }, toDisplayString(_ctx.title), 3)
+            }, toDisplayString(_ctx.title), 11, _hoisted_1$B)
           ]),
           _ctx.showClose ? (openBlock(), createElementBlock("button", {
             key: 0,
@@ -28856,14 +28898,14 @@ const _sfc_main$1d = /* @__PURE__ */ defineComponent({
               ]),
               _: 1
             }, 8, ["class"])
-          ], 10, _hoisted_1$B)) : createCommentVNode("v-if", true)
+          ], 10, _hoisted_2$n)) : createCommentVNode("v-if", true)
         ], 2),
         createElementVNode("div", {
           id: unref(bodyId),
           class: normalizeClass(unref(ns).e("body"))
         }, [
           renderSlot(_ctx.$slots, "default")
-        ], 10, _hoisted_2$n),
+        ], 10, _hoisted_3$b),
         _ctx.$slots.footer ? (openBlock(), createElementBlock("footer", {
           key: 0,
           class: normalizeClass(unref(ns).e("footer"))
@@ -28878,17 +28920,11 @@ var ElDialogContent = /* @__PURE__ */ _export_sfc(_sfc_main$1d, [["__file", "dia
 
 const dialogProps = buildProps({
   ...dialogContentProps,
-  appendToBody: {
-    type: Boolean,
-    default: false
-  },
+  appendToBody: Boolean,
   beforeClose: {
     type: definePropType(Function)
   },
-  destroyOnClose: {
-    type: Boolean,
-    default: false
-  },
+  destroyOnClose: Boolean,
   closeOnClickModal: {
     type: Boolean,
     default: true
@@ -28916,10 +28952,7 @@ const dialogProps = buildProps({
   top: {
     type: String
   },
-  modelValue: {
-    type: Boolean,
-    default: false
-  },
+  modelValue: Boolean,
   modalClass: String,
   width: {
     type: [String, Number]
@@ -28930,6 +28963,10 @@ const dialogProps = buildProps({
   trapFocus: {
     type: Boolean,
     default: false
+  },
+  headerAriaLevel: {
+    type: String,
+    default: "2"
   }
 });
 const dialogEmits = {
@@ -29228,6 +29265,7 @@ const _sfc_main$1c = /* @__PURE__ */ defineComponent({
                         fullscreen: _ctx.fullscreen,
                         "show-close": _ctx.showClose,
                         title: _ctx.title,
+                        "aria-level": _ctx.headerAriaLevel,
                         onClose: unref(handleClose)
                       }), createSlots({
                         header: withCtx(() => [
@@ -29249,7 +29287,7 @@ const _sfc_main$1c = /* @__PURE__ */ defineComponent({
                             renderSlot(_ctx.$slots, "footer")
                           ])
                         } : void 0
-                      ]), 1040, ["custom-class", "center", "align-center", "close-icon", "draggable", "fullscreen", "show-close", "title", "onClose"])) : createCommentVNode("v-if", true)
+                      ]), 1040, ["custom-class", "center", "align-center", "close-icon", "draggable", "fullscreen", "show-close", "title", "aria-level", "onClose"])) : createCommentVNode("v-if", true)
                     ]),
                     _: 3
                   }, 8, ["trapped", "onFocusAfterTrapped", "onFocusAfterReleased", "onFocusoutPrevented", "onReleaseRequested"])
@@ -29339,6 +29377,10 @@ const drawerProps = buildProps({
   modalFade: {
     type: Boolean,
     default: true
+  },
+  headerAriaLevel: {
+    type: String,
+    default: "2"
   }
 });
 const drawerEmits = dialogEmits;
@@ -29388,7 +29430,7 @@ const _sfc_main$1a = defineComponent({
   }
 });
 const _hoisted_1$z = ["aria-label", "aria-labelledby", "aria-describedby"];
-const _hoisted_2$m = ["id"];
+const _hoisted_2$m = ["id", "aria-level"];
 const _hoisted_3$a = ["aria-label"];
 const _hoisted_4$7 = ["id"];
 function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
@@ -29455,6 +29497,7 @@ function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
                         key: 0,
                         id: _ctx.titleId,
                         role: "heading",
+                        "aria-level": _ctx.headerAriaLevel,
                         class: normalizeClass(_ctx.ns.e("title"))
                       }, toDisplayString(_ctx.title), 11, _hoisted_2$m)) : createCommentVNode("v-if", true)
                     ]) : renderSlot(_ctx.$slots, "title", { key: 1 }, () => [
@@ -29999,20 +30042,20 @@ const _sfc_main$14 = defineComponent({
       maxHeight: addUnit(props.maxHeight)
     }));
     const dropdownTriggerKls = computed$1(() => [ns.m(dropdownSize.value)]);
+    const trigger = computed$1(() => castArray$1(props.trigger));
     const defaultTriggerId = useId().value;
     const triggerId = computed$1(() => {
       return props.id || defaultTriggerId;
     });
-    watch([triggeringElementRef, toRef(props, "trigger")], ([triggeringElement, trigger], [prevTriggeringElement]) => {
+    watch([triggeringElementRef, trigger], ([triggeringElement, trigger2], [prevTriggeringElement]) => {
       var _a, _b, _c;
-      const triggerArray = isArray$1(trigger) ? trigger : [trigger];
       if ((_a = prevTriggeringElement == null ? void 0 : prevTriggeringElement.$el) == null ? void 0 : _a.removeEventListener) {
         prevTriggeringElement.$el.removeEventListener("pointerenter", onAutofocusTriggerEnter);
       }
       if ((_b = triggeringElement == null ? void 0 : triggeringElement.$el) == null ? void 0 : _b.removeEventListener) {
         triggeringElement.$el.removeEventListener("pointerenter", onAutofocusTriggerEnter);
       }
-      if (((_c = triggeringElement == null ? void 0 : triggeringElement.$el) == null ? void 0 : _c.addEventListener) && triggerArray.includes("hover")) {
+      if (((_c = triggeringElement == null ? void 0 : triggeringElement.$el) == null ? void 0 : _c.addEventListener) && trigger2.includes("hover")) {
         triggeringElement.$el.addEventListener("pointerenter", onAutofocusTriggerEnter);
       }
     }, { immediate: true });
@@ -30045,7 +30088,7 @@ const _sfc_main$14 = defineComponent({
     }
     function onItemLeave() {
       const contentEl = unref(contentRef);
-      contentEl == null ? void 0 : contentEl.focus();
+      trigger.value.includes("hover") && (contentEl == null ? void 0 : contentEl.focus());
       currentTabId.value = null;
     }
     function handleCurrentTabIdChange(id) {
@@ -31721,7 +31764,7 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
       } else {
         innerInput.removeAttribute("aria-valuemin");
       }
-      innerInput.setAttribute("aria-valuenow", String(data.currentValue));
+      innerInput.setAttribute("aria-valuenow", data.currentValue || data.currentValue === 0 ? String(data.currentValue) : "");
       innerInput.setAttribute("aria-disabled", String(inputNumberDisabled.value));
       if (!isNumber(modelValue) && modelValue != null) {
         let val = Number(modelValue);
@@ -31732,9 +31775,9 @@ const _sfc_main$Y = /* @__PURE__ */ defineComponent({
       }
     });
     onUpdated(() => {
-      var _a;
+      var _a, _b;
       const innerInput = (_a = input.value) == null ? void 0 : _a.input;
-      innerInput == null ? void 0 : innerInput.setAttribute("aria-valuenow", `${data.currentValue}`);
+      innerInput == null ? void 0 : innerInput.setAttribute("aria-valuenow", `${(_b = data.currentValue) != null ? _b : ""}`);
     });
     expose({
       focus,
@@ -32206,6 +32249,8 @@ var SubMenu = defineComponent({
       "left-start"
     ] : [
       "right-start",
+      "right",
+      "right-end",
       "left-start",
       "bottom-start",
       "bottom-end",
@@ -33175,10 +33220,7 @@ const _sfc_main$Q = defineComponent({
     },
     label: [String, Number],
     created: Boolean,
-    disabled: {
-      type: Boolean,
-      default: false
-    }
+    disabled: Boolean
   },
   setup(props) {
     const ns = useNamespace("select");
@@ -33292,6 +33334,7 @@ function useSelectStates(props) {
   return reactive({
     options: /* @__PURE__ */ new Map(),
     cachedOptions: /* @__PURE__ */ new Map(),
+    disabledOptions: /* @__PURE__ */ new Map(),
     createdLabel: null,
     createdSelected: false,
     selected: props.multiple ? [] : {},
@@ -33310,10 +33353,10 @@ function useSelectStates(props) {
     menuVisibleOnFocus: false,
     isOnComposition: false,
     prefixWidth: 11,
-    mouseEnter: false
+    mouseEnter: false,
+    focused: false
   });
 }
-let ignoreFocusEvent = false;
 const useSelect$3 = (props, states, ctx) => {
   const { t } = useLocale();
   const ns = useNamespace("select");
@@ -33347,6 +33390,7 @@ const useSelect$3 = (props, states, ctx) => {
   });
   const iconComponent = computed$1(() => props.remote && props.filterable && !props.remoteShowSuffix ? "" : props.suffixIcon);
   const iconReverse = computed$1(() => ns.is("reverse", iconComponent.value && states.visible && props.suffixTransition));
+  const showStatusIconAndState = computed$1(() => (form == null ? void 0 : form.statusIcon) && (formItem == null ? void 0 : formItem.validateState) && ValidateComponentsMap[formItem == null ? void 0 : formItem.validateState]);
   const debounce$1 = computed$1(() => props.remote ? 300 : 0);
   const emptyText = computed$1(() => {
     if (props.loading) {
@@ -33440,7 +33484,6 @@ const useSelect$3 = (props, states, ctx) => {
           props.remoteMethod("");
         }
       }
-      input.value && input.value.blur();
       states.query = "";
       states.previousQuery = null;
       states.selectedLabel = "";
@@ -33499,7 +33542,7 @@ const useSelect$3 = (props, states, ctx) => {
       resetInputHeight();
     }
     const inputs = ((_c = selectWrapper.value) == null ? void 0 : _c.querySelectorAll("input")) || [];
-    if (!Array.from(inputs).includes(document.activeElement)) {
+    if (!props.filterable && !props.defaultFirstOption && !isUndefined(props.modelValue) || !Array.from(inputs).includes(document.activeElement)) {
       setSelected();
     }
     if (props.defaultFirstOption && (props.filterable || props.remote) && states.filteredOptionsCount) {
@@ -33551,9 +33594,11 @@ const useSelect$3 = (props, states, ctx) => {
     states.hoverIndex = -1;
     if (props.multiple && props.filterable) {
       nextTick(() => {
-        const length = input.value.value.length * 15 + 20;
-        states.inputLength = props.collapseTags ? Math.min(50, length) : length;
-        managePlaceholder();
+        if (!selectDisabled.value) {
+          const length = input.value.value.length * 15 + 20;
+          states.inputLength = props.collapseTags ? Math.min(50, length) : length;
+          managePlaceholder();
+        }
         resetInputHeight();
       });
     }
@@ -33618,7 +33663,7 @@ const useSelect$3 = (props, states, ctx) => {
     let option;
     const isObjectValue = toRawType(value).toLowerCase() === "object";
     const isNull = toRawType(value).toLowerCase() === "null";
-    const isUndefined = toRawType(value).toLowerCase() === "undefined";
+    const isUndefined2 = toRawType(value).toLowerCase() === "undefined";
     for (let i = states.cachedOptions.size - 1; i >= 0; i--) {
       const cachedOption = cachedOptionsArray.value[i];
       const isEqualValue = isObjectValue ? get(cachedOption.value, props.valueKey) === get(value, props.valueKey) : cachedOption.value === value;
@@ -33633,7 +33678,7 @@ const useSelect$3 = (props, states, ctx) => {
     }
     if (option)
       return option;
-    const label = isObjectValue ? value.label : !isNull && !isUndefined ? value : "";
+    const label = isObjectValue ? value.label : !isNull && !isUndefined2 ? value : "";
     const newOption = {
       value,
       currentLabel: label
@@ -33690,12 +33735,16 @@ const useSelect$3 = (props, states, ctx) => {
       ctx.emit(CHANGE_EVENT, val);
     }
   };
+  const getLastNotDisabledIndex = (value) => findLastIndex(value, (it) => !states.disabledOptions.has(it));
   const deletePrevTag = (e) => {
     if (e.code === EVENT_CODE.delete)
       return;
     if (e.target.value.length <= 0 && !toggleLastOptionHitState()) {
       const value = props.modelValue.slice();
-      value.pop();
+      const lastNotDisabledIndex = getLastNotDisabledIndex(value);
+      if (lastNotDisabledIndex < 0)
+        return;
+      value.splice(lastNotDisabledIndex, 1);
       ctx.emit(UPDATE_MODEL_EVENT, value);
       emitChange(value);
     }
@@ -33713,6 +33762,7 @@ const useSelect$3 = (props, states, ctx) => {
       ctx.emit("remove-tag", tag.value);
     }
     event.stopPropagation();
+    focus();
   };
   const deleteSelected = (event) => {
     event.stopPropagation();
@@ -33728,6 +33778,7 @@ const useSelect$3 = (props, states, ctx) => {
     states.hoverIndex = -1;
     states.visible = false;
     ctx.emit("clear");
+    focus();
   };
   const handleOptionSelect = (option) => {
     var _a;
@@ -33803,6 +33854,7 @@ const useSelect$3 = (props, states, ctx) => {
     states.filteredOptionsCount++;
     states.options.set(vm.value, vm);
     states.cachedOptions.set(vm.value, vm);
+    vm.disabled && states.disabledOptions.set(vm.value, vm);
   };
   const onOptionDestroy = (key, vm) => {
     if (states.options.get(key) === vm) {
@@ -33820,7 +33872,8 @@ const useSelect$3 = (props, states, ctx) => {
   const toggleLastOptionHitState = (hit) => {
     if (!Array.isArray(states.selected))
       return;
-    const option = states.selected[states.selected.length - 1];
+    const lastNotDisabledIndex = getLastNotDisabledIndex(states.selected.map((it) => it.value));
+    const option = states.selected[lastNotDisabledIndex];
     if (!option)
       return;
     if (hit === true || hit === false) {
@@ -33844,16 +33897,23 @@ const useSelect$3 = (props, states, ctx) => {
     nextTick(() => scrollToOption(states.selected));
   };
   const handleFocus = (event) => {
-    if (!ignoreFocusEvent) {
+    if (!states.focused) {
       if (props.automaticDropdown || props.filterable) {
         if (props.filterable && !states.visible) {
           states.menuVisibleOnFocus = true;
         }
         states.visible = true;
       }
+      states.focused = true;
       ctx.emit("focus", event);
+    }
+  };
+  const focus = () => {
+    var _a, _b;
+    if (states.visible) {
+      (_a = input.value || reference.value) == null ? void 0 : _a.focus();
     } else {
-      ignoreFocusEvent = false;
+      (_b = reference.value) == null ? void 0 : _b.focus();
     }
   };
   const blur = () => {
@@ -33863,15 +33923,13 @@ const useSelect$3 = (props, states, ctx) => {
     (_c = (_b = iOSInput.value) == null ? void 0 : _b.blur) == null ? void 0 : _c.call(_b);
   };
   const handleBlur = (event) => {
-    setTimeout(() => {
-      var _a;
-      if ((_a = tooltipRef.value) == null ? void 0 : _a.isFocusInsideContent()) {
-        ignoreFocusEvent = true;
-        return;
-      }
-      states.visible && handleClose();
-      ctx.emit("blur", event);
-    });
+    var _a, _b, _c;
+    if (((_a = tooltipRef.value) == null ? void 0 : _a.isFocusInsideContent(event)) || ((_b = tagTooltipRef.value) == null ? void 0 : _b.isFocusInsideContent(event)) || ((_c = selectWrapper.value) == null ? void 0 : _c.contains(event.relatedTarget))) {
+      return;
+    }
+    states.visible && handleClose();
+    states.focused = false;
+    ctx.emit("blur", event);
   };
   const handleClearClick = (event) => {
     deleteSelected(event);
@@ -33887,7 +33945,6 @@ const useSelect$3 = (props, states, ctx) => {
     }
   };
   const toggleMenu = (e) => {
-    var _a;
     if (e && !states.mouseEnter) {
       return;
     }
@@ -33899,9 +33956,7 @@ const useSelect$3 = (props, states, ctx) => {
           states.visible = !states.visible;
         }
       }
-      if (states.visible) {
-        (_a = input.value || reference.value) == null ? void 0 : _a.focus();
-      }
+      focus();
     }
   };
   const selectOption = () => {
@@ -33958,6 +34013,10 @@ const useSelect$3 = (props, states, ctx) => {
     deleteTag(event, tag);
     (_b = (_a = tagTooltipRef.value) == null ? void 0 : _a.updatePopper) == null ? void 0 : _b.call(_a);
   };
+  const selectTagsStyle = computed$1(() => ({
+    maxWidth: `${unref(states.inputWidth) - 32 - (showStatusIconAndState.value ? 22 : 0)}px`,
+    width: "100%"
+  }));
   return {
     optionList,
     optionsArray,
@@ -33988,6 +34047,7 @@ const useSelect$3 = (props, states, ctx) => {
     onOptionDestroy,
     handleMenuEnter,
     handleFocus,
+    focus,
     blur,
     handleBlur,
     handleClearClick,
@@ -34003,6 +34063,7 @@ const useSelect$3 = (props, states, ctx) => {
     groupQueryChange,
     showTagList,
     collapseTagList,
+    selectTagsStyle,
     reference,
     input,
     iOSInput,
@@ -34134,10 +34195,7 @@ const _sfc_main$O = defineComponent({
       default: "value"
     },
     collapseTags: Boolean,
-    collapseTagsTooltip: {
-      type: Boolean,
-      default: false
-    },
+    collapseTagsTooltip: Boolean,
     maxCollapseTags: {
       type: Number,
       default: 1
@@ -34151,10 +34209,7 @@ const _sfc_main$O = defineComponent({
       type: iconPropType,
       default: circle_close_default
     },
-    fitInputWidth: {
-      type: Boolean,
-      default: false
-    },
+    fitInputWidth: Boolean,
     suffixIcon: {
       type: iconPropType,
       default: arrow_down_default
@@ -34164,10 +34219,7 @@ const _sfc_main$O = defineComponent({
       type: Boolean,
       default: true
     },
-    remoteShowSuffix: {
-      type: Boolean,
-      default: false
-    },
+    remoteShowSuffix: Boolean,
     suffixTransition: {
       type: Boolean,
       default: true
@@ -34176,6 +34228,10 @@ const _sfc_main$O = defineComponent({
       type: String,
       values: Ee,
       default: "bottom-start"
+    },
+    ariaLabel: {
+      type: String,
+      default: void 0
     }
   },
   emits: [
@@ -34222,6 +34278,7 @@ const _sfc_main$O = defineComponent({
       onOptionDestroy,
       handleMenuEnter,
       handleFocus,
+      focus,
       blur,
       handleBlur,
       handleClearClick,
@@ -34246,9 +34303,9 @@ const _sfc_main$O = defineComponent({
       handleMouseEnter,
       handleMouseLeave,
       showTagList,
-      collapseTagList
+      collapseTagList,
+      selectTagsStyle
     } = useSelect$3(props, states, ctx);
-    const { focus } = useFocus(reference);
     const {
       inputWidth,
       selected,
@@ -34299,10 +34356,6 @@ const _sfc_main$O = defineComponent({
     const scrollbarKls = computed$1(() => [
       nsSelect.is("empty", !props.allowCreate && Boolean(unref(query)) && unref(filteredOptionsCount) === 0)
     ]);
-    const selectTagsStyle = computed$1(() => ({
-      maxWidth: `${unref(inputWidth) - 32}px`,
-      width: "100%"
-    }));
     const tagTextStyle = computed$1(() => {
       const maxWidth = unref(inputWidth) > 123 ? unref(inputWidth) - 123 : unref(inputWidth) - 75;
       return { maxWidth: `${maxWidth}px` };
@@ -34406,6 +34459,7 @@ const _sfc_main$O = defineComponent({
       handleComposition,
       handleMenuEnter,
       handleFocus,
+      focus,
       blur,
       handleBlur,
       handleClearClick,
@@ -34416,7 +34470,6 @@ const _sfc_main$O = defineComponent({
       getValueKey,
       navigateOptions,
       dropMenuVisible,
-      focus,
       reference,
       input,
       iOSInput,
@@ -34443,7 +34496,7 @@ const _sfc_main$O = defineComponent({
     };
   }
 });
-const _hoisted_1$n = ["disabled", "autocomplete"];
+const _hoisted_1$n = ["disabled", "autocomplete", "aria-label"];
 const _hoisted_2$f = ["disabled"];
 const _hoisted_3$8 = { style: { "height": "100%", "display": "flex", "justify-content": "center", "align-items": "center" } };
 function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
@@ -34459,9 +34512,9 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
   return withDirectives((openBlock(), createElementBlock("div", {
     ref: "selectWrapper",
     class: normalizeClass(_ctx.wrapperKls),
-    onMouseenter: _cache[21] || (_cache[21] = (...args) => _ctx.handleMouseEnter && _ctx.handleMouseEnter(...args)),
-    onMouseleave: _cache[22] || (_cache[22] = (...args) => _ctx.handleMouseLeave && _ctx.handleMouseLeave(...args)),
-    onClick: _cache[23] || (_cache[23] = withModifiers((...args) => _ctx.toggleMenu && _ctx.toggleMenu(...args), ["stop"]))
+    onMouseenter: _cache[22] || (_cache[22] = (...args) => _ctx.handleMouseEnter && _ctx.handleMouseEnter(...args)),
+    onMouseleave: _cache[23] || (_cache[23] = (...args) => _ctx.handleMouseLeave && _ctx.handleMouseLeave(...args)),
+    onClick: _cache[24] || (_cache[24] = withModifiers((...args) => _ctx.toggleMenu && _ctx.toggleMenu(...args), ["stop"]))
   }, [
     createVNode(_component_el_tooltip, {
       ref: "tooltipRef",
@@ -34483,14 +34536,16 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
       default: withCtx(() => [
         createElementVNode("div", {
           class: "select-trigger",
-          onMouseenter: _cache[19] || (_cache[19] = ($event) => _ctx.inputHovering = true),
-          onMouseleave: _cache[20] || (_cache[20] = ($event) => _ctx.inputHovering = false)
+          onMouseenter: _cache[20] || (_cache[20] = ($event) => _ctx.inputHovering = true),
+          onMouseleave: _cache[21] || (_cache[21] = ($event) => _ctx.inputHovering = false)
         }, [
           _ctx.multiple ? (openBlock(), createElementBlock("div", {
             key: 0,
             ref: "tags",
+            tabindex: "-1",
             class: normalizeClass(_ctx.tagsKls),
-            style: normalizeStyle(_ctx.selectTagsStyle)
+            style: normalizeStyle(_ctx.selectTagsStyle),
+            onClick: _cache[15] || (_cache[15] = (...args) => _ctx.focus && _ctx.focus(...args))
           }, [
             _ctx.collapseTags && _ctx.selected.length ? (openBlock(), createBlock(Transition, {
               key: 0,
@@ -34627,6 +34682,7 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
               disabled: _ctx.selectDisabled,
               autocomplete: _ctx.autocomplete,
               style: normalizeStyle(_ctx.inputStyle),
+              "aria-label": _ctx.ariaLabel,
               onFocus: _cache[1] || (_cache[1] = (...args) => _ctx.handleFocus && _ctx.handleFocus(...args)),
               onBlur: _cache[2] || (_cache[2] = (...args) => _ctx.handleBlur && _ctx.handleBlur(...args)),
               onKeyup: _cache[3] || (_cache[3] = (...args) => _ctx.managePlaceholder && _ctx.managePlaceholder(...args)),
@@ -34659,7 +34715,7 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
             id: _ctx.id,
             ref: "reference",
             modelValue: _ctx.selectedLabel,
-            "onUpdate:modelValue": _cache[15] || (_cache[15] = ($event) => _ctx.selectedLabel = $event),
+            "onUpdate:modelValue": _cache[16] || (_cache[16] = ($event) => _ctx.selectedLabel = $event),
             type: "text",
             placeholder: typeof _ctx.currentPlaceholder === "function" ? _ctx.currentPlaceholder() : _ctx.currentPlaceholder,
             name: _ctx.name,
@@ -34670,6 +34726,7 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
             "validate-event": false,
             class: normalizeClass([_ctx.nsSelect.is("focus", _ctx.visible)]),
             tabindex: _ctx.multiple && _ctx.filterable ? -1 : void 0,
+            label: _ctx.ariaLabel,
             onFocus: _ctx.handleFocus,
             onBlur: _ctx.handleBlur,
             onInput: _ctx.debouncedOnInputChange,
@@ -34678,11 +34735,11 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
             onCompositionupdate: _ctx.handleComposition,
             onCompositionend: _ctx.handleComposition,
             onKeydown: [
-              _cache[16] || (_cache[16] = withKeys(withModifiers(($event) => _ctx.navigateOptions("next"), ["stop", "prevent"]), ["down"])),
-              _cache[17] || (_cache[17] = withKeys(withModifiers(($event) => _ctx.navigateOptions("prev"), ["stop", "prevent"]), ["up"])),
+              _cache[17] || (_cache[17] = withKeys(withModifiers(($event) => _ctx.navigateOptions("next"), ["stop", "prevent"]), ["down"])),
+              _cache[18] || (_cache[18] = withKeys(withModifiers(($event) => _ctx.navigateOptions("prev"), ["stop", "prevent"]), ["up"])),
               withKeys(withModifiers(_ctx.selectOption, ["stop", "prevent"]), ["enter"]),
               withKeys(_ctx.handleKeydownEscape, ["esc"]),
-              _cache[18] || (_cache[18] = withKeys(($event) => _ctx.visible = false, ["tab"]))
+              _cache[19] || (_cache[19] = withKeys(($event) => _ctx.visible = false, ["tab"]))
             ]
           }, createSlots({
             suffix: withCtx(() => [
@@ -34716,7 +34773,7 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
                 ])
               ])
             } : void 0
-          ]), 1032, ["id", "modelValue", "placeholder", "name", "autocomplete", "size", "disabled", "readonly", "class", "tabindex", "onFocus", "onBlur", "onInput", "onPaste", "onCompositionstart", "onCompositionupdate", "onCompositionend", "onKeydown"])
+          ]), 1032, ["id", "modelValue", "placeholder", "name", "autocomplete", "size", "disabled", "readonly", "class", "tabindex", "label", "onFocus", "onBlur", "onInput", "onPaste", "onCompositionstart", "onCompositionupdate", "onCompositionend", "onKeydown"])
         ], 32)
       ]),
       content: withCtx(() => [
@@ -34769,10 +34826,7 @@ const _sfc_main$N = defineComponent({
   componentName: "ElOptionGroup",
   props: {
     label: String,
-    disabled: {
-      type: Boolean,
-      default: false
-    }
+    disabled: Boolean
   },
   setup(props) {
     const ns = useNamespace("select");
@@ -41650,6 +41704,12 @@ const switchProps = buildProps({
     type: Boolean,
     default: false
   },
+  inactiveActionIcon: {
+    type: iconPropType
+  },
+  activeActionIcon: {
+    type: iconPropType
+  },
   activeIcon: {
     type: iconPropType
   },
@@ -41925,7 +41985,17 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
                 createVNode(unref(loading_default))
               ]),
               _: 1
-            }, 8, ["class"])) : createCommentVNode("v-if", true)
+            }, 8, ["class"])) : _ctx.activeActionIcon && unref(checked) ? (openBlock(), createBlock(unref(ElIcon), { key: 1 }, {
+              default: withCtx(() => [
+                (openBlock(), createBlock(resolveDynamicComponent(_ctx.activeActionIcon)))
+              ]),
+              _: 1
+            })) : _ctx.inactiveActionIcon && !unref(checked) ? (openBlock(), createBlock(unref(ElIcon), { key: 2 }, {
+              default: withCtx(() => [
+                (openBlock(), createBlock(resolveDynamicComponent(_ctx.inactiveActionIcon)))
+              ]),
+              _: 1
+            })) : createCommentVNode("v-if", true)
           ], 2)
         ], 6),
         !_ctx.inlinePrompt && (_ctx.activeIcon || _ctx.activeText) ? (openBlock(), createElementBlock("span", {
@@ -44458,8 +44528,16 @@ function useEvents(props) {
     const range = document.createRange();
     range.setStart(cellChild, 0);
     range.setEnd(cellChild, cellChild.childNodes.length);
-    const rangeWidth = Math.round(range.getBoundingClientRect().width);
-    const rangeHeight = Math.round(range.getBoundingClientRect().height);
+    let rangeWidth = range.getBoundingClientRect().width;
+    let rangeHeight = range.getBoundingClientRect().height;
+    const offsetWidth = rangeWidth - Math.floor(rangeWidth);
+    if (offsetWidth < 1e-3) {
+      rangeWidth = Math.floor(rangeWidth);
+    }
+    const offsetHeight = rangeHeight - Math.floor(rangeHeight);
+    if (offsetHeight < 1e-3) {
+      rangeHeight = Math.floor(rangeHeight);
+    }
     const { top, left, right, bottom } = getPadding(cellChild);
     const horizontalPadding = left + right;
     const verticalPadding = top + bottom;
@@ -44648,7 +44726,7 @@ function useRender$1(props) {
       if (!rowspan || !colspan) {
         return null;
       }
-      const columnData = { ...column };
+      const columnData = Object.assign({}, column);
       columnData.realWidth = getColspanRealWidth(columns.value, colspan, cellIndex);
       const data = {
         store: props.store,
@@ -44833,11 +44911,7 @@ var TableBody = defineComponent({
     watch(props.store.states.hoverRow, (newVal, oldVal) => {
       if (!props.store.states.isComplex.value || !isClient)
         return;
-      let raf = window.requestAnimationFrame;
-      if (!raf) {
-        raf = (fn) => window.setTimeout(fn, 16);
-      }
-      raf(() => {
+      rAF(() => {
         const el = instance == null ? void 0 : instance.vnode.el;
         const rows = Array.from((el == null ? void 0 : el.children) || []).filter((e) => e == null ? void 0 : e.classList.contains(`${ns.e("row")}`));
         const oldRow = rows[oldVal];
@@ -45873,7 +45947,7 @@ const getDefaultClassName = (type) => {
 };
 const cellForced = {
   selection: {
-    renderHeader({ store }) {
+    renderHeader({ store, column }) {
       function isDisabled() {
         return store.states.data.value && store.states.data.value.length === 0;
       }
@@ -45882,7 +45956,8 @@ const cellForced = {
         size: store.states.tableSize.value,
         indeterminate: store.states.selection.value.length > 0 && !store.states.isAllSelected.value,
         "onUpdate:modelValue": store.toggleAllSelection,
-        modelValue: store.states.isAllSelected.value
+        modelValue: store.states.isAllSelected.value,
+        ariaLabel: column.label
       });
     },
     renderCell({
@@ -45898,7 +45973,8 @@ const cellForced = {
           store.commit("rowSelectedChanged", row);
         },
         onClick: (event) => event.stopPropagation(),
-        modelValue: store.isSelected(row)
+        modelValue: store.isSelected(row),
+        ariaLabel: column.label
       });
     },
     sortable: false,
@@ -46071,6 +46147,7 @@ function useWatcher(owner, props_) {
       "label",
       "filters",
       "filterMultiple",
+      "filteredValue",
       "sortable",
       "index",
       "formatter",
@@ -48338,7 +48415,7 @@ const TableV2 = defineComponent({
         data: _data,
         fixedData,
         estimatedRowHeight,
-        bodyWidth: unref(bodyWidth),
+        bodyWidth: unref(bodyWidth) + vScrollbarSize,
         headerHeight,
         headerWidth: unref(headerWidth),
         height: unref(mainTableHeight),
@@ -51569,7 +51646,7 @@ const _sfc_main$b = defineComponent({
       expanded.value = true;
       childNodeRendered.value = true;
     }
-    const childrenKey = tree.props["children"] || "children";
+    const childrenKey = tree.props.props["children"] || "children";
     watch(() => {
       const children = props.node.data[childrenKey];
       return children && [...children];
@@ -53132,7 +53209,7 @@ function useTree(props, emit) {
   }
   function isCurrent(node) {
     const current = currentKey.value;
-    return !!current && current === node.key;
+    return current !== void 0 && current === node.key;
   }
   function getCurrentNode() {
     var _a, _b;
@@ -53468,7 +53545,7 @@ const ajaxUpload = (option) => {
   const formData = new FormData();
   if (option.data) {
     for (const [key, value] of Object.entries(option.data)) {
-      if (Array.isArray(value))
+      if (isArray$1(value) && value.length)
         formData.append(key, ...value);
       else
         formData.append(key, value);
@@ -54207,7 +54284,6 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   props: uploadProps,
   setup(__props, { expose }) {
     const props = __props;
-    const slots = useSlots();
     const disabled = useFormDisabled();
     const uploadRef = shallowRef();
     const {
@@ -54263,8 +54339,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
               ref: uploadRef
             }, unref(uploadContentProps)), {
               default: withCtx(() => [
-                unref(slots).trigger ? renderSlot(_ctx.$slots, "trigger", { key: 0 }) : createCommentVNode("v-if", true),
-                !unref(slots).trigger && unref(slots).default ? renderSlot(_ctx.$slots, "default", { key: 1 }) : createCommentVNode("v-if", true)
+                _ctx.$slots.trigger ? renderSlot(_ctx.$slots, "trigger", { key: 0 }) : createCommentVNode("v-if", true),
+                !_ctx.$slots.trigger && _ctx.$slots.default ? renderSlot(_ctx.$slots, "default", { key: 1 }) : createCommentVNode("v-if", true)
               ]),
               _: 3
             }, 16)
@@ -54284,8 +54360,8 @@ const _sfc_main$3 = /* @__PURE__ */ defineComponent({
           ref: uploadRef
         }, unref(uploadContentProps)), {
           default: withCtx(() => [
-            unref(slots).trigger ? renderSlot(_ctx.$slots, "trigger", { key: 0 }) : createCommentVNode("v-if", true),
-            !unref(slots).trigger && unref(slots).default ? renderSlot(_ctx.$slots, "default", { key: 1 }) : createCommentVNode("v-if", true)
+            _ctx.$slots.trigger ? renderSlot(_ctx.$slots, "trigger", { key: 0 }) : createCommentVNode("v-if", true),
+            !_ctx.$slots.trigger && _ctx.$slots.default ? renderSlot(_ctx.$slots, "default", { key: 1 }) : createCommentVNode("v-if", true)
           ]),
           _: 3
         }, 16)) : createCommentVNode("v-if", true),