element-plus 2.3.4 → 2.3.6

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Element Plus v2.3.4 */
+/*! Element Plus v2.3.6 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
@@ -9614,23 +9614,6 @@
     };
   }
 
-  const useRestoreActive = (toggle, initialFocus) => {
-    let previousActive;
-    vue.watch(() => toggle.value, (val) => {
-      var _a, _b;
-      if (val) {
-        previousActive = document.activeElement;
-        if (vue.isRef(initialFocus)) {
-          (_b = (_a = initialFocus.value).focus) == null ? void 0 : _b.call(_a);
-        }
-      } else {
-        {
-          previousActive.focus();
-        }
-      }
-    });
-  };
-
   const useSameTarget = (handleClick) => {
     if (!handleClick) {
       return { onClick: NOOP, onMousedown: NOOP, onMouseup: NOOP };
@@ -11225,7 +11208,7 @@
 
   const ElConfigProvider = withInstall(ConfigProvider);
 
-  const version$1 = "2.3.4";
+  const version$1 = "2.3.6";
 
   const makeInstaller = (components = []) => {
     const install = (app, options) => {
@@ -15289,8 +15272,8 @@
     const contentStyle = vue.computed(() => {
       return [
         { zIndex: vue.unref(contentZIndex) },
-        props.popperStyle || {},
-        vue.unref(styles).popper
+        vue.unref(styles).popper,
+        props.popperStyle || {}
       ];
     });
     const ariaModal = vue.computed(() => role.value === "dialog" ? "false" : void 0);
@@ -20808,12 +20791,24 @@
     const timer = vue.ref(null);
     const hover = vue.ref(false);
     const root = vue.ref();
+    const containerHeight = vue.ref(0);
     const arrowDisplay = vue.computed(() => props.arrow !== "never" && !vue.unref(isVertical));
     const hasLabel = vue.computed(() => {
       return items.value.some((item) => item.props.label.toString().length > 0);
     });
     const isCardType = vue.computed(() => props.type === "card");
     const isVertical = vue.computed(() => props.direction === "vertical");
+    const containerStyle = vue.computed(() => {
+      if (props.height !== "auto") {
+        return {
+          height: props.height
+        };
+      }
+      return {
+        height: `${containerHeight.value}px`,
+        overflow: "hidden"
+      };
+    });
     const throttledArrowClick = throttle((index) => {
       setActiveItem(index);
     }, THROTTLE_TIME, { trailing: true });
@@ -20932,6 +20927,11 @@
       pauseTimer();
       startTimer();
     }
+    function setContainerHeight(height) {
+      if (props.height !== "auto")
+        return;
+      containerHeight.value = height;
+    }
     vue.watch(() => activeIndex.value, (current, prev2) => {
       resetItemPosition(prev2);
       if (prev2 > -1) {
@@ -20971,7 +20971,8 @@
       loop: props.loop,
       addItem,
       removeItem,
-      setActiveItem
+      setActiveItem,
+      setContainerHeight
     });
     return {
       root,
@@ -20981,6 +20982,8 @@
       hover,
       isCardType,
       items,
+      isVertical,
+      containerStyle,
       handleButtonEnter,
       handleButtonLeave,
       handleIndicatorClick,
@@ -21014,6 +21017,8 @@
         hover,
         isCardType,
         items,
+        isVertical,
+        containerStyle,
         handleButtonEnter,
         handleButtonLeave,
         handleIndicatorClick,
@@ -21038,9 +21043,12 @@
         if (vue.unref(hasLabel)) {
           classes.push(ns.em("indicators", "labels"));
         }
-        if (props.indicatorPosition === "outside" || vue.unref(isCardType)) {
+        if (props.indicatorPosition === "outside") {
           classes.push(ns.em("indicators", "outside"));
         }
+        if (vue.unref(isVertical)) {
+          classes.push(ns.em("indicators", "right"));
+        }
         return classes;
       });
       expose({
@@ -21058,7 +21066,7 @@
         }, [
           vue.createElementVNode("div", {
             class: vue.normalizeClass(vue.unref(ns).e("container")),
-            style: vue.normalizeStyle({ height: _ctx.height })
+            style: vue.normalizeStyle(vue.unref(containerStyle))
           }, [
             vue.unref(arrowDisplay) ? (vue.openBlock(), vue.createBlock(vue.Transition, {
               key: 0,
@@ -21159,6 +21167,7 @@
     const carouselContext = vue.inject(carouselContextKey);
     const instance = vue.getCurrentInstance();
     const CARD_SCALE = 0.83;
+    const carouselItemRef = vue.ref();
     const hover = vue.ref(false);
     const translate = vue.ref(0);
     const scale = vue.ref(1);
@@ -21184,8 +21193,8 @@
       return index;
     }
     function calcCardTranslate(index, activeIndex) {
-      var _a;
-      const parentWidth = ((_a = carouselContext.root.value) == null ? void 0 : _a.offsetWidth) || 0;
+      var _a, _b;
+      const parentWidth = vue.unref(isVertical) ? ((_a = carouselContext.root.value) == null ? void 0 : _a.offsetHeight) || 0 : ((_b = carouselContext.root.value) == null ? void 0 : _b.offsetWidth) || 0;
       if (inStage.value) {
         return parentWidth * ((2 - CARD_SCALE) * (index - activeIndex) + 1) / 4;
       } else if (index < activeIndex) {
@@ -21222,6 +21231,9 @@
         translate.value = calcTranslate(index, activeIndex, _isVertical);
       }
       ready.value = true;
+      if (isActive && carouselItemRef.value) {
+        carouselContext.setContainerHeight(carouselItemRef.value.offsetHeight);
+      }
     };
     function handleItemClick() {
       if (carouselContext && vue.unref(isCardType)) {
@@ -21249,6 +21261,7 @@
       carouselContext.removeItem(instance.uid);
     });
     return {
+      carouselItemRef,
       active,
       animating,
       hover,
@@ -21272,6 +21285,7 @@
       const props = __props;
       const ns = useNamespace("carousel");
       const {
+        carouselItemRef,
         active,
         animating,
         hover,
@@ -21294,13 +21308,18 @@
       });
       return (_ctx, _cache) => {
         return vue.withDirectives((vue.openBlock(), vue.createElementBlock("div", {
+          ref_key: "carouselItemRef",
+          ref: carouselItemRef,
           class: vue.normalizeClass([
             vue.unref(ns).e("item"),
             vue.unref(ns).is("active", vue.unref(active)),
             vue.unref(ns).is("in-stage", vue.unref(inStage)),
             vue.unref(ns).is("hover", vue.unref(hover)),
             vue.unref(ns).is("animating", vue.unref(animating)),
-            { [vue.unref(ns).em("item", "card")]: vue.unref(isCardType) }
+            {
+              [vue.unref(ns).em("item", "card")]: vue.unref(isCardType),
+              [vue.unref(ns).em("item", "card-vertical")]: vue.unref(isCardType) && vue.unref(isVertical)
+            }
           ]),
           style: vue.normalizeStyle(vue.unref(itemStyle)),
           onClick: _cache[0] || (_cache[0] = (...args) => vue.unref(handleItemClick) && vue.unref(handleItemClick)(...args))
@@ -23008,14 +23027,14 @@
   const ElCascaderPanel = _CascaderPanel;
 
   const tagProps = buildProps({
-    closable: Boolean,
     type: {
       type: String,
       values: ["success", "info", "warning", "danger", ""],
       default: ""
     },
-    hit: Boolean,
+    closable: Boolean,
     disableTransitions: Boolean,
+    hit: Boolean,
     color: {
       type: String,
       default: ""
@@ -23048,7 +23067,7 @@
       const props = __props;
       const tagSize = useFormSize();
       const ns = useNamespace("tag");
-      const classes = vue.computed(() => {
+      const containerKls = vue.computed(() => {
         const { type, hit, effect, closable, round } = props;
         return [
           ns.b(),
@@ -23069,7 +23088,7 @@
       return (_ctx, _cache) => {
         return _ctx.disableTransitions ? (vue.openBlock(), vue.createElementBlock("span", {
           key: 0,
-          class: vue.normalizeClass(vue.unref(classes)),
+          class: vue.normalizeClass(vue.unref(containerKls)),
           style: vue.normalizeStyle({ backgroundColor: _ctx.color }),
           onClick: handleClick
         }, [
@@ -23095,7 +23114,7 @@
         }, {
           default: vue.withCtx(() => [
             vue.createElementVNode("span", {
-              class: vue.normalizeClass(vue.unref(classes)),
+              class: vue.normalizeClass(vue.unref(containerKls)),
               style: vue.normalizeStyle({ backgroundColor: _ctx.color }),
               onClick: handleClick
             }, [
@@ -23801,6 +23820,7 @@
     setup(__props, { emit }) {
       const props = __props;
       const ns = useNamespace("check-tag");
+      const containerKls = vue.computed(() => [ns.b(), ns.is("checked", props.checked)]);
       const handleChange = () => {
         const checked = !props.checked;
         emit(CHANGE_EVENT, checked);
@@ -23808,7 +23828,7 @@
       };
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("span", {
-          class: vue.normalizeClass([vue.unref(ns).b(), vue.unref(ns).is("checked", _ctx.checked)]),
+          class: vue.normalizeClass(vue.unref(containerKls)),
           onClick: handleChange
         }, [
           vue.renderSlot(_ctx.$slots, "default")
@@ -31281,7 +31301,7 @@
           removeLazyLoadListener();
         }
       }
-      const lazyLoadHandler = useThrottleFn(handleLazyLoad, 200);
+      const lazyLoadHandler = useThrottleFn(handleLazyLoad, 200, true);
       async function addLazyLoadListener() {
         var _a;
         if (!isClient)
@@ -31580,6 +31600,9 @@
       };
       const verifyValue = (value, update) => {
         const { max, min, step, precision, stepStrictly, valueOnClear } = props;
+        if (max < min) {
+          throwError("InputNumber", "min should not be greater than max.");
+        }
         let newVal = Number(value);
         if (isNil(value) || Number.isNaN(newVal)) {
           return null;
@@ -32510,7 +32533,7 @@
         var _a, _b;
         if (!menu.value)
           return -1;
-        const items2 = Array.from((_b = (_a = menu.value) == null ? void 0 : _a.childNodes) != null ? _b : []).filter((item) => item.nodeName !== "#text" || item.nodeValue);
+        const items2 = Array.from((_b = (_a = menu.value) == null ? void 0 : _a.childNodes) != null ? _b : []).filter((item) => item.nodeName !== "#comment" && (item.nodeName !== "#text" || item.nodeValue));
         const moreItemWidth = 64;
         const paddingLeft = Number.parseInt(getComputedStyle(menu.value).paddingLeft, 10);
         const paddingRight = Number.parseInt(getComputedStyle(menu.value).paddingRight, 10);
@@ -33162,7 +33185,7 @@
       });
       function selectOptionClick() {
         if (props.disabled !== true && states.groupDisabled !== true) {
-          select.handleOptionSelect(vm, true);
+          select.handleOptionSelect(vm);
         }
       }
       return {
@@ -33251,7 +33274,6 @@
       optionsCount: 0,
       filteredOptionsCount: 0,
       visible: false,
-      softFocus: false,
       selectedLabel: "",
       hoverIndex: -1,
       query: "",
@@ -33261,12 +33283,12 @@
       currentPlaceholder: t("el.select.placeholder"),
       menuVisibleOnFocus: false,
       isOnComposition: false,
-      isSilentBlur: false,
       prefixWidth: 11,
       tagInMultiLine: false,
       mouseEnter: false
     });
   }
+  let ignoreFocusEvent = false;
   const useSelect$3 = (props, states, ctx) => {
     const { t } = useLocale();
     const ns = useNamespace("select");
@@ -33352,6 +33374,10 @@
     });
     vue.watch(() => props.placeholder, (val) => {
       states.cachedPlaceHolder = states.currentPlaceholder = val;
+      const hasValue = props.multiple && Array.isArray(props.modelValue) && props.modelValue.length > 0;
+      if (hasValue) {
+        states.currentPlaceholder = "";
+      }
     });
     vue.watch(() => props.modelValue, (val, oldVal) => {
       if (props.multiple) {
@@ -33679,7 +33705,7 @@
       states.visible = false;
       ctx.emit("clear");
     };
-    const handleOptionSelect = (option, byClick) => {
+    const handleOptionSelect = (option) => {
       var _a;
       if (props.multiple) {
         const value = (props.modelValue || []).slice();
@@ -33703,7 +33729,6 @@
         emitChange(option.value);
         states.visible = false;
       }
-      states.isSilentBlur = byClick;
       setSoftFocus();
       if (states.visible)
         return;
@@ -33726,7 +33751,6 @@
       return index;
     };
     const setSoftFocus = () => {
-      states.softFocus = true;
       const _input = input.value || reference.value;
       if (_input) {
         _input == null ? void 0 : _input.focus();
@@ -33796,7 +33820,7 @@
       vue.nextTick(() => scrollToOption(states.selected));
     };
     const handleFocus = (event) => {
-      if (!states.softFocus) {
+      if (!ignoreFocusEvent) {
         if (props.automaticDropdown || props.filterable) {
           if (props.filterable && !states.visible) {
             states.menuVisibleOnFocus = true;
@@ -33805,7 +33829,7 @@
         }
         ctx.emit("focus", event);
       } else {
-        states.softFocus = false;
+        ignoreFocusEvent = false;
       }
     };
     const blur = () => {
@@ -33815,14 +33839,15 @@
       (_c = (_b = iOSInput.value) == null ? void 0 : _b.blur) == null ? void 0 : _c.call(_b);
     };
     const handleBlur = (event) => {
-      vue.nextTick(() => {
-        if (states.isSilentBlur) {
-          states.isSilentBlur = false;
-        } else {
-          ctx.emit("blur", event);
+      setTimeout(() => {
+        var _a;
+        if ((_a = tooltipRef.value) == null ? void 0 : _a.isFocusInsideContent()) {
+          ignoreFocusEvent = true;
+          return;
         }
+        states.visible && handleClose();
+        ctx.emit("blur", event);
       });
-      states.softFocus = false;
     };
     const handleClearClick = (event) => {
       deleteSelected(event);
@@ -33860,7 +33885,7 @@
         toggleMenu();
       } else {
         if (optionsArray.value[states.hoverIndex]) {
-          handleOptionSelect(optionsArray.value[states.hoverIndex], void 0);
+          handleOptionSelect(optionsArray.value[states.hoverIndex]);
         }
       }
     };
@@ -34197,7 +34222,6 @@
         inputLength,
         filteredOptionsCount,
         visible,
-        softFocus,
         selectedLabel,
         hoverIndex,
         query,
@@ -34205,7 +34229,6 @@
         currentPlaceholder,
         menuVisibleOnFocus,
         isOnComposition,
-        isSilentBlur,
         options,
         cachedOptions,
         optionsCount,
@@ -34303,7 +34326,6 @@
         inputLength,
         filteredOptionsCount,
         visible,
-        softFocus,
         selectedLabel,
         hoverIndex,
         query,
@@ -34311,7 +34333,6 @@
         currentPlaceholder,
         menuVisibleOnFocus,
         isOnComposition,
-        isSilentBlur,
         options,
         resetInputHeight,
         managePlaceholder,
@@ -35022,6 +35043,18 @@
         }
         return array;
       });
+      const prevMoreKls = vue.computed(() => [
+        "more",
+        "btn-quickprev",
+        nsIcon.b(),
+        nsPager.is("disabled", props.disabled)
+      ]);
+      const nextMoreKls = vue.computed(() => [
+        "more",
+        "btn-quicknext",
+        nsIcon.b(),
+        nsPager.is("disabled", props.disabled)
+      ]);
       const tabindex = vue.computed(() => props.disabled ? -1 : 0);
       vue.watchEffect(() => {
         const halfPagerCount = (props.pagerCount - 1) / 2;
@@ -35109,12 +35142,7 @@
           }, " 1 ", 10, _hoisted_2$e)) : vue.createCommentVNode("v-if", true),
           showPrevMore.value ? (vue.openBlock(), vue.createElementBlock("li", {
             key: 1,
-            class: vue.normalizeClass([
-              "more",
-              "btn-quickprev",
-              vue.unref(nsIcon).b(),
-              vue.unref(nsPager).is("disabled", _ctx.disabled)
-            ]),
+            class: vue.normalizeClass(vue.unref(prevMoreKls)),
             tabindex: vue.unref(tabindex),
             "aria-label": vue.unref(t)("el.pagination.prevPages", { pager: _ctx.pagerCount - 2 }),
             onMouseenter: _cache[0] || (_cache[0] = ($event) => onMouseEnter(true)),
@@ -35138,12 +35166,7 @@
           }), 128)),
           showNextMore.value ? (vue.openBlock(), vue.createElementBlock("li", {
             key: 2,
-            class: vue.normalizeClass([
-              "more",
-              "btn-quicknext",
-              vue.unref(nsIcon).b(),
-              vue.unref(nsPager).is("disabled", _ctx.disabled)
-            ]),
+            class: vue.normalizeClass(vue.unref(nextMoreKls)),
             tabindex: vue.unref(tabindex),
             "aria-label": vue.unref(t)("el.pagination.nextPages", { pager: _ctx.pagerCount - 2 }),
             onMouseenter: _cache[4] || (_cache[4] = ($event) => onMouseEnter()),
@@ -35171,11 +35194,9 @@
 
   const isAbsent = (v) => typeof v !== "number";
   const paginationProps = buildProps({
-    total: Number,
     pageSize: Number,
     defaultPageSize: Number,
-    currentPage: Number,
-    defaultCurrentPage: Number,
+    total: Number,
     pageCount: Number,
     pagerCount: {
       type: Number,
@@ -35184,6 +35205,8 @@
       },
       default: 7
     },
+    currentPage: Number,
+    defaultCurrentPage: Number,
     layout: {
       type: String,
       default: ["prev", "pager", "next", "jumper", "->", "total"].join(", ")
@@ -41314,13 +41337,17 @@
     setup(__props, { emit }) {
       const props = __props;
       const ns = useNamespace("steps");
-      const steps = vue.ref([]);
+      const {
+        children: steps,
+        addChild: addStep,
+        removeChild: removeStep
+      } = useOrderedChildren(vue.getCurrentInstance(), "ElStep");
       vue.watch(steps, () => {
         steps.value.forEach((instance, index) => {
           instance.setIndex(index);
         });
       });
-      vue.provide("ElSteps", { props, steps });
+      vue.provide("ElSteps", { props, steps, addStep, removeStep });
       vue.watch(() => props.active, (newVal, oldVal) => {
         emit(CHANGE_EVENT, newVal, oldVal);
       });
@@ -41378,7 +41405,7 @@
         }, { immediate: true });
       });
       vue.onBeforeUnmount(() => {
-        parent.steps.value = parent.steps.value.filter((instance) => instance.uid !== (currentInstance == null ? void 0 : currentInstance.uid));
+        parent.removeStep(stepItemState.uid);
       });
       const currentStatus = vue.computed(() => {
         return props.status || internalStatus.value;
@@ -41406,6 +41433,14 @@
       const space = vue.computed(() => {
         return isSimple.value ? "" : parent.props.space;
       });
+      const containerKls = vue.computed(() => {
+        return [
+          ns.b(),
+          ns.is(isSimple.value ? "simple" : parent.props.direction),
+          ns.is("flex", isLast.value && !space.value && !isCenter.value),
+          ns.is("center", isCenter.value && !isVertical.value && !isSimple.value)
+        ];
+      });
       const style = vue.computed(() => {
         const style2 = {
           flexBasis: isNumber(space.value) ? `${space.value}px` : space.value ? space.value : `${100 / (stepsCount.value - (isCenter.value ? 0 : 1))}%`
@@ -41443,21 +41478,16 @@
           prevChild.calcProgress(internalStatus.value);
       };
       const stepItemState = vue.reactive({
-        uid: vue.computed(() => currentInstance == null ? void 0 : currentInstance.uid),
+        uid: currentInstance.uid,
         currentStatus,
         setIndex,
         calcProgress
       });
-      parent.steps.value = [...parent.steps.value, stepItemState];
+      parent.addStep(stepItemState);
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("div", {
           style: vue.normalizeStyle(vue.unref(style)),
-          class: vue.normalizeClass([
-            vue.unref(ns).b(),
-            vue.unref(ns).is(vue.unref(isSimple) ? "simple" : vue.unref(parent).props.direction),
-            vue.unref(ns).is("flex", vue.unref(isLast) && !vue.unref(space) && !vue.unref(isCenter)),
-            vue.unref(ns).is("center", vue.unref(isCenter) && !vue.unref(isVertical) && !vue.unref(isSimple))
-          ])
+          class: vue.normalizeClass(vue.unref(containerKls))
         }, [
           vue.createCommentVNode(" icon & line "),
           vue.createElementVNode("div", {
@@ -43900,10 +43930,13 @@
       }
     };
     const handleMouseMove = (event, column) => {
-      var _a;
       if (column.children && column.children.length > 0)
         return;
-      const target = (_a = event.target) == null ? void 0 : _a.closest("th");
+      const el = event.target;
+      if (!isElement$1(el)) {
+        return;
+      }
+      const target = el == null ? void 0 : el.closest("th");
       if (!column || !column.resizable)
         return;
       if (!dragging.value && props.border) {
@@ -45238,13 +45271,9 @@
       }
       if (props.maxHeight) {
         if (!Number.isNaN(Number(props.maxHeight))) {
-          const maxHeight = props.maxHeight;
-          const reachMaxHeight = tableScrollHeight.value >= Number(maxHeight);
-          if (reachMaxHeight) {
-            return {
-              maxHeight: `${tableScrollHeight.value - headerScrollHeight.value - footerScrollHeight.value}px`
-            };
-          }
+          return {
+            maxHeight: `${props.maxHeight - headerScrollHeight.value - footerScrollHeight.value}px`
+          };
         } else {
           return {
             maxHeight: `calc(${props.maxHeight} - ${headerScrollHeight.value + footerScrollHeight.value}px)`
@@ -47973,7 +48002,7 @@
     };
     const Cell = CellComponent(cellProps);
     const kls = [ns.e("row-cell"), column.class, column.align === Alignment.CENTER && ns.is("align-center"), column.align === Alignment.RIGHT && ns.is("align-right")];
-    const expandable = rowIndex >= 0 && column.key === expandColumnKey;
+    const expandable = rowIndex >= 0 && expandColumnKey && column.key === expandColumnKey;
     const expanded = rowIndex >= 0 && expandedRowKeys.includes(rowData[rowKey]);
     let IconOrPlaceholder;
     const iconStyle = `margin-inline-start: ${depth * indentSize}px;`;
@@ -49324,7 +49353,14 @@
     ...__default__$g,
     props: timelineItemProps,
     setup(__props) {
+      const props = __props;
       const ns = useNamespace("timeline-item");
+      const defaultNodeKls = vue.computed(() => [
+        ns.e("node"),
+        ns.em("node", props.size || ""),
+        ns.em("node", props.type || ""),
+        ns.is("hollow", props.hollow)
+      ]);
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("li", {
           class: vue.normalizeClass([vue.unref(ns).b(), { [vue.unref(ns).e("center")]: _ctx.center }])
@@ -49334,12 +49370,7 @@
           }, null, 2),
           !_ctx.$slots.dot ? (vue.openBlock(), vue.createElementBlock("div", {
             key: 0,
-            class: vue.normalizeClass([
-              vue.unref(ns).e("node"),
-              vue.unref(ns).em("node", _ctx.size || ""),
-              vue.unref(ns).em("node", _ctx.type || ""),
-              vue.unref(ns).is("hollow", _ctx.hollow)
-            ]),
+            class: vue.normalizeClass(vue.unref(defaultNodeKls)),
             style: vue.normalizeStyle({
               backgroundColor: _ctx.color
             })
@@ -51289,7 +51320,7 @@
     const treeNodeDragOver = ({ event, treeNode }) => {
       const dropNode = treeNode;
       const oldDropNode = dragState.value.dropNode;
-      if (oldDropNode && oldDropNode !== dropNode) {
+      if (oldDropNode && oldDropNode.node.id !== dropNode.node.id) {
         removeClass(oldDropNode.$el, ns.is("drop-inner"));
       }
       const draggingNode = dragState.value.draggingNode;
@@ -51305,7 +51336,7 @@
         dropNext = props.allowDrop(draggingNode.node, dropNode.node, "next");
       }
       event.dataTransfer.dropEffect = dropInner || dropPrev || dropNext ? "move" : "none";
-      if ((dropPrev || dropInner || dropNext) && oldDropNode !== dropNode) {
+      if ((dropPrev || dropInner || dropNext) && (oldDropNode == null ? void 0 : oldDropNode.node.id) !== dropNode.node.id) {
         if (oldDropNode) {
           ctx.emit("node-drag-leave", draggingNode.node, oldDropNode.node, event);
         }
@@ -52246,6 +52277,9 @@
       }, (data) => getNodeValByProp("children", data));
       return options;
     });
+    const cacheOptionsMap = vue.computed(() => {
+      return cacheOptions.value.reduce((prev, next) => ({ ...prev, [next.value]: next }), {});
+    });
     return {
       ...pick(vue.toRefs(props), Object.keys(_Tree.props)),
       ...attrs,
@@ -52279,18 +52313,21 @@
         if (!props.showCheckbox && (props.checkStrictly || node.isLeaf)) {
           if (!getNodeValByProp("disabled", data)) {
             const option = (_b = select.value) == null ? void 0 : _b.options.get(getNodeValByProp("value", data));
-            (_c = select.value) == null ? void 0 : _c.handleOptionSelect(option, true);
+            (_c = select.value) == null ? void 0 : _c.handleOptionSelect(option);
           }
         } else if (props.expandOnClickNode) {
           e.proxy.handleExpandIconClick();
         }
       },
       onCheck: (data, params) => {
-        var _a;
-        (_a = attrs.onCheck) == null ? void 0 : _a.call(attrs, data, params);
+        if (!props.showCheckbox)
+          return;
         const dataValue = getNodeValByProp("value", data);
+        const uncachedCheckedKeys = params.checkedKeys;
+        const cachedKeys = props.multiple ? toValidArray(props.modelValue).filter((item) => item in cacheOptionsMap.value && !tree.value.getNode(item) && !uncachedCheckedKeys.includes(item)) : [];
+        const checkedKeys = uncachedCheckedKeys.concat(cachedKeys);
         if (props.checkStrictly) {
-          emit(UPDATE_MODEL_EVENT, props.multiple ? params.checkedKeys : params.checkedKeys.includes(dataValue) ? dataValue : void 0);
+          emit(UPDATE_MODEL_EVENT, props.multiple ? checkedKeys : checkedKeys.includes(dataValue) ? dataValue : void 0);
         } else {
           if (props.multiple) {
             emit(UPDATE_MODEL_EVENT, tree.value.getCheckedKeys(true));
@@ -52301,6 +52338,17 @@
             emit(UPDATE_MODEL_EVENT, firstLeafKey === props.modelValue || hasCheckedChild ? void 0 : firstLeafKey);
           }
         }
+        vue.nextTick(() => {
+          var _a;
+          const checkedKeys2 = toValidArray(props.modelValue);
+          tree.value.setCheckedKeys(checkedKeys2);
+          (_a = attrs.onCheck) == null ? void 0 : _a.call(attrs, data, {
+            checkedKeys: tree.value.getCheckedKeys(),
+            checkedNodes: tree.value.getCheckedNodes(),
+            halfCheckedKeys: tree.value.getHalfCheckedKeys(),
+            halfCheckedNodes: tree.value.getHalfCheckedNodes()
+          });
+        });
       },
       cacheOptions
     };
@@ -53804,9 +53852,13 @@
         let hookResult;
         let beforeData = {};
         try {
+          const originData = props.data;
           const beforeUploadPromise = props.beforeUpload(rawFile);
           beforeData = isObject$1(props.data) ? cloneDeep(props.data) : props.data;
           hookResult = await beforeUploadPromise;
+          if (isObject$1(props.data) && isEqual$1(originData, beforeData)) {
+            beforeData = cloneDeep(props.data);
+          }
         } catch (e) {
           hookResult = false;
         }
@@ -54569,7 +54621,7 @@
     };
   };
   const addStyle = async (options, parent, instance) => {
-    const { nextZIndex } = instance.vm.zIndex;
+    const { nextZIndex } = instance.vm.zIndex || instance.vm._.exposed.zIndex;
     const maskStyle = {};
     if (options.fullscreen) {
       instance.originalPosition.value = getStyle(document.body, "position");
@@ -54593,7 +54645,7 @@
     }
   };
   const addClassList = (options, parent, instance) => {
-    const ns = instance.vm.ns;
+    const ns = instance.vm.ns || instance.vm._.exposed.ns;
     if (!["absolute", "fixed", "sticky"].includes(instance.originalPosition.value)) {
       addClass(parent, ns.bm("parent", "relative"));
     } else {
@@ -55267,7 +55319,6 @@
       if (props.lockScroll) {
         useLockscreen(visible);
       }
-      useRestoreActive(visible);
       return {
         ...vue.toRefs(state),
         ns,
@@ -55694,10 +55745,7 @@
       values: [...notificationTypes, ""],
       default: ""
     },
-    zIndex: {
-      type: Number,
-      default: 0
-    }
+    zIndex: Number
   });
   const notificationEmits = {
     destroy: () => true
@@ -55733,9 +55781,10 @@
       const horizontalClass = vue.computed(() => props.position.endsWith("right") ? "right" : "left");
       const verticalProperty = vue.computed(() => props.position.startsWith("top") ? "top" : "bottom");
       const positionStyle = vue.computed(() => {
+        var _a;
         return {
           [verticalProperty.value]: `${props.offset}px`,
-          zIndex: currentZIndex.value
+          zIndex: (_a = props.zIndex) != null ? _a : currentZIndex.value
         };
       });
       function startTimer() {
@@ -56365,7 +56414,6 @@
   exports.usePopperTriggerProps = usePopperTriggerProps;
   exports.usePreventGlobal = usePreventGlobal;
   exports.useProp = useProp;
-  exports.useRestoreActive = useRestoreActive;
   exports.useSameTarget = useSameTarget;
   exports.useSize = useSize;
   exports.useSizeProp = useSizeProp;