element-plus 2.3.6 → 2.3.7

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Element Plus v2.3.6 */
+/*! Element Plus v2.3.7 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
@@ -11208,7 +11208,7 @@
 
   const ElConfigProvider = withInstall(ConfigProvider);
 
-  const version$1 = "2.3.6";
+  const version$1 = "2.3.7";
 
   const makeInstaller = (components = []) => {
     const install = (app, options) => {
@@ -11651,10 +11651,7 @@
       type: Boolean,
       default: true
     },
-    hideRequiredAsterisk: {
-      type: Boolean,
-      default: false
-    },
+    hideRequiredAsterisk: Boolean,
     scrollToError: Boolean,
     scrollIntoViewOptions: {
       type: [Object, Boolean]
@@ -13633,16 +13630,16 @@
       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;
@@ -16494,6 +16491,7 @@
         }
         container.value = el.value;
       }
+      handleScroll();
     });
     return {
       visible,
@@ -18444,6 +18442,7 @@
     ],
     setup(__props, { expose, emit }) {
       const props = __props;
+      const attrs = vue.useAttrs();
       const { lang } = useLocale();
       const nsDate = useNamespace("date");
       const nsInput = useNamespace("input");
@@ -18457,6 +18456,21 @@
       const valueOnOpen = vue.ref(null);
       let hasJustTabExitedInput = false;
       let ignoreFocusEvent = false;
+      const rangeInputKls = vue.computed(() => [
+        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 = vue.computed(() => [
+        nsInput.e("icon"),
+        nsRange.e("close-icon"),
+        !showClose.value ? nsRange.e("close-icon--hidden") : ""
+      ]);
       vue.watch(pickerVisible, (val) => {
         if (!val) {
           userInput.value = null;
@@ -18949,16 +18963,7 @@
               key: 1,
               ref_key: "inputRef",
               ref: inputRef,
-              class: vue.normalizeClass([
-                vue.unref(nsDate).b("editor"),
-                vue.unref(nsDate).bm("editor", _ctx.type),
-                vue.unref(nsInput).e("wrapper"),
-                vue.unref(nsDate).is("disabled", vue.unref(pickerDisabled)),
-                vue.unref(nsDate).is("active", pickerVisible.value),
-                vue.unref(nsRange).b("editor"),
-                vue.unref(pickerSize) ? vue.unref(nsRange).bm("editor", vue.unref(pickerSize)) : "",
-                _ctx.$attrs.class
-              ]),
+              class: vue.normalizeClass(vue.unref(rangeInputKls)),
               style: vue.normalizeStyle(_ctx.$attrs.style),
               onClick: handleFocusInput,
               onMouseenter: onMouseEnter,
@@ -19014,13 +19019,7 @@
               }, null, 42, _hoisted_2$D),
               _ctx.clearIcon ? (vue.openBlock(), vue.createBlock(vue.unref(ElIcon), {
                 key: 1,
-                class: vue.normalizeClass([
-                  vue.unref(nsInput).e("icon"),
-                  vue.unref(nsRange).e("close-icon"),
-                  {
-                    [vue.unref(nsRange).e("close-icon--hidden")]: !showClose.value
-                  }
-                ]),
+                class: vue.normalizeClass(vue.unref(clearIconKls)),
                 onClick: onClearIconClick
               }, {
                 default: vue.withCtx(() => [
@@ -19458,7 +19457,11 @@
       };
       const typeItemHeight = (type) => {
         const scrollbar = vue.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);
@@ -19834,6 +19837,18 @@
         disabledSeconds,
         defaultValue
       } = pickerBase.props;
+      const startContainerKls = vue.computed(() => [
+        nsTime.be("range-picker", "body"),
+        nsTime.be("panel", "content"),
+        nsTime.is("arrow", arrowControl),
+        showSeconds.value ? "has-seconds" : ""
+      ]);
+      const endContainerKls = vue.computed(() => [
+        nsTime.be("range-picker", "body"),
+        nsTime.be("panel", "content"),
+        nsTime.is("arrow", arrowControl),
+        showSeconds.value ? "has-seconds" : ""
+      ]);
       const startTime = vue.computed(() => props.parsedValue[0]);
       const endTime = vue.computed(() => props.parsedValue[1]);
       const oldValue = useOldValue(props);
@@ -20003,12 +20018,7 @@
                 class: vue.normalizeClass(vue.unref(nsTime).be("range-picker", "header"))
               }, vue.toDisplayString(vue.unref(t)("el.datepicker.startTime")), 3),
               vue.createElementVNode("div", {
-                class: vue.normalizeClass([
-                  vue.unref(nsTime).be("range-picker", "body"),
-                  vue.unref(nsTime).be("panel", "content"),
-                  vue.unref(nsTime).is("arrow", vue.unref(arrowControl)),
-                  { "has-seconds": vue.unref(showSeconds) }
-                ])
+                class: vue.normalizeClass(vue.unref(startContainerKls))
               }, [
                 vue.createVNode(TimeSpinner, {
                   ref: "minSpinner",
@@ -20033,12 +20043,7 @@
                 class: vue.normalizeClass(vue.unref(nsTime).be("range-picker", "header"))
               }, vue.toDisplayString(vue.unref(t)("el.datepicker.endTime")), 3),
               vue.createElementVNode("div", {
-                class: vue.normalizeClass([
-                  vue.unref(nsTime).be("range-picker", "body"),
-                  vue.unref(nsTime).be("panel", "content"),
-                  vue.unref(nsTime).is("arrow", vue.unref(arrowControl)),
-                  { "has-seconds": vue.unref(showSeconds) }
-                ])
+                class: vue.normalizeClass(vue.unref(endContainerKls))
               }, [
                 vue.createVNode(TimeSpinner, {
                   ref: "maxSpinner",
@@ -30515,7 +30520,7 @@
   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 = {
@@ -30588,7 +30593,7 @@
               vue.createElementVNode("stop", {
                 "stop-color": `var(${vue.unref(ns).cssVarBlockName("fill-color-1")})`,
                 offset: "0%"
-              }, null, 8, _hoisted_6$1),
+              }, null, 8, _hoisted_6$2),
               vue.createElementVNode("stop", {
                 "stop-color": `var(${vue.unref(ns).cssVarBlockName("fill-color-6")})`,
                 offset: "100%"
@@ -30761,14 +30766,8 @@
       type: Boolean,
       default: true
     },
-    hideOnClickModal: {
-      type: Boolean,
-      default: false
-    },
-    teleported: {
-      type: Boolean,
-      default: false
-    },
+    hideOnClickModal: Boolean,
+    teleported: Boolean,
     closeOnPressEscape: {
       type: Boolean,
       default: true
@@ -30832,6 +30831,16 @@
       const currentImg = vue.computed(() => {
         return props.urlList[activeIndex.value];
       });
+      const arrowPrevKls = vue.computed(() => [
+        ns.e("btn"),
+        ns.e("prev"),
+        ns.is("disabled", !props.infinite && isFirst.value)
+      ]);
+      const arrowNextKls = vue.computed(() => [
+        ns.e("btn"),
+        ns.e("next"),
+        ns.is("disabled", !props.infinite && isLast.value)
+      ]);
       const imgStyle = vue.computed(() => {
         const { scale, deg, offsetX, offsetY, enableTransition } = transform.value;
         let translateX = offsetX / scale;
@@ -31050,11 +31059,7 @@
                 vue.createCommentVNode(" ARROW "),
                 !vue.unref(isSingle) ? (vue.openBlock(), vue.createElementBlock(vue.Fragment, { key: 0 }, [
                   vue.createElementVNode("span", {
-                    class: vue.normalizeClass([
-                      vue.unref(ns).e("btn"),
-                      vue.unref(ns).e("prev"),
-                      vue.unref(ns).is("disabled", !_ctx.infinite && vue.unref(isFirst))
-                    ]),
+                    class: vue.normalizeClass(vue.unref(arrowPrevKls)),
                     onClick: prev
                   }, [
                     vue.createVNode(vue.unref(ElIcon), null, {
@@ -31065,11 +31070,7 @@
                     })
                   ], 2),
                   vue.createElementVNode("span", {
-                    class: vue.normalizeClass([
-                      vue.unref(ns).e("btn"),
-                      vue.unref(ns).e("next"),
-                      vue.unref(ns).is("disabled", !_ctx.infinite && vue.unref(isLast))
-                    ]),
+                    class: vue.normalizeClass(vue.unref(arrowNextKls)),
                     onClick: next
                   }, [
                     vue.createVNode(vue.unref(ElIcon), null, {
@@ -31167,10 +31168,7 @@
   const ElImageViewer = withInstall(ImageViewer);
 
   const imageProps = buildProps({
-    hideOnClickModal: {
-      type: Boolean,
-      default: false
-    },
+    hideOnClickModal: Boolean,
     src: {
       type: String,
       default: ""
@@ -31184,10 +31182,7 @@
       type: String,
       values: ["eager", "lazy"]
     },
-    lazy: {
-      type: Boolean,
-      default: false
-    },
+    lazy: Boolean,
     scrollContainer: {
       type: definePropType([String, Object])
     },
@@ -31195,10 +31190,7 @@
       type: definePropType(Array),
       default: () => mutable([])
     },
-    previewTeleported: {
-      type: Boolean,
-      default: false
-    },
+    previewTeleported: Boolean,
     zIndex: {
       type: Number
     },
@@ -31253,6 +31245,11 @@
       const supportLoading = isClient && "loading" in HTMLImageElement.prototype;
       let stopScrollListener;
       let stopWheelListener;
+      const imageKls = vue.computed(() => [
+        ns.e("inner"),
+        preview.value && ns.e("preview"),
+        isLoading.value && ns.is("loading")
+      ]);
       const containerStyle = vue.computed(() => rawAttrs.style);
       const imageStyle = vue.computed(() => {
         const { fit } = props;
@@ -31390,11 +31387,7 @@
               src: imageSrc.value,
               loading: _ctx.loading,
               style: vue.unref(imageStyle),
-              class: [
-                vue.unref(ns).e("inner"),
-                vue.unref(preview) && vue.unref(ns).e("preview"),
-                isLoading.value && vue.unref(ns).is("loading")
-              ],
+              class: vue.unref(imageKls),
               onClick: clickHandler,
               onLoad: handleLoad,
               onError: handleError
@@ -33284,7 +33277,6 @@
       menuVisibleOnFocus: false,
       isOnComposition: false,
       prefixWidth: 11,
-      tagInMultiLine: false,
       mouseEnter: false
     });
   }
@@ -33504,7 +33496,6 @@
         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);
         }
@@ -33642,8 +33633,7 @@
       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;
@@ -34232,8 +34222,7 @@
         options,
         cachedOptions,
         optionsCount,
-        prefixWidth,
-        tagInMultiLine
+        prefixWidth
       } = vue.toRefs(states);
       const wrapperKls = vue.computed(() => {
         const classList = [nsSelect.b()];
@@ -34287,7 +34276,7 @@
           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();
@@ -34308,7 +34297,6 @@
       return {
         isIOS,
         onOptionsRendered,
-        tagInMultiLine,
         prefixWidth,
         selectSize,
         readonly,
@@ -34534,7 +34522,8 @@
                     class: vue.normalizeClass([
                       _ctx.nsSelect.b("tags-wrapper"),
                       { "has-prefix": _ctx.prefixWidth && _ctx.selected.length }
-                    ])
+                    ]),
+                    style: vue.normalizeStyle(_ctx.prefixWidth && _ctx.selected.length ? { marginLeft: `${_ctx.prefixWidth}px` } : "")
                   }, [
                     (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(_ctx.selected, (item) => {
                       return vue.openBlock(), vue.createBlock(_component_el_tag, {
@@ -34555,11 +34544,11 @@
                         _: 2
                       }, 1032, ["closable", "size", "hit", "type", "onClose"]);
                     }), 128))
-                  ], 2)
+                  ], 6)
                 ]),
                 _: 1
               }, 8, ["onAfterLeave"])) : vue.createCommentVNode("v-if", true),
-              _ctx.filterable ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("input", {
+              _ctx.filterable && !_ctx.selectDisabled ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("input", {
                 key: 2,
                 ref: "input",
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.query = $event),
@@ -34572,7 +34561,7 @@
                 disabled: _ctx.selectDisabled,
                 autocomplete: _ctx.autocomplete,
                 style: vue.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`
@@ -34987,7 +34976,7 @@
   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 = vue.defineComponent({
     name: "ElPaginationPager"
   });
@@ -35185,7 +35174,7 @@
             "aria-current": _ctx.currentPage === _ctx.pageCount,
             "aria-label": vue.unref(t)("el.pagination.currentPage", { pager: _ctx.pageCount }),
             tabindex: vue.unref(tabindex)
-          }, vue.toDisplayString(_ctx.pageCount), 11, _hoisted_6)) : vue.createCommentVNode("v-if", true)
+          }, vue.toDisplayString(_ctx.pageCount), 11, _hoisted_6$1)) : vue.createCommentVNode("v-if", true)
         ], 42, _hoisted_1$k);
       };
     }
@@ -38919,6 +38908,13 @@
         return null;
       }).filter((v) => v !== null));
     });
+    const filteredOptionsValueMap = vue.computed(() => {
+      const valueMap = /* @__PURE__ */ new Map();
+      filteredOptions.value.forEach((option, index) => {
+        valueMap.set(getValueKey(option), { option, index });
+      });
+      return valueMap;
+    });
     const optionsAllDisabled = vue.computed(() => filteredOptions.value.every((option) => option.disabled));
     const selectSize = useFormSize();
     const collapseTagSize = vue.computed(() => selectSize.value === "small" ? "small" : "default");
