@element-plus/nightly 0.0.20221021 → 0.0.20221023

package/dist/index.full.js

@@ -1,4 +1,4 @@
-/*! Element Plus v0.0.20221021 */
+/*! 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.20221021";
+  const version$1 = "0.0.20221023";
 
   const makeInstaller = (components = []) => {
     const install = (app, options) => {
@@ -18390,9 +18390,32 @@
   });
   var DateTable$1 = /* @__PURE__ */ _export_sfc(_sfc_main$1Q, [["__file", "date-table.vue"]]);
 
+  const adjacentMonth = (start, end) => {
+    const firstMonthLastDay = start.endOf("month");
+    const lastMonthFirstDay = end.startOf("month");
+    const isSameWeek = firstMonthLastDay.isSame(lastMonthFirstDay, "week");
+    const lastMonthStartDay = isSameWeek ? lastMonthFirstDay.add(1, "week") : lastMonthFirstDay;
+    return [
+      [start, firstMonthLastDay],
+      [lastMonthStartDay.startOf("week"), end]
+    ];
+  };
+  const threeConsecutiveMonth = (start, end) => {
+    const firstMonthLastDay = start.endOf("month");
+    const secondMonthFirstDay = start.add(1, "month").startOf("month");
+    const secondMonthStartDay = firstMonthLastDay.isSame(secondMonthFirstDay, "week") ? secondMonthFirstDay.add(1, "week") : secondMonthFirstDay;
+    const secondMonthLastDay = secondMonthStartDay.endOf("month");
+    const lastMonthFirstDay = end.startOf("month");
+    const lastMonthStartDay = secondMonthLastDay.isSame(lastMonthFirstDay, "week") ? lastMonthFirstDay.add(1, "week") : lastMonthFirstDay;
+    return [
+      [start, firstMonthLastDay],
+      [secondMonthStartDay.startOf("week"), secondMonthLastDay],
+      [lastMonthStartDay.startOf("week"), end]
+    ];
+  };
   const useCalendar = (props, emit, componentName) => {
-    const solts = vue.useSlots();
-    const { t, lang } = useLocale();
+    const slots = vue.useSlots();
+    const { lang } = useLocale();
     const selectedDay = vue.ref();
     const now = dayjs().locale(lang.value);
     const realSelectedDay = vue.computed({
@@ -18429,12 +18452,7 @@
     });
     const date = vue.computed(() => {
       if (!props.modelValue) {
-        if (realSelectedDay.value) {
-          return realSelectedDay.value;
-        } else if (validatedRange.value.length) {
-          return validatedRange.value[0][0];
-        }
-        return now;
+        return realSelectedDay.value || (validatedRange.value.length ? validatedRange.value[0][0] : now);
       } else {
         return dayjs(props.modelValue).locale(lang.value);
       }
@@ -18443,10 +18461,6 @@
     const nextMonthDayjs = vue.computed(() => date.value.add(1, "month").date(1));
     const prevYearDayjs = vue.computed(() => date.value.subtract(1, "year").date(1));
     const nextYearDayjs = vue.computed(() => date.value.add(1, "year").date(1));
-    const i18nDate = vue.computed(() => {
-      const pickedMonth = `el.datepicker.month${date.value.format("M")}`;
-      return `${date.value.year()} ${t("el.datepicker.year")} ${t(pickedMonth)}`;
-    });
     const calculateValidatedDateRange = (startDayjs, endDayjs) => {
       const firstDay = startDayjs.startOf("week");
       const lastDay = endDayjs.endOf("week");
@@ -18455,26 +18469,9 @@
       if (firstMonth === lastMonth) {
         return [[firstDay, lastDay]];
       } else if (firstMonth + 1 === lastMonth) {
-        const firstMonthLastDay = firstDay.endOf("month");
-        const lastMonthFirstDay = lastDay.startOf("month");
-        const isSameWeek = firstMonthLastDay.isSame(lastMonthFirstDay, "week");
-        const lastMonthStartDay = isSameWeek ? lastMonthFirstDay.add(1, "week") : lastMonthFirstDay;
-        return [
-          [firstDay, firstMonthLastDay],
-          [lastMonthStartDay.startOf("week"), lastDay]
-        ];
+        return adjacentMonth(firstDay, lastDay);
       } else if (firstMonth + 2 === lastMonth || (firstMonth + 1) % 11 === lastMonth) {
-        const firstMonthLastDay = firstDay.endOf("month");
-        const secondMonthFirstDay = firstDay.add(1, "month").startOf("month");
-        const secondMonthStartDay = firstMonthLastDay.isSame(secondMonthFirstDay, "week") ? secondMonthFirstDay.add(1, "week") : secondMonthFirstDay;
-        const secondMonthLastDay = secondMonthStartDay.endOf("month");
-        const lastMonthFirstDay = lastDay.startOf("month");
-        const lastMonthStartDay = secondMonthLastDay.isSame(lastMonthFirstDay, "week") ? lastMonthFirstDay.add(1, "week") : lastMonthFirstDay;
-        return [
-          [firstDay, firstMonthLastDay],
-          [secondMonthStartDay.startOf("week"), secondMonthLastDay],
-          [lastMonthStartDay.startOf("week"), lastDay]
-        ];
+        return threeConsecutiveMonth(firstDay, lastDay);
       } else {
         return [];
       }
@@ -18502,16 +18499,14 @@
       version: "2.3.0",
       ref: "https://element-plus.org/en-US/component/calendar.html#slots",
       type: "Slot"
-    }, vue.computed(() => !!solts.dateCell));
+    }, vue.computed(() => !!slots.dateCell));
     return {
       calculateValidatedDateRange,
       date,
       realSelectedDay,
       pickDay,
       selectDate,
-      validatedRange,
-      t,
-      i18nDate
+      validatedRange
     };
   };
 
