From d3fd851e20c34d37237cdebac99623bb869ea9f6 Mon Sep 17 00:00:00 2001 From: goodmice Date: Thu, 6 Oct 2022 11:19:56 +0500 Subject: [PATCH] =?UTF-8?q?=D0=A3=D0=BB=D1=83=D1=87=D1=88=D0=B5=D0=BD?= =?UTF-8?q?=D0=BE=20=D0=BF=D0=BE=D0=B7=D0=B8=D1=86=D0=B8=D0=BE=D0=BD=D0=B8?= =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B0=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4?= =?UTF-8?q?=D1=81=D0=BA=D0=B0=D0=B7=D0=BA=D0=B8=20=D0=BE=20=D1=81=D0=BA?= =?UTF-8?q?=D0=B2=D0=B0=D0=B6=D0=B8=D0=BD=D0=B5=20=D0=B2=20=D1=81=D0=BE?= =?UTF-8?q?=D0=BE=D0=B1=D1=89=D0=B5=D0=BD=D0=B8=D1=8F=D1=85=20=D1=81=20?= =?UTF-8?q?=D0=BE=D1=88=D0=B8=D0=B1=D0=BA=D0=BE=D0=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/factory.tsx | 2 +- src/components/views/WellView.tsx | 8 ++++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/components/factory.tsx b/src/components/factory.tsx index 80ad3aa..4ba138c 100644 --- a/src/components/factory.tsx +++ b/src/components/factory.tsx @@ -30,7 +30,7 @@ export const notify = (body?: ReactNode, notifyType: NotifyType = 'info', well?: const message = (
{instance.message} - +
) diff --git a/src/components/views/WellView.tsx b/src/components/views/WellView.tsx index d942af9..316edb8 100644 --- a/src/components/views/WellView.tsx +++ b/src/components/views/WellView.tsx @@ -1,5 +1,5 @@ import { memo } from 'react' -import { Tooltip } from 'antd' +import { Tooltip, TooltipProps } from 'antd' import { Grid, GridItem } from '@components/Grid' import { WellIcon, WellIconState } from '@components/icons' @@ -13,12 +13,12 @@ const wellState: Record = { 2: { enum: 'inactive', label: 'Завершена' }, } -export type WellViewProps = { +export type WellViewProps = TooltipProps & { well?: WellDto } -export const WellView = memo(({ well }) => well ? ( - (({ well, ...other }) => well ? ( + Название: {well.caption ?? '---'}