element-plus 2.3.0 → 2.3.2

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Element Plus v2.3.0 */
+/*! Element Plus v2.3.2 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
@@ -119,7 +119,7 @@
   const isString$2 = (val) => typeof val === "string";
   const noop$1 = () => {
   };
-  isClient && ((_a = window == null ? void 0 : window.navigator) == null ? void 0 : _a.userAgent) && /iP(ad|hone|od)/.test(window.navigator.userAgent);
+  const isIOS = isClient && ((_a = window == null ? void 0 : window.navigator) == null ? void 0 : _a.userAgent) && /iP(ad|hone|od)/.test(window.navigator.userAgent);
 
   function resolveUnref(r) {
     return typeof r === "function" ? r() : vue.unref(r);
@@ -9519,7 +9519,7 @@
     const vm = vue.getCurrentInstance();
     return vue.computed(() => {
       var _a, _b;
-      return (_b = ((_a = vm.proxy) == null ? void 0 : _a.$props)[name]) != null ? _b : void 0;
+      return (_b = (_a = vm == null ? void 0 : vm.proxy) == null ? void 0 : _a.$props) == null ? void 0 : _b[name];
     });
   };
 
@@ -9920,7 +9920,10 @@
     close
   }) => {
     const { registerTimeout } = useTimeout();
-    const { registerTimeout: registerTimeoutForAutoClose } = useTimeout();
+    const {
+      registerTimeout: registerTimeoutForAutoClose,
+      cancelTimeout: cancelTimeoutForAutoClose
+    } = useTimeout();
     const onOpen = (event) => {
       registerTimeout(() => {
         open(event);
@@ -9933,6 +9936,7 @@
       }, vue.unref(showAfter));
     };
     const onClose = (event) => {
+      cancelTimeoutForAutoClose();
       registerTimeout(() => {
         close(event);
       }, vue.unref(hideAfter));
@@ -11221,7 +11225,7 @@
 
   const ElConfigProvider = withInstall(ConfigProvider);
 
-  const version$1 = "2.3.0";
+  const version$1 = "2.3.2";
 
   const makeInstaller = (components = []) => {
     const install = (app, options) => {
@@ -11668,7 +11672,10 @@
       type: Boolean,
       default: false
     },
-    scrollToError: Boolean
+    scrollToError: Boolean,
+    scrollIntoViewOptions: {
+      type: [Object, Boolean]
+    }
   });
   const formEmits = {
     validate: (prop, isValid, message) => (isArray$1(prop) || isString$1(prop)) && isBoolean$1(isValid) && isString$1(message)
@@ -11811,7 +11818,7 @@
         var _a;
         const field = filterFields(fields, prop)[0];
         if (field) {
-          (_a = field.$el) == null ? void 0 : _a.scrollIntoView();
+          (_a = field.$el) == null ? void 0 : _a.scrollIntoView(props.scrollIntoViewOptions);
         }
       };
       vue.watch(() => props.rules, () => {
@@ -13508,7 +13515,7 @@
 
   const _hoisted_1$12 = ["role"];
   const _hoisted_2$G = ["id", "type", "disabled", "formatter", "parser", "readonly", "autocomplete", "tabindex", "aria-label", "placeholder", "form"];
-  const _hoisted_3$k = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
+  const _hoisted_3$l = ["id", "tabindex", "disabled", "readonly", "autocomplete", "aria-label", "placeholder", "form"];
   const __default__$1x = vue.defineComponent({
     name: "ElInput",
     inheritAttrs: false
@@ -13596,6 +13603,7 @@
       const suffixVisible = vue.computed(() => !!slots.suffix || !!props.suffixIcon || showClear.value || props.showPassword || isWordLimitVisible.value || !!validateState.value && needStatusIcon.value);
       const [recordCursor, setCursor] = useCursor(input);
       useResizeObserver(textarea, (entries) => {
+        onceInitSizeTextarea();
         if (!isWordLimitVisible.value || props.resize !== "both")
           return;
         const entry = entries[0];
@@ -13611,15 +13619,35 @@
         if (autosize) {
           const minRows = isObject$1(autosize) ? autosize.minRows : void 0;
           const maxRows = isObject$1(autosize) ? autosize.maxRows : void 0;
+          const textareaStyle2 = calcTextareaHeight(textarea.value, minRows, maxRows);
           textareaCalcStyle.value = {
-            ...calcTextareaHeight(textarea.value, minRows, maxRows)
+            overflowY: "hidden",
+            ...textareaStyle2
           };
+          vue.nextTick(() => {
+            textarea.value.offsetHeight;
+            textareaCalcStyle.value = textareaStyle2;
+          });
         } else {
           textareaCalcStyle.value = {
             minHeight: calcTextareaHeight(textarea.value).minHeight
           };
         }
       };
+      const createOnceInitResize = (resizeTextarea2) => {
+        let isInit = false;
+        return () => {
+          var _a;
+          if (isInit || !props.autosize)
+            return;
+          const isElHidden = ((_a = textarea.value) == null ? void 0 : _a.offsetParent) === null;
+          if (!isElHidden) {
+            resizeTextarea2();
+            isInit = true;
+          }
+        };
+      };
+      const onceInitSizeTextarea = createOnceInitResize(resizeTextarea);
       const setNativeInputValue = () => {
         const input2 = _ref.value;
         if (!input2 || input2.value === nativeInputValue.value)
@@ -13906,7 +13934,7 @@
               onBlur: handleBlur,
               onChange: handleChange,
               onKeydown: handleKeydown
-            }), null, 16, _hoisted_3$k),
+            }), null, 16, _hoisted_3$l),
             vue.unref(isWordLimitVisible) ? (vue.openBlock(), vue.createElementBlock("span", {
               key: 0,
               style: vue.normalizeStyle(countStyle.value),
@@ -16000,7 +16028,7 @@
 
   const _hoisted_1$10 = ["aria-expanded", "aria-owns"];
   const _hoisted_2$E = { key: 0 };
-  const _hoisted_3$j = ["id", "aria-selected", "onClick"];
+  const _hoisted_3$k = ["id", "aria-selected", "onClick"];
   const COMPONENT_NAME$i = "ElAutocomplete";
   const __default__$1o = vue.defineComponent({
     name: COMPONENT_NAME$i,
@@ -16266,7 +16294,7 @@
                       vue.renderSlot(_ctx.$slots, "default", { item }, () => [
                         vue.createTextVNode(vue.toDisplayString(item[_ctx.valueKey]), 1)
                       ])
-                    ], 10, _hoisted_3$j);
+                    ], 10, _hoisted_3$k);
                   }), 128))
                 ]),
                 _: 3
@@ -21515,7 +21543,7 @@
 
   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$i = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
+  const _hoisted_3$j = ["id", "aria-hidden", "disabled", "value", "name", "tabindex"];
   const __default__$1a = vue.defineComponent({
     name: "ElCheckbox"
   });
@@ -21601,7 +21629,7 @@
                 onChange: _cache[5] || (_cache[5] = (...args) => vue.unref(handleChange) && vue.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$i)), [
+              }, null, 42, _hoisted_3$j)), [
                 [vue.vModelCheckbox, vue.unref(model)]
               ]),
               vue.createElementVNode("span", {
@@ -23137,7 +23165,7 @@
 
   const _hoisted_1$N = { key: 0 };
   const _hoisted_2$w = ["placeholder", "onKeydown"];
-  const _hoisted_3$h = ["onClick"];
+  const _hoisted_3$i = ["onClick"];
   const COMPONENT_NAME$e = "ElCascader";
   const __default__$13 = vue.defineComponent({
     name: COMPONENT_NAME$e
@@ -23241,6 +23269,10 @@
       const inputClass = vue.computed(() => {
         return nsCascader.is("focus", popperVisible.value || filterFocus.value);
       });
+      const contentRef = vue.computed(() => {
+        var _a, _b;
+        return (_b = (_a = tooltipRef.value) == null ? void 0 : _a.popperRef) == null ? void 0 : _b.contentRef;
+      });
       const togglePopperVisible = (visible) => {
         var _a, _b, _c;
         if (isDisabled.value)
@@ -23504,7 +23536,8 @@
       expose({
         getCheckedNodes,
         cascaderPanelRef,
-        togglePopperVisible
+        togglePopperVisible,
+        contentRef
       });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(vue.unref(ElTooltip), {
@@ -23662,7 +23695,7 @@
                 ]) : vue.createCommentVNode("v-if", true)
               ], 2)) : vue.createCommentVNode("v-if", true)
             ], 38)), [
-              [vue.unref(ClickOutside), () => togglePopperVisible(false), cascaderPanelRef.value]
+              [vue.unref(ClickOutside), () => togglePopperVisible(false), vue.unref(contentRef)]
             ])
           ]),
           content: vue.withCtx(() => [
@@ -23707,7 +23740,7 @@
                       ]),
                       _: 1
                     })) : vue.createCommentVNode("v-if", true)
-                  ], 10, _hoisted_3$h);
+                  ], 10, _hoisted_3$i);
                 }), 128)) : vue.renderSlot(_ctx.$slots, "empty", { key: 1 }, () => [
                   vue.createElementVNode("li", {
                     class: vue.normalizeClass(vue.unref(nsCascader).e("empty-text"))
@@ -24190,7 +24223,7 @@
 
   const _hoisted_1$M = ["aria-expanded", "aria-controls", "aria-describedby"];
   const _hoisted_2$v = ["id", "tabindex"];
-  const _hoisted_3$g = ["id", "aria-hidden", "aria-labelledby"];
+  const _hoisted_3$h = ["id", "aria-hidden", "aria-labelledby"];
   const __default__$Z = vue.defineComponent({
     name: "ElCollapseItem"
   });
@@ -24266,7 +24299,7 @@
                 }, [
                   vue.renderSlot(_ctx.$slots, "default")
                 ], 2)
-              ], 10, _hoisted_3$g), [
+              ], 10, _hoisted_3$h), [
                 [vue.vShow, vue.unref(isActive)]
               ])
             ]),
@@ -25883,7 +25916,7 @@
     key: 0,
     scope: "col"
   };
-  const _hoisted_3$f = ["aria-label"];
+  const _hoisted_3$g = ["aria-label"];
   const _hoisted_4$b = ["aria-current", "aria-selected", "tabindex"];
   const _sfc_main$1l = /* @__PURE__ */ vue.defineComponent({
     __name: "basic-date-table",
@@ -26201,7 +26234,7 @@
                   key,
                   scope: "col",
                   "aria-label": vue.unref(t)("el.datepicker.weeksFull." + week)
-                }, vue.toDisplayString(vue.unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$f);
+                }, vue.toDisplayString(vue.unref(t)("el.datepicker.weeks." + week)), 9, _hoisted_3$g);
               }), 128))
             ]),
             (vue.openBlock(true), vue.createElementBlock(vue.Fragment, null, vue.renderList(vue.unref(rows), (row, rowKey) => {
@@ -26239,7 +26272,7 @@
 
   const _hoisted_1$H = ["aria-label"];
   const _hoisted_2$s = ["aria-selected", "aria-label", "tabindex", "onKeydown"];
-  const _hoisted_3$e = { class: "cell" };
+  const _hoisted_3$f = { class: "cell" };
   const _sfc_main$1k = /* @__PURE__ */ vue.defineComponent({
     __name: "basic-month-table",
     props: basicMonthTableProps,
@@ -26422,7 +26455,7 @@
                     ]
                   }, [
                     vue.createElementVNode("div", null, [
-                      vue.createElementVNode("span", _hoisted_3$e, vue.toDisplayString(vue.unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
+                      vue.createElementVNode("span", _hoisted_3$f, vue.toDisplayString(vue.unref(t)("el.datepicker.months." + months.value[cell.text])), 1)
                     ])
                   ], 42, _hoisted_2$s);
                 }), 128))
@@ -26444,7 +26477,7 @@
 
   const _hoisted_1$G = ["aria-label"];
   const _hoisted_2$r = ["aria-selected", "tabindex", "onKeydown"];
-  const _hoisted_3$d = { class: "cell" };
+  const _hoisted_3$e = { class: "cell" };
   const _hoisted_4$a = { key: 1 };
   const _sfc_main$1j = /* @__PURE__ */ vue.defineComponent({
     __name: "basic-year-table",
@@ -26529,7 +26562,7 @@
                         vue.withKeys(vue.withModifiers(handleYearTableClick, ["prevent", "stop"]), ["enter"])
                       ]
                     }, [
-                      vue.createElementVNode("span", _hoisted_3$d, vue.toDisplayString(vue.unref(startYear) + i * 4 + j), 1)
+                      vue.createElementVNode("span", _hoisted_3$e, vue.toDisplayString(vue.unref(startYear) + i * 4 + j), 1)
                     ], 42, _hoisted_2$r)) : (vue.openBlock(), vue.createElementBlock("td", _hoisted_4$a))
                   ], 64);
                 }), 64))
