From 0238c5a30a8bf8d74f1e57308f1f360a5b0b25ce Mon Sep 17 00:00:00 2001 From: Ilya Korneev Date: Tue, 19 Jan 2021 17:53:37 +0300 Subject: [PATCH] indent column optional behaviour as in full hierarchy table, ability to set column width manually --- src/components/HierarchyTable/HierarchyTable.tsx | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/components/HierarchyTable/HierarchyTable.tsx b/src/components/HierarchyTable/HierarchyTable.tsx index e492617ad..6bd6bf06c 100644 --- a/src/components/HierarchyTable/HierarchyTable.tsx +++ b/src/components/HierarchyTable/HierarchyTable.tsx @@ -190,6 +190,7 @@ export const HierarchyTable: FunctionComponent = props => { } const fields = hierarchyLevel ? hierarchyLevel.fields : props.meta.fields + const withHierarchyShift = fields.find(field => field.hierarchyShift === true) // Уровни иерархии отбиваются отступом через пустую колонку с вычисляемой шириной const indentColumn = { @@ -197,7 +198,7 @@ export const HierarchyTable: FunctionComponent = props => { key: '_indentColumn', dataIndex: null as string, className: styles.selectColumn, - width: '50px', + width: withHierarchyShift ? `${50 + indentLevel * 20}px` : '50px', render: (text: string, dataItem: AssociatedItem): React.ReactNode => { return null } @@ -215,8 +216,9 @@ export const HierarchyTable: FunctionComponent = props => { title: item.title, key: item.key, dataIndex: item.key, + width: item.width, className: cn({ - [styles[`padding${indentLevel}`]]: fields[0].key === item.key && indentLevel, + [styles[`padding${indentLevel}`]]: fields[0].key === item.key && indentLevel && !item.width, [styles.numberColumn]: fields[0].key === item.key }), render: (text: string, dataItem: any) => {