element-pe 2.2.61 → 2.2.62

package/dist/index.full.js

@@ -9632,23 +9632,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 affixProps = buildProps({
     zIndex: {
       type: definePropType([Number, String]),
@@ -13719,8 +13702,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);
@@ -32012,7 +31995,7 @@
       });
       function selectOptionClick() {
         if (props.disabled !== true && states.groupDisabled !== true) {
-          select.handleOptionSelect(vm, true);
+          select.handleOptionSelect(vm);
         }
       }
       return {
@@ -32101,7 +32084,6 @@
       optionsCount: 0,
       filteredOptionsCount: 0,
       visible: false,
-      softFocus: false,
       selectedLabel: "",
       hoverIndex: -1,
       query: "",
@@ -32111,12 +32093,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");
@@ -32533,7 +32515,7 @@
       states.visible = false;
       ctx.emit("clear");
     };
-    const handleOptionSelect = (option, byClick) => {
+    const handleOptionSelect = (option) => {
       var _a;
       if (props.multiple) {
         const value = (props.modelValue || []).slice();
@@ -32557,7 +32539,6 @@
         emitChange(option.value);
         states.visible = false;
       }
-      states.isSilentBlur = byClick;
       setSoftFocus();
       if (states.visible)
         return;
@@ -32580,7 +32561,6 @@
       return index;
     };
     const setSoftFocus = () => {
-      states.softFocus = true;
       const _input = input.value || reference.value;
       if (_input) {
         _input == null ? void 0 : _input.focus();
@@ -32650,7 +32630,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;
@@ -32659,7 +32639,7 @@
         }
         ctx.emit("focus", event);
       } else {
-        states.softFocus = false;
+        ignoreFocusEvent = false;
       }
     };
     const blur = () => {
@@ -32669,14 +32649,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);
@@ -32714,7 +32695,7 @@
         toggleMenu();
       } else {
         if (optionsArray.value[states.hoverIndex]) {
-          handleOptionSelect(optionsArray.value[states.hoverIndex], void 0);
+          handleOptionSelect(optionsArray.value[states.hoverIndex]);
         }
       }
     };
@@ -33060,7 +33041,6 @@
         inputLength,
         filteredOptionsCount,
         visible,
-        softFocus,
         selectedLabel,
         hoverIndex,
         query,
@@ -33068,7 +33048,6 @@
         currentPlaceholder,
         menuVisibleOnFocus,
         isOnComposition,
-        isSilentBlur,
         options,
         cachedOptions,
         optionsCount,
@@ -33167,7 +33146,6 @@
         inputLength,
         filteredOptionsCount,
         visible,
-        softFocus,
         selectedLabel,
         hoverIndex,
         query,
@@ -33175,7 +33153,6 @@
         currentPlaceholder,
         menuVisibleOnFocus,
         isOnComposition,
-        isSilentBlur,
         options,
         resetInputHeight,
         managePlaceholder,
@@ -33890,6 +33867,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);
       watchEffect(() => {
         const halfPagerCount = (props.pagerCount - 1) / 2;
@@ -33977,12 +33966,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)),
@@ -34006,12 +33990,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()),
@@ -34039,11 +34018,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,
@@ -34052,6 +34029,8 @@
       },
       default: 7
     },
+    currentPage: Number,
+    defaultCurrentPage: Number,
     layout: {
       type: String,
       default: ["prev", "pager", "next", "jumper", "->", "total"].join(", ")
@@ -39790,13 +39769,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);
       });
@@ -39854,7 +39837,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;
@@ -39927,12 +39910,12 @@
           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)),
@@ -43729,13 +43712,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)`
@@ -50237,7 +50216,7 @@
         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();
@@ -53147,7 +53126,6 @@
       if (props.lockScroll) {
         useLockscreen(visible);
       }
-      useRestoreActive(visible);
       return {
         forEditor,
         ...vue.toRefs(state),
@@ -53576,10 +53554,7 @@
       values: [...notificationTypes, ""],
       default: ""
     },
-    zIndex: {
-      type: Number,
-      default: 0
-    }
+    zIndex: Number
   });
   const notificationEmits = {
     destroy: () => true
@@ -53616,9 +53591,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() {
@@ -56745,7 +56721,6 @@
   exports.usePopperTriggerProps = usePopperTriggerProps;
   exports.usePreventGlobal = usePreventGlobal;
   exports.useProp = useProp;
-  exports.useRestoreActive = useRestoreActive;
   exports.useSameTarget = useSameTarget;
   exports.useSize = useSize;
   exports.useSizeProp = useSizeProp;