@@ -26544,7 +26577,7 @@
 
   const _hoisted_1$F = ["onClick"];
   const _hoisted_2$q = ["aria-label"];
-  const _hoisted_3$c = ["aria-label"];
+  const _hoisted_3$d = ["aria-label"];
   const _hoisted_4$9 = ["aria-label"];
   const _hoisted_5$7 = ["aria-label"];
   const _sfc_main$1i = /* @__PURE__ */ vue.defineComponent({
@@ -27035,7 +27068,7 @@
                       ]),
                       _: 1
                     })
-                  ], 10, _hoisted_3$c), [
+                  ], 10, _hoisted_3$d), [
                     [vue.vShow, currentView.value === "date"]
                   ])
                 ], 2),
@@ -27274,7 +27307,7 @@
 
   const _hoisted_1$E = ["onClick"];
   const _hoisted_2$p = ["disabled"];
-  const _hoisted_3$b = ["disabled"];
+  const _hoisted_3$c = ["disabled"];
   const _hoisted_4$8 = ["disabled"];
   const _hoisted_5$6 = ["disabled"];
   const unit$1 = "month";
@@ -27790,7 +27823,7 @@
                       ]),
                       _: 1
                     })
-                  ], 10, _hoisted_3$b)) : vue.createCommentVNode("v-if", true),
+                  ], 10, _hoisted_3$c)) : vue.createCommentVNode("v-if", true),
                   vue.createElementVNode("div", null, vue.toDisplayString(vue.unref(leftLabel)), 1)
                 ], 2),
                 vue.createVNode(DateTable, {
@@ -27974,7 +28007,7 @@
 
   const _hoisted_1$D = ["onClick"];
   const _hoisted_2$o = ["disabled"];
-  const _hoisted_3$a = ["disabled"];
+  const _hoisted_3$b = ["disabled"];
   const unit = "year";
   const __default__$R = vue.defineComponent({
     name: "DatePickerMonthRange"
@@ -28151,7 +28184,7 @@
                       ]),
                       _: 1
                     })
