element-plus 2.3.6 → 2.3.7

package/dist/index.full.mjs

@@ -1,4 +1,4 @@
-/*! Element Plus v2.3.6 */
+/*! Element Plus v2.3.7 */
 
 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';
 
@@ -11204,7 +11204,7 @@ const ConfigProvider = defineComponent({
 
 const ElConfigProvider = withInstall(ConfigProvider);
 
-const version$1 = "2.3.6";
+const version$1 = "2.3.7";
 
 const makeInstaller = (components = []) => {
   const install = (app, options) => {
@@ -11647,10 +11647,7 @@ const formProps = buildProps({
     type: Boolean,
     default: true
   },
-  hideRequiredAsterisk: {
-    type: Boolean,
-    default: false
-  },
+  hideRequiredAsterisk: Boolean,
   scrollToError: Boolean,
   scrollIntoViewOptions: {
     type: [Object, Boolean]
@@ -13629,16 +13626,16 @@ const _sfc_main$2d = /* @__PURE__ */ defineComponent({
     const onceInitSizeTextarea = createOnceInitResize(resizeTextarea);
     const setNativeInputValue = () => {
       const input2 = _ref.value;
-      if (!input2 || input2.value === nativeInputValue.value)
+      const formatterValue = props.formatter ? props.formatter(nativeInputValue.value) : nativeInputValue.value;
+      if (!input2 || input2.value === formatterValue)
         return;
-      input2.value = nativeInputValue.value;
+      input2.value = formatterValue;
     };
     const handleInput = async (event) => {
       recordCursor();
       let { value } = event.target;
       if (props.formatter) {
         value = props.parser ? props.parser(value) : value;
-        value = props.formatter(value);
       }
       if (isComposing.value)
         return;
@@ -16490,6 +16487,7 @@ const useBackTop = (props, emit, componentName) => {
       }
       container.value = el.value;
     }
+    handleScroll();
   });
   return {
     visible,
@@ -18440,6 +18438,7 @@ const _sfc_main$1V = /* @__PURE__ */ defineComponent({
   ],
   setup(__props, { expose, emit }) {
     const props = __props;
+    const attrs = useAttrs$1();
     const { lang } = useLocale();
     const nsDate = useNamespace("date");
     const nsInput = useNamespace("input");
@@ -18453,6 +18452,21 @@ const _sfc_main$1V = /* @__PURE__ */ defineComponent({
     const valueOnOpen = ref(null);
     let hasJustTabExitedInput = false;
     let ignoreFocusEvent = false;
+    const rangeInputKls = computed$1(() => [
+      nsDate.b("editor"),
+      nsDate.bm("editor", props.type),
+      nsInput.e("wrapper"),
+      nsDate.is("disabled", pickerDisabled.value),
+      nsDate.is("active", pickerVisible.value),
+      nsRange.b("editor"),
+      pickerSize ? nsRange.bm("editor", pickerSize.value) : "",
+      attrs.class
+    ]);
+    const clearIconKls = computed$1(() => [
+      nsInput.e("icon"),
+      nsRange.e("close-icon"),
+      !showClose.value ? nsRange.e("close-icon--hidden") : ""
+    ]);
     watch(pickerVisible, (val) => {
       if (!val) {
         userInput.value = null;
@@ -18945,16 +18959,7 @@ const _sfc_main$1V = /* @__PURE__ */ defineComponent({
             key: 1,
             ref_key: "inputRef",
             ref: inputRef,
-            class: normalizeClass([
-              unref(nsDate).b("editor"),
-              unref(nsDate).bm("editor", _ctx.type),
-              unref(nsInput).e("wrapper"),
-              unref(nsDate).is("disabled", unref(pickerDisabled)),
-              unref(nsDate).is("active", pickerVisible.value),
-              unref(nsRange).b("editor"),
-              unref(pickerSize) ? unref(nsRange).bm("editor", unref(pickerSize)) : "",
-              _ctx.$attrs.class
-            ]),
+            class: normalizeClass(unref(rangeInputKls)),
             style: normalizeStyle(_ctx.$attrs.style),
             onClick: handleFocusInput,
             onMouseenter: onMouseEnter,
@@ -19010,13 +19015,7 @@ const _sfc_main$1V = /* @__PURE__ */ defineComponent({
             }, null, 42, _hoisted_2$D),
             _ctx.clearIcon ? (openBlock(), createBlock(unref(ElIcon), {
               key: 1,
-              class: normalizeClass([
-                unref(nsInput).e("icon"),
-                unref(nsRange).e("close-icon"),
-                {
-                  [unref(nsRange).e("close-icon--hidden")]: !showClose.value
-                }
-              ]),
+              class: normalizeClass(unref(clearIconKls)),
               onClick: onClearIconClick
             }, {
               default: withCtx(() => [
@@ -19454,7 +19453,11 @@ const _sfc_main$1U = /* @__PURE__ */ defineComponent({
     };
     const typeItemHeight = (type) => {
       const scrollbar = unref(listRefsMap[type]);
-      return (scrollbar == null ? void 0 : scrollbar.$el.querySelector("li").offsetHeight) || 0;
+      const listItem = scrollbar == null ? void 0 : scrollbar.$el.querySelector("li");
+      if (listItem) {
+        return Number.parseFloat(getStyle(listItem, "height")) || 0;
+      }
+      return 0;
     };
     const onIncrement = () => {
       scrollDown(1);
@@ -19830,6 +19833,18 @@ const _sfc_main$1S = /* @__PURE__ */ defineComponent({
       disabledSeconds,
       defaultValue
     } = pickerBase.props;
+    const startContainerKls = computed$1(() => [
+      nsTime.be("range-picker", "body"),
+      nsTime.be("panel", "content"),
+      nsTime.is("arrow", arrowControl),
+      showSeconds.value ? "has-seconds" : ""
+    ]);
+    const endContainerKls = computed$1(() => [
+      nsTime.be("range-picker", "body"),
+      nsTime.be("panel", "content"),
+      nsTime.is("arrow", arrowControl),
+      showSeconds.value ? "has-seconds" : ""
+    ]);
     const startTime = computed$1(() => props.parsedValue[0]);
     const endTime = computed$1(() => props.parsedValue[1]);
     const oldValue = useOldValue(props);
@@ -19999,12 +20014,7 @@ const _sfc_main$1S = /* @__PURE__ */ defineComponent({
               class: normalizeClass(unref(nsTime).be("range-picker", "header"))
             }, toDisplayString(unref(t)("el.datepicker.startTime")), 3),
             createElementVNode("div", {
-              class: normalizeClass([
-                unref(nsTime).be("range-picker", "body"),
-                unref(nsTime).be("panel", "content"),
-                unref(nsTime).is("arrow", unref(arrowControl)),
-                { "has-seconds": unref(showSeconds) }
-              ])
+              class: normalizeClass(unref(startContainerKls))
             }, [
               createVNode(TimeSpinner, {
                 ref: "minSpinner",
@@ -20029,12 +20039,7 @@ const _sfc_main$1S = /* @__PURE__ */ defineComponent({
               class: normalizeClass(unref(nsTime).be("range-picker", "header"))
             }, toDisplayString(unref(t)("el.datepicker.endTime")), 3),
             createElementVNode("div", {
-              class: normalizeClass([
-                unref(nsTime).be("range-picker", "body"),
-                unref(nsTime).be("panel", "content"),
-                unref(nsTime).is("arrow", unref(arrowControl)),
-                { "has-seconds": unref(showSeconds) }
-              ])
+              class: normalizeClass(unref(endContainerKls))
             }, [
               createVNode(TimeSpinner, {
                 ref: "maxSpinner",
@@ -30511,7 +30516,7 @@ const _hoisted_2$l = ["id"];
 const _hoisted_3$9 = ["stop-color"];
 const _hoisted_4$6 = ["stop-color"];
 const _hoisted_5$5 = ["id"];
-const _hoisted_6$1 = ["stop-color"];
+const _hoisted_6$2 = ["stop-color"];
 const _hoisted_7 = ["stop-color"];
 const _hoisted_8 = ["id"];
 const _hoisted_9 = {
@@ -30584,7 +30589,7 @@ const _sfc_main$10 = /* @__PURE__ */ defineComponent({
             createElementVNode("stop", {
               "stop-color": `var(${unref(ns).cssVarBlockName("fill-color-1")})`,
               offset: "0%"
-            }, null, 8, _hoisted_6$1),
+            }, null, 8, _hoisted_6$2),
             createElementVNode("stop", {
               "stop-color": `var(${unref(ns).cssVarBlockName("fill-color-6")})`,
               offset: "100%"
@@ -30757,14 +30762,8 @@ const imageViewerProps = buildProps({
     type: Boolean,
     default: true
   },
-  hideOnClickModal: {
-    type: Boolean,
-    default: false
-  },
-  teleported: {
-    type: Boolean,
-    default: false
-  },
+  hideOnClickModal: Boolean,
+  teleported: Boolean,
   closeOnPressEscape: {
     type: Boolean,
     default: true
@@ -30828,6 +30827,16 @@ const _sfc_main$_ = /* @__PURE__ */ defineComponent({
     const currentImg = computed$1(() => {
       return props.urlList[activeIndex.value];
     });
+    const arrowPrevKls = computed$1(() => [
+      ns.e("btn"),
+      ns.e("prev"),
+      ns.is("disabled", !props.infinite && isFirst.value)
+    ]);
+    const arrowNextKls = computed$1(() => [
+      ns.e("btn"),
+      ns.e("next"),
+      ns.is("disabled", !props.infinite && isLast.value)
+    ]);
     const imgStyle = computed$1(() => {
       const { scale, deg, offsetX, offsetY, enableTransition } = transform.value;
       let translateX = offsetX / scale;
@@ -31046,11 +31055,7 @@ const _sfc_main$_ = /* @__PURE__ */ defineComponent({
               createCommentVNode(" ARROW "),
               !unref(isSingle) ? (openBlock(), createElementBlock(Fragment, { key: 0 }, [
                 createElementVNode("span", {
-                  class: normalizeClass([
-                    unref(ns).e("btn"),
-                    unref(ns).e("prev"),
-                    unref(ns).is("disabled", !_ctx.infinite && unref(isFirst))
-                  ]),
+                  class: normalizeClass(unref(arrowPrevKls)),
                   onClick: prev
                 }, [
                   createVNode(unref(ElIcon), null, {
@@ -31061,11 +31066,7 @@ const _sfc_main$_ = /* @__PURE__ */ defineComponent({
                   })
                 ], 2),
                 createElementVNode("span", {
-                  class: normalizeClass([
-                    unref(ns).e("btn"),
-                    unref(ns).e("next"),
-                    unref(ns).is("disabled", !_ctx.infinite && unref(isLast))
-                  ]),
+                  class: normalizeClass(unref(arrowNextKls)),
                   onClick: next
                 }, [
                   createVNode(unref(ElIcon), null, {
@@ -31163,10 +31164,7 @@ var ImageViewer = /* @__PURE__ */ _export_sfc(_sfc_main$_, [["__file", "image-vi
 const ElImageViewer = withInstall(ImageViewer);
 
 const imageProps = buildProps({
-  hideOnClickModal: {
-    type: Boolean,
-    default: false
-  },
+  hideOnClickModal: Boolean,
   src: {
     type: String,
     default: ""
@@ -31180,10 +31178,7 @@ const imageProps = buildProps({
     type: String,
     values: ["eager", "lazy"]
   },
-  lazy: {
-    type: Boolean,
-    default: false
-  },
+  lazy: Boolean,
   scrollContainer: {
     type: definePropType([String, Object])
   },
@@ -31191,10 +31186,7 @@ const imageProps = buildProps({
     type: definePropType(Array),
     default: () => mutable([])
   },
-  previewTeleported: {
-    type: Boolean,
-    default: false
-  },
+  previewTeleported: Boolean,
   zIndex: {
     type: Number
   },
@@ -31249,6 +31241,11 @@ const _sfc_main$Z = /* @__PURE__ */ defineComponent({
     const supportLoading = isClient && "loading" in HTMLImageElement.prototype;
     let stopScrollListener;
     let stopWheelListener;
+    const imageKls = computed$1(() => [
+      ns.e("inner"),
+      preview.value && ns.e("preview"),
+      isLoading.value && ns.is("loading")
+    ]);
     const containerStyle = computed$1(() => rawAttrs.style);
     const imageStyle = computed$1(() => {
       const { fit } = props;
@@ -31386,11 +31383,7 @@ const _sfc_main$Z = /* @__PURE__ */ defineComponent({
             src: imageSrc.value,
             loading: _ctx.loading,
             style: unref(imageStyle),
-            class: [
-              unref(ns).e("inner"),
-              unref(preview) && unref(ns).e("preview"),
-              isLoading.value && unref(ns).is("loading")
-            ],
+            class: unref(imageKls),
             onClick: clickHandler,
             onLoad: handleLoad,
             onError: handleError
@@ -33280,7 +33273,6 @@ function useSelectStates(props) {
     menuVisibleOnFocus: false,
     isOnComposition: false,
     prefixWidth: 11,
-    tagInMultiLine: false,
     mouseEnter: false
   });
 }
@@ -33500,7 +33492,6 @@ const useSelect$3 = (props, states, ctx) => {
       const sizeInMap = selectSize.value || gotSize === originClientHeight || originClientHeight <= 0 ? gotSize : originClientHeight;
       const isElHidden = input2.offsetParent === null;
       !isElHidden && (input2.style.height = `${(states.selected.length === 0 ? sizeInMap : Math.max(_tags ? _tags.clientHeight + (_tags.clientHeight > sizeInMap ? 6 : 0) : 0, sizeInMap)) - 2}px`);
-      states.tagInMultiLine = Number.parseFloat(input2.style.height) >= sizeInMap;
       if (states.visible && emptyText.value !== false) {
         (_b = (_a = tooltipRef.value) == null ? void 0 : _a.updatePopper) == null ? void 0 : _b.call(_a);
       }
@@ -33638,8 +33629,7 @@ const useSelect$3 = (props, states, ctx) => {
     var _a, _b;
     resetInputWidth();
     (_b = (_a = tooltipRef.value) == null ? void 0 : _a.updatePopper) == null ? void 0 : _b.call(_a);
-    if (props.multiple)
-      resetInputHeight();
+    props.multiple && resetInputHeight();
   };
   const resetInputWidth = () => {
     var _a;
@@ -34228,8 +34218,7 @@ const _sfc_main$O = defineComponent({
       options,
       cachedOptions,
       optionsCount,
-      prefixWidth,
-      tagInMultiLine
+      prefixWidth
     } = toRefs(states);
     const wrapperKls = computed$1(() => {
       const classList = [nsSelect.b()];
@@ -34283,7 +34272,7 @@ const _sfc_main$O = defineComponent({
         inputWidth.value = refEl.getBoundingClientRect().width;
         if (ctx.slots.prefix) {
           const prefix = refEl.querySelector(`.${nsInput.e("prefix")}`);
-          prefixWidth.value = Math.max(prefix.getBoundingClientRect().width + 5, 30);
+          prefixWidth.value = Math.max(prefix.getBoundingClientRect().width + 11, 30);
         }
       });
       setSelected();
@@ -34304,7 +34293,6 @@ const _sfc_main$O = defineComponent({
     return {
       isIOS,
       onOptionsRendered,
-      tagInMultiLine,
       prefixWidth,
       selectSize,
       readonly,
@@ -34530,7 +34518,8 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
                   class: normalizeClass([
                     _ctx.nsSelect.b("tags-wrapper"),
                     { "has-prefix": _ctx.prefixWidth && _ctx.selected.length }
-                  ])
+                  ]),
+                  style: normalizeStyle(_ctx.prefixWidth && _ctx.selected.length ? { marginLeft: `${_ctx.prefixWidth}px` } : "")
                 }, [
                   (openBlock(true), createElementBlock(Fragment, null, renderList(_ctx.selected, (item) => {
                     return openBlock(), createBlock(_component_el_tag, {
@@ -34551,11 +34540,11 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
                       _: 2
                     }, 1032, ["closable", "size", "hit", "type", "onClose"]);
                   }), 128))
-                ], 2)
+                ], 6)
               ]),
               _: 1
             }, 8, ["onAfterLeave"])) : createCommentVNode("v-if", true),
-            _ctx.filterable ? withDirectives((openBlock(), createElementBlock("input", {
+            _ctx.filterable && !_ctx.selectDisabled ? withDirectives((openBlock(), createElementBlock("input", {
               key: 2,
               ref: "input",
               "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.query = $event),
@@ -34568,7 +34557,7 @@ function _sfc_render$9(_ctx, _cache, $props, $setup, $data, $options) {
               disabled: _ctx.selectDisabled,
               autocomplete: _ctx.autocomplete,
               style: normalizeStyle({
-                marginLeft: _ctx.prefixWidth && !_ctx.selected.length || _ctx.tagInMultiLine ? `${_ctx.prefixWidth}px` : "",
+                marginLeft: `${_ctx.prefixWidth}px`,
                 flexGrow: 1,
                 width: `${_ctx.inputLength / (_ctx.inputWidth - 32)}%`,
                 maxWidth: `${_ctx.inputWidth - 42}px`
@@ -34983,7 +34972,7 @@ const _hoisted_2$e = ["aria-current", "aria-label", "tabindex"];
 const _hoisted_3$7 = ["tabindex", "aria-label"];
 const _hoisted_4$5 = ["aria-current", "aria-label", "tabindex"];
 const _hoisted_5$4 = ["tabindex", "aria-label"];
-const _hoisted_6 = ["aria-current", "aria-label", "tabindex"];
+const _hoisted_6$1 = ["aria-current", "aria-label", "tabindex"];
 const __default__$z = defineComponent({
   name: "ElPaginationPager"
 });
@@ -35181,7 +35170,7 @@ const _sfc_main$J = /* @__PURE__ */ defineComponent({
           "aria-current": _ctx.currentPage === _ctx.pageCount,
           "aria-label": unref(t)("el.pagination.currentPage", { pager: _ctx.pageCount }),
           tabindex: unref(tabindex)
-        }, toDisplayString(_ctx.pageCount), 11, _hoisted_6)) : createCommentVNode("v-if", true)
+        }, toDisplayString(_ctx.pageCount), 11, _hoisted_6$1)) : createCommentVNode("v-if", true)
       ], 42, _hoisted_1$k);
     };
   }
@@ -38915,6 +38904,13 @@ const useSelect$1 = (props, emit) => {
       return null;
     }).filter((v) => v !== null));
   });
+  const filteredOptionsValueMap = computed$1(() => {
+    const valueMap = /* @__PURE__ */ new Map();
+    filteredOptions.value.forEach((option, index) => {
+      valueMap.set(getValueKey(option), { option, index });
+    });
+    return valueMap;
+  });
   const optionsAllDisabled = computed$1(() => filteredOptions.value.every((option) => option.disabled));
   const selectSize = useFormSize();
   const collapseTagSize = computed$1(() => selectSize.value === "small" ? "small" : "default");
@@ -38951,12 +38947,14 @@ const useSelect$1 = (props, emit) => {
   const indexRef = computed$1(() => {
     if (props.multiple) {
       const len = props.modelValue.length;
-      if (props.modelValue.length > 0) {
-        return filteredOptions.value.findIndex((o) => o.value === props.modelValue[len - 1]);
+      if (props.modelValue.length > 0 && filteredOptionsValueMap.value.has(props.modelValue[len - 1])) {
+        const { index } = filteredOptionsValueMap.value.get(props.modelValue[len - 1]);
+        return index;
       }
     } else {
-      if (props.modelValue) {
-        return filteredOptions.value.findIndex((o) => o.value === props.modelValue);
+      if (props.modelValue && filteredOptionsValueMap.value.has(props.modelValue)) {
+        const { index } = filteredOptionsValueMap.value.get(props.modelValue);
+        return index;
       }
     }
     return -1;
@@ -39300,16 +39298,16 @@ const useSelect$1 = (props, emit) => {
         let initHovering = false;
         states.cachedOptions.length = 0;
         states.previousValue = props.modelValue.toString();
-        props.modelValue.forEach((selected) => {
-          const itemIndex = filteredOptions.value.findIndex((option) => getValueKey(option) === selected);
-          if (~itemIndex) {
-            states.cachedOptions.push(filteredOptions.value[itemIndex]);
+        for (const value of props.modelValue) {
+          if (filteredOptionsValueMap.value.has(value)) {
+            const { index, option } = filteredOptionsValueMap.value.get(value);
+            states.cachedOptions.push(option);
             if (!initHovering) {
-              updateHoveringIndex(itemIndex);
+              updateHoveringIndex(index);
             }
             initHovering = true;
           }
-        });
+        }
       } else {
         states.cachedOptions = [];
         states.previousValue = void 0;
@@ -41572,14 +41570,18 @@ const switchProps = buildProps({
     type: [Boolean, String, Number],
     default: false
   },
-  value: {
-    type: [Boolean, String, Number],
+  disabled: {
+    type: Boolean,
     default: false
   },
-  disabled: {
+  loading: {
     type: Boolean,
     default: false
   },
+  size: {
+    type: String,
+    validator: isValidComponentSize
+  },
   width: {
     type: [String, Number],
     default: ""
@@ -41602,6 +41604,14 @@ const switchProps = buildProps({
     type: String,
     default: ""
   },
+  activeValue: {
+    type: [Boolean, String, Number],
+    default: true
+  },
+  inactiveValue: {
+    type: [Boolean, String, Number],
+    default: false
+  },
   activeColor: {
     type: String,
     default: ""
@@ -41614,14 +41624,6 @@ const switchProps = buildProps({
     type: String,
     default: ""
   },
-  activeValue: {
-    type: [Boolean, String, Number],
-    default: true
-  },
-  inactiveValue: {
-    type: [Boolean, String, Number],
-    default: false
-  },
   name: {
     type: String,
     default: ""
@@ -41630,20 +41632,16 @@ const switchProps = buildProps({
     type: Boolean,
     default: true
   },
-  id: String,
-  loading: {
-    type: Boolean,
-    default: false
-  },
   beforeChange: {
     type: definePropType(Function)
   },
-  size: {
-    type: String,
-    validator: isValidComponentSize
-  },
+  id: String,
   tabindex: {
     type: [String, Number]
+  },
+  value: {
+    type: [Boolean, String, Number],
+    default: false
   }
 });
 const switchEmits = {
@@ -41671,17 +41669,27 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
     const { formItem } = useFormItem();
     const switchSize = useFormSize();
     const ns = useNamespace("switch");
-    useDeprecated({
-      from: '"value"',
-      replacement: '"model-value" or "v-model"',
-      scope: COMPONENT_NAME$8,
-      version: "2.3.0",
-      ref: "https://element-plus.org/en-US/component/switch.html#attributes",
-      type: "Attribute"
-    }, computed$1(() => {
-      var _a;
-      return !!((_a = vm.vnode.props) == null ? void 0 : _a.value);
-    }));
+    const useBatchDeprecated = (list) => {
+      list.forEach((param) => {
+        useDeprecated({
+          from: param[0],
+          replacement: param[1],
+          scope: COMPONENT_NAME$8,
+          version: "2.3.0",
+          ref: "https://element-plus.org/en-US/component/switch.html#attributes",
+          type: "Attribute"
+        }, computed$1(() => {
+          var _a;
+          return !!((_a = vm.vnode.props) == null ? void 0 : _a[param[2]]);
+        }));
+      });
+    };
+    useBatchDeprecated([
+      ['"value"', '"model-value" or "v-model"', "value"],
+      ['"active-color"', "CSS var `--el-switch-on-color`", "activeColor"],
+      ['"inactive-color"', "CSS var `--el-switch-off-color`", "inactiveColor"],
+      ['"border-color"', "CSS var `--el-switch-border-color`", "borderColor"]
+    ]);
     const { inputId } = useFormItemInputId(props, {
       formItemContext: formItem
     });
@@ -41695,6 +41703,16 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
       ns.is("disabled", switchDisabled.value),
       ns.is("checked", checked.value)
     ]);
+    const labelLeftKls = computed$1(() => [
+      ns.e("label"),
+      ns.em("label", "left"),
+      ns.is("active", !checked.value)
+    ]);
+    const labelRightKls = computed$1(() => [
+      ns.e("label"),
+      ns.em("label", "right"),
+      ns.is("active", checked.value)
+    ]);
     const coreStyle = computed$1(() => ({
       width: addUnit(props.width)
     }));
@@ -41799,11 +41817,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
         }, null, 42, _hoisted_2$9),
         !_ctx.inlinePrompt && (_ctx.inactiveIcon || _ctx.inactiveText) ? (openBlock(), createElementBlock("span", {
           key: 0,
-          class: normalizeClass([
-            unref(ns).e("label"),
-            unref(ns).em("label", "left"),
-            unref(ns).is("active", !unref(checked))
-          ])
+          class: normalizeClass(unref(labelLeftKls))
         }, [
           _ctx.inactiveIcon ? (openBlock(), createBlock(unref(ElIcon), { key: 0 }, {
             default: withCtx(() => [
@@ -41856,11 +41870,7 @@ const _sfc_main$s = /* @__PURE__ */ defineComponent({
         ], 6),
         !_ctx.inlinePrompt && (_ctx.activeIcon || _ctx.activeText) ? (openBlock(), createElementBlock("span", {
           key: 1,
-          class: normalizeClass([
-            unref(ns).e("label"),
-            unref(ns).em("label", "right"),
-            unref(ns).is("active", unref(checked))
-          ])
+          class: normalizeClass(unref(labelRightKls))
         }, [
           _ctx.activeIcon ? (openBlock(), createBlock(unref(ElIcon), { key: 0 }, {
             default: withCtx(() => [
@@ -42663,7 +42673,7 @@ const sortData = (data, states) => {
 const doFlattenColumns = (columns) => {
   const result = [];
   columns.forEach((column) => {
-    if (column.children) {
+    if (column.children && column.children.length > 0) {
       result.push.apply(result, doFlattenColumns(column.children));
     } else {
       result.push(column);
@@ -45049,6 +45059,7 @@ function useStyle(props, layout, store, table) {
   const bodyScrollHeight = ref(0);
   const headerScrollHeight = ref(0);
   const footerScrollHeight = ref(0);
+  const appendScrollHeight = ref(0);
   watchEffect(() => {
     layout.setHeight(props.height);
   });
@@ -45188,7 +45199,7 @@ function useStyle(props, layout, store, table) {
     });
   };
   const resizeListener = () => {
-    var _a, _b, _c;
+    var _a, _b, _c, _d;
     const el = table.vnode.el;
     if (!table.$ready || !el)
       return;
@@ -45213,7 +45224,8 @@ function useStyle(props, layout, store, table) {
     tableScrollHeight.value = ((_b = table.refs.tableWrapper) == null ? void 0 : _b.scrollHeight) || 0;
     headerScrollHeight.value = (tableHeader == null ? void 0 : tableHeader.scrollHeight) || 0;
     footerScrollHeight.value = ((_c = table.refs.footerWrapper) == null ? void 0 : _c.offsetHeight) || 0;
-    bodyScrollHeight.value = tableScrollHeight.value - headerScrollHeight.value - footerScrollHeight.value;
+    appendScrollHeight.value = ((_d = table.refs.appendWrapper) == null ? void 0 : _d.offsetHeight) || 0;
+    bodyScrollHeight.value = tableScrollHeight.value - headerScrollHeight.value - footerScrollHeight.value - appendScrollHeight.value;
     if (shouldUpdateLayout) {
       resizeState.value = {
         width,
@@ -45411,7 +45423,8 @@ var defaultProps$1 = {
     type: Boolean,
     default: false
   },
-  flexible: Boolean
+  flexible: Boolean,
+  showOverflowTooltip: [Boolean, Object]
 };
 
 const useScrollbar$1 = () => {
@@ -46195,7 +46208,10 @@ var defaultProps = {
   columnKey: String,
   align: String,
   headerAlign: String,
-  showOverflowTooltip: [Boolean, Object],
+  showOverflowTooltip: {
+    type: [Boolean, Object],
+    default: void 0
+  },
   fixed: [Boolean, String],
   formatter: Function,
   selectable: Function,
@@ -46257,6 +46273,7 @@ var ElTableColumn$1 = defineComponent({
       isSubColumn.value = owner.value !== parent;
       const type = props.type || "default";
       const sortable = props.sortable === "" ? true : props.sortable;
+      const showOverflowTooltip = isUndefined(props.showOverflowTooltip) ? parent.props.showOverflowTooltip : props.showOverflowTooltip;
       const defaults = {
         ...cellStarts[type],
         id: columnId.value,
@@ -46264,7 +46281,7 @@ var ElTableColumn$1 = defineComponent({
         property: props.prop || props.property,
         align: realAlign,
         headerAlign: realHeaderAlign,
-        showOverflowTooltip: props.showOverflowTooltip,
+        showOverflowTooltip,
         filterable: props.filters || props.filterMethod,
         filteredValue: [],
         filterPlacement: "",
@@ -53538,8 +53555,9 @@ const uploadListEmits = {
 const _hoisted_1$5 = ["onKeydown"];
 const _hoisted_2$4 = ["src"];
 const _hoisted_3$2 = ["onClick"];
-const _hoisted_4$1 = ["onClick"];
+const _hoisted_4$1 = ["title"];
 const _hoisted_5 = ["onClick"];
+const _hoisted_6 = ["onClick"];
 const __default__$5 = defineComponent({
   name: "ElUploadList"
 });
@@ -53606,8 +53624,9 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                       _: 1
                     }, 8, ["class"]),
                     createElementVNode("span", {
-                      class: normalizeClass(unref(nsUpload).be("list", "item-file-name"))
-                    }, toDisplayString(file.name), 3)
+                      class: normalizeClass(unref(nsUpload).be("list", "item-file-name")),
+                      title: file.name
+                    }, toDisplayString(file.name), 11, _hoisted_4$1)
                   ], 10, _hoisted_3$2),
                   file.status === "uploading" ? (openBlock(), createBlock(unref(ElProgress), {
                     key: 0,
@@ -53671,7 +53690,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }, 8, ["class"])
-                  ], 10, _hoisted_4$1),
+                  ], 10, _hoisted_5),
                   !unref(disabled) ? (openBlock(), createElementBlock("span", {
                     key: 0,
                     class: normalizeClass(unref(nsUpload).be("list", "item-delete")),
@@ -53685,7 +53704,7 @@ const _sfc_main$6 = /* @__PURE__ */ defineComponent({
                       ]),
                       _: 1
                     }, 8, ["class"])
-                  ], 10, _hoisted_5)) : createCommentVNode("v-if", true)
+                  ], 10, _hoisted_6)) : createCommentVNode("v-if", true)
                 ], 2)) : createCommentVNode("v-if", true)
               ])
             ], 42, _hoisted_1$5);