diff --git a/src/client/Containers/Calculation/lib/buildElement.js b/src/client/Containers/Calculation/lib/buildElement.js index 881eebc..23fa937 100644 --- a/src/client/Containers/Calculation/lib/buildElement.js +++ b/src/client/Containers/Calculation/lib/buildElement.js @@ -10,16 +10,14 @@ import { omit } from 'lodash'; import elementsActions from './elements/actions'; import elementsComponents from './elements/components'; import elementsComputedValues from './elements/computedValues'; -import elementsProps from './elements/elementsProps'; import tables from './elements/tables'; import elementsTypes from './elements/types'; import elementsUrls from './elements/urls'; import elementsValues from './elements/values'; -export function buildElement(elementName) { +export function buildElement(elementName, elementProps = {}) { const elementType = elementsTypes[elementName]; const Component = elementsComponents[elementName]; - const elementProps = elementsProps[elementName] || {}; switch (elementType) { case ElementType.Table: { diff --git a/src/client/Containers/Calculation/lib/elements/elementsProps.ts b/src/client/Containers/Calculation/lib/elements/elementsProps.ts index 7ae99df..4959992 100644 --- a/src/client/Containers/Calculation/lib/elements/elementsProps.ts +++ b/src/client/Containers/Calculation/lib/elements/elementsProps.ts @@ -350,6 +350,10 @@ const elementsProps: TElements = { step: 100, max: 9999999, precision: 2, + tooltip: { + title: 'Без учета налога на роскошь', + placement: 'topLeft', + }, }, tbxVehicleTaxInLeasingPeriod: { min: 0, diff --git a/src/client/Containers/Calculation/lib/renderSections.js b/src/client/Containers/Calculation/lib/renderSections.js index 57f135f..0c15137 100644 --- a/src/client/Containers/Calculation/lib/renderSections.js +++ b/src/client/Containers/Calculation/lib/renderSections.js @@ -1,12 +1,14 @@ import { Tabs } from 'antd'; import Divider from 'client/Elements/Divider'; import { SecondaryColoredText } from 'client/Elements/Text'; +import Tooltip from 'client/Elements/Tooltip'; import colors from 'client/UIKit/colors'; import { Box, Flex } from 'client/UIKit/grid'; import mq from 'client/UIKit/mq'; import { Fragment } from 'react'; import styled from 'styled-components'; import { buildElement } from '../lib/buildElement'; +import elementsProps from './elements/elementsProps'; import elementsTitles from './elements/titles'; const ElementTitle = styled.h5` @@ -23,12 +25,16 @@ const ElementTitle = styled.h5` const renderElements = ({ elements }) => { return elements.map((elementName, ie) => { const elementTitle = elementsTitles[elementName]; - const Component = buildElement(elementName); + const { tooltip, ...elementProps } = elementsProps[elementName] || {}; + + const Component = buildElement(elementName, elementProps); return ( - - {elementTitle} - - + + + {elementTitle} + + + ); }); }; diff --git a/src/client/Elements/Tooltip.jsx b/src/client/Elements/Tooltip.jsx new file mode 100644 index 0000000..724d116 --- /dev/null +++ b/src/client/Elements/Tooltip.jsx @@ -0,0 +1,3 @@ +import { Tooltip as AntTooltip } from 'antd'; + +export default AntTooltip;