From b14cb222859ba481c07652e8b456be9d1cfdf1b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=8B=91=E5=AE=8F=E5=8D=9A?= <9419827+yuan-hongbo@user.noreply.gitee.com> Date: Tue, 23 Apr 2024 17:24:02 +0800 Subject: [PATCH] =?UTF-8?q?fix:=20=E8=A7=A3=E5=86=B3=E5=86=B2=E7=AA=81?= =?UTF-8?q?=E3=80=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx | 2 +- .../WarningRecordList/WarningRecordList.tsx | 2 +- packages/biz/src/RealTimeMonitor/demo/mock.tsx | 12 ++++++------ packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx | 10 +++++----- packages/biz/src/VideoPlayerCard/demo/base.tsx | 2 +- packages/biz/src/VideoPlayerCard/index.md | 2 +- packages/biz/src/ViewLargerImageModal/demo/base.tsx | 10 +++++----- packages/biz/src/ViewLargerImageModal/index.md | 2 +- .../biz/src/WarningRecordCard/WarningRecordCard.tsx | 6 +++--- packages/biz/src/WarningRecordCard/demo/base.tsx | 6 +++--- packages/biz/src/WarningRecordCard/index.md | 2 +- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx b/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx index 24056e9..de7d6a1 100644 --- a/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx +++ b/packages/biz/src/RealTimeMonitor/RealTimeMonitor.tsx @@ -17,7 +17,7 @@ interface RealTimeMonitorProps { /* 处理 图片下载按钮点击事件 */ - handleDownloadImg?: (imageKey?: string) => void; + handleDownloadImg?: (imgSrc?: string) => void; /* 处理 预警记录卡片点击事件 */ diff --git a/packages/biz/src/RealTimeMonitor/components/WarningRecordList/WarningRecordList.tsx b/packages/biz/src/RealTimeMonitor/components/WarningRecordList/WarningRecordList.tsx index 298f180..d03aca2 100644 --- a/packages/biz/src/RealTimeMonitor/components/WarningRecordList/WarningRecordList.tsx +++ b/packages/biz/src/RealTimeMonitor/components/WarningRecordList/WarningRecordList.tsx @@ -13,7 +13,7 @@ interface WarningRecordListProps { /* 处理 图片下载按钮点击事件 */ - handleDownloadImg?: (imageKey?: string) => void; + handleDownloadImg?: (imgSrc?: string) => void; /* 处理 预警记录卡片点击事件 */ diff --git a/packages/biz/src/RealTimeMonitor/demo/mock.tsx b/packages/biz/src/RealTimeMonitor/demo/mock.tsx index 77b69af..4497d61 100644 --- a/packages/biz/src/RealTimeMonitor/demo/mock.tsx +++ b/packages/biz/src/RealTimeMonitor/demo/mock.tsx @@ -1,12 +1,12 @@ export const videoData = { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', // videoSrc: 'ws://10.0.0.7:9033/flv/File/test/test_h264_1.mp4.flv?ip=127.0.0.1', title: `盒子1 点位1` } export const warningData = [ { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '156156ewr1', warningType: '火焰识别', boxId: '2', @@ -17,7 +17,7 @@ export const warningData = [ // warningTimeFormat:"YYYY-MM-DD" }, { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '156156ewr155', warningType: '火焰识别', boxId: '1', @@ -28,7 +28,7 @@ export const warningData = [ // warningTimeFormat:"YYYY-MM-DD" }, { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '156156rew155', warningType: '火焰识别', boxId: '3', @@ -39,7 +39,7 @@ export const warningData = [ // warningTimeFormat:"YYYY-MM-DD" }, { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '15615615ew5', warningType: '火焰识别', boxId: '4', @@ -50,7 +50,7 @@ export const warningData = [ // warningTimeFormat:"YYYY-MM-DD" }, { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '15615615sdf5', warningType: '火焰识别', boxId: '5', diff --git a/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx b/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx index 552ee68..55f2115 100644 --- a/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx +++ b/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx @@ -9,7 +9,7 @@ export interface VideoPlayerCardProps { windowKey?: string; selectedWindowKey?: string; showType?: 'video' | "image"; - imageKey?: string; + imgSrc?: string; videoSrc?: string; cardProps?: CardProps; errorReasonText?: string; @@ -41,7 +41,7 @@ export const VideoPlayerCard: React.FC = (props) => { const videoPlayerCardStyle = size === 'small' ? { width: "calc(50% - 20px)" } : { flex: 1 } useEffect(() => { - if (!isWindowLoading && (videoSrc || imageKey)) { + if (!isWindowLoading && (videoSrc || imgSrc)) { let contentElement: JSX.Element | null = null; if (videoSrc) { contentElement = ( @@ -49,11 +49,11 @@ export const VideoPlayerCard: React.FC = (props) => { ); videoRef.current?.setShowCrop(true) - } else if (imageKey) { + } else if (imgSrc) { contentElement = ( 首帧图 ); @@ -62,7 +62,7 @@ export const VideoPlayerCard: React.FC = (props) => { } else { setCardContent(null) } - }, [showType, imageKey, videoSrc, isWindowLoading]); + }, [showType, imgSrc, videoSrc, isWindowLoading]); return (
{ handleWindowClick?.(windowKey) }} style={videoPlayerCardStyle}> diff --git a/packages/biz/src/VideoPlayerCard/demo/base.tsx b/packages/biz/src/VideoPlayerCard/demo/base.tsx index 87826d3..3f75d69 100644 --- a/packages/biz/src/VideoPlayerCard/demo/base.tsx +++ b/packages/biz/src/VideoPlayerCard/demo/base.tsx @@ -7,7 +7,7 @@ const mockVideoPlayerCardProps: VideoPlayerCardProps = { showType: 'image', videoSrc: 'ws://10.0.0.7:9033/flv/File/test/test_h264_1.mp4.flv?ip=127.0.0.1', // 如果需要在没有视频时显示图片封面 - // imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + // imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', size: 'small', }; diff --git a/packages/biz/src/VideoPlayerCard/index.md b/packages/biz/src/VideoPlayerCard/index.md index 4d4d7e8..44bff14 100644 --- a/packages/biz/src/VideoPlayerCard/index.md +++ b/packages/biz/src/VideoPlayerCard/index.md @@ -19,7 +19,7 @@ title: VideoPlayerCard 视频播放卡片 | --- | --- | --- | --- | --- | | windowKey | 每个卡片的唯一标识 | string | - | - | | selectedWindowKey | 选中的窗口key | string | - | - | -| imageKey | 图片地址 | string | - | - | +| imgSrc | 图片地址 | string | - | - | | videoSrc | 视频地址 | string | - | - | | errorReasonText | 加载失败的错误提示 | string | - | - | | isWindowLoading | 判断是否显示loading | boolean | - | - | diff --git a/packages/biz/src/ViewLargerImageModal/demo/base.tsx b/packages/biz/src/ViewLargerImageModal/demo/base.tsx index 3d02996..c588232 100644 --- a/packages/biz/src/ViewLargerImageModal/demo/base.tsx +++ b/packages/biz/src/ViewLargerImageModal/demo/base.tsx @@ -7,7 +7,7 @@ import dayjs from 'dayjs'; // 结合预警图列表 演示查看预警大图的使用 例如 后端返回这样的数据结构 const backEndData = [ { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '1561561', warningType: '火焰识别', boxId: '2', @@ -25,7 +25,7 @@ const backEndData = [ }] }, { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc: 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '156156155', warningType: '火焰识别', boxId: '1', @@ -47,7 +47,7 @@ const backEndData = [ // 前端处理数据结构 const dataSource = backEndData.map(o => { return { - imageKey: o.imageKey, + imgSrc: o.imgSrc, id: o.id, warningType: o.warningType, boxId: o.boxId, @@ -78,7 +78,7 @@ export default () => { const handleClick = (record?: IRecord) => { // 点击的时候把数据 拿过来处理一下传给大图弹框 - const { imageKey, warningType, boxId, position, cabietId, warningTime, warningTimestamp, warningTimeFormat = 'YYYY-MM-DD HH:mm:ss', odRect } = record || {} + const { imgSrc, warningType, boxId, position, cabietId, warningTime, warningTimestamp, warningTimeFormat = 'YYYY-MM-DD HH:mm:ss', odRect } = record || {} const formattedDate = warningTimestamp ? dayjs(warningTimestamp).format(warningTimeFormat) : ''; const warningTimeShow = warningTime ? warningTime : formattedDate //用于渲染右侧的 信息 @@ -90,7 +90,7 @@ export default () => { { label: '柜子ID', value: cabietId }, ] // 调用这个方法打开弹框 - viewLargerImageModalRef?.current?.show({ imageKey: imageKey, warningData: warningData, odRect: odRect }) + viewLargerImageModalRef?.current?.show({ imgSrc: imgSrc, warningData: warningData, odRect: odRect }) setSelectedRecordId(record?.id) } diff --git a/packages/biz/src/ViewLargerImageModal/index.md b/packages/biz/src/ViewLargerImageModal/index.md index f7ef24c..5bf5e28 100644 --- a/packages/biz/src/ViewLargerImageModal/index.md +++ b/packages/biz/src/ViewLargerImageModal/index.md @@ -19,7 +19,7 @@ title: ViewLargerImageModal 查看大图弹窗 | --- | --- | --- | --- | --- | | show() |通过 ref 用于开启弹窗 可以将点击的 记录传给弹窗| | | | | handleCancel() | 通过 ref 用于关闭弹窗 | | | | -| imageKey | 图片地址 |string | | | +| imgSrc | 图片地址 |string | | | | contextData | 大图显示的数据 | | | | | imgStyle | 用于修改图片样式 | | | | | downloadImg | 传入下载图片的方法 | | | | diff --git a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx b/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx index d8df9dc..61ab5f4 100644 --- a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx +++ b/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx @@ -7,7 +7,7 @@ import { ConfigProvider,CropperImage} from '@zhst/meta'; import './index.less' export interface IRecord { - imageKey?: string; + imgSrc?: string; id?: string; /** @@ -84,7 +84,7 @@ export const WarningRecordCard: React.FC = (props) => { const componentName = getPrefixCls('biz-warning-record-card', customizePrefixCls); ; - const { imageKey, id, warningType, warningInfo = [], cabietText, warningTime, warningTimestamp, warningTimeFormat = 'YYYY-MM-DD HH:mm:ss', odRect = [] } = record || {} + const { imgSrc, id, warningType, warningInfo = [], cabietText, warningTime, warningTimestamp, warningTimeFormat = 'YYYY-MM-DD HH:mm:ss', odRect = [] } = record || {} const formattedDate = warningTimestamp ? dayjs(warningTimestamp).format(warningTimeFormat) : ''; const warningTimeShow = warningTime ? warningTime : formattedDate const { useToken } = theme @@ -116,7 +116,7 @@ export const WarningRecordCard: React.FC = (props) => {
} diff --git a/packages/biz/src/WarningRecordCard/demo/base.tsx b/packages/biz/src/WarningRecordCard/demo/base.tsx index cbfe287..f4db09e 100644 --- a/packages/biz/src/WarningRecordCard/demo/base.tsx +++ b/packages/biz/src/WarningRecordCard/demo/base.tsx @@ -6,7 +6,7 @@ import { Space } from 'antd'; // 例如 后端返回这样的数据结构 const backEndData = [ { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc : 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '1561561', warningType: '火焰识别', boxId: '2', @@ -24,7 +24,7 @@ const backEndData = [ }] }, { - imageKey: 'https://i.yourimageshare.com/lRHiD2UnAT.png', + imgSrc : 'https://i.yourimageshare.com/lRHiD2UnAT.png', id: '156156155', warningType: '火焰识别', boxId: '1', @@ -46,7 +46,7 @@ const backEndData = [ // 前端处理数据结构 const dataSource = backEndData.map(o => { return { - imageKey: o.imageKey, + imgSrc : o.imgSrc , id: o.id, warningType: o.warningType, boxId: o.boxId, diff --git a/packages/biz/src/WarningRecordCard/index.md b/packages/biz/src/WarningRecordCard/index.md index 8352ce2..e7fdfb8 100644 --- a/packages/biz/src/WarningRecordCard/index.md +++ b/packages/biz/src/WarningRecordCard/index.md @@ -16,7 +16,7 @@ title: WarningRecordCard 预警记录卡片 | 参数 | 说明 | 类型 | 默认值 | 版本 | | --- | --- | --- | --- | --- | -| imageKey | 图片src | string | - | - | +| imgSrc | 图片src | string | - | - | | id | 数据的唯一id 用于key 传值| string | - | - | | warningType | 预警类型 | string | - | - | | warningInfo | 盒子 点位 柜子 等信息 | string[] | - | - |