From fb364104f7bc0c355de9a3fea6fd71dda1d23d35 Mon Sep 17 00:00:00 2001 From: goodmice Date: Tue, 12 Oct 2021 15:03:43 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A4=D0=B0=D0=B1=D1=80=D0=B8=D0=BA=D0=B8=20?= =?UTF-8?q?=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D1=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Table/index.tsx | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/src/components/Table/index.tsx b/src/components/Table/index.tsx index a4d6dc5..e726d2e 100644 --- a/src/components/Table/index.tsx +++ b/src/components/Table/index.tsx @@ -146,28 +146,28 @@ export const makeNumericColumnPlanFact = (title: string, dataIndex: string, filt export const makeNumericStartEnd = ( title: string, dataIndex: string, - editable: boolean, + fixed: number, filters: object[], filterDelegate: (key: string | number) => any, renderDelegate: (_: any, row: object) => any, width: string, ) => makeGroupColumn( title, [ - makeNumericColumn('старт', dataIndex + '_start', filters, filterDelegate, renderDelegate, width, {editable}), - makeNumericColumn('конец', dataIndex + '_end', filters, filterDelegate, renderDelegate, width, {editable}) + makeNumericColumn('старт', dataIndex + 'Start', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Start')), + makeNumericColumn('конец', dataIndex + 'End', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'End')) ]) export const makeNumericAvgRange = ( title: string, dataIndex: string, - editable: boolean, + fixed: number, filters: object[], filterDelegate: (key: string | number) => any, renderDelegate: (_: any, row: object) => any, width: string ) => makeGroupColumn( title, [ - makeNumericColumn('мин', dataIndex + '_min', filters, filterDelegate, renderDelegate, width, {editable}), - makeNumericColumn('сред', dataIndex + '_avg', filters, filterDelegate, renderDelegate, width, {editable}), - makeNumericColumn('макс', dataIndex + '_max', filters, filterDelegate, renderDelegate, width, {editable}) + makeNumericColumn('мин', dataIndex + 'Min', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Min')), + makeNumericColumn('сред', dataIndex + 'Avg', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Avg')), + makeNumericColumn('макс', dataIndex + 'Max', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Max')) ]) type PaginationContainer = {