diff --git a/components/apolloTable/detailForm/index.less b/components/apolloTable/detailForm/index.less index 6aad50fe504028f5fba40bafef9c382920c7285f..36faad00c8d01ad2cf20dcf540523c899814f019 100644 --- a/components/apolloTable/detailForm/index.less +++ b/components/apolloTable/detailForm/index.less @@ -1,44 +1,42 @@ @import '~@/theme/common'; .wrap { - position: relative; - // width: 580px; - width: 100%; - height: 90vh; background: #fff; - .titleRow { + display: flex; + flex-direction: column; + height: 100%; + .topWrap { display: flex; - flex-direction: row; + height: 60px; align-items: center; justify-content: space-between; padding: 0 @paddingLg; .titleCls { font-size: 14px; color: #5a6876; - line-height: 62px; - z-index: 10; - background: #fff; } .editClick { cursor: pointer; .detailEdit { color: @primaryColor; font-size: 14px; - margin-left: 6px; } } } .formWrap { + position: relative; + flex: 1; padding: @paddingLg; - height: calc(100% - 130px); overflow-x: hidden; overflow-y: auto; - margin-bottom: 68px; - position: relative; background: rgb(250, 250, 250); .row { display: flex; background-color: rgba(251, 251, 251, 1); + border: 1px solid #ececec; + &:first-child { + border-top: none; + } .listLeft { width: 150px; @@ -59,4 +57,14 @@ } } } + .bottomWrap { + display: flex; + height: 68px; + align-items: center; + justify-content: space-between; + padding: 0 @paddingLg; + .delBtnCls { + color: @errorColor; + } + } } diff --git a/components/apolloTable/detailForm/index.tsx b/components/apolloTable/detailForm/index.tsx index b443460c57d0f18df5b9994259f2789a463909ec..e0e3eb58f09af20caec325ce48e8be1160fb361b 100644 --- a/components/apolloTable/detailForm/index.tsx +++ b/components/apolloTable/detailForm/index.tsx @@ -1,10 +1,11 @@ import React from 'react'; +import { Button } from 'antd'; import { config } from '../component/base/config'; import { transferAttr } from '../component/base/_utils/transferAttr'; import styles from './index.less'; const DetailForm = (props: any) => { - const { data, rowData, title, goEdit, hideEditBtn } = props; + const { data, rowData, name, goEdit, hideEditBtn, isShowDelBtn, handleDelete, delLabel } = props; const renderDetailForm = (item: any) => { const { columnType, columnAttrObj, value, renderDetailForm } = item; let detailConfig; @@ -49,28 +50,27 @@ const DetailForm = (props: any) => { }; return (
{name}
+