@v-c/table 1.1.0-rc.2 → 1.1.1

package/dist/Body/BodyRow.d.ts

@@ -27,6 +27,7 @@ export declare function getCellProps<RecordType>(rowInfo: ReturnType<typeof useR
     fixedInfo: import('../utils/fixUtil').FixedInfo;
     appendCellNode: any;
     additionalCellProps: Partial<import('../interface').CellAttributes>;
+    hoverRowSpan: number | undefined;
 };
 declare const BodyRow: import('vue').DefineComponent<BodyRowProps<any>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<BodyRowProps<any>> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;
 export default BodyRow;

package/dist/Body/BodyRow.js

@@ -25,22 +25,22 @@ function getCellProps(rowInfo, record, column, colIndex, indent, index, rowKeys
 		onExpand: onTriggerExpand
 	})]);
 	const additionalCellProps = column.onCell?.(record, index) || {};
-	if (expandedRowOffset) {
+	let hoverRowSpan;
+	if (expandedRowOffset && expandable.value && colIndex < expandedRowOffset) {
 		const { rowSpan = 1 } = additionalCellProps;
-		if (expandable.value && rowSpan && colIndex < expandedRowOffset) {
-			let currentRowSpan = rowSpan;
-			for (let i = index; i < index + rowSpan; i += 1) {
-				const keyInRow = rowKeys[i];
-				if (expandedKeys.has(keyInRow)) currentRowSpan += 1;
-			}
-			additionalCellProps.rowSpan = currentRowSpan;
+		if (rowSpan) {
+			hoverRowSpan = rowSpan;
+			let expandedCount = 0;
+			for (let i = index; i < index + rowSpan; i += 1) if (expandedKeys.has(rowKeys[i])) expandedCount += 1;
+			additionalCellProps.rowSpan = rowSpan + expandedCount;
 		}
 	}
 	return {
 		key,
 		fixedInfo,
 		appendCellNode,
-		additionalCellProps
+		additionalCellProps,
+		hoverRowSpan
 	};
 }
 var BodyRow = /* @__PURE__ */ defineComponent({
@@ -89,7 +89,7 @@ var BodyRow = /* @__PURE__ */ defineComponent({
 				"style": mergedRowStyle
 			}), _isSlot(_slot = flattenColumns.map((column, colIndex) => {
 				const { render, dataIndex, className: columnClassName } = column;
-				const { key, fixedInfo, appendCellNode, additionalCellProps } = getCellProps(rowInfo, record, column, colIndex, indent, index, rowKeys, expandedRowInfo?.offset);
+				const { key, fixedInfo, appendCellNode, additionalCellProps, hoverRowSpan } = getCellProps(rowInfo, record, column, colIndex, indent, index, rowKeys, expandedRowInfo?.offset);
 				const scope = column.rowScope ? column.rowScope : column.title ? "row" : void 0;
 				const CellComponent = column.rowScope ? scopeCellComponent : BodyCellComponent;
 				return createVNode(Cell, mergeProps({
@@ -109,6 +109,7 @@ var BodyRow = /* @__PURE__ */ defineComponent({
 					"rowType": "body"
 				}, fixedInfo, {
 					"additionalProps": additionalCellProps,
+					"hoverRowSpan": hoverRowSpan,
 					"column": column,
 					"appendNode": appendCellNode
 				}), null);

package/dist/Cell/index.d.ts

@@ -17,6 +17,7 @@ export interface CellProps<RecordType extends DefaultRecordType> {
     children?: any;
     colSpan?: number;
     rowSpan?: number;
+    hoverRowSpan?: number;
     scope?: ScopeType;
     ellipsis?: CellEllipsisType;
     align?: AlignType;

package/dist/Cell/index.js

@@ -55,6 +55,7 @@ var Cell = /* @__PURE__ */ defineComponent({
 		"children",
 		"colSpan",
 		"rowSpan",
+		"hoverRowSpan",
 		"scope",
 		"ellipsis",
 		"align",
@@ -90,7 +91,7 @@ var Cell = /* @__PURE__ */ defineComponent({
 			return [isFixStart.value && fixedStartShadow ? absScroll - (offsetFixedStartShadow || 0) >= 1 : false, isFixEnd && fixedEndShadow ? scrollWidth - absScroll - (offsetFixedEndShadow || 0) > 1 : false];
 		});
 		return () => {
-			const { component: Component = "td", ellipsis, scope, prefixCls, className, style, align, record, index, colIndex, renderIndex, dataIndex, render, column, rowType, colSpan, rowSpan, fixStart, fixEnd, fixedStartShadow, fixedEndShadow, zIndex, zIndexReverse, additionalProps = {}, isSticky, appendNode } = props;
+			const { component: Component = "td", ellipsis, scope, prefixCls, className, style, align, record, index, colIndex, renderIndex, dataIndex, render, column, rowType, colSpan, rowSpan, hoverRowSpan, fixStart, fixEnd, fixedStartShadow, fixedEndShadow, zIndex, zIndexReverse, additionalProps = {}, isSticky, appendNode } = props;
 			const cellPrefixCls = `${prefixCls}-cell`;
 			const mergedAppendNode = appendNode ?? slots?.appendNode?.();
 			const mergedRenderIndex = renderIndex ?? index ?? 0;
@@ -116,9 +117,10 @@ var Cell = /* @__PURE__ */ defineComponent({
 			}
 			const mergedColSpan = legacyCellProps?.colSpan ?? additionalProps.colSpan ?? colSpan ?? 1;
 			const mergedRowSpan = legacyCellProps?.rowSpan ?? additionalProps.rowSpan ?? rowSpan ?? 1;
-			const [hovering, onHover] = useHoverState(index, mergedRowSpan, tableContext);
+			const mergedHoverRowSpan = hoverRowSpan ?? mergedRowSpan;
+			const [hovering, onHover] = useHoverState(index, mergedHoverRowSpan, tableContext);
 			const onMouseEnter = (event) => {
-				if (record) onHover(index, index + mergedRowSpan - 1);
+				if (record) onHover(index, index + mergedHoverRowSpan - 1);
 				(additionalProps.onMouseEnter || additionalProps.onMouseenter)?.(event);
 			};
 			const onMouseLeave = (event) => {

package/dist/VirtualTable/VirtualCell.js

@@ -30,7 +30,7 @@ var VirtualCell = /* @__PURE__ */ defineComponent({
 			const { rowInfo, column, colIndex, indent, index, component, renderIndex, record, style, className, inverse, getHeight } = props;
 			const { render, dataIndex, className: columnClassName, width: colWidth } = column;
 			const columnsOffset = gridContext.columnsOffset || [];
-			const { key, fixedInfo, appendCellNode, additionalCellProps } = getCellProps(rowInfo, record, column, colIndex, indent, index);
+			const { key, fixedInfo, appendCellNode, additionalCellProps, hoverRowSpan } = getCellProps(rowInfo, record, column, colIndex, indent, index);
 			const { style: cellStyle, colSpan = 1, rowSpan = 1 } = additionalCellProps;
 			const concatColWidth = getColumnWidth(colIndex - 1, colSpan, columnsOffset);
 			const marginOffset = colSpan > 1 ? colWidth - concatColWidth : 0;
@@ -69,6 +69,7 @@ var VirtualCell = /* @__PURE__ */ defineComponent({
 				"shouldCellUpdate": column.shouldCellUpdate
 			}, fixedInfo, {
 				"appendNode": appendCellNode,
+				"hoverRowSpan": hoverRowSpan,
 				"additionalProps": {
 					...additionalCellProps,
 					style: mergedStyle,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/table",
   "type": "module",
-  "version": "1.1.0-rc.2",
+  "version": "1.1.1",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",
@@ -20,7 +20,7 @@
     "vue": "^3.0.0"
   },
   "dependencies": {
-    "@v-c/resize-observer": "^1.0.8",
+    "@v-c/resize-observer": "^1.1.0",
     "@v-c/util": "^1.0.19",
     "@v-c/virtual-list": "^1.0.7"
   },