From 6657ebf615ada6986897dbe8909cbecd66d2ea28 Mon Sep 17 00:00:00 2001 From: luqimin Date: Fri, 29 Apr 2022 15:21:07 +0800 Subject: [PATCH 1/2] Update columnRangeHover.tsx --- .../src/pipeline/features/columnRangeHover.tsx | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/ali-react-table/src/pipeline/features/columnRangeHover.tsx b/packages/ali-react-table/src/pipeline/features/columnRangeHover.tsx index 3d32998d3..0eec9242e 100644 --- a/packages/ali-react-table/src/pipeline/features/columnRangeHover.tsx +++ b/packages/ali-react-table/src/pipeline/features/columnRangeHover.tsx @@ -57,7 +57,7 @@ export function columnRangeHover(opts: ColumnRangeHoverFeatureOptions = {}) { onMouseLeave() { onChangeHoverRange(EMPTY_RANGE) }, - style: { '--header-bgcolor': match ? headerHoverColor : undefined } as any, + style: { '--header-bgcolor': match ? headerHoverColor : col.headerCellProps?.style?.['--header-bgcolor'] } as any, }), } } @@ -73,7 +73,7 @@ export function columnRangeHover(opts: ColumnRangeHoverFeatureOptions = {}) { onMouseLeave() { onChangeHoverRange(EMPTY_RANGE) }, - style: { '--header-bgcolor': match ? headerHoverColor : undefined } as any, + style: { '--header-bgcolor': match ? headerHoverColor : col.headerCellProps?.style?.['--header-bgcolor'] } as any, }), getCellProps(value: any, record: any, rowIndex: number): CellProps { @@ -86,7 +86,7 @@ export function columnRangeHover(opts: ColumnRangeHoverFeatureOptions = {}) { onMouseLeave() { onChangeHoverRange(EMPTY_RANGE) }, - style: { '--bgcolor': match ? hoverColor : undefined } as any, + style: { '--bgcolor': match ? hoverColor : prevCellProps?.style?.['--bgcolor'] } as any, }) }, } From 7b455ca23a30ef14e09d0c03ebe95fdde78c4d53 Mon Sep 17 00:00:00 2001 From: luqimin Date: Fri, 29 Apr 2022 15:26:03 +0800 Subject: [PATCH 2/2] Update columnHover.tsx --- packages/ali-react-table/src/pipeline/features/columnHover.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/ali-react-table/src/pipeline/features/columnHover.tsx b/packages/ali-react-table/src/pipeline/features/columnHover.tsx index 8f08f9a72..eb2e5fa37 100644 --- a/packages/ali-react-table/src/pipeline/features/columnHover.tsx +++ b/packages/ali-react-table/src/pipeline/features/columnHover.tsx @@ -43,7 +43,7 @@ export function columnHover(opts: ColumnHoverFeatureOptions = {}) { const prevCellProps = prevGetCellProps?.(value, record, rowIndex) return mergeCellProps(prevCellProps, { - style: { '--bgcolor': colIndexMatched ? hoverColor : undefined } as any, + style: { '--bgcolor': colIndexMatched ? hoverColor : prevCellProps?.style?.['--bgcolor'] } as any, onMouseEnter() { onChangeHoverColIndex(range.start) },