@@ -38955,12 +38951,14 @@
     const indexRef = vue.computed(() => {
       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;
@@ -39304,16 +39302,16 @@
           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;
@@ -41576,14 +41574,18 @@
       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: ""
@@ -41606,6 +41608,14 @@
       type: String,
       default: ""
     },
+    activeValue: {
+      type: [Boolean, String, Number],
+      default: true
+    },
+    inactiveValue: {
+      type: [Boolean, String, Number],
+      default: false
+    },
     activeColor: {
       type: String,
       default: ""
@@ -41618,14 +41628,6 @@
       type: String,
       default: ""
     },
-    activeValue: {
-      type: [Boolean, String, Number],
-      default: true
-    },
-    inactiveValue: {
-      type: [Boolean, String, Number],
-      default: false
-    },
     name: {
       type: String,
       default: ""
@@ -41634,20 +41636,16 @@
       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 = {
@@ -41675,17 +41673,27 @@
       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"
-      }, vue.computed(() => {
-        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"
+          }, vue.computed(() => {
+            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
       });
@@ -41699,6 +41707,16 @@
         ns.is("disabled", switchDisabled.value),
         ns.is("checked", checked.value)
       ]);
+      const labelLeftKls = vue.computed(() => [
+        ns.e("label"),
+        ns.em("label", "left"),
+        ns.is("active", !checked.value)
+      ]);
+      const labelRightKls = vue.computed(() => [
+        ns.e("label"),
+        ns.em("label", "right"),
+        ns.is("active", checked.value)
+      ]);
       const coreStyle = vue.computed(() => ({
         width: addUnit(props.width)
       }));
@@ -41803,11 +41821,7 @@
           }, null, 42, _hoisted_2$9),
           !_ctx.inlinePrompt && (_ctx.inactiveIcon || _ctx.inactiveText) ? (vue.openBlock(), vue.createElementBlock("span", {
             key: 0,
-            class: vue.normalizeClass([
-              vue.unref(ns).e("label"),
-              vue.unref(ns).em("label", "left"),
-              vue.unref(ns).is("active", !vue.unref(checked))
-            ])
+            class: vue.normalizeClass(vue.unref(labelLeftKls))
           }, [
             _ctx.inactiveIcon ? (vue.openBlock(), vue.createBlock(vue.unref(ElIcon), { key: 0 }, {
               default: vue.withCtx(() => [
@@ -41860,11 +41874,7 @@
           ], 6),
           !_ctx.inlinePrompt && (_ctx.activeIcon || _ctx.activeText) ? (vue.openBlock(), vue.createElementBlock("span", {
             key: 1,
-            class: vue.normalizeClass([
-              vue.unref(ns).e("label"),
-              vue.unref(ns).em("label", "right"),
-              vue.unref(ns).is("active", vue.unref(checked))
-            ])
+            class: vue.normalizeClass(vue.unref(labelRightKls))
           }, [
             _ctx.activeIcon ? (vue.openBlock(), vue.createBlock(vue.unref(ElIcon), { key: 0 }, {
               default: vue.withCtx(() => [
@@ -42667,7 +42677,7 @@
   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);
@@ -45053,6 +45063,7 @@
     const bodyScrollHeight = vue.ref(0);
     const headerScrollHeight = vue.ref(0);
     const footerScrollHeight = vue.ref(0);
+    const appendScrollHeight = vue.ref(0);
     vue.watchEffect(() => {
       layout.setHeight(props.height);
     });
@@ -45192,7 +45203,7 @@
       });
     };
     const resizeListener = () => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d;
       const el = table.vnode.el;
       if (!table.$ready || !el)
         return;
@@ -45217,7 +45228,8 @@
       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,
@@ -45415,7 +45427,8 @@
       type: Boolean,
       default: false
     },
-    flexible: Boolean
+    flexible: Boolean,
+    showOverflowTooltip: [Boolean, Object]
   };
 
   const useScrollbar$1 = () => {
@@ -46199,7 +46212,10 @@
     columnKey: String,
     align: String,
     headerAlign: String,
-    showOverflowTooltip: [Boolean, Object],
+    showOverflowTooltip: {
+      type: [Boolean, Object],
+      default: void 0
+    },
     fixed: [Boolean, String],
     formatter: Function,
     selectable: Function,
@@ -46261,6 +46277,7 @@
         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,
@@ -46268,7 +46285,7 @@
           property: props.prop || props.property,
           align: realAlign,
           headerAlign: realHeaderAlign,
-          showOverflowTooltip: props.showOverflowTooltip,
+          showOverflowTooltip,
           filterable: props.filters || props.filterMethod,
           filteredValue: [],
           filterPlacement: "",
@@ -53542,8 +53559,9 @@
   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 = vue.defineComponent({
     name: "ElUploadList"
   });
@@ -53610,8 +53628,9 @@
                         _: 1
                       }, 8, ["class"]),
                       vue.createElementVNode("span", {
-                        class: vue.normalizeClass(vue.unref(nsUpload).be("list", "item-file-name"))
-                      }, vue.toDisplayString(file.name), 3)
+                        class: vue.normalizeClass(vue.unref(nsUpload).be("list", "item-file-name")),
+                        title: file.name
+                      }, vue.toDisplayString(file.name), 11, _hoisted_4$1)
                     ], 10, _hoisted_3$2),
                     file.status === "uploading" ? (vue.openBlock(), vue.createBlock(vue.unref(ElProgress), {
                       key: 0,
@@ -53675,7 +53694,7 @@
                         ]),
                         _: 1
                       }, 8, ["class"])
-                    ], 10, _hoisted_4$1),
+                    ], 10, _hoisted_5),
                     !vue.unref(disabled) ? (vue.openBlock(), vue.createElementBlock("span", {
                       key: 0,
                       class: vue.normalizeClass(vue.unref(nsUpload).be("list", "item-delete")),
@@ -53689,7 +53708,7 @@
                         ]),
                         _: 1
                       }, 8, ["class"])
-                    ], 10, _hoisted_5)) : vue.createCommentVNode("v-if", true)
+                    ], 10, _hoisted_6)) : vue.createCommentVNode("v-if", true)
                   ], 2)) : vue.createCommentVNode("v-if", true)
                 ])
               ], 42, _hoisted_1$5);