From 67e59fffe88ca5908ff42aa31ea5edc02c154dce Mon Sep 17 00:00:00 2001 From: jiangzhixiong <710328466@qq.com> Date: Thu, 25 Apr 2024 17:28:24 +0800 Subject: [PATCH] =?UTF-8?q?fix(zhst/meta,zhst/biz):=20zhst/meta=20?= =?UTF-8?q?=E5=A4=A7=E5=9B=BE=E5=9C=88=E9=80=89=E7=BB=84=E4=BB=B6=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E9=80=89=E4=B8=8D=E4=B8=8A=20bug=20=E4=BF=AE=E5=A4=8D?= =?UTF-8?q?,attach=20=E9=81=AE=E6=8C=A1=E5=BA=95=E9=83=A8=E6=A1=86?= =?UTF-8?q?=E4=BA=8B=E4=BB=B6=E9=98=BB=E6=AD=A2=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package.json | 1 - packages/biz/CHANGELOG.md | 11 +++ packages/biz/package.json | 2 +- .../components/navigation/index.less | 2 +- .../components/navigation/index.tsx | 2 +- packages/biz/src/odModal/demo/basic.tsx | 5 +- packages/material/CHANGELOG.md | 14 ++++ packages/material/package.json | 2 +- packages/meta/CHANGELOG.md | 11 +++ .../es/BigImagePreview/BigImagePreview.js | 57 ++-------------- packages/meta/es/ImageEditor/viewer/helper.js | 7 +- packages/meta/package.json | 2 +- .../src/BigImagePreview/BigImagePreview.tsx | 68 ++----------------- .../meta/src/ImageEditor/viewer/helper.ts | 5 +- packages/meta/src/attachImage/AttachImage.tsx | 3 +- packages/meta/src/attachImage/demo/basic.tsx | 4 +- packages/meta/src/attachImage/index.less | 19 ++++-- .../meta/src/cropperImage/CropperImage.tsx | 4 +- tsconfig.json | 2 +- 19 files changed, 77 insertions(+), 144 deletions(-) diff --git a/package.json b/package.json index 1c9d983..bb02ed1 100644 --- a/package.json +++ b/package.json @@ -51,7 +51,6 @@ "prettier --parser=typescript --write" ] }, - "dependencies": {}, "devDependencies": { "@changesets/cli": "^2.27.1", "@commitlint/cli": "^17.1.2", diff --git a/packages/biz/CHANGELOG.md b/packages/biz/CHANGELOG.md index 5b62e04..3e9d7e8 100644 --- a/packages/biz/CHANGELOG.md +++ b/packages/biz/CHANGELOG.md @@ -1,5 +1,16 @@ # @zhst/biz +## 0.16.0 + +### Minor Changes + +- zhst/meta 大图圈选组件点击选不上 bug 修复,attach 遮挡底部框事件阻止修复 + +### Patch Changes + +- Updated dependencies + - @zhst/meta@0.14.0 + ## 0.15.0 ### Minor Changes diff --git a/packages/biz/package.json b/packages/biz/package.json index f57a42b..449d35d 100644 --- a/packages/biz/package.json +++ b/packages/biz/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/biz", - "version": "0.15.0", + "version": "0.16.0", "description": "业务库", "keywords": [ "business", diff --git a/packages/biz/src/BigImageModal/components/navigation/index.less b/packages/biz/src/BigImageModal/components/navigation/index.less index a25dc7b..46fe9e5 100644 --- a/packages/biz/src/BigImageModal/components/navigation/index.less +++ b/packages/biz/src/BigImageModal/components/navigation/index.less @@ -17,7 +17,7 @@ :global { i:hover { - color: #f0f0f0 !important; + color: #fff !important; } } diff --git a/packages/biz/src/BigImageModal/components/navigation/index.tsx b/packages/biz/src/BigImageModal/components/navigation/index.tsx index 946b1e5..d52efbf 100644 --- a/packages/biz/src/BigImageModal/components/navigation/index.tsx +++ b/packages/biz/src/BigImageModal/components/navigation/index.tsx @@ -29,7 +29,7 @@ const Navigation: React.FC<{ className )} > - diff --git a/packages/biz/src/odModal/demo/basic.tsx b/packages/biz/src/odModal/demo/basic.tsx index 0636355..44f6c9c 100644 --- a/packages/biz/src/odModal/demo/basic.tsx +++ b/packages/biz/src/odModal/demo/basic.tsx @@ -69,11 +69,8 @@ const demo = () => { autoSelectDisable={paintType === 'auto'} onCropEnd={_cropData => console.log('结束绘制：', _cropData)} onReset={() => console.log('重置')} - onRotate={() => console.log('旋转', odModalRef.current.rotateTo(90))} + onRotate={() => console.log('旋转', odModalRef.current?.rotateTo?.(90))} onTypeSelect={(val) => { - if (val === 1) { - - } setSelectedType(val) }} /> diff --git a/packages/material/CHANGELOG.md b/packages/material/CHANGELOG.md index 1a17dd3..3fecbd8 100644 --- a/packages/material/CHANGELOG.md +++ b/packages/material/CHANGELOG.md @@ -1,5 +1,19 @@ # @zhst/material +## 0.10.3 + +### Patch Changes + +- Updated dependencies + - @zhst/meta@0.14.0 + - @zhst/biz@0.16.0 + +## 0.10.2 + +### Patch Changes + +- material 修改找不到包的问题 + ## 0.10.1 ### Patch Changes diff --git a/packages/material/package.json b/packages/material/package.json index 441f416..5b0d5a8 100644 --- a/packages/material/package.json +++ b/packages/material/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/material", - "version": "0.10.1", + "version": "0.10.3", "description": "物料库", "keywords": [ "business", diff --git a/packages/meta/CHANGELOG.md b/packages/meta/CHANGELOG.md index 589976c..8ee3344 100644 --- a/packages/meta/CHANGELOG.md +++ b/packages/meta/CHANGELOG.md @@ -1,5 +1,16 @@ # @zhst/utils +## 0.14.0 + +### Minor Changes + +- zhst/meta 大图圈选组件点击选不上 bug 修复,attach 遮挡底部框事件阻止修复 + +### Patch Changes + +- Updated dependencies + - @zhst/meta@0.14.0 + ## 0.13.0 ### Minor Changes diff --git a/packages/meta/es/BigImagePreview/BigImagePreview.js b/packages/meta/es/BigImagePreview/BigImagePreview.js index c07d1c2..4d384f8 100644 --- a/packages/meta/es/BigImagePreview/BigImagePreview.js +++ b/packages/meta/es/BigImagePreview/BigImagePreview.js @@ -17,8 +17,7 @@ import React, { useEffect, useState, useRef, useImperativeHandle } from 'react'; import classNames from 'classnames'; import { get, pick, isNull, generateImg, dataURLToBlob, getTransforms, addEventListenerWrapper, getFileByRect } from '@zhst/func'; import Align from 'rc-align'; -import { Button, Empty } from '..'; -import { IconFont as Icon } from '@zhst/icon'; +import { Empty, AttachImage } from '..'; import { Cropper, Viewer, EVENT_VIEWER_TRANSFORM_CHANGE, EVENT_VIEWER_READY, EVENT_CROP_START, EVENT_CROP_END } from "../ImageEditor"; import BtnGroup from "./components/BtnGroup"; import "./index.less"; @@ -480,16 +479,6 @@ export var BigImagePreview = /*#__PURE__*/React.forwardRef(function (props, ref) } }; - // ============================= attact img ========================= - var _useState17 = useState(0), - _useState18 = _slicedToArray(_useState17, 2), - selectAttachImgIndex = _useState18[0], - setSelectAttachImgIndex = _useState18[1]; - var _useState19 = useState(false), - _useState20 = _slicedToArray(_useState19, 2), - isZoomin = _useState20[0], - setIsZoomin = _useState20[1]; - // ============================== Ref =============================== useImperativeHandle(ref, function () { return { @@ -544,46 +533,10 @@ export var BigImagePreview = /*#__PURE__*/React.forwardRef(function (props, ref) setShowCrop: setShowCrop, cropType: cropType, selectAlgorithmVersion: selectAlgorithmVersion - }))), (attachImg === null || attachImg === void 0 ? void 0 : attachImg.length) && !showCrop && /*#__PURE__*/React.createElement("div", { - className: classNames("".concat(componentName, "-attach"), isZoomin && "".concat(componentName, "-attach--zoomin"), "".concat(componentName, "-attach--fixed"), isZoomin && "".concat(componentName, "-attach--zoomin--fixed")) - }, /*#__PURE__*/React.createElement("div", { - className: classNames("".concat(componentName, "-attach__tab")) - }, showAttachImgLabel ? attachImg === null || attachImg === void 0 ? void 0 : attachImg.map(function (_ref6, index) { - var label = _ref6.label; - return /*#__PURE__*/React.createElement("div", { - key: index, - className: classNames("".concat(componentName, "-attach__tab-item"), selectAttachImgIndex === index && "".concat(componentName, "-attach__tab-item--select")), - onMouseEnter: function onMouseEnter() { - setSelectAttachImgIndex(index); - } - }, label); - }) : null), /*#__PURE__*/React.createElement("div", { - className: classNames("".concat(componentName, "-attach__scale")) - }, /*#__PURE__*/React.createElement(Button, { - type: "text" - //绝对定位下onClick事件失效采用onMouseDown - , - onMouseDown: function onMouseDown(e) { - //如果是左键执行 - if (e.button == 0) { - setIsZoomin(function (pre) { - return !pre; - }); - } - }, - style: { - color: '#fff' - } - }, /*#__PURE__*/React.createElement(Icon, { - styles: { - display: 'flex' - }, - icon: isZoomin ? 'icon-cancle_fullscreen' : 'icon-fullscreen' - }))), /*#__PURE__*/React.createElement("img", { - draggable: "false", - className: classNames("".concat(componentName, "-attach__img"), "".concat(componentName, "-attach__img--fixed")), - src: get(attachImg, "".concat(selectAttachImgIndex, ".url"), '') - })), (showScore || score) && /*#__PURE__*/React.createElement("div", { + }))), (attachImg === null || attachImg === void 0 ? void 0 : attachImg.length) && !showCrop && /*#__PURE__*/React.createElement(AttachImage, { + showAttachImgLabel: showAttachImgLabel, + data: attachImg + }), (showScore || score) && /*#__PURE__*/React.createElement("div", { style: { bottom: 20 }, diff --git a/packages/meta/es/ImageEditor/viewer/helper.js b/packages/meta/es/ImageEditor/viewer/helper.js index c3462f4..1902b96 100644 --- a/packages/meta/es/ImageEditor/viewer/helper.js +++ b/packages/meta/es/ImageEditor/viewer/helper.js @@ -47,12 +47,9 @@ export default { // rotate: 90, }, windowToCanvasAxis: function windowToCanvasAxis(event) { - var _this$canvas$getBound = this.canvas.getBoundingClientRect(), - x = _this$canvas$getBound.x, - y = _this$canvas$getBound.y; return { - x: event.pageX - x, - y: event.pageY - y, + x: event.offsetX, + y: event.offsetY, __AXIS_TYPE__: AXIS_TYPE_CANVAS }; }, diff --git a/packages/meta/package.json b/packages/meta/package.json index eefd576..24aed55 100644 --- a/packages/meta/package.json +++ b/packages/meta/package.json @@ -1,6 +1,6 @@ { "name": "@zhst/meta", - "version": "0.13.0", + "version": "0.14.0", "description": "原子组件", "keywords": [ "meta", diff --git a/packages/meta/src/BigImagePreview/BigImagePreview.tsx b/packages/meta/src/BigImagePreview/BigImagePreview.tsx index 25a9fa7..a701943 100644 --- a/packages/meta/src/BigImagePreview/BigImagePreview.tsx +++ b/packages/meta/src/BigImagePreview/BigImagePreview.tsx @@ -11,9 +11,8 @@ import { getFileByRect } from '@zhst/func'; import Align from 'rc-align'; -import { Button, Empty } from '..'; +import { Empty, AttachImage } from '..'; import { type Rect, type IScreenshotButtonProp, type AlignType } from '@zhst/types' -import { IconFont as Icon } from '@zhst/icon' import { Cropper, Viewer, @@ -450,10 +449,6 @@ export const BigImagePreview = React.forwardRef((props } }; - // ============================= attact img ========================= - const [selectAttachImgIndex, setSelectAttachImgIndex] = useState(0); - const [isZoomin, setIsZoomin] = useState(false); - // ============================== Ref =============================== useImperativeHandle(ref, () => ({ imgInsRef, @@ -529,62 +524,11 @@ export const BigImagePreview = React.forwardRef((props )} {/* 场景图小图 */} - {attachImg?.length && !showCrop && ( -
-
- {showAttachImgLabel - ? attachImg?.map(({ label }, index) => ( -
{ - setSelectAttachImgIndex(index); - }} - > - {label} -
- )) - : null} -
-
- -
- -
+ {attachImg?.length && !showCrop && ( + )} {(showScore || score) &&
((props) =
diff --git a/packages/meta/src/attachImage/demo/basic.tsx b/packages/meta/src/attachImage/demo/basic.tsx index 7be4255..a86e78f 100644 --- a/packages/meta/src/attachImage/demo/basic.tsx +++ b/packages/meta/src/attachImage/demo/basic.tsx @@ -7,13 +7,13 @@ export default () => { return (
((props, }); // 监听形状选择事件 - addEventListenerWrapper(imageRef.current, EVENT_SHAPE_SELECT, async (e: { detail: any; }) => { + addEventListenerWrapper(imageRef.current, EVENT_SHAPE_SELECT, (e: { detail: any; }) => { // 选中的od const id = e.detail; if (id) { @@ -156,7 +156,7 @@ const CropperImage = forwardRef((props, onCropStart?.() }); // 矩形 - 结束绘制实践 - cropEndRef.current = addEventListenerWrapper(imageRef.current, EVENT_CROP_END, async (event: { detail: any; }) => { + 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 }) diff --git a/tsconfig.json b/tsconfig.json index 6819b85..8aef6e6 100644 --- a/tsconfig.json +++ b/tsconfig.json @@ -11,7 +11,7 @@ "@@/*": [".dumi/tmp/*"], "@zhst/*": ["packages/*/src/"] }, - "importHelpers": true, + "importHelpers": false, "sourceMap": true, "strictNullChecks": true, "module": "esnext",