@element-plus/nightly 0.0.20221022 → 0.0.20221023

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Element Plus v0.0.20221022 */
+/*! Element Plus v0.0.20221023 */
 
 (function (global, factory) {
   typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('vue')) :
@@ -11072,7 +11072,7 @@
     };
   };
 
-  const version$1 = "0.0.20221022";
+  const version$1 = "0.0.20221023";
 
   const makeInstaller = (components = []) => {
     const install = (app, options) => {
@@ -41285,22 +41285,29 @@
     scrollContainer == null ? void 0 : scrollContainer.addEventListener("scroll", removePopper);
     return popperInstance;
   }
+  function getCurrentColumns(column) {
+    if (column.children) {
+      return flatMap(column.children, getCurrentColumns);
+    } else {
+      return [column];
+    }
+  }
+  function getColSpan(colSpan, column) {
+    return colSpan + column.colSpan;
+  }
   const isFixedColumn = (index, fixed, store, realColumns) => {
     let start = 0;
     let after = index;
+    const columns = store.states.columns.value;
     if (realColumns) {
-      if (realColumns[index].colSpan > 1) {
-        return {};
-      }
-      for (let i = 0; i < index; i++) {
-        start += realColumns[i].colSpan;
-      }
-      after = start + realColumns[index].colSpan - 1;
+      const curColumns = getCurrentColumns(realColumns[index]);
+      const preColumns = columns.slice(0, columns.indexOf(curColumns[0]));
+      start = preColumns.reduce(getColSpan, 0);
+      after = start + curColumns.reduce(getColSpan, 0) - 1;
     } else {
       start = index;
     }
     let fixedLayout;
-    const columns = store.states.columns;
     switch (fixed) {
       case "left":
         if (after < store.states.fixedLeafColumnsLength.value) {
@@ -41308,14 +41315,14 @@
         }
         break;
       case "right":
-        if (start >= columns.value.length - store.states.rightFixedLeafColumnsLength.value) {
+        if (start >= columns.length - store.states.rightFixedLeafColumnsLength.value) {
           fixedLayout = "right";
         }
         break;
       default:
         if (after < store.states.fixedLeafColumnsLength.value) {
           fixedLayout = "left";
-        } else if (start >= columns.value.length - store.states.rightFixedLeafColumnsLength.value) {
+        } else if (start >= columns.length - store.states.rightFixedLeafColumnsLength.value) {
           fixedLayout = "right";
         }
     }
@@ -41327,11 +41334,11 @@
   };
   const getFixedColumnsClass = (namespace, index, fixed, store, realColumns, offset = 0) => {
     const classes = [];
-    const { direction, start } = isFixedColumn(index, fixed, store, realColumns);
+    const { direction, start, after } = isFixedColumn(index, fixed, store, realColumns);
     if (direction) {
       const isLeft = direction === "left";
       classes.push(`${namespace}-fixed-column--${direction}`);
-      if (isLeft && start + offset === store.states.fixedLeafColumnsLength.value - 1) {
+      if (isLeft && after + offset === store.states.fixedLeafColumnsLength.value - 1) {
         classes.push("is-last-column");
       } else if (!isLeft && start - offset === store.states.columns.value.length - store.states.rightFixedLeafColumnsLength.value) {
         classes.push("is-first-column");
@@ -41343,7 +41350,11 @@
     return offset + (column.realWidth === null || Number.isNaN(column.realWidth) ? Number(column.width) : column.realWidth);
   }
   const getFixedColumnOffset = (index, fixed, store, realColumns) => {
-    const { direction, start = 0 } = isFixedColumn(index, fixed, store, realColumns);
+    const {
+      direction,
+      start = 0,
+      after = 0
+    } = isFixedColumn(index, fixed, store, realColumns);
     if (!direction) {
       return;
     }
@@ -41351,9 +41362,9 @@
     const isLeft = direction === "left";
     const columns = store.states.columns.value;
     if (isLeft) {
-      styles.left = columns.slice(0, index).reduce(getOffset, 0);
+      styles.left = columns.slice(0, start).reduce(getOffset, 0);
     } else {
-      styles.right = columns.slice(start + 1).reverse().reduce(getOffset, 0);
+      styles.right = columns.slice(after + 1).reverse().reduce(getOffset, 0);
     }
     return styles;
   };
@@ -41739,7 +41750,17 @@
       if (!rowKey.value)
         throw new Error("[ElTable] prop row-key is required");
     };
+    const updateChildFixed = (column) => {
+      var _a2;
+      (_a2 = column.children) == null ? void 0 : _a2.forEach((childColumn) => {
+        childColumn.fixed = column.fixed;
+        updateChildFixed(childColumn);
+      });
+    };
     const updateColumns = () => {
+      _columns.value.forEach((column) => {
+        updateChildFixed(column);
+      });
       fixedColumns.value = _columns.value.filter((column) => column.fixed === true || column.fixed === "left");
       rightFixedColumns.value = _columns.value.filter((column) => column.fixed === "right");
       if (fixedColumns.value.length > 0 && _columns.value[0] && _columns.value[0].type === "selection" && !_columns.value[0].fixed) {
@@ -43039,13 +43060,13 @@
           column
         });
       }
-      const fixedStyle = column.isSubColumn ? null : getFixedColumnOffset(columnIndex, column.fixed, props.store, row);
+      const fixedStyle = getFixedColumnOffset(columnIndex, column.fixed, props.store, row);
       ensurePosition(fixedStyle, "left");
       ensurePosition(fixedStyle, "right");
       return Object.assign({}, headerCellStyles, fixedStyle);
     };
     const getHeaderCellClass = (rowIndex, columnIndex, row, column) => {
-      const fixedClasses = column.isSubColumn ? [] : getFixedColumnsClass(ns.b(), columnIndex, column.fixed, props.store, row);
+      const fixedClasses = getFixedColumnsClass(ns.b(), columnIndex, column.fixed, props.store, row);
       const classes = [
         column.id,
         column.order,
@@ -43443,13 +43464,13 @@
           column
         });
       }
-      const fixedStyle = column.isSubColumn ? null : getFixedColumnOffset(columnIndex, props == null ? void 0 : props.fixed, props.store);
+      const fixedStyle = getFixedColumnOffset(columnIndex, props == null ? void 0 : props.fixed, props.store);
       ensurePosition(fixedStyle, "left");
       ensurePosition(fixedStyle, "right");
       return Object.assign({}, cellStyles, fixedStyle);
     };
     const getCellClass = (rowIndex, columnIndex, row, column, offset) => {
-      const fixedClasses = column.isSubColumn ? [] : getFixedColumnsClass(ns.b(), columnIndex, props == null ? void 0 : props.fixed, props.store, void 0, offset);
+      const fixedClasses = getFixedColumnsClass(ns.b(), columnIndex, props == null ? void 0 : props.fixed, props.store, void 0, offset);
       const classes = [column.id, column.align, column.className, ...fixedClasses];
       const cellClassName = parent == null ? void 0 : parent.props.cellClassName;
       if (typeof cellClassName === "string") {