Исправлено отображение данных в таблице "Заполнить режимы текущей скважины" и в таблице на странице "Режимы"

src/components/Table/Columns/numeric.tsx

@@ -1,7 +1,7 @@
 import { InputNumber } from 'antd'
 import { ReactNode } from 'react'
 
-import { makeNumericSorter } from '../sorters'
+import { makeNumericSorter, makeObjNumericSorter } from '../sorters'
 import { columnPropsOther, makeGroupColumn, RenderMethod } from '.'
 
 export const RegExpIsFloat = /^[-+]?\d+\.?\d*$/
@@ -21,6 +21,25 @@ export const makeNumericRender = <T extends unknown>(fixed?: number): RenderMeth
     )
 }
 
+type ObjRenderType = {
+    max: number
+    avg: number
+    min: number
+    isMax: boolean
+    isMin: boolean
+}
+
+export const makeObjRender = (key: keyof ObjRenderType, boolKey?: keyof ObjRenderType): RenderMethod<ObjRenderType> => (value: ObjRenderType) => {
+    const val = key ? value[key]: '-'
+    const isSelected = boolKey ? value[boolKey] : false
+
+    return (
+        <div className={`text-align-r-container ${isSelected ? 'color-pale-green' : ''}`}>
+            <span>{val}</span>
+        </div>
+    )
+}
+
 export const makeNumericColumnOptions = (fixed?: number, sorterKey?: string): columnPropsOther => ({
     editable: true,
     initialValue: 0,
@@ -34,6 +53,19 @@ export const makeNumericColumnOptions = (fixed?: number, sorterKey?: string): co
     render: makeNumericRender(fixed),
 })
 
+export const makeObjColumnOptions = (key: keyof ObjRenderType, sortedObj?: string, boolKey?: keyof ObjRenderType): columnPropsOther => ({
+    editable: true,
+    initialValue: 0,
+    width: 100,
+    sorter: sortedObj && key ? makeObjNumericSorter(sortedObj, key) : undefined,
+    formItemRules: [{
+        required: true,
+        message: 'Введите число',
+        pattern: RegExpIsFloat,
+    }],
+    render: makeObjRender(key, boolKey),
+})
+
 export const makeNumericColumn = (
     title: ReactNode,
     dataIndex: string,
@@ -103,9 +135,9 @@ export const makeNumericAvgRange = (
     renderDelegate: (_: any, row: object) => any,
     width: string
 ) => makeGroupColumn(title, [
-    makeNumericColumn('мин', dataIndex + 'Min', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Min')),
+    makeNumericColumn('мин', dataIndex, filters, filterDelegate, renderDelegate, width, makeObjColumnOptions('min', dataIndex, 'isMin')),
-    makeNumericColumn('сред', dataIndex + 'Avg', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Avg')),
+    makeNumericColumn('сред', dataIndex, filters, filterDelegate, renderDelegate, width, makeObjColumnOptions('avg', dataIndex)),
-    makeNumericColumn('макс', dataIndex + 'Max', filters, filterDelegate, renderDelegate, width, makeNumericColumnOptions(fixed, dataIndex + 'Max'))
+    makeNumericColumn('макс', dataIndex, filters, filterDelegate, renderDelegate, width, makeObjColumnOptions('max', dataIndex, 'isMax'))
 ])
 
 export default makeNumericColumn

src/components/Table/sorters.ts

@@ -7,6 +7,9 @@ import { DataType } from './Columns'
 export const makeNumericSorter = <T extends unknown>(key: keyof DataType<T>) =>
     (a: DataType<T>, b: DataType<T>) => Number(a[key]) - Number(b[key])
 
+export const makeObjNumericSorter = <T extends unknown>(obj: keyof DataType<T>, key: keyof DataType<T>) =>
+    (a: DataType<DataType<T>>, b: DataType<DataType<T>>) => Number(a[obj][key]) - Number(b[obj][key])
+
 export const makeStringSorter = <T extends unknown>(key: keyof DataType<T>) => (a?: DataType<T> | null, b?: DataType<T> | null) => {
     if (!a && !b) return 0
     if (!a) return 1

src/pages/WellOperations/WellDrillParams.jsx

@@ -2,7 +2,7 @@ import { useState, useEffect, useCallback, memo, useMemo } from 'react'
 
 import { useWell } from '@asb/context'
 import {
-    EditableTable,
+    Table,
     makeSelectColumn,
     makeNumericAvgRange,
     makeNumericSorter,
@@ -81,15 +81,12 @@ export const WellDrillParams = memo(() => {
 
     return (
         <LoaderPortal show={showLoader}>
-            <EditableTable
+            <Table
                 bordered
                 size={'small'}
                 columns={columns}
                 dataSource={params}
                 tableName={'well_drill_params'}
-                onRowAdd={tableHandlers.add}
-                onRowEdit={tableHandlers.edit}
-                onRowDelete={tableHandlers.delete}
                 pagination={false}
             />
         </LoaderPortal>

src/styles/index.css

@@ -141,4 +141,16 @@ code {
 .download-link {
   height: 32px;
   padding: 4px 15px;
+}
+
+.ant-table-cell:has(.color-pale-green) {
+  background-color: #98fb98;
+}
+
+.ant-table-tbody > tr > td.ant-table-cell-row-hover:has( > div.color-pale-green) {
+  background: #98fb98;
+}
+
+.color-pale-green {
+  background-color: #98fb98;
 }