Фабрики исправлены

This commit is contained in:
goodmice 2021-10-12 15:03:43 +05:00
parent 92f95b5fe2
commit fb364104f7

View File

@ -146,28 +146,28 @@ export const makeNumericColumnPlanFact = (title: string, dataIndex: string, filt
export const makeNumericStartEnd = ( export const makeNumericStartEnd = (
title: string, title: string,
dataIndex: string, dataIndex: string,
editable: boolean, fixed: number,
filters: object[], filters: object[],
filterDelegate: (key: string | number) => any, filterDelegate: (key: string | number) => any,
renderDelegate: (_: any, row: object) => any, renderDelegate: (_: any, row: object) => any,
width: string, width: string,
) => makeGroupColumn( title, [ ) => makeGroupColumn( title, [
makeNumericColumn('старт', dataIndex + '_start', filters, filterDelegate, renderDelegate, width, {editable}), makeNumericColumn('старт', dataIndex + 'Start', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Start')),
makeNumericColumn('конец', dataIndex + '_end', filters, filterDelegate, renderDelegate, width, {editable}) makeNumericColumn('конец', dataIndex + 'End', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'End'))
]) ])
export const makeNumericAvgRange = ( export const makeNumericAvgRange = (
title: string, title: string,
dataIndex: string, dataIndex: string,
editable: boolean, fixed: number,
filters: object[], filters: object[],
filterDelegate: (key: string | number) => any, filterDelegate: (key: string | number) => any,
renderDelegate: (_: any, row: object) => any, renderDelegate: (_: any, row: object) => any,
width: string width: string
) => makeGroupColumn( title, [ ) => makeGroupColumn( title, [
makeNumericColumn('мин', dataIndex + '_min', filters, filterDelegate, renderDelegate, width, {editable}), makeNumericColumn('мин', dataIndex + 'Min', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Min')),
makeNumericColumn('сред', dataIndex + '_avg', filters, filterDelegate, renderDelegate, width, {editable}), makeNumericColumn('сред', dataIndex + 'Avg', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Avg')),
makeNumericColumn('макс', dataIndex + '_max', filters, filterDelegate, renderDelegate, width, {editable}) makeNumericColumn('макс', dataIndex + 'Max', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Max'))
]) ])
type PaginationContainer = { type PaginationContainer = {