-                  ], 10, _hoisted_3$a)) : vue.createCommentVNode("v-if", true),
+                  ], 10, _hoisted_3$b)) : vue.createCommentVNode("v-if", true),
                   vue.createElementVNode("button", {
                     type: "button",
                     class: vue.normalizeClass([vue.unref(ppNs).e("icon-btn"), "d-arrow-right"]),
@@ -29280,7 +29313,7 @@
   });
   const _hoisted_1$z = ["aria-label", "aria-labelledby", "aria-describedby"];
   const _hoisted_2$m = ["id"];
-  const _hoisted_3$9 = ["aria-label"];
+  const _hoisted_3$a = ["aria-label"];
   const _hoisted_4$7 = ["id"];
   function _sfc_render$o(_ctx, _cache, $props, $setup, $data, $options) {
     const _component_close = vue.resolveComponent("close");
@@ -29366,7 +29399,7 @@
                           ]),
                           _: 1
                         }, 8, ["class"])
-                      ], 10, _hoisted_3$9)) : vue.createCommentVNode("v-if", true)
+                      ], 10, _hoisted_3$a)) : vue.createCommentVNode("v-if", true)
                     ], 2)) : vue.createCommentVNode("v-if", true),
                     _ctx.rendered ? (vue.openBlock(), vue.createElementBlock("div", {
                       key: 1,
@@ -30439,7 +30472,7 @@
     "xmlns:xlink": "http://www.w3.org/1999/xlink"
   };
   const _hoisted_2$l = ["id"];
-  const _hoisted_3$8 = ["stop-color"];
+  const _hoisted_3$9 = ["stop-color"];
   const _hoisted_4$6 = ["stop-color"];
   const _hoisted_5$5 = ["id"];
   const _hoisted_6$1 = ["stop-color"];
@@ -30499,7 +30532,7 @@
               vue.createElementVNode("stop", {
                 "stop-color": `var(${vue.unref(ns).cssVarBlockName("fill-color-1")})`,
                 offset: "0%"
-              }, null, 8, _hoisted_3$8),
+              }, null, 8, _hoisted_3$9),
               vue.createElementVNode("stop", {
                 "stop-color": `var(${vue.unref(ns).cssVarBlockName("fill-color-4")})`,
                 offset: "100%"
@@ -31551,12 +31584,12 @@
         var _a;
         const oldVal = data.currentValue;
         const newVal = verifyValue(value);
-        if (oldVal === newVal)
-          return;
         if (!emitChange) {
           emit(UPDATE_MODEL_EVENT, newVal);
           return;
         }
+        if (oldVal === newVal)
+          return;
         data.userInput = null;
         emit(UPDATE_MODEL_EVENT, newVal);
         emit(CHANGE_EVENT, newVal, oldVal);
@@ -33224,6 +33257,7 @@
     }, vue.computed(() => props.suffixTransition === false));
     const reference = vue.ref(null);
     const input = vue.ref(null);
