bkui-vue 0.0.1-beta.214 → 0.0.1-beta.216

package/dist/index.esm.js

@@ -7564,7 +7564,7 @@ class BKPopIndexManager {
     }
   }
 }
-new BKPopIndexManager();
+const bkPopIndexManager = new BKPopIndexManager();
 /*!
  * is-plain-object <https://github.com/jonschlinkert/is-plain-object>
  *
@@ -10200,7 +10200,6 @@ var Component$v = defineComponent({
   data() {
     return {
       visible: false,
-      bkPopIndexManager: null,
       closeTimer: null
     };
   },
@@ -10244,10 +10243,8 @@ var Component$v = defineComponent({
     },
     visible: {
       handler(val) {
-        var _a, _b;
         if (val) {
-          this.bkPopIndexManager = new BKPopIndexManager();
-          this.bkPopIndexManager.onMaskClick((_e) => {
+          bkPopIndexManager.onMaskClick((_e) => {
             this.handleClickOutSide();
           });
           this.$nextTick(() => {
@@ -10255,21 +10252,22 @@ var Component$v = defineComponent({
               "background-color": "rgba(0,0,0,0)"
             };
             const appendStyle = this.showMask ? {} : hideMaskStyle;
-            this.bkPopIndexManager.show(this.$el, this.showMask, appendStyle, this.transfer, this.zIndex);
+            bkPopIndexManager.show(this.$el, this.showMask, appendStyle, this.transfer, this.zIndex);
             this.$emit("shown");
           });
         } else {
-          (_a = this.bkPopIndexManager) == null ? void 0 : _a.hide(this.$el, this.transfer);
-          (_b = this.bkPopIndexManager) == null ? void 0 : _b.destroy();
+          bkPopIndexManager == null ? void 0 : bkPopIndexManager.hide(this.$el, this.transfer);
+          bkPopIndexManager == null ? void 0 : bkPopIndexManager.destroy();
         }
       },
       immediate: true
     }
   },
   beforeUnmount() {
-    var _a, _b;
-    (_a = this.bkPopIndexManager) == null ? void 0 : _a.hide(this.$el);
-    (_b = this.bkPopIndexManager) == null ? void 0 : _b.destroy();
+    if (this.visible) {
+      bkPopIndexManager == null ? void 0 : bkPopIndexManager.hide(this.$el);
+      bkPopIndexManager == null ? void 0 : bkPopIndexManager.destroy();
+    }
   },
   methods: {
     handleClickOutSide() {
@@ -16244,7 +16242,8 @@ const TABLE_ROW_ATTRIBUTE = {
   ROW_SELECTION: "__row_selection",
   ROW_SELECTION_ALL: "__row_selection_all",
   ROW_SELECTION_INDETERMINATE: "__row_selection_indeterminate",
-  ROW_SOURCE_DATA: "__row_source_data"
+  ROW_SOURCE_DATA: "__row_source_data",
+  ROW_SKIP_CFG: "__row_skip_config"
 };
 const COLUMN_ATTRIBUTE = {
   COL_UID: "__col_$uuid"
@@ -16312,7 +16311,9 @@ const IColumnType = {
     }),
     PropTypes.bool,
     PropTypes.string
-  ]).def(false)
+  ]).def(false),
+  colspan: PropTypes.oneOfType([PropTypes.func.def(() => 1), PropTypes.number.def(1)]),
+  rowspan: PropTypes.oneOfType([PropTypes.func.def(() => 1), PropTypes.number.def(1)])
 };
 const tableProps = {
   data: PropTypes.arrayOf(PropTypes.any).def([]),
@@ -17180,6 +17181,28 @@ const isColumnHidden = (settingFields, column, checked) => {
   const isSettingField = (col) => settingFields.some((field) => field.field === resolvePropVal(col, ["field", "type"], [col]));
   return isSettingField(column) && checked.length && !checked.includes(resolvePropVal(column, ["field", "type"], [column]));
 };
+const resolveColumnSpan = (column, colIndex, row, rowIndex, key2) => {
+  if (typeof column[key2] === "function") {
+    return Reflect.apply(column[key2], globalThis, [{
+      column,
+      colIndex,
+      row,
+      rowIndex
+    }]);
+  }
+  if (typeof column[key2] === "number") {
+    return column[key2];
+  }
+  return 1;
+};
+const resolveCellSpan = (column, colIndex, row, rowIndex) => {
+  const colspan = resolveColumnSpan(column, colIndex, row, rowIndex, "colspan");
+  const rowspan = resolveColumnSpan(column, colIndex, row, rowIndex, "rowspan");
+  return {
+    colspan,
+    rowspan
+  };
+};
 var TableCell = defineComponent({
   name: "TableCell",
   props: {
@@ -17760,7 +17783,7 @@ var useFixedColumn = (props2, colgroups, hasScrollY) => {
     let start2 = fixedPos === "right" ? length * opt : 1;
     let preOffset = 0;
     for (start2; ; ) {
-      start2 += -1 * opt;
+      start2 = start2 + -1 * opt;
       const index = Math.abs(start2);
       const current = colgroups[index];
       const curFixedPos = resolveFixColPos(current);
@@ -18072,6 +18095,7 @@ class TableRender {
     const {
       resolveFixedColumnStyle
     } = useFixedColumn(this.props, this.colgroups);
+    const rowLength = rows.length;
     return createVNode("tbody", null, [rows.map((row, rowIndex) => {
       const rowStyle = [...formatPropAsArray(this.props.rowStyle, [row, rowIndex, this]), {
         "--row-height": `${this.getRowHeight(row, rowIndex)}px`
@@ -18087,30 +18111,45 @@ class TableRender {
           "onClick": (e) => this.handleRowClick(e, row, rowIndex, rows),
           "onDblclick": (e) => this.handleRowDblClick(e, row, rowIndex, rows)
         }, [this.filterColgroups.map((column, index) => {
-          let _slot2;
+          var _a, _b;
           const cellStyle = [resolveFixedColumnStyle(column), ...formatPropAsArray(this.props.cellStyle, [column, index, row, rowIndex, this])];
-          const cellClass = [this.getColumnClass(column, index), ...formatPropAsArray(this.props.cellClass, [column, index, row, rowIndex, this]), {
-            "expand-row": row[TABLE_ROW_ATTRIBUTE.ROW_EXPAND]
-          }];
           const tdCtxClass = {
             cell: true,
             "expand-cell": column.type === "expand"
           };
           const cellKey = `__CELL_${rowIndex}_${index}`;
-          return createVNode("td", {
-            "class": cellClass,
-            "style": cellStyle,
-            "key": cellKey,
-            "colspan": 1,
-            "rowspan": 1
-          }, [createVNode(TableCell, {
-            "class": tdCtxClass,
-            "column": column,
-            "row": row,
-            "parentSetting": this.props.showOverflowTooltip
-          }, _isSlot$1(_slot2 = this.renderCell(row, column, rowIndex, rows)) ? _slot2 : {
-            default: () => [_slot2]
-          })]);
+          const {
+            colspan,
+            rowspan
+          } = resolveCellSpan(column, index, row, rowIndex);
+          const skipRowKey = TABLE_ROW_ATTRIBUTE.ROW_SKIP_CFG;
+          const columnIdKey = column[COLUMN_ATTRIBUTE.COL_UID];
+          const {
+            skipRow = false,
+            skipCol = false
+          } = (_b = (_a = row[skipRowKey]) == null ? void 0 : _a[columnIdKey]) != null ? _b : {};
+          if (!skipRow && !skipCol) {
+            let _slot2;
+            const cellClass = [this.getColumnClass(column, index), ...formatPropAsArray(this.props.cellClass, [column, index, row, rowIndex, this]), {
+              "expand-row": row[TABLE_ROW_ATTRIBUTE.ROW_EXPAND],
+              "is-last": rowIndex + rowspan >= rowLength
+            }];
+            return createVNode("td", {
+              "class": cellClass,
+              "style": cellStyle,
+              "key": cellKey,
+              "colspan": colspan,
+              "rowspan": rowspan
+            }, [createVNode(TableCell, {
+              "class": tdCtxClass,
+              "column": column,
+              "row": row,
+              "parentSetting": this.props.showOverflowTooltip
+            }, _isSlot$1(_slot2 = this.renderCell(row, column, rowIndex, rows)) ? _slot2 : {
+              default: () => [_slot2]
+            })]);
+          }
+          return null;
         })])]
       }), this.renderExpandRow(row, rowClass)];
     })]);
@@ -18700,30 +18739,84 @@ const useInit = (props2, targetColumns) => {
     return false;
   });
   const indexData = reactive([]);
+  const neepColspanOrRowspan = computed(() => colgroups.some((col) => typeof col.rowspan === "function" || /^\d$/.test(`${col.rowspan}`) || typeof col.colspan === "function" || /^\d$/.test(`${col.colspan}`)));
   const initIndexData = (keepLocalAction = false) => {
+    let preRowId = null;
+    const skipConfig = {};
     indexData.splice(0, indexData.length, ...props2.data.map((item, index) => {
       const rowId = getRowKey(item, props2, index);
+      const cfg = neepColspanOrRowspan.value ? getSkipConfig(item, rowId, index, skipConfig, preRowId) : {};
+      preRowId = rowId;
       return __spreadProps(__spreadValues({}, item), {
         [TABLE_ROW_ATTRIBUTE.ROW_INDEX]: index,
         [TABLE_ROW_ATTRIBUTE.ROW_UID]: rowId,
         [TABLE_ROW_ATTRIBUTE.ROW_EXPAND]: keepLocalAction ? isRowExpand(rowId) : false,
         [TABLE_ROW_ATTRIBUTE.ROW_SELECTION]: resolveSelection(item, rowId),
-        [TABLE_ROW_ATTRIBUTE.ROW_SOURCE_DATA]: __spreadValues({}, item)
+        [TABLE_ROW_ATTRIBUTE.ROW_SOURCE_DATA]: __spreadValues({}, item),
+        [TABLE_ROW_ATTRIBUTE.ROW_SKIP_CFG]: cfg
       });
     }));
     initSelectionAllByData();
   };
   const updateIndexData = (selectedAll) => {
-    indexData.forEach((item) => {
+    let preRowId = null;
+    const skipConfig = {};
+    indexData.forEach((item, index) => {
+      const rowId = item[TABLE_ROW_ATTRIBUTE.ROW_UID];
+      const cfg = neepColspanOrRowspan.value ? getSkipConfig(item, rowId, index, skipConfig, preRowId) : {};
       Object.assign(item, {
         [TABLE_ROW_ATTRIBUTE.ROW_EXPAND]: isRowExpand(item[TABLE_ROW_ATTRIBUTE.ROW_UID]),
-        [TABLE_ROW_ATTRIBUTE.ROW_SELECTION]: typeof selectedAll === "boolean" ? selectedAll : resolveSelection(item, item[TABLE_ROW_ATTRIBUTE.ROW_UID])
+        [TABLE_ROW_ATTRIBUTE.ROW_SELECTION]: typeof selectedAll === "boolean" ? selectedAll : resolveSelection(item, item[TABLE_ROW_ATTRIBUTE.ROW_UID]),
+        [TABLE_ROW_ATTRIBUTE.ROW_SKIP_CFG]: cfg
       });
+      preRowId = item[TABLE_ROW_ATTRIBUTE.ROW_UID];
     });
     if (typeof selectedAll !== "boolean") {
       initSelectionAllByData();
     }
   };
+  const getSkipConfig = (row, rowId, rowIndex, skipCfg, preRowId) => {
+    var _a2;
+    let skipColumnNum = 0;
+    const preRowConfig = (_a2 = skipCfg[preRowId]) != null ? _a2 : {};
+    if (!skipCfg[rowId]) {
+      skipCfg[rowId] = {};
+    }
+    colgroups.forEach((column, index) => {
+      var _a3, _b2;
+      const { colspan, rowspan } = resolveCellSpan(column, index, row, rowIndex);
+      const colId = column[COLUMN_ATTRIBUTE.COL_UID];
+      const preRowColSkipLen = (_b2 = (_a3 = preRowConfig[colId]) == null ? void 0 : _a3.skipRowLen) != null ? _b2 : 0;
+      const target = {
+        [colId]: {
+          skipRowLen: 0,
+          skipRow: false,
+          skipCol: false,
+          skipColLen: 0
+        }
+      };
+      if (skipColumnNum > 0) {
+        target[colId].skipColLen = skipColumnNum;
+        target[colId].skipCol = true;
+        skipColumnNum = skipColumnNum - 1;
+      }
+      if (preRowColSkipLen > 1) {
+        target[colId].skipRowLen = preRowColSkipLen - 1;
+        target[colId].skipRow = true;
+      } else {
+        if (rowspan > 1) {
+          target[colId].skipRowLen = rowspan;
+          target[colId].skipRow = false;
+        }
+      }
+      if (colspan > 1) {
+        target[colId].skipColLen = colspan;
+        skipColumnNum = colspan - 1;
+      }
+      Object.assign(skipCfg[rowId], __spreadValues({}, target));
+    });
+    return skipCfg[rowId];
+  };
   const asyncSelection = (row, value, all = false) => {
     if (props2.asyncData && props2.rowKey) {
       if (all) {