@element-plus/nightly 0.0.20240819 → 0.0.20240822

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Element Plus v0.0.20240819 */
+/*! Element Plus v0.0.20240822 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
@@ -8869,7 +8869,7 @@
         dragRef.value.removeEventListener("mousedown", onMousedown);
       }
     };
-    const resetPostion = () => {
+    const resetPosition = () => {
       transform = {
         offsetX: 0,
         offsetY: 0
@@ -8891,7 +8891,7 @@
       offDraggable();
     });
     return {
-      resetPostion
+      resetPosition
     };
   };
 
@@ -11559,7 +11559,7 @@
 
   const ElConfigProvider = withInstall(ConfigProvider);
 
-  const version$1 = "0.0.20240819";
+  const version$1 = "0.0.20240822";
 
   const makeInstaller = (components = []) => {
     const install = (app, options) => {
@@ -11657,20 +11657,22 @@
         if (!scrollContainer.value)
           return;
         scrollTop.value = scrollContainer.value instanceof Window ? document.documentElement.scrollTop : scrollContainer.value.scrollTop || 0;
-        if (props.position === "top") {
-          if (props.target) {
-            const difference = targetRect.bottom.value - props.offset - rootHeight.value;
-            fixed.value = props.offset > rootTop.value && targetRect.bottom.value > 0;
+        const { position, target: target2, offset } = props;
+        const rootHeightOffset = offset + rootHeight.value;
+        if (position === "top") {
+          if (target2) {
+            const difference = targetRect.bottom.value - rootHeightOffset;
+            fixed.value = offset > rootTop.value && targetRect.bottom.value > 0;
             transform.value = difference < 0 ? difference : 0;
           } else {
-            fixed.value = props.offset > rootTop.value;
+            fixed.value = offset > rootTop.value;
           }
-        } else if (props.target) {
-          const difference = windowHeight.value - targetRect.top.value - props.offset - rootHeight.value;
-          fixed.value = windowHeight.value - props.offset < rootBottom.value && windowHeight.value > targetRect.top.value;
+        } else if (target2) {
+          const difference = windowHeight.value - targetRect.top.value - rootHeightOffset;
+          fixed.value = windowHeight.value - offset < rootBottom.value && windowHeight.value > targetRect.top.value;
           transform.value = difference < 0 ? -difference : 0;
         } else {
-          fixed.value = windowHeight.value - props.offset < rootBottom.value;
+          fixed.value = windowHeight.value - offset < rootBottom.value;
         }
       };
       const handleScroll = () => {
@@ -21226,6 +21228,7 @@
   };
 
   const carouselContextKey = Symbol("carouselContextKey");
+  const CAROUSEL_ITEM_NAME = "ElCarouselItem";
 
   const THROTTLE_TIME = 300;
   const useCarousel = (props, emit, componentName) => {
@@ -21233,7 +21236,7 @@
       children: items,
       addChild: addItem,
       removeChild: removeItem
-    } = useOrderedChildren(vue.getCurrentInstance(), "ElCarouselItem");
+    } = useOrderedChildren(vue.getCurrentInstance(), CAROUSEL_ITEM_NAME);
     const slots = vue.useSlots();
     const activeIndex = vue.ref(-1);
     const timer = vue.ref(null);
@@ -21416,9 +21419,8 @@
       if (!defaultSlots)
         return null;
       const flatSlots = flattedChildren(defaultSlots);
-      const carouselItemsName = "ElCarouselItem";
       const normalizeSlots = flatSlots.filter((slot) => {
-        return vue.isVNode(slot) && slot.type.name === carouselItemsName;
+        return vue.isVNode(slot) && slot.type.name === CAROUSEL_ITEM_NAME;
       });
       if ((normalizeSlots == null ? void 0 : normalizeSlots.length) === 2 && props.loop && !isCardType.value) {
         isItemsTwoLength.value = true;
@@ -21709,7 +21711,7 @@
     }
   });
 
-  const useCarouselItem = (props, componentName) => {
+  const useCarouselItem = (props) => {
     const carouselContext = vue.inject(carouselContextKey);
     const instance = vue.getCurrentInstance();
     const carouselItemRef = vue.ref();
@@ -21821,7 +21823,7 @@
   };
 
   const __default__$1n = vue.defineComponent({
-    name: "ElCarouselItem"
+    name: CAROUSEL_ITEM_NAME
   });
   const _sfc_main$1Y = /* @__PURE__ */ vue.defineComponent({
     ...__default__$1n,
@@ -29782,6 +29784,7 @@
       const label = ((_d = (_c = (_b = this.cell) == null ? void 0 : _b.children) == null ? void 0 : _c.label) == null ? void 0 : _d.call(_c)) || item.label;
       const content = (_g = (_f = (_e = this.cell) == null ? void 0 : _e.children) == null ? void 0 : _f.default) == null ? void 0 : _g.call(_f);
       const span = item.span;
+      const rowspan = item.rowspan;
       const align = item.align ? `is-${item.align}` : "";
       const labelAlign = item.labelAlign ? `is-${item.labelAlign}` : align;
       const className = item.className;
@@ -29803,7 +29806,8 @@
               labelAlign,
               labelClassName
             ],
-            colSpan: isVertical ? span : 1
+            colSpan: isVertical ? span : 1,
+            rowspan: isVertical ? 1 : rowspan
           }, label), directives);
         case "content":
           return vue.withDirectives(vue.h(this.tag, {
@@ -29816,13 +29820,15 @@
               align,
               className
             ],
-            colSpan: isVertical ? span : span * 2 - 1
+            colSpan: isVertical ? span : span * 2 - 1,
+            rowspan: isVertical ? rowspan * 2 - 1 : rowspan
           }, content), directives);
         default:
           return vue.withDirectives(vue.h("td", {
             style,
             class: [ns.e("cell"), align],
-            colSpan: span
+            colSpan: span,
+            rowspan
           }, [
             !isNil(label) ? vue.h("span", {
               class: [ns.e("label"), labelClassName]
@@ -29960,9 +29966,24 @@
         let temp = [];
         let count = props.column;
         let totalSpan = 0;
+        const rowspanTemp = [];
         children.forEach((node, index) => {
-          var _a;
+          var _a, _b, _c;
           const span = ((_a = node.props) == null ? void 0 : _a.span) || 1;
+          const rowspan = ((_b = node.props) == null ? void 0 : _b.rowspan) || 1;
+          const rowNo = rows.length;
+          rowspanTemp[rowNo] || (rowspanTemp[rowNo] = 0);
+          if (rowspan > 1) {
+            for (let i = 1; i < rowspan; i++) {
+              rowspanTemp[_c = rowNo + i] || (rowspanTemp[_c] = 0);
+              rowspanTemp[rowNo + i]++;
+              totalSpan++;
+            }
+          }
+          if (rowspanTemp[rowNo] > 0) {
+            count -= rowspanTemp[rowNo];
+            rowspanTemp[rowNo] = 0;
+          }
           if (index < children.length - 1) {
             totalSpan += span > count ? count : span;
           }
@@ -30038,6 +30059,10 @@
       type: Number,
       default: 1
     },
+    rowspan: {
+      type: Number,
+      default: 1
+    },
     width: {
       type: [String, Number],
       default: ""
@@ -30179,9 +30204,9 @@
       const composedDialogRef = composeRefs(focusTrapRef, dialogRef);
       const draggable = vue.computed(() => props.draggable);
       const overflow = vue.computed(() => props.overflow);
-      const { resetPostion } = useDraggable(dialogRef, headerRef, draggable, overflow);
+      const { resetPosition } = useDraggable(dialogRef, headerRef, draggable, overflow);
       expose({
-        resetPostion
+        resetPosition
       });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createElementBlock("div", {
@@ -30518,14 +30543,14 @@
       });
       const overlayEvent = useSameTarget(onModalClick);
       const draggable = vue.computed(() => props.draggable && !props.fullscreen);
-      const resetPostion = () => {
+      const resetPosition = () => {
         var _a;
-        (_a = dialogContentRef.value) == null ? void 0 : _a.resetPostion();
+        (_a = dialogContentRef.value) == null ? void 0 : _a.resetPosition();
       };
       expose({
         visible,
         dialogContentRef,
-        resetPostion
+        resetPosition
       });
       return (_ctx, _cache) => {
         return vue.openBlock(), vue.createBlock(vue.unref(ElTeleport$1), {
@@ -35724,7 +35749,11 @@
                 }, 8, ["class"])) : vue.createCommentVNode("v-if", true),
                 _ctx.showClose && _ctx.clearIcon ? (vue.openBlock(), vue.createBlock(_component_el_icon, {
                   key: 1,
-                  class: vue.normalizeClass([_ctx.nsSelect.e("caret"), _ctx.nsSelect.e("icon")]),
+                  class: vue.normalizeClass([
+                    _ctx.nsSelect.e("caret"),
+                    _ctx.nsSelect.e("icon"),
+                    _ctx.nsSelect.e("clear")
+                  ]),
                   onClick: _ctx.handleClearClick
                 }, {
                   default: vue.withCtx(() => [
@@ -38326,13 +38355,12 @@
         const children = [];
         if (total > 0) {
           for (let i = start; i <= end; i++) {
-            children.push((_a = $slots.default) == null ? void 0 : _a.call($slots, {
+            children.push(vue.h(vue.Fragment, { key: i }, (_a = $slots.default) == null ? void 0 : _a.call($slots, {
               data,
-              key: i,
               index: i,
               isScrolling: useIsScrolling ? states.isScrolling : void 0,
               style: getItemStyle(i)
-            }));
+            })));
           }
         }
         const InnerNode = [
@@ -38994,14 +39022,14 @@
           if (totalRow > 0 && totalColumn > 0) {
             for (let row = rowStart; row <= rowEnd; row++) {
               for (let column = columnStart; column <= columnEnd; column++) {
-                children.push((_a = slots.default) == null ? void 0 : _a.call(slots, {
+                const key = itemKey({ columnIndex: column, data, rowIndex: row });
+                children.push(vue.h(vue.Fragment, { key }, (_a = slots.default) == null ? void 0 : _a.call(slots, {
                   columnIndex: column,
                   data,
-                  key: itemKey({ columnIndex: column, data, rowIndex: row }),
                   isScrolling: useIsScrolling ? vue.unref(states).isScrolling : void 0,
                   style: getItemStyle(row, column),
                   rowIndex: row
-                }));
+                })));
               }
             }
           }
@@ -40868,7 +40896,11 @@
               ]) : vue.createCommentVNode("v-if", true),
               _ctx.showClearBtn && _ctx.clearIcon ? (vue.openBlock(), vue.createBlock(_component_el_icon, {
                 key: 1,
-                class: vue.normalizeClass([_ctx.nsSelect.e("caret"), _ctx.nsInput.e("icon")]),
+                class: vue.normalizeClass([
+                  _ctx.nsSelect.e("caret"),
+                  _ctx.nsInput.e("icon"),
+                  _ctx.nsSelect.e("clear")
+                ]),
                 onClick: vue.withModifiers(_ctx.handleClear, ["prevent", "stop"])
               }, {
                 default: vue.withCtx(() => [
@@ -59568,6 +59600,7 @@
   const version = installer.version;
 
   exports.BAR_MAP = BAR_MAP;
+  exports.CAROUSEL_ITEM_NAME = CAROUSEL_ITEM_NAME;
   exports.CASCADER_PANEL_INJECTION_KEY = CASCADER_PANEL_INJECTION_KEY;
   exports.CHANGE_EVENT = CHANGE_EVENT;
   exports.ClickOutside = ClickOutside;