@v-c/table 1.1.0 → 1.1.2

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/dist/hooks/useFixedInfo.d.ts

@@ -1,3 +1,3 @@
 import { Ref } from 'vue';
 import { ColumnType, StickyOffsets } from '../interface';
-export default function useFixedInfo<RecordType>(flattenColumns: Ref<readonly ColumnType<RecordType>[]> | readonly ColumnType<RecordType>[], stickyOffsets: Ref<StickyOffsets> | StickyOffsets): import('vue').Ref<import('../utils/fixUtil').FixedInfo[], import('../utils/fixUtil').FixedInfo[]>;
+export default function useFixedInfo<RecordType>(flattenColumns: Ref<readonly ColumnType<RecordType>[]> | readonly ColumnType<RecordType>[], stickyOffsets: Ref<StickyOffsets> | StickyOffsets): any;

package/dist/hooks/useRowInfo.d.ts

@@ -8,7 +8,7 @@ export default function useRowInfo<RecordType>(record: Ref<RecordType> | RecordT
     rowSupportExpand: import('vue').ComputedRef<boolean>;
     expandable: import('vue').ComputedRef<boolean>;
     rowProps: import('vue').ComputedRef<{
-        className: string;
+        className: any;
         onClick: (event: MouseEvent) => void;
         innerHTML?: string | undefined | undefined;
         class?: any;

package/dist/stickyScrollBar.js

@@ -1,7 +1,7 @@
 import { useInjectTableContext } from "./context/TableContext.js";
 import { useLayoutState } from "./hooks/useFrame.js";
 import { getOffset } from "./utils/offsetUtil.js";
-import { computed, createVNode, defineComponent, onBeforeUnmount, onMounted, ref, watch } from "vue";
+import { computed, createVNode, defineComponent, nextTick, onBeforeUnmount, onMounted, ref, watch } from "vue";
 import { clsx } from "@v-c/util";
 import { getDOM } from "@v-c/util/dist/Dom/findDOMNode";
 import getScrollBarSize from "@v-c/util/dist/getScrollBarSize";
@@ -33,8 +33,13 @@ var StickyScrollBar = /* @__PURE__ */ defineComponent({
 		});
 		const isActive = ref(false);
 		const rafRef = ref(null);
-		const bodyScrollWidth = computed(() => props.scrollBodyRef.value?.scrollWidth || 0);
-		const bodyWidth = computed(() => props.scrollBodyRef.value?.clientWidth || 0);
+		const bodyScrollWidth = ref(0);
+		const bodyWidth = ref(0);
+		const syncBodySize = () => {
+			const bodyNode = props.scrollBodyRef.value;
+			bodyScrollWidth.value = bodyNode?.scrollWidth || 0;
+			bodyWidth.value = bodyNode?.clientWidth || 0;
+		};
 		const scrollBarWidth = computed(() => {
 			const totalWidth = bodyScrollWidth.value;
 			const clientWidth = bodyWidth.value;
@@ -66,6 +71,7 @@ var StickyScrollBar = /* @__PURE__ */ defineComponent({
 		const checkScrollBarVisible = () => {
 			raf.cancel(rafRef.value);
 			rafRef.value = raf(() => {
+				syncBodySize();
 				if (!props.scrollBodyRef.value || !props.container) return;
 				const container = props.container;
 				const tableOffsetTop = getOffset(props.scrollBodyRef.value).top;
@@ -94,7 +100,7 @@ var StickyScrollBar = /* @__PURE__ */ defineComponent({
 		onMounted(() => {
 			document.body.addEventListener(MOUSEUP_EVENT, onMouseUp, false);
 			document.body.addEventListener(MOUSEMOVE_EVENT, onMouseMove, false);
-			checkScrollBarVisible();
+			nextTick(checkScrollBarVisible);
 		});
 		const removeScrollListeners = ref(null);
 		onBeforeUnmount(() => {
@@ -103,6 +109,12 @@ var StickyScrollBar = /* @__PURE__ */ defineComponent({
 			raf.cancel(rafRef.value);
 			removeScrollListeners.value?.();
 		});
+		watch(() => props.scrollBodyRef.value, () => {
+			nextTick(checkScrollBarVisible);
+		}, {
+			immediate: true,
+			flush: "post"
+		});
 		watch(() => [scrollBarWidth.value, isActive.value], () => {
 			checkScrollBarVisible();
 		});

package/dist/sugar/Column.js

@@ -52,15 +52,6 @@ var Column = /* @__PURE__ */ defineComponent(() => {
 		default: void 0
 	},
 	title: {
-		type: [
-			Object,
-			Function,
-			String,
-			Number,
-			null,
-			Boolean,
-			Array
-		],
 		required: false,
 		default: void 0
 	},

package/dist/sugar/ColumnGroup.js

@@ -52,15 +52,6 @@ var ColumnGroup = /* @__PURE__ */ defineComponent(() => {
 		default: void 0
 	},
 	title: {
-		type: [
-			Object,
-			Function,
-			String,
-			Number,
-			null,
-			Boolean,
-			Array
-		],
 		required: false,
 		default: void 0
 	},

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@v-c/table",
   "type": "module",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "exports": {
     ".": {
       "types": "./dist/index.d.ts",