+    const iOSInput = vue.ref(null);
     const tooltipRef = vue.ref(null);
     const tags = vue.ref(null);
     const selectWrapper = vue.ref(null);
@@ -33322,7 +33356,7 @@
       deep: true
     });
     vue.watch(() => states.visible, (val) => {
-      var _a, _b, _c;
+      var _a, _b, _c, _d, _e;
       if (!val) {
         if (props.filterable) {
           if (isFunction$1(props.filterMethod)) {
@@ -33363,8 +33397,9 @@
         if (props.filterable) {
           states.filteredOptionsCount = states.optionsCount;
           states.query = props.remote ? "" : states.selectedLabel;
+          (_d = (_c = iOSInput.value) == null ? void 0 : _c.focus) == null ? void 0 : _d.call(_c);
           if (props.multiple) {
-            (_c = input.value) == null ? void 0 : _c.focus();
+            (_e = input.value) == null ? void 0 : _e.focus();
           } else {
             if (states.selectedLabel) {
               states.currentPlaceholder = `${states.selectedLabel}`;
@@ -33750,9 +33785,10 @@
       }
     };
     const blur = () => {
-      var _a;
+      var _a, _b, _c;
       states.visible = false;
       (_a = reference.value) == null ? void 0 : _a.blur();
+      (_c = (_b = iOSInput.value) == null ? void 0 : _b.blur) == null ? void 0 : _c.call(_b);
     };
     const handleBlur = (event) => {
       vue.nextTick(() => {
@@ -33890,6 +33926,7 @@
       collapseTagList,
       reference,
       input,
+      iOSInput,
       tooltipRef,
       tags,
       selectWrapper,
@@ -34117,6 +34154,7 @@
         dropMenuVisible,
         reference,
         input,
+        iOSInput,
         tooltipRef,
         tags,
         selectWrapper,
@@ -34221,6 +34259,7 @@
         optionList.value = v;
       };
       return {
+        isIOS,
         onOptionsRendered,
         tagInMultiLine,
         prefixWidth,
@@ -34276,6 +34315,7 @@
         focus,
         reference,
         input,
+        iOSInput,
         tooltipRef,
         popperPaneRef,
         tags,
@@ -34293,7 +34333,8 @@
     }
   });
   const _hoisted_1$n = ["disabled", "autocomplete"];
-  const _hoisted_2$f = { style: { "height": "100%", "display": "flex", "justify-content": "center", "align-items": "center" } };
+  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) {
     const _component_el_tag = vue.resolveComponent("el-tag");
     const _component_el_tooltip = vue.resolveComponent("el-tooltip");
@@ -34337,7 +34378,10 @@
             _ctx.multiple ? (vue.openBlock(), vue.createElementBlock("div", {
               key: 0,
               ref: "tags",
-              class: vue.normalizeClass(_ctx.nsSelect.e("tags")),
+              class: vue.normalizeClass([
+                _ctx.nsSelect.e("tags"),
+                _ctx.nsSelect.is("disabled", _ctx.selectDisabled)
+              ]),
               style: vue.normalizeStyle(_ctx.selectTagsStyle)
             }, [
               _ctx.collapseTags && _ctx.selected.length ? (vue.openBlock(), vue.createBlock(vue.Transition, {
@@ -34475,7 +34519,11 @@
                 ref: "input",
                 "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => _ctx.query = $event),
                 type: "text",
-                class: vue.normalizeClass([_ctx.nsSelect.e("input"), _ctx.nsSelect.is(_ctx.selectSize)]),
+                class: vue.normalizeClass([
+                  _ctx.nsSelect.e("input"),
+                  _ctx.nsSelect.is(_ctx.selectSize),
+                  _ctx.nsSelect.is("disabled", _ctx.selectDisabled)
+                ]),
                 disabled: _ctx.selectDisabled,
                 autocomplete: _ctx.autocomplete,
                 style: vue.normalizeStyle({
@@ -34504,6 +34552,18 @@
                 [vue.vModelText, _ctx.query]
               ]) : vue.createCommentVNode("v-if", true)
             ], 6)) : vue.createCommentVNode("v-if", true),
+            vue.createCommentVNode(" fix: https://github.com/element-plus/element-plus/issues/11415 "),
+            _ctx.isIOS && !_ctx.multiple && _ctx.filterable && _ctx.readonly ? (vue.openBlock(), vue.createElementBlock("input", {
+              key: 1,
+              ref: "iOSInput",
+              class: vue.normalizeClass([
+                _ctx.nsSelect.e("input"),
+                _ctx.nsSelect.is(_ctx.selectSize),
+                _ctx.nsSelect.em("input", "iOS")
+              ]),
+              disabled: _ctx.selectDisabled,
+              type: "text"
+            }, null, 10, _hoisted_2$f)) : vue.createCommentVNode("v-if", true),
             vue.createVNode(_component_el_input, {
               id: _ctx.id,
               ref: "reference",
@@ -34560,7 +34620,7 @@
               _ctx.$slots.prefix ? {
                 name: "prefix",
                 fn: vue.withCtx(() => [
-                  vue.createElementVNode("div", _hoisted_2$f, [
+                  vue.createElementVNode("div", _hoisted_3$8, [
                     vue.renderSlot(_ctx.$slots, "prefix")
                   ])
                 ])
@@ -34794,11 +34854,11 @@
         return (_a = userInput.value) != null ? _a : currentPage == null ? void 0 : currentPage.value;
       });
       function handleInput(val) {
-        userInput.value = +val;
+        userInput.value = val ? +val : "";
       }
       function handleChange(val) {
         val = Math.trunc(+val);
-        changeEvent == null ? void 0 : changeEvent(+val);
+        changeEvent == null ? void 0 : changeEvent(val);
         userInput.value = void 0;
       }
       return (_ctx, _cache) => {
@@ -39259,6 +39319,11 @@
     vue.watch(filteredOptions, () => {
       return vue.nextTick(menuRef.value.resetScrollTop);
     });
+    vue.watch(() => dropdownMenuVisible.value, (val) => {
+      if (!val) {
+        resetHoveringIndex();
+      }
+    });
     vue.onMounted(() => {
       initStates();
     });
@@ -45994,7 +46059,9 @@
           } else {
             children = originRenderCell(data);
           }
-          const shouldCreatePlaceholder = hasTreeColumn.value && data.cellIndex === 0 && data.column.type !== "selection";
+          const { columns } = owner.value.store.states;
+          const firstUserColumnIndex = columns.value.findIndex((item) => item.type === "default");
+          const shouldCreatePlaceholder = hasTreeColumn.value && data.cellIndex === firstUserColumnIndex;
           const prefix = treeCellPrefix(data, shouldCreatePlaceholder);
           const props2 = {
             class: "cell",
@@ -53703,8 +53770,11 @@
           return doUpload(rawFile);
         }
         let hookResult;
+        let beforeData = {};
         try {
-          hookResult = await props.beforeUpload(rawFile);
+          const beforeUploadPromise = props.beforeUpload(rawFile);
+          beforeData = isObject$1(props.data) ? cloneDeep(props.data) : props.data;
+          hookResult = await beforeUploadPromise;
         } catch (e) {
           hookResult = false;
         }
@@ -53724,9 +53794,9 @@
         }
         doUpload(Object.assign(file, {
           uid: rawFile.uid
-        }));
+        }), beforeData);
       };
-      const doUpload = (rawFile) => {
+      const doUpload = (rawFile, beforeData) => {
         const {
           headers,
           data,
@@ -53744,7 +53814,7 @@
           headers: headers || {},
           withCredentials,
           file: rawFile,
-          data,
+          data: beforeData != null ? beforeData : data,
           method,
           filename,
           action,