diff --git a/src/client/Containers/Calculation/Sections/index.ts b/src/client/Containers/Calculation/Sections/index.ts index 8739469..aa87d2f 100644 --- a/src/client/Containers/Calculation/Sections/index.ts +++ b/src/client/Containers/Calculation/Sections/index.ts @@ -25,6 +25,7 @@ export default [ name: 'total', Component: withTitle('Total')(Input), props: { + readonly: true, computedValue: 'total' } } diff --git a/src/client/Containers/Calculation/index.jsx b/src/client/Containers/Calculation/index.jsx index ae73e4c..98d503b 100644 --- a/src/client/Containers/Calculation/index.jsx +++ b/src/client/Containers/Calculation/index.jsx @@ -3,7 +3,7 @@ import React, { useState } from 'react'; import Sections from './Sections'; import { Tabs } from 'antd'; -import { Box } from 'client/UIKit/grid'; +import { Box, Flex } from 'client/UIKit/grid'; const { TabPane } = Tabs; const Calculation = () => { @@ -12,13 +12,15 @@ const Calculation = () => { {Sections.map(({ title, elements }, i) => ( - {elements.map(({ Component, props }, ie) => { - return ( - - - - ); - })} + + {elements.map(({ Component, props }, ie) => { + return ( + + + + ); + })} + ))} diff --git a/src/client/Elements/Input.jsx b/src/client/Elements/Input.jsx index 1f03316..7b5b4b6 100644 --- a/src/client/Elements/Input.jsx +++ b/src/client/Elements/Input.jsx @@ -28,6 +28,7 @@ const Input = ({ readonly, placeholder, bindedValueName, computedValue }) => { return ( { diff --git a/src/client/hocs/withTitle.jsx b/src/client/hocs/withTitle.jsx index 0e5ee33..083cb24 100644 --- a/src/client/hocs/withTitle.jsx +++ b/src/client/hocs/withTitle.jsx @@ -1,9 +1,19 @@ -import React from "react"; -import { Flex } from "client/UIKit/grid"; +import React from 'react'; +import { Flex } from 'client/UIKit/grid'; -const withTitle = (title) => (Component) => (props) => ( - -
{title}
+import styled from 'styled-components'; + +const Title = styled.h5` + color: rgba(0, 0, 0, 0.85); + font-weight: 600; + font-size: 16px; + line-height: 1.5; + margin: 0 0 2px 0; +`; + +const withTitle = title => Component => props => ( + + {title} );