+ {/*场景图大图 */}
+
+ {/* 图片操作 */}
+ {!hideLeftTopBtn && (
+
+ )}
+ {showCrop && (
+
+ )}
+ {showCrop && cropRect && screenshotButtonRender && (
+ <>
+
+
+ {screenshotButtonRender({
+ model: 'IMAGE',
+ getCropInfo,
+ setShowCrop,
+ cropType,
+ selectAlgorithmVersion,
+ })}
+
+ >
+ )}
+ {/* 场景图小图 */}
+ {showAttachImg && !showCrop && (
+
+
+ {showAttachImgLabel
+ ? attachImg.map(({ label, url }, index) => (
+
{
+ setSelectAttachImgIndex(index);
+ }}
+ >
+ {label}
+
+ ))
+ : null}
+
+
+
+
+

+
+ )}
+
{`人脸质量分:${(score as number).toFixed(2)}`}
+
+ );
+});
+
+ImgView.displayName = 'ImgView';
+
+export default ImgView;
diff --git a/packages/meta/src/ImageEditor/cropper/event.ts b/packages/meta/src/ImageEditor/cropper/event.ts
index 28036a1..09b4cd6 100644
--- a/packages/meta/src/ImageEditor/cropper/event.ts
+++ b/packages/meta/src/ImageEditor/cropper/event.ts
@@ -1,6 +1,6 @@
//@ts-nocheck
import { addClass, removeClass } from 'rc-util/lib/Dom/class';
-import { addEventlistener, isNumber, get } from '@zhst/func';
+import { addEventListenerWrapper, isNumber, get } from '@zhst/func';
import warn from 'rc-util/lib/warn';
import { getData, getPointer, getOffset, dispatchEvent } from '../utils';
import {
@@ -36,13 +36,13 @@ export default {
bind() {
const { container, element, eventHandleList = [], option } = this;
- const handleCropStart = addEventlistener(
+ const handleCropStart = addEventListenerWrapper(
container,
EVENT_POINTER_DOWN,
this.onCropStart.bind(this)
);
eventHandleList.push(handleCropStart);
- const handleCropMove = addEventlistener(
+ const handleCropMove = addEventListenerWrapper(
element.ownerDocument,
EVENT_POINTER_MOVE,
this.onCropMove.bind(this)
@@ -51,7 +51,7 @@ export default {
EVENT_POINTER_UP.trim()
.split(REGEXP_SPACES)
.forEach((eventName) => {
- const handleCropEnd = addEventlistener(
+ const handleCropEnd = addEventListenerWrapper(
element.ownerDocument,
eventName,
this.onCropEnd.bind(this)
diff --git a/packages/meta/src/ImageEditor/cropper/viewerBridge.ts b/packages/meta/src/ImageEditor/cropper/viewerBridge.ts
index 43662ef..ec9159c 100644
--- a/packages/meta/src/ImageEditor/cropper/viewerBridge.ts
+++ b/packages/meta/src/ImageEditor/cropper/viewerBridge.ts
@@ -1,5 +1,5 @@
//@ts-nocheck
-import {addEventlistener} from '@zhst/func';
+import {addEventListenerWrapper} from '@zhst/func';
import { EVENT_WHEEL } from './constants';
import { EVENT_VIEWER_TRANSFORM_CHANGE } from '../viewer/constants';
@@ -10,12 +10,12 @@ export default {
if (this.options.viewer) {
const viewer = this.options.viewer;
//添加缩放事件
- const handleWhele = addEventlistener(container, EVENT_WHEEL, this.onWheel.bind(this));
+ const handleWhele = addEventListenerWrapper(container, EVENT_WHEEL, this.onWheel.bind(this));
eventHandleList.push(handleWhele);
//添加事件监听 获取limit crop box & 渲染canvas
this.onTransformChange(viewer);
this.limited = true;
- const handleTransformChange = addEventlistener(
+ const handleTransformChange = addEventListenerWrapper(
viewer.element,
EVENT_VIEWER_TRANSFORM_CHANGE,
(event) => {
diff --git a/packages/meta/src/ImageEditor/viewer/event.ts b/packages/meta/src/ImageEditor/viewer/event.ts
index 810b980..de1cd71 100644
--- a/packages/meta/src/ImageEditor/viewer/event.ts
+++ b/packages/meta/src/ImageEditor/viewer/event.ts
@@ -1,5 +1,5 @@
//@ts-nocheck
-import { isNumber, get, addEventListener } from '@zhst/func';
+import { isNumber, get, addEventListenerWrapper } from '@zhst/func';
import { addClass, removeClass } from 'rc-util/lib/Dom/class.js';
import guid from 'rc-util/lib/guid';
import warn from 'rc-util/lib/warn';
@@ -33,19 +33,19 @@ export default {
//图片事件
const scaleAble = get(options, 'scaleAble', true);
if (scaleAble) {
- const handleWhele = addEventListener(canvas, EVENT_WHEEL, this.onWheel.bind(this));
+ const handleWhele = addEventListenerWrapper(canvas, EVENT_WHEEL, this.onWheel.bind(this));
eventHandleList.push(handleWhele);
}
const dragAble = get(options, 'dragAble', true);
if (dragAble) {
- const handleDragStart = addEventListener(
+ const handleDragStart = addEventListenerWrapper(
canvas,
EVENT_POINTER_DOWN,
this.onDragStart.bind(this)
);
- eventHandleList.push(addEventListener);
- const handleDragMove = addEventListener(
+ eventHandleList.push(addEventListenerWrapper);
+ const handleDragMove = addEventListenerWrapper(
element.ownerDocument,
EVENT_POINTER_MOVE,
this.onDragMove.bind(this)
@@ -54,7 +54,7 @@ export default {
EVENT_POINTER_UP.trim()
.split(REGEXP_SPACES)
.forEach((eventName) => {
- const handleDragEnd = addEventListener(
+ const handleDragEnd = addEventListenerWrapper(
element.ownerDocument,
eventName,
this.onDragEnd.bind(this)
@@ -64,11 +64,11 @@ export default {
}
//rect事件
- const handleClick = addEventListener(canvas, EVENT_CLICK, this.onClick.bind(this));
+ const handleClick = addEventListenerWrapper(canvas, EVENT_CLICK, this.onClick.bind(this));
eventHandleList.push(handleClick);
- // const handleLeveal = addEventListener(canvas, EVENT_LEAVEL, this.onLeavel.bind(this));
+ // const handleLeveal = addEventListenerWrapper(canvas, EVENT_LEAVEL, this.onLeavel.bind(this));
// eventHandleList.push(handleLeveal);
- // const handleEnter = addEventListener(canvas, EVENT_ENTER, this.onEnter.bind(this));
+ // const handleEnter = addEventListenerWrapper(canvas, EVENT_ENTER, this.onEnter.bind(this));
// eventHandleList.push(handleEnter);
},
unbind() {
diff --git a/packages/meta/src/ImagePreview/index.tsx b/packages/meta/src/ImagePreview/index.tsx
index 1986e10..03e8d5c 100644
--- a/packages/meta/src/ImagePreview/index.tsx
+++ b/packages/meta/src/ImagePreview/index.tsx
@@ -1,5 +1,5 @@
import React, { useRef, useState, FC, useEffect, useCallback } from 'react'
-import { generateImg, get, addEventListener } from '@zhst/func';
+import { generateImg, get, addEventListenerWrapper } from '@zhst/func';
import { useUpdateEffect } from '@zhst/hooks';
import { Button } from 'antd';
import classNames from 'classnames'
@@ -43,7 +43,7 @@ const CompaterImage: FC