@cloud-app-dev/vidc 3.2.7 → 3.2.9

package/es/DomMove/index.js

@@ -11,7 +11,8 @@ function DomMove(_ref) {
     children = _ref.children,
     onDragChange = _ref.onDragChange,
     onDragEnd = _ref.onDragEnd,
-    forwordRef = _ref.forwordRef;
+    forwordRef = _ref.forwordRef,
+    disabled = _ref.disabled;
   var dragRef = useRef(null);
   var ref = useRef({
     position: {
@@ -91,12 +92,14 @@ function DomMove(_ref) {
     target: document.body
   });
   _useEventListener('mousedown', function (event) {
-    var _getMouseXY2 = getMouseXY(event),
-      x = _getMouseXY2.x,
-      y = _getMouseXY2.y;
-    ref.current.deviation.offsetX = x - ref.current.position.x;
-    ref.current.deviation.offsetY = y - ref.current.position.y;
-    ref.current.isDrag = true;
+    if (!disabled) {
+      var _getMouseXY2 = getMouseXY(event),
+        _x2 = _getMouseXY2.x,
+        _y2 = _getMouseXY2.y;
+      ref.current.deviation.offsetX = _x2 - ref.current.position.x;
+      ref.current.deviation.offsetY = _y2 - ref.current.position.y;
+      ref.current.isDrag = true;
+    }
   }, {
     target: dragRef
   });

package/es/Picture/demo.js

@@ -11,6 +11,7 @@ export default function App() {
       height: 400
     }
   }, /*#__PURE__*/React.createElement(Picture, {
-    imagePath: "https://x0.ifengimg.com/cmpp/fck/2020_30/65cca65a549d6c2_w1024_h578.jpg"
+    imagePath: "https://x0.ifengimg.com/cmpp/fck/2020_30/65cca65a549d6c2_w1024_h578.jpg",
+    isOpenSelect: false
   })));
 }

package/es/Picture/interface.d.ts

@@ -145,9 +145,9 @@ export interface IPictureProps {
   minHeight?: number | string;
 
   /**
-   * 进展拓展状态
+   * 禁止拓展状态
    */
-  disabledDrag?: false;
+  disabledDrag?: boolean;
 
   /**
    * 图片地址
@@ -162,12 +162,12 @@ export interface IPictureProps {
   /**
    * 开启自定义框选
    */
-  isOpenSelect?: false;
+  isOpenSelect?: boolean;
 
   /**
    * 禁止框选 后的菜单项
    */
-  disabledDrawMenu?: false;
+  disabledDrawMenu?: boolean;
 
   /**
    * 框选 后的菜单项

package/es/Picture/useDraw.d.ts

@@ -1 +1 @@
-export default function useDraw(dom: HTMLElement, flag: boolean): [number[], boolean];
+export default function useDraw(dom: HTMLElement, open: boolean): [number[], boolean];

package/es/Picture/useDraw.js

@@ -6,7 +6,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Symbol !== "undefined" && arr[Symbol.iterator] || arr["@@iterator"]; if (_i == null) return; var _arr = []; var _n = true; var _d = false; var _s, _e; try { for (_i = _i.call(arr); !(_n = (_s = _i.next()).done); _n = true) { _arr.push(_s.value); if (i && _arr.length === i) break; } } catch (err) { _d = true; _e = err; } finally { try { if (!_n && _i["return"] != null) _i["return"](); } finally { if (_d) throw _e; } } return _arr; }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { useState, useRef, useCallback } from 'react';
-export default function useDraw(dom, flag) {
+export default function useDraw(dom, open) {
   var _useState = useState({
       rect: [0, 0, 0, 0],
       isEnd: false
@@ -71,8 +71,10 @@ export default function useDraw(dom, flag) {
     }
   }, [dom]);
   _useEventListener('mousedown', function (event) {
-    selectOptionsRef.current.startSelect = true;
-    selectOptionsRef.current.start = [event.clientX, event.clientY];
+    if (open) {
+      selectOptionsRef.current.startSelect = true;
+      selectOptionsRef.current.start = [event.clientX, event.clientY];
+    }
   }, {
     target: dom
   });

package/es/ScreenPlayer/interface.d.ts

@@ -80,7 +80,7 @@ export interface IRecordPlayerProps {
   /**
    * 自定义合成前端录像
    */
-  getLocalRecordUrl?: (options: { url: URL; begin: number; end: number }) => Promise<string>;
+  getLocalRecordUrl?: (options: { url: URL; begin: number; end: number; screenIndex: number }) => Promise<string>;
 
   /**
    * 插件下载地址

package/es/useDrawROI/index.js

@@ -1,5 +1,6 @@
 import _useEventListener from "ahooks/es/useEventListener";
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+import _usePrevious from "ahooks/es/usePrevious";
 import _useSize from "ahooks/es/useSize";
 import _useLatest from "ahooks/es/useLatest";
 function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
@@ -36,16 +37,28 @@ function useDrawROI(target, _ref) {
     setState = _useSimpleState2[2];
   var isOpenRef = _useLatest(state.isOpen);
   var size = _useSize(target);
+  var oldSize = _usePrevious(size);
   useEffect(function () {
+    if (!(size === null || size === void 0 ? void 0 : size.width)) {
+      return;
+    }
     var canvas = getTargetElement(target);
     canvas.width = size === null || size === void 0 ? void 0 : size.width;
     canvas.height = size === null || size === void 0 ? void 0 : size.height;
-    console.warn('canvas，size变化，请重新绘制！');
+    console.warn('canvas，size变化！');
+    if (!(oldSize === null || oldSize === void 0 ? void 0 : oldSize.width)) {
+      return;
+    }
+    var scale = size.width / oldSize.width;
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
         pos: [],
         tempPos: [],
-        saveArea: []
+        saveArea: old.saveArea.map(function (area) {
+          return area.map(function (v) {
+            return [v[0] * scale, v[1] * scale];
+          });
+        })
       });
     });
     // eslint-disable-next-line react-hooks/exhaustive-deps

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.2.7",
+  "version": "3.2.9",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",