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

package/dist/index.esm.js

@@ -15347,13 +15347,6 @@ var Component$j = defineComponent({
         initActiveOptionValue();
       }
     });
-    const watchOnce = watch(isPopoverShow, () => {
-      setTimeout(() => {
-        var _a, _b;
-        enableVirtualRender.value && ((_b = (_a = virtualRenderRef.value) == null ? void 0 : _a.reset) == null ? void 0 : _b.call(_a));
-        watchOnce();
-      });
-    });
     const initActiveOptionValue = () => {
       var _a;
       const firstSelected = selected.value[0];
@@ -15573,6 +15566,12 @@ var Component$j = defineComponent({
       hidePopover();
       handleBlur();
     };
+    const handlePopoverShow = () => {
+      setTimeout(() => {
+        var _a, _b;
+        enableVirtualRender.value && ((_b = (_a = virtualRenderRef.value) == null ? void 0 : _a.reset) == null ? void 0 : _b.call(_a));
+      });
+    };
     provide(selectKey, reactive({
       multiple,
       selected,
@@ -15640,7 +15639,8 @@ var Component$j = defineComponent({
       handleInputChange,
       handleInputEnter,
       handleKeydown,
-      handleSelectedAllOptionMouseEnter
+      handleSelectedAllOptionMouseEnter,
+      handlePopoverShow
     };
   },
   render() {
@@ -15799,6 +15799,7 @@ var Component$j = defineComponent({
       "class": selectClass
     }, [createVNode(BkPopover2, mergeProps(this.popoverConfig, {
       "onClickoutside": this.handleClickOutside,
+      "onAfterShow": this.handlePopoverShow,
       "ref": "popoverRef"
     }), {
       default: () => renderSelectTrigger(),
@@ -16242,7 +16243,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"
@@ -18094,7 +18096,6 @@ 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]), {
@@ -18102,7 +18103,6 @@ class TableRender {
       }];
       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
       }, {
@@ -18112,6 +18112,7 @@ class TableRender {
           "onClick": (e) => this.handleRowClick(e, row, rowIndex, rows),
           "onDblclick": (e) => this.handleRowDblClick(e, row, rowIndex, rows)
         }, [this.filterColgroups.map((column, index) => {
+          var _a, _b;
           const cellStyle = [resolveFixedColumnStyle(column), ...formatPropAsArray(this.props.cellStyle, [column, index, row, rowIndex, this])];
           const tdCtxClass = {
             cell: true,
@@ -18122,15 +18123,14 @@ class TableRender {
             colspan,
             rowspan
           } = resolveCellSpan(column, index, row, rowIndex);
-          const skipCurrentRow = skipRow.get(index);
-          if (skipColumn === 0 && !skipCurrentRow) {
+          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;
-            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
@@ -18150,12 +18150,6 @@ class TableRender {
               default: () => [_slot2]
             })]);
           }
-          if (skipColumn > 0) {
-            skipColumn = skipColumn - 1;
-          }
-          if (skipCurrentRow > 0) {
-            skipRow.set(index, skipCurrentRow - 1);
-          }
           return null;
         })])]
       }), this.renderExpandRow(row, rowClass)];
@@ -18746,30 +18740,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) {