Merge branch 'develop' into feat/cropper-upgrade

deploy/build.sh

@@ -1,5 +1,12 @@
 pnpm install --force
 
+# 打包 npm 包
+pnpm run pkg:build
+
+# 发布 npm 包到私有仓库
+pnpm run pub
+
+# 打包 npm 相关文档
 pnpm run build:master
 
 mkdir -p ./app/public/

packages/biz/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @zhst/biz
 
+## 0.21.3
+
+### Patch Changes
+
+- zhst/biz: fix: 边框颜色主题色，实时监控窗口有图片和选中，预警记录文字溢出
+
 ## 0.21.2
 
 ### Patch Changes

packages/biz/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/biz",
-  "version": "0.21.2",
+  "version": "0.21.3",
   "description": "业务库",
   "keywords": [
     "business",

packages/biz/src/RealTimeMonitor/components/WindowToggle/WindowToggle.tsx

@@ -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}

packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx

@@ -1,5 +1,4 @@
-import { Card, Space, CardProps, Spin, Button } from 'antd';
+import { Card, Space, CardProps, Spin, Button, theme } from 'antd';
-import { theme } from 'antd/lib';
 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 ? (

packages/biz/src/WarningRecordCard/WarningRecordCard.tsx

@@ -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 {
 

packages/biz/src/WarningRecordCard/index.less

@@ -9,6 +9,7 @@
 
   &-card {
     border-radius: 4px;
+    max-width: 380px;
 
     &-img {
       width: 356px ;

packages/material/CHANGELOG.md

@@ -1,5 +1,12 @@
 # @zhst/material
 
+## 0.17.2
+
+### Patch Changes
+
+- Updated dependencies
+  - @zhst/biz@0.21.3
+
 ## 0.17.1
 
 ### Patch Changes

packages/material/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zhst/material",
-  "version": "0.17.1",
+  "version": "0.17.2",
   "description": "物料库",
   "keywords": [
     "business",