From defd87dfc7e2dd976fecdc804ccca6c649371827 Mon Sep 17 00:00:00 2001 From: jiangzhixiong <710328466@qq.com> Date: Sat, 11 May 2024 17:17:36 +0800 Subject: [PATCH] =?UTF-8?q?fix(zhst/meta-cropperImage):=20cropperImage=20?= =?UTF-8?q?=E9=80=8F=E5=87=BA=E7=9F=A9=E5=BD=A2=E5=9D=90=E6=A0=87?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/biz/CHANGELOG.md | 36 +++++++++++++++++- packages/biz/package.json | 2 +- packages/func/CHANGELOG.md | 18 +++++++++ packages/func/es/string/index.js | 2 +- packages/func/lib/string/index.js | 2 +- packages/func/package.json | 2 +- packages/func/src/string/index.ts | 2 +- packages/hooks/CHANGELOG.md | 18 +++++++++ packages/hooks/package.json | 2 +- packages/icon/CHANGELOG.md | 6 +++ packages/icon/package.json | 2 +- packages/material/CHANGELOG.md | 38 ++++++++++++++++++- packages/material/package.json | 2 +- packages/meta/CHANGELOG.md | 34 +++++++++++++++++ packages/meta/package.json | 2 +- .../BigImagePreview/bigImagePreviewHelper.ts | 1 - .../meta/src/cropperImage/CropperImage.tsx | 7 +++- packages/request/CHANGELOG.md | 18 +++++++++ packages/request/package.json | 2 +- packages/slave/CHANGELOG.md | 18 +++++++++ packages/slave/package.json | 2 +- 21 files changed, 200 insertions(+), 16 deletions(-) diff --git a/packages/biz/CHANGELOG.md b/packages/biz/CHANGELOG.md index ad3d3b7..1821540 100644 --- a/packages/biz/CHANGELOG.md +++ b/packages/biz/CHANGELOG.md @@ -1,6 +1,40 @@ # @zhst/biz -## 0.19.2 +## 0.21.1 + +### Patch Changes + +- Updated dependencies + - @zhst/meta@0.20.0 + +## 0.21.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + +### Patch Changes + +- Updated dependencies + - @zhst/hooks@0.13.0 + - @zhst/func@0.15.0 + - @zhst/icon@0.5.0 + - @zhst/meta@0.19.0 + +## 0.20.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.14.1 + - @zhst/hooks@0.12.1 + - @zhst/meta@0.18.1 + +## 0.20.0 + +### Minor Changes + +- feat: 重新发版 ### Patch Changes diff --git a/packages/biz/package.json b/packages/biz/package.json index 30dd05a..6b49736 100644 --- a/packages/biz/package.json +++ b/packages/biz/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/biz", - "version": "0.19.2", + "version": "0.21.1", "description": "业务库", "keywords": [ "business", diff --git a/packages/func/CHANGELOG.md b/packages/func/CHANGELOG.md index 41c6ce6..acd5b23 100644 --- a/packages/func/CHANGELOG.md +++ b/packages/func/CHANGELOG.md @@ -1,5 +1,23 @@ # @zhst/utils +## 0.15.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + +### Patch Changes + +- Updated dependencies + - @zhst/request@0.15.0 + +## 0.14.1 + +### Patch Changes + +- zhst/func: 修改 pxToRem 算法 + - @zhst/request@0.14.1 + ## 0.14.0 ### Minor Changes diff --git a/packages/func/es/string/index.js b/packages/func/es/string/index.js index 6178477..6920e07 100644 --- a/packages/func/es/string/index.js +++ b/packages/func/es/string/index.js @@ -79,7 +79,7 @@ export var getValueByUrl = function getValueByUrl(key, str) { * @param rootFontSize 根元素大小: 默认16px */ export var pxToRem = function pxToRem(value, rootFontSize) { - var fontSize = rootFontSize || parseFloat(document.documentElement.style.fontSize) || 16; + var fontSize = rootFontSize || 80 || parseFloat(document.documentElement.style.fontSize); var valueArr = value.split(' '); return valueArr.filter(function (o) { return o; diff --git a/packages/func/lib/string/index.js b/packages/func/lib/string/index.js index b5e6592..b018287 100644 --- a/packages/func/lib/string/index.js +++ b/packages/func/lib/string/index.js @@ -76,7 +76,7 @@ var getValueByUrl = (key, str) => { return result; }; var pxToRem = (value, rootFontSize) => { - const fontSize = rootFontSize || parseFloat(document.documentElement.style.fontSize) || 16; + const fontSize = rootFontSize || 80; const valueArr = value.split(" "); return valueArr.filter((o) => o).map((val) => parseFloat(val) / fontSize + "rem").join(" "); }; diff --git a/packages/func/package.json b/packages/func/package.json index 3ee9ba2..bdfe2fb 100644 --- a/packages/func/package.json +++ b/packages/func/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/func", - "version": "0.14.0", + "version": "0.15.0", "description": "函数合集", "keywords": [ "hooks" diff --git a/packages/func/src/string/index.ts b/packages/func/src/string/index.ts index 08ad3a1..aca9e9b 100644 --- a/packages/func/src/string/index.ts +++ b/packages/func/src/string/index.ts @@ -85,7 +85,7 @@ export const getValueByUrl = (key: string, str: string) => { * @param rootFontSize 根元素大小: 默认16px */ export const pxToRem = (value: string, rootFontSize?: number) => { - const fontSize = rootFontSize || parseFloat(document.documentElement.style.fontSize) || 16 + const fontSize = rootFontSize || 80 || parseFloat(document.documentElement.style.fontSize) const valueArr = value.split(' ') return valueArr.filter(o => o).map(val => ((parseFloat(val) / fontSize) + 'rem')).join(' ') diff --git a/packages/hooks/CHANGELOG.md b/packages/hooks/CHANGELOG.md index eb7feba..03d7444 100644 --- a/packages/hooks/CHANGELOG.md +++ b/packages/hooks/CHANGELOG.md @@ -1,5 +1,23 @@ # @zhst/hooks +## 0.13.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.15.0 + +## 0.12.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.14.1 + ## 0.12.0 ### Minor Changes diff --git a/packages/hooks/package.json b/packages/hooks/package.json index 58be0eb..750ee14 100644 --- a/packages/hooks/package.json +++ b/packages/hooks/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/hooks", - "version": "0.12.0", + "version": "0.13.0", "description": "hooks合集", "keywords": [ "hooks" diff --git a/packages/icon/CHANGELOG.md b/packages/icon/CHANGELOG.md index f69d947..9caa74f 100644 --- a/packages/icon/CHANGELOG.md +++ b/packages/icon/CHANGELOG.md @@ -1,5 +1,11 @@ # @zhst/icon +## 0.5.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + ## 0.4.0 ### Minor Changes diff --git a/packages/icon/package.json b/packages/icon/package.json index fdb8374..bbccee2 100644 --- a/packages/icon/package.json +++ b/packages/icon/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/icon", - "version": "0.4.0", + "version": "0.5.0", "description": "图标库", "keywords": [ "icon", diff --git a/packages/material/CHANGELOG.md b/packages/material/CHANGELOG.md index 90fc6cd..65f77e9 100644 --- a/packages/material/CHANGELOG.md +++ b/packages/material/CHANGELOG.md @@ -1,6 +1,42 @@ # @zhst/material -## 0.14.2 +## 0.17.0 + +### Minor Changes + +- fix: cropperImage 透出矩形坐标 + +### Patch Changes + +- Updated dependencies + - @zhst/meta@0.20.0 + - @zhst/biz@0.21.1 + +## 0.16.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + +### Patch Changes + +- Updated dependencies + - @zhst/hooks@0.13.0 + - @zhst/func@0.15.0 + - @zhst/meta@0.19.0 + - @zhst/biz@0.21.0 + +## 0.15.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.14.1 + - @zhst/biz@0.20.1 + - @zhst/hooks@0.12.1 + - @zhst/meta@0.18.1 + +## 0.15.0 ### Patch Changes diff --git a/packages/material/package.json b/packages/material/package.json index 6b0ec39..f2df319 100644 --- a/packages/material/package.json +++ b/packages/material/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/material", - "version": "0.14.2", + "version": "0.17.0", "description": "物料库", "keywords": [ "business", diff --git a/packages/meta/CHANGELOG.md b/packages/meta/CHANGELOG.md index bf28180..caf32ee 100644 --- a/packages/meta/CHANGELOG.md +++ b/packages/meta/CHANGELOG.md @@ -1,5 +1,39 @@ # @zhst/utils +## 0.20.0 + +### Minor Changes + +- fix: cropperImage 透出矩形坐标 + +### Patch Changes + +- Updated dependencies + - @zhst/meta@0.20.0 + +## 0.19.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + +### Patch Changes + +- Updated dependencies + - @zhst/hooks@0.13.0 + - @zhst/func@0.15.0 + - @zhst/icon@0.5.0 + - @zhst/meta@0.19.0 + +## 0.18.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.14.1 + - @zhst/hooks@0.12.1 + - @zhst/meta@0.18.1 + ## 0.18.0 ### Minor Changes diff --git a/packages/meta/package.json b/packages/meta/package.json index a854130..a88e4f4 100644 --- a/packages/meta/package.json +++ b/packages/meta/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/meta", - "version": "0.18.0", + "version": "0.20.0", "description": "原子组件", "keywords": [ "meta", diff --git a/packages/meta/src/BigImagePreview/bigImagePreviewHelper.ts b/packages/meta/src/BigImagePreview/bigImagePreviewHelper.ts index 653dec6..f85a956 100644 --- a/packages/meta/src/BigImagePreview/bigImagePreviewHelper.ts +++ b/packages/meta/src/BigImagePreview/bigImagePreviewHelper.ts @@ -212,7 +212,6 @@ export const getOtherExtendRect = (srcRect: Rect, maxW: number, maxH: number, ty return newRect; }; - export const getTransformRect = (image: { height: number; width: number; }, transform: { translateX: any; translateY: any; scale: any; rotate: any; }, rect: Rect) => { const canvasRect = { x: rect.x, diff --git a/packages/meta/src/cropperImage/CropperImage.tsx b/packages/meta/src/cropperImage/CropperImage.tsx index 4ba8a76..0e1649d 100644 --- a/packages/meta/src/cropperImage/CropperImage.tsx +++ b/packages/meta/src/cropperImage/CropperImage.tsx @@ -9,6 +9,7 @@ import { Cropper, EVENT_CROP_END, EVENT_CROP_START, EVENT_SHAPE_SELECT } from '. import { Rect } from '../ImageEditor/viewer/shape'; import { checkPointInRect, drawArrowLine, getImageDataByPosition, percentToLength } from './cropperImagehelper'; import Align from 'rc-align'; +import { getTransformRect } from '../BigImagePreview/bigImagePreviewHelper'; interface RectPro extends Rect { imageRect: string @@ -161,8 +162,10 @@ const CropperImage = forwardRef((props, // 矩形 - 结束绘制实践 cropEndRef.current = addEventListenerWrapper(imageRef.current, EVENT_CROP_END, (event: { detail: any; }) => { const data = event.detail; - const imageRect = getImageDataByPosition({ x: data.left, y: data.top, w: data.width, h: data.height }, { canvas: viewerRef.current.canvas }) - onCropEnd?.({ ...data , imageRect, targetTransform }) + const targetPosition = { x: data.left, y: data.top, w: data.width, h: data.height } + const imageRect = getImageDataByPosition(targetPosition, { canvas: viewerRef.current.canvas }) + const targetData = getTransformRect(_viewer.image, targetTransform, targetPosition) + onCropEnd?.({ ...data , imageRect, targetTransform, targetData }) setIsMove(false) }) } else { diff --git a/packages/request/CHANGELOG.md b/packages/request/CHANGELOG.md index 2e31b91..343a93e 100644 --- a/packages/request/CHANGELOG.md +++ b/packages/request/CHANGELOG.md @@ -1,5 +1,23 @@ # @zhst/request +## 0.15.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.15.0 + +## 0.14.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.14.1 + ## 0.14.0 ### Minor Changes diff --git a/packages/request/package.json b/packages/request/package.json index c0c2a04..be82317 100644 --- a/packages/request/package.json +++ b/packages/request/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/request", - "version": "0.14.0", + "version": "0.15.0", "description": "请求库", "keywords": [ "request", diff --git a/packages/slave/CHANGELOG.md b/packages/slave/CHANGELOG.md index d49fde8..62e1ae9 100644 --- a/packages/slave/CHANGELOG.md +++ b/packages/slave/CHANGELOG.md @@ -1,5 +1,23 @@ # @zhst/slave +## 0.11.0 + +### Minor Changes + +- feat: 修复之前发版错乱问题 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.15.0 + +## 0.10.1 + +### Patch Changes + +- Updated dependencies + - @zhst/func@0.14.1 + ## 0.10.0 ### Minor Changes diff --git a/packages/slave/package.json b/packages/slave/package.json index 71fed31..c24a0ef 100644 --- a/packages/slave/package.json +++ b/packages/slave/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/slave", - "version": "0.10.0", + "version": "0.11.0", "description": "微前端子应用方法库", "keywords": [ "slave",