From 6eb14f8eef6253e751c2e607273051c31367d0c3 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: Sat, 11 May 2024 11:56:24 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:=20=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=89=B2=EF=BC=8C=E5=AE=9E=E6=97=B6=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E7=AA=97=E5=8F=A3=E6=9C=89=E5=9B=BE=E7=89=87=E5=92=8C?= =?UTF-8?q?=E9=80=89=E4=B8=AD=EF=BC=8C=E9=A2=84=E8=AD=A6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx | 4 ++-- packages/biz/src/WarningRecordCard/WarningRecordCard.tsx | 1 - packages/biz/src/WarningRecordCard/index.less | 1 + 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx b/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx index 946e00b..45e7fd4 100644 --- a/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx +++ b/packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx @@ -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 = (props) => {
diff --git a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx b/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx index 26d63be..c1c26fa 100644 --- a/packages/biz/src/WarningRecordCard/WarningRecordCard.tsx +++ b/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 { diff --git a/packages/biz/src/WarningRecordCard/index.less b/packages/biz/src/WarningRecordCard/index.less index 72505fb..ea92d86 100644 --- a/packages/biz/src/WarningRecordCard/index.less +++ b/packages/biz/src/WarningRecordCard/index.less @@ -9,6 +9,7 @@ &-card { border-radius: 4px; + max-width: 380px; &-img { width: 356px ; From 64d38943f716b098c849721044bfb5d83fc7b73c 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: Mon, 13 May 2024 09:57:44 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:=20=E4=BB=A3=E7=A0=81=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/WindowToggle/WindowToggle.tsx | 6 +++--- packages/biz/src/VideoPlayerCard/VideoPlayerCard.tsx | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/packages/biz/src/RealTimeMonitor/components/WindowToggle/WindowToggle.tsx b/packages/biz/src/RealTimeMonitor/components/WindowToggle/WindowToggle.tsx index 902a47d..0a6fc8e 100644 --- a/packages/biz/src/RealTimeMonitor/components/WindowToggle/WindowToggle.tsx +++ b/packages/biz/src/RealTimeMonitor/components/WindowToggle/WindowToggle.tsx @@ -51,7 +51,7 @@ export const WindowToggle: React.FC = (props) => {
- {/* 设置栅格间距 */} + {/* 设置栅格间距 */} { size === "large" ? <> @@ -59,7 +59,7 @@ export const WindowToggle: React.FC = (props) => { dataSource?.map((item, index) => { // 仅显示前四个元素，即两行两列 if (index > 0) return null return ( - + = (props) => { : <> {dataSource?.map((item) => { return ( - + = (props) => {
} style={{ display: "flex", flexDirection: "column", borderRadius: 4, overflow: "hidden", ...cardStyle }} - bodyStyle={{ flex: 1 }} + styles={{ body: { flex: 1 } }} {...cardProps} > {cardContent ? ( From 5f806dadba3882ecc7a4a8c9dbab2bfb2f4e9b9d Mon Sep 17 00:00:00 2001 From: jiangzhixiong <710328466@qq.com> Date: Mon, 13 May 2024 10:33:49 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix:=20=E8=BE=B9=E6=A1=86=E9=A2=9C=E8=89=B2?= =?UTF-8?q?=E4=B8=BB=E9=A2=98=E8=89=B2=EF=BC=8C=E5=AE=9E=E6=97=B6=E7=9B=91?= =?UTF-8?q?=E6=8E=A7=E7=AA=97=E5=8F=A3=E6=9C=89=E5=9B=BE=E7=89=87=E5=92=8C?= =?UTF-8?q?=E9=80=89=E4=B8=AD=EF=BC=8C=E9=A2=84=E8=AD=A6=E8=AE=B0=E5=BD=95?= =?UTF-8?q?=E6=96=87=E5=AD=97=E6=BA=A2=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/biz/CHANGELOG.md | 6 ++++++ packages/biz/package.json | 2 +- packages/material/CHANGELOG.md | 7 +++++++ packages/material/package.json | 2 +- 4 files changed, 15 insertions(+), 2 deletions(-) diff --git a/packages/biz/CHANGELOG.md b/packages/biz/CHANGELOG.md index 6fbd9f7..0e925b9 100644 --- a/packages/biz/CHANGELOG.md +++ b/packages/biz/CHANGELOG.md @@ -1,5 +1,11 @@ # @zhst/biz +## 0.21.3 + +### Patch Changes + +- zhst/biz: fix: 边框颜色主题色，实时监控窗口有图片和选中，预警记录文字溢出 + ## 0.21.2 ### Patch Changes diff --git a/packages/biz/package.json b/packages/biz/package.json index 62ae121..dea7efb 100644 --- a/packages/biz/package.json +++ b/packages/biz/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/biz", - "version": "0.21.2", + "version": "0.21.3", "description": "业务库", "keywords": [ "business", diff --git a/packages/material/CHANGELOG.md b/packages/material/CHANGELOG.md index 7630b0c..eff8883 100644 --- a/packages/material/CHANGELOG.md +++ b/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 diff --git a/packages/material/package.json b/packages/material/package.json index 64949b9..2395681 100644 --- a/packages/material/package.json +++ b/packages/material/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/material", - "version": "0.17.1", + "version": "0.17.2", "description": "物料库", "keywords": [ "business", From 3083ef78656da921731ab1c94906b77257e66bed Mon Sep 17 00:00:00 2001 From: jiangzhixiong <710328466@qq.com> Date: Mon, 13 May 2024 10:37:12 +0800 Subject: [PATCH 4/4] =?UTF-8?q?fix(deploy.build):=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=89=93=E5=8C=85=E5=91=BD=E4=BB=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- deploy/build.sh | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/deploy/build.sh b/deploy/build.sh index d935c92..7a34ca5 100755 --- a/deploy/build.sh +++ b/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/