diff --git a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx b/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx index a555952..74f0376 100644 --- a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx +++ b/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx @@ -1,4 +1,4 @@ -import { Card, Space, Divider } from 'antd'; +import { Card, Space, Divider, CardProps } from 'antd'; import React from 'react'; import dayjs from 'dayjs'; import './index.less' @@ -26,7 +26,7 @@ export interface IRecord { /* 直接传格式化好的时间 */ - warningTime?: string ; + warningTime?: string; /* 传格时间戳 */ @@ -42,11 +42,12 @@ export interface WarningRecordCardProps { record?: IRecord; onRecordClick?: (record?: IRecord) => void; style?: React.CSSProperties; + cardProps?: CardProps; }; export const WarningRecordCard: React.FC = (props) => { - const { record, onRecordClick, style } = props; + const { record, onRecordClick, style, cardProps } = props; const { imgSrc = '', id = '', warningType = '', warningInfo = [], cabietInfo = '', warningTime, warningTimestamp, warningTimeFormat = 'YYYY-MM-DD HH:mm:ss' } = record || {} const formattedDate = warningTimestamp ? dayjs(warningTimestamp).format(warningTimeFormat) : ''; const warningTimeShow = warningTime ? warningTime : formattedDate @@ -56,11 +57,12 @@ export const WarningRecordCard: React.FC = (props) => { }; return ( -
+
} + style={{ width: 356, height: 302, padding: 10, borderRadius: 4 }} + {...cardProps} >
diff --git a/packages/biz/src/WarningRecordCard/demo/base.tsx b/packages/biz/src/WarningRecordCard/demo/base.tsx index b954ceb..b5938a8 100644 --- a/packages/biz/src/WarningRecordCard/demo/base.tsx +++ b/packages/biz/src/WarningRecordCard/demo/base.tsx @@ -17,13 +17,14 @@ const props = { }, onRecordClick:(record?:IRecord) =>{ console.log(record) - } + }, + // cardProps:{ style:{width:5000}} } export default () => { return ( - + ) } diff --git a/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx b/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx index 0cad4a0..5aeab5e 100644 --- a/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx +++ b/packages/biz/src/boxSelectTree/components/boxPanel/index.tsx @@ -5,6 +5,7 @@ import { DiffOutlined, SwitcherOutlined } from '@ant-design/icons' import type { TreeProps, InputProps } from 'antd'; import TreeTransferModal from '../../../treeTransferModal' import BoxTree from '../../../tree'; +// import './index.less' export interface BoxGroupPanelProps { searchInputProps?: InputProps