Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Table] fix sibling column resizable does not work #2335

Merged
merged 6 commits into from
Apr 20, 2023
Merged

[Table] fix sibling column resizable does not work #2335

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a6e6b7
fix(table): 修复table组件激活左侧固定列时拖拽异常的问题
chuyueZhang Apr 12, 2023
95ec2a1
fix(table): 修复table组件在拖拽使横向滚动条隐现后列宽无法正常调整的问题
chuyueZhang Apr 12, 2023
64ea94e
fix(table): 修复table组件在开启多级表头时点击子表头后控制台报错的问题
chuyueZhang Apr 12, 2023
431eb8b
fix(table): 修复table组件在开启固定列单列resizable禁用时，相邻resizable启用的列列宽调整范围与预期不一致的问题
chuyueZhang Apr 14, 2023
cd36bc9
Merge remote-tracking branch 'origin/develop' into fix-table-20230414
chuyueZhang Apr 14, 2023
8898c9e
chore(table): 代码cr简化
chuyueZhang Apr 17, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 14 additions & 6 deletions src/table/hooks/useColumnResize.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -186,13 +186,20 @@ export default function useColumnResize(params: {
};
};

const getFixedToLeftResizeInfo = (targetBoundRect: DOMRect, tableBoundRect: DOMRect) => {
const resizeLinePos = targetBoundRect.left - tableBoundRect.left;
const getFixedToLeftResizeInfo = (
target: HTMLElement,
col: BaseTableCol,
targetBoundRect: DOMRect,
tableBoundRect: DOMRect,
) => {
const targetIsSameAsCol = target.dataset.colkey === col.colKey;
const colLeft = targetBoundRect.left - tableBoundRect.left;
const resizeLinePos = colLeft + targetBoundRect.width;
const { minColWidth, maxColWidth } = getMinMaxColWidth(col);
return {
resizeLinePos,
minResizeLineLeft: colLeft,
maxResizeLineLeft: colLeft,
minResizeLineLeft: colLeft + (targetIsSameAsCol ? minColWidth : targetBoundRect.width),
maxResizeLineLeft: colLeft + (targetIsSameAsCol ? maxColWidth : targetBoundRect.width),
};
};

Expand All @@ -218,13 +225,14 @@ export default function useColumnResize(params: {
return !(isWidthAbnormal || isWidthOverflow.value || index === leafColumns.value.length - 1);
};
const getOtherResizeInfo = (
target: HTMLElement,
col: BaseTableCol<TableRowData>,
effectPrevCol: BaseTableCol,
targetBoundRect: DOMRect,
tableBoundRect: DOMRect,
) => effectPrevCol
? getNormalResizeInfo(col, effectPrevCol, targetBoundRect, tableBoundRect)
: getFixedToLeftResizeInfo(targetBoundRect, tableBoundRect);
: getFixedToLeftResizeInfo(target, col, targetBoundRect, tableBoundRect);

// 调整表格列宽
const onColumnMousedown = (e: MouseEvent, col: BaseTableCol<TableRowData>, index: number) => {
Expand All @@ -236,7 +244,7 @@ export default function useColumnResize(params: {
const effectPrevCol = effectColMap.value[col.colKey]?.prev;
const { resizeLinePos, minResizeLineLeft, maxResizeLineLeft } = isColRightFixActive(col)
? getFixedToRightResizeInfo(target, col, effectNextCol, targetBoundRect, tableBoundRect)
: getOtherResizeInfo(col, effectNextCol, targetBoundRect, tableBoundRect);
: getOtherResizeInfo(target, col, effectPrevCol, targetBoundRect, tableBoundRect);

// 开始拖拽，记录下鼠标起始位置
resizeLineParams.isDragging = true;
Expand Down