@@ -18547,10 +18542,13 @@
         pickDay,
         realSelectedDay,
         selectDate,
-        t,
-        i18nDate,
         validatedRange
       } = useCalendar(props, emit);
+      const { t } = useLocale();
+      const i18nDate = vue.computed(() => {
+        const pickedMonth = `el.datepicker.month${date.value.format("M")}`;
+        return `${date.value.year()} ${t("el.datepicker.year")} ${t(pickedMonth)}`;
+      });
       expose({
         selectedDay: realSelectedDay,
         pickDay,
@@ -38142,7 +38140,7 @@
       selectWidth: 200,
       initialInputHeight: 0,
       previousQuery: null,
-      previousValue: "",
+      previousValue: void 0,
       query: "",
       selectedLabel: "",
       softFocus: false,
@@ -38331,7 +38329,7 @@
     const update = (val) => {
       emit(UPDATE_MODEL_EVENT, val);
       emitChange(val);
-      states.previousValue = val.toString();
+      states.previousValue = val == null ? void 0 : val.toString();
     };
     const getValueIndex = (arr = [], value) => {
       if (!isObject$1(value)) {
@@ -38497,7 +38495,7 @@
       if (isArray(props.modelValue)) {
         emptyValue = [];
       } else {
-        emptyValue = "";
+        emptyValue = void 0;
       }
       states.softFocus = true;
       if (props.multiple) {
@@ -38617,7 +38615,7 @@
           });
         } else {
           states.cachedOptions = [];
-          states.previousValue = "";
+          states.previousValue = void 0;
         }
       } else {
         if (hasModelValue.value) {
@@ -38632,7 +38630,7 @@
           }
         } else {
           states.selectedLabel = "";
-          states.previousValue = "";
+          states.previousValue = void 0;
         }
       }
       clearAllNewOption();
@@ -41287,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) {
@@ -41310,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";
         }
     }
@@ -41329,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");
@@ -41345,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;
     }
@@ -41353,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;
   };
@@ -41741,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) {
@@ -43041,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,
@@ -43445,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") {