From badd05943f8f963a0bac2e5cc32aaa1a954cb429 Mon Sep 17 00:00:00 2001 From: zhouyun1 Date: Wed, 15 May 2024 20:27:04 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix(env):=20=E6=B7=BB=E5=8A=A0=E4=BE=9D?= =?UTF-8?q?=E8=B5=96=E5=85=BC=E5=AE=B9=E4=B9=8B=E5=89=8D=E7=BB=84=E4=BB=B6?= =?UTF-8?q?=E7=89=88=E6=9C=AC=E4=B8=AD=E4=BD=BF=E7=94=A8=E5=88=B0=E8=AF=A5?= =?UTF-8?q?=E4=BE=9D=E8=B5=96=E6=83=85=E5=86=B5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/utils/env/package.json | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/utils/env/package.json b/packages/utils/env/package.json index d91bea637..fd361c2dc 100644 --- a/packages/utils/env/package.json +++ b/packages/utils/env/package.json @@ -1,6 +1,6 @@ { "name": "@hi-ui/env", - "version": "4.0.5", + "version": "4.0.6", "description": "Now I’m the model of a modern major general / The venerated Virginian veteran whose men are all / Lining up, to put me up on a pedestal / Writin’ letters to relatives / Embellishin’ my elegance and eloquence / But the elephant is in the room / The truth is in ya face when ya hear the British cannons go / BOOM", "keywords": [], "author": "Flcwl ", @@ -36,6 +36,8 @@ }, "homepage": "https://github.com/XiaoMi/hiui#readme", "dependencies": { - "@hi-ui/style-inject": "^4.0.0" + "@hi-ui/style-inject": "^4.0.0", + "inject-head-style": "^1.0.0", + "style-inject": "^0.3.0" } } From 85918b74962c420a883713429b81c94701f4d9fb Mon Sep 17 00:00:00 2001 From: zhouyun1 Date: Wed, 15 May 2024 20:32:30 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix(form):=20=E4=BF=AE=E5=A4=8D=E7=A4=BA?= =?UTF-8?q?=E4=BE=8B=E4=BB=A3=E7=A0=81=E9=94=99=E8=AF=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui/form/stories/validate-message.stories.tsx | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/packages/ui/form/stories/validate-message.stories.tsx b/packages/ui/form/stories/validate-message.stories.tsx index bb544a521..cbf0bfe21 100644 --- a/packages/ui/form/stories/validate-message.stories.tsx +++ b/packages/ui/form/stories/validate-message.stories.tsx @@ -16,7 +16,12 @@ export const ValidateMessage = () => {

ValidateMessage

-
+ From 8e92f3be788f71eb6691d766e4cd1a98da26f713 Mon Sep 17 00:00:00 2001 From: zhouyun1 Date: Wed, 15 May 2024 20:35:23 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix(preview):=20=E4=BC=98=E5=8C=96=E4=BB=A3?= =?UTF-8?q?=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/ui/preview/src/Preview.tsx | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/packages/ui/preview/src/Preview.tsx b/packages/ui/preview/src/Preview.tsx index 32f89a6b1..8f7bf5ae1 100644 --- a/packages/ui/preview/src/Preview.tsx +++ b/packages/ui/preview/src/Preview.tsx @@ -53,7 +53,6 @@ export const Preview = forwardRef( const [active, setActive] = useUncontrolledState(defaultCurrent || 0, current, onPreviewChange) - const [isLoaded, setIsLoaded] = useState(false) const [isMoving, setIsMoving] = useState(false) const [imgTransform, updateImgTransform] = useState(defaultTransform) const movingPosition = useRef({ @@ -69,7 +68,7 @@ export const Preview = forwardRef( const isMultiple = useMemo(() => Array.isArray(src) && src.length > 1, [src]) // 图片加水印 - const [watermarkContainerRef, setWatermarkContainerRef] = useState(null) + const [watermarkContainer, setWatermarkContainer] = useState(null) const handleContextMenu = useLatestCallback((evt: React.MouseEvent) => { evt.preventDefault() @@ -239,7 +238,7 @@ export const Preview = forwardRef(
{ - setWatermarkContainerRef(e) + setWatermarkContainer(e) }} style={{ transform: `scale(${imgTransform.scale}, ${imgTransform.scale}) translate(${imgTransform.translateX}px,${imgTransform.translateY}px) rotate(${imgTransform.rotate}deg)`, @@ -247,9 +246,6 @@ export const Preview = forwardRef( > { - setIsLoaded(true) - }} onError={onError} onMouseDown={onMoveStart} onMouseUp={onMoveEnd} @@ -304,8 +300,8 @@ export const Preview = forwardRef( )}
- {watermarkProps && ( - + {watermarkProps && watermarkContainer && ( + )} )} From 3afbf239e816ede48d6a85cbd99b6b099b8c8eb3 Mon Sep 17 00:00:00 2001 From: zhouyun1 Date: Fri, 17 May 2024 17:26:29 +0800 Subject: [PATCH 4/4] =?UTF-8?q?chore:=20=E7=94=9F=E6=88=90=E5=8F=98?= =?UTF-8?q?=E6=9B=B4=E8=AE=B0=E5=BD=95=E6=96=87=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .changeset/cool-comics-crash.md | 5 +++++ .changeset/four-ducks-admire.md | 5 +++++ 2 files changed, 10 insertions(+) create mode 100644 .changeset/cool-comics-crash.md create mode 100644 .changeset/four-ducks-admire.md diff --git a/.changeset/cool-comics-crash.md b/.changeset/cool-comics-crash.md new file mode 100644 index 000000000..97ffdba6d --- /dev/null +++ b/.changeset/cool-comics-crash.md @@ -0,0 +1,5 @@ +--- +"@hi-ui/env": patch +--- + +fix: 添加依赖兼容之前组件 diff --git a/.changeset/four-ducks-admire.md b/.changeset/four-ducks-admire.md new file mode 100644 index 000000000..459b1a288 --- /dev/null +++ b/.changeset/four-ducks-admire.md @@ -0,0 +1,5 @@ +--- +"@hi-ui/hiui": patch +--- + +fix(env): 添加依赖兼容之前组件