bkui-vue 0.0.1-beta.213 → 0.0.1-beta.215

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
     };
   },
@@ -10240,34 +10239,35 @@ var Component$v = defineComponent({
           }, 250);
         }
       },
-      immediate: true,
-      deep: true
+      immediate: true
     },
-    visible(val) {
-      var _a, _b;
-      if (val) {
-        this.bkPopIndexManager = new BKPopIndexManager();
-        this.bkPopIndexManager.onMaskClick((_e) => {
-          this.handleClickOutSide();
-        });
-        this.$nextTick(() => {
-          const hideMaskStyle = {
-            "background-color": "rgba(0,0,0,0)"
-          };
-          const appendStyle = this.showMask ? {} : hideMaskStyle;
-          this.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();
-      }
+    visible: {
+      handler(val) {
+        if (val) {
+          bkPopIndexManager.onMaskClick((_e) => {
+            this.handleClickOutSide();
+          });
+          this.$nextTick(() => {
+            const hideMaskStyle = {
+              "background-color": "rgba(0,0,0,0)"
+            };
+            const appendStyle = this.showMask ? {} : hideMaskStyle;
+            bkPopIndexManager.show(this.$el, this.showMask, appendStyle, this.transfer, this.zIndex);
+            this.$emit("shown");
+          });
+        } else {
+          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() {
@@ -16310,7 +16310,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([]),
@@ -17178,6 +17180,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: {
@@ -17758,7 +17782,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);
@@ -18070,12 +18094,15 @@ class TableRender {
     const {
       resolveFixedColumnStyle
     } = useFixedColumn(this.props, this.colgroups);
+    const skipRow = /* @__PURE__ */ new Map();
+    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`
       }];
       const rowClass = [...formatPropAsArray(this.props.rowClass, [row, rowIndex, this]), `hover-${this.props.rowHover}`];
       const rowKey = row[TABLE_ROW_ATTRIBUTE.ROW_UID];
+      let skipColumn = 0;
       return [createVNode(TableRow, {
         "key": rowKey
       }, {
@@ -18085,30 +18112,51 @@ 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;
           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 skipCurrentRow = skipRow.get(index);
+          if (skipColumn === 0 && !skipCurrentRow) {
+            let _slot2;
+            if (colspan > 1) {
+              skipColumn = colspan - 1;
+            }
+            if (rowspan > 1) {
+              skipRow.set(index, rowspan - 1);
+            }
+            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]
+            })]);
+          }
+          if (skipColumn > 0) {
+            skipColumn = skipColumn - 1;
+          }
+          if (skipCurrentRow > 0) {
+            skipRow.set(index, skipCurrentRow - 1);
+          }
+          return null;
         })])]
       }), this.renderExpandRow(row, rowClass)];
     })]);