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

fix(table): 列宽度和小于表宽的情况下，调整列宽的结果与预期不符 #1284

Merged
merged 3 commits into from
Aug 14, 2022
Merged

fix(table): 列宽度和小于表宽的情况下，调整列宽的结果与预期不符 #1284

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6c8e6ab
fix(table): optimize table column resize
ZTao-z Aug 13, 2022
0040aaa
fix(table): update table demo
ZTao-z Aug 13, 2022
b25938c
fix(table): update test case
ZTao-z Aug 13, 2022
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
28 changes: 21 additions & 7 deletions src/table/BaseTable.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ import { BaseTableProps } from './interface';
import useStyle, { formatCSSUnit } from './hooks/useStyle';
import useClassName from './hooks/useClassName';
import { getAffixProps } from './utils';
import log from '../_common/js/log';

import { StyledProps, Styles } from '../common';

Expand All @@ -29,14 +30,19 @@ export interface TableListeners {
export interface TBaseTableProps extends BaseTableProps, StyledProps {}

const BaseTable = forwardRef((props: TBaseTableProps, ref) => {
const { tableLayout, height, data, columns, style, headerAffixedTop, bordered } = props;
const { tableLayout, height, data, columns, style, headerAffixedTop, bordered, resizable } = props;
const tableRef = useRef<HTMLDivElement>();
const tableElmRef = useRef<HTMLTableElement>();
const [tableFootHeight, setTableFootHeight] = useState(0);
const { virtualScrollClasses, tableLayoutClasses, tableBaseClass, tableColFixedClasses } = useClassName();
// 表格基础样式类
const { tableClasses, tableContentStyles, tableElementStyles } = useStyle(props);
// const [global] = useLocaleReceiver('table');
const { isMultipleHeader, spansAndLeafNodes, thList } = useTableHeader({ columns: props.columns });
const finalColumns = useMemo(
() => spansAndLeafNodes?.leafColumns || columns,
[spansAndLeafNodes?.leafColumns, columns],
);

// 固定表头和固定列逻辑
const {
Expand All @@ -55,7 +61,10 @@ const BaseTable = forwardRef((props: TBaseTableProps, ref) => {
emitScrollEvent,
setUseFixedTableElmRef,
updateColumnFixedShadow,
} = useFixed(props);
getThWidthList,
updateThWidthList,
setRecalculateColWidthFuncRef,
} = useFixed(props, finalColumns);

// 1. 表头吸顶；2. 表尾吸底；3. 底部滚动条吸底；4. 分页器吸底
const {
Expand All @@ -71,12 +80,12 @@ const BaseTable = forwardRef((props: TBaseTableProps, ref) => {
updateAffixHeaderOrFooter,
} = useAffix(props);

const { isMultipleHeader, spansAndLeafNodes, thList } = useTableHeader({ columns: props.columns });
const { dataSource, isPaginateData, renderPagination } = usePagination(props);

// 列宽拖拽逻辑
const columnResizeParams = useColumnResize(tableContentRef, refreshTable);
const { resizeLineRef, resizeLineStyle } = columnResizeParams;
const columnResizeParams = useColumnResize(tableContentRef, refreshTable, getThWidthList, updateThWidthList);
const { resizeLineRef, resizeLineStyle, recalculateColWidth } = columnResizeParams;
setRecalculateColWidthFuncRef(recalculateColWidth);

const dynamicBaseTableClasses = classNames(
tableClasses.concat({
Expand Down Expand Up @@ -175,11 +184,15 @@ const BaseTable = forwardRef((props: TBaseTableProps, ref) => {

const newData = isPaginateData ? dataSource : data;

if (resizable && tableLayout === 'auto') {
log.warn('Table', 'table-layout can not be `auto` for resizable column table, set `table-layout: fixed` please.');
}

const defaultColWidth = props.tableLayout === 'fixed' && isWidthOverflow ? '100px' : undefined;
const colgroup = (
<colgroup>
{(spansAndLeafNodes?.leafColumns || columns).map((col) => {
const style: Styles = { width: formatCSSUnit(col.width) || defaultColWidth };
{finalColumns.map((col) => {
const style: Styles = { width: formatCSSUnit(thWidthList[col.colKey] || col.width) || defaultColWidth };
if (col.minWidth) {
style.minWidth = formatCSSUnit(col.minWidth);
}
Expand Down Expand Up @@ -329,6 +342,7 @@ const BaseTable = forwardRef((props: TBaseTableProps, ref) => {
bordered={props.bordered}
spansAndLeafNodes={spansAndLeafNodes}
thList={thList}
thWidthList={thWidthList}
resizable={props.resizable}
columnResizeParams={columnResizeParams}
/>
Expand Down
13 changes: 9 additions & 4 deletions src/table/THead.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ export interface TheadProps {
columnResizeParams?: {
resizeLineRef: MutableRefObject<HTMLDivElement>;
resizeLineStyle: CSSProperties;
onColumnMouseover: (e: MouseEvent, col: BaseTableCol<TableRowData>) => void;
onColumnMousedown: (e: MouseEvent, col: BaseTableCol<TableRowData>) => void;
onColumnMouseover: (e: MouseEvent) => void;
onColumnMousedown: (e: MouseEvent, col: BaseTableCol<TableRowData>, nearCol: BaseTableCol<TableRowData>) => void;
};
}

Expand Down Expand Up @@ -85,8 +85,13 @@ export default function THead(props: TheadProps) {
if (!col.colKey) return null;
const resizeColumnListener = props.resizable
? {
onMouseDown: (e) => columnResizeParams?.onColumnMousedown?.(e, col),
onMouseMove: (e) => columnResizeParams?.onColumnMouseover?.(e, col),
onMouseDown: (e) =>
columnResizeParams?.onColumnMousedown?.(
e,
col,
index < row.length - 1 ? row[index + 1] : row[index - 1],
),
onMouseMove: (e) => columnResizeParams?.onColumnMouseover?.(e),
}
: {};
const content = isFunction(col.ellipsisTitle) ? col.ellipsisTitle({ col, colIndex: index }) : undefined;
Expand Down
Loading