Зависимость Table заменена с antd на @components/Table

This commit is contained in:
Александр Сироткин 2022-11-08 08:03:05 +05:00
parent 1ec74e92f1
commit bc73490029
5 changed files with 9 additions and 10 deletions

View File

@ -1,7 +1,6 @@
import { memo, useMemo } from 'react' import { memo, useMemo } from 'react'
import { Table } from 'antd'
import { makeTextColumn, makeNumericColumnPlanFact } from '@components/Table' import { Table, makeTextColumn, makeNumericColumnPlanFact } from '@components/Table'
import { getPrecision } from '@utils/functions' import { getPrecision } from '@utils/functions'
const columns = [ const columns = [

View File

@ -1,12 +1,12 @@
import { Link, useLocation } from 'react-router-dom' import { Link, useLocation } from 'react-router-dom'
import { useState, useEffect, memo, useMemo, lazy, Suspense } from 'react' import { useState, useEffect, memo, useMemo, lazy, Suspense } from 'react'
import { LineChartOutlined, ProfileOutlined, TeamOutlined } from '@ant-design/icons' import { LineChartOutlined, ProfileOutlined, TeamOutlined } from '@ant-design/icons'
import { Table, Button, Badge, Divider, Modal, Row, Col } from 'antd' import { Button, Badge, Divider, Modal, Row, Col } from 'antd'
import { useWell } from '@asb/context' import { useWell } from '@asb/context'
import LoaderPortal from '@components/LoaderPortal' import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory' import { invokeWebApiWrapperAsync } from '@components/factory'
import { makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn } from '@components/Table' import { Table, makeTextColumn, makeNumericColumnPlanFact, makeNumericColumn } from '@components/Table'
import { WellCompositeService } from '@api' import { WellCompositeService } from '@api'
import { import {
hasPermission, hasPermission,

View File

@ -1,15 +1,15 @@
import { DatePicker, Descriptions, Form, Input, InputNumber, Modal, Table, Tabs } from 'antd' import { DatePicker, Descriptions, Form, Input, InputNumber, Modal, Table as RawTable, Tabs } from 'antd'
import { memo, useCallback, useEffect, useState } from 'react' import { memo, useCallback, useEffect, useState } from 'react'
import moment from 'moment' import moment from 'moment'
import { useWell } from '@asb/context' import { useWell } from '@asb/context'
import LoaderPortal from '@components/LoaderPortal' import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory' import { invokeWebApiWrapperAsync } from '@components/factory'
import { makeColumn, makeGroupColumn } from '@components/Table' import { Table, makeColumn, makeGroupColumn } from '@components/Table'
import { DailyReportService } from '@api' import { DailyReportService } from '@api'
const { Item: RawItem } = Form const { Item: RawItem } = Form
const { Summary } = Table const { Summary } = RawTable
const { TabPane } = Tabs const { TabPane } = Tabs
const Item = memo(({ style, ...other }) => <RawItem style={{ margin: 0, ...style }} {...other} />) const Item = memo(({ style, ...other }) => <RawItem style={{ margin: 0, ...style }} {...other} />)

View File

@ -1,7 +1,7 @@
import { Table } from 'antd'
import { useState, useEffect, useCallback, memo, useMemo } from 'react' import { useState, useEffect, useCallback, memo, useMemo } from 'react'
import { useWell } from '@asb/context' import { useWell } from '@asb/context'
import { Table } from '@components/Table'
import LoaderPortal from '@components/LoaderPortal' import LoaderPortal from '@components/LoaderPortal'
import { invokeWebApiWrapperAsync } from '@components/factory' import { invokeWebApiWrapperAsync } from '@components/factory'
import { Subscribe } from '@services/signalr' import { Subscribe } from '@services/signalr'
@ -22,7 +22,7 @@ export const ActiveMessagesOnline = memo(({ well: givenWell }) => {
if (messages) if (messages)
setMessages(messages.items.splice(0, 4)) setMessages(messages.items.splice(0, 4))
}, []) }, [])
const columns = useMemo(() => makeMessageColumns(well.id), [well.id]) const columns = useMemo(() => makeMessageColumns(well.id), [well.id])
useEffect(() => { useEffect(() => {

View File

@ -1,5 +1,5 @@
import { memo, useCallback, useEffect, useMemo, useState } from 'react' import { memo, useCallback, useEffect, useMemo, useState } from 'react'
import { Alert, Button, Typography } from 'antd' import { Alert, Button } from 'antd'
import { useWell } from '@asb/context' import { useWell } from '@asb/context'
import { UserView } from '@components/views' import { UserView } from '@components/views'