Merge branch 'hongbo/file-cabinet' into 'develop'
fix: 边框颜色主题色,实时监控窗口有图片和选中,预警记录文字溢出 See merge request web-project/zhst-lambo!27
This commit is contained in:
commit
72db5f1273
@ -51,7 +51,7 @@ export const WindowToggle: React.FC<WindowToggleProps> = (props) => {
|
||||
|
||||
<div className='body'>
|
||||
|
||||
<Row gutter={[0, 20]} style={{ width: "100%" }}> {/* 设置栅格间距 */}
|
||||
<Row gutter={[0, 20]} style={{ width: "100%" }} > {/* 设置栅格间距 */}
|
||||
{
|
||||
size === "large" ?
|
||||
<>
|
||||
@ -59,7 +59,7 @@ export const WindowToggle: React.FC<WindowToggleProps> = (props) => {
|
||||
dataSource?.map((item, index) => { // 仅显示前四个元素,即两行两列
|
||||
if (index > 0) return null
|
||||
return (
|
||||
<Col xs={24} sm={24} md={24} lg={24} xl={24} >
|
||||
<Col xs={24} sm={24} md={24} lg={24} xl={24} key={item.windowKey}>
|
||||
<VideoPlayerCard
|
||||
key={""}
|
||||
selectedWindowKey={selectedWindowKey}
|
||||
@ -76,7 +76,7 @@ export const WindowToggle: React.FC<WindowToggleProps> = (props) => {
|
||||
: <>
|
||||
{dataSource?.map((item) => {
|
||||
return (
|
||||
<Col xs={24} sm={12} md={12} lg={12} xl={12} className='sm-card'>
|
||||
<Col xs={24} sm={12} md={12} lg={12} xl={12} className='sm-card' key={item.windowKey}>
|
||||
<VideoPlayerCard
|
||||
key={item.windowKey}
|
||||
selectedWindowKey={selectedWindowKey}
|
||||
|
@ -1,5 +1,4 @@
|
||||
import { Card, Space, CardProps, Spin, Button } from 'antd';
|
||||
import { theme } from 'antd/lib';
|
||||
import { Card, Space, CardProps, Spin, Button, theme } from 'antd';
|
||||
import { ConfigProvider, VideoPlayer, CropperImage, type VideoViewRef, } from '@zhst/meta';
|
||||
import React, { useState, useEffect, ReactNode, useRef, useContext } from 'react';
|
||||
import { CloseOutlined, LoadingOutlined } from '@ant-design/icons';
|
||||
@ -63,6 +62,7 @@ export const VideoPlayerCard: React.FC<VideoPlayerCardProps> = (props) => {
|
||||
<div style={{ width: "100%", height: "100%" }}>
|
||||
<CropperImage
|
||||
// editAble={true}
|
||||
selectAble={false}
|
||||
odList={odRectDefault}
|
||||
url={imageKey}
|
||||
/>
|
||||
@ -88,7 +88,7 @@ export const VideoPlayerCard: React.FC<VideoPlayerCardProps> = (props) => {
|
||||
</div>
|
||||
</Space>}
|
||||
style={{ display: "flex", flexDirection: "column", borderRadius: 4, overflow: "hidden", ...cardStyle }}
|
||||
bodyStyle={{ flex: 1 }}
|
||||
styles={{ body: { flex: 1 } }}
|
||||
{...cardProps}
|
||||
>
|
||||
{cardContent ? (
|
||||
|
@ -2,7 +2,6 @@ import { Card, Space, Divider, CardProps, theme } from 'antd';
|
||||
import React, { useContext } from 'react';
|
||||
import dayjs from 'dayjs';
|
||||
import { ConfigProvider, CropperImage } from '@zhst/meta';
|
||||
|
||||
import './index.less'
|
||||
export interface IRecord {
|
||||
|
||||
|
@ -9,6 +9,7 @@
|
||||
|
||||
&-card {
|
||||
border-radius: 4px;
|
||||
max-width: 380px;
|
||||
|
||||
&-img {
|
||||
width: 356px ;
|
||||
|
Loading…
Reference in New Issue
Block a user