@cloud-app-dev/vidc 4.0.1 → 4.0.3

package/es/Picture/index.js

@@ -1,31 +1,22 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 import _useUpdateLayoutEffect from "ahooks/es/useUpdateLayoutEffect";
 import _useMemoizedFn from "ahooks/es/useMemoizedFn";
 import _useSize from "ahooks/es/useSize";
 var _excluded = ["className", "width", "height", "minHeight", "disabledDrag", "imagePath", "rects", "isOpenSelect", "disabledDrawMenu", "menus", "hasTool", "fullScreenEle"];
-
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) { arr2[i] = arr[i]; } return arr2; }
-
-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 _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
+function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
-
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-
 import React, { useEffect, useMemo, useRef } from 'react';
 import DomMove from "../DomMove";
 import useSimpleState from "../useSimpleState";
@@ -40,61 +31,53 @@ import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-
 function Picture(_ref) {
   var _layoutRef$current;
-
   var className = _ref.className,
-      width = _ref.width,
-      height = _ref.height,
-      minHeight = _ref.minHeight,
-      disabledDrag = _ref.disabledDrag,
-      imagePath = _ref.imagePath,
-      rects = _ref.rects,
-      isOpenSelect = _ref.isOpenSelect,
-      disabledDrawMenu = _ref.disabledDrawMenu,
-      menus = _ref.menus,
-      hasTool = _ref.hasTool,
-      fullScreenEle = _ref.fullScreenEle,
-      props = _objectWithoutProperties(_ref, _excluded);
-
+    width = _ref.width,
+    height = _ref.height,
+    minHeight = _ref.minHeight,
+    disabledDrag = _ref.disabledDrag,
+    imagePath = _ref.imagePath,
+    rects = _ref.rects,
+    isOpenSelect = _ref.isOpenSelect,
+    disabledDrawMenu = _ref.disabledDrawMenu,
+    menus = _ref.menus,
+    hasTool = _ref.hasTool,
+    fullScreenEle = _ref.fullScreenEle,
+    props = _objectWithoutProperties(_ref, _excluded);
   var _useMemo = useMemo(function () {
-    return props;
-  }, [props]),
-      imgDownload = _useMemo.imgDownload,
-      onClickRect = _useMemo.onClickRect,
-      onMenuClick = _useMemo.onMenuClick,
-      children = _useMemo.children;
-
+      return props;
+    }, [props]),
+    imgDownload = _useMemo.imgDownload,
+    onClickRect = _useMemo.onClickRect,
+    onMenuClick = _useMemo.onMenuClick,
+    children = _useMemo.children;
   var _useSimpleState = useSimpleState({
-    x: 0,
-    y: 0,
-    rotate: 0,
-    scale: 1,
-    baseXOrY: 'x',
-    forceUpdateKey: Date.now(),
-    loadedTime: 0,
-    fullScreenStatus: false,
-    localUrl: '',
-    offset: [0, 0],
-    size: ['auto', 'auto']
-  }),
-      _useSimpleState2 = _slicedToArray(_useSimpleState, 3),
-      state = _useSimpleState2[0],
-      updateState = _useSimpleState2[1],
-      setState = _useSimpleState2[2];
-
+      x: 0,
+      y: 0,
+      rotate: 0,
+      scale: 1,
+      baseXOrY: 'x',
+      forceUpdateKey: Date.now(),
+      loadedTime: 0,
+      fullScreenStatus: false,
+      localUrl: '',
+      offset: [0, 0],
+      size: ['auto', 'auto']
+    }),
+    _useSimpleState2 = _slicedToArray(_useSimpleState, 3),
+    state = _useSimpleState2[0],
+    updateState = _useSimpleState2[1],
+    setState = _useSimpleState2[2];
   var layoutRef = useRef(null);
   var moveActionRef = useRef(null);
   var domImgRef = useRef(null);
-
   var size = _useSize(layoutRef);
-
   useEffect(function () {
     if (!imagePath) {
       return undefined;
     }
-
     var localUrl;
     fetch(imagePath).then(function (res) {
       return res.blob();
@@ -109,25 +92,24 @@ function Picture(_ref) {
     return function () {
       return URL.revokeObjectURL(localUrl);
     };
-  }, [imagePath]); // draw hooks
+  }, [imagePath]);
 
+  // draw hooks
   var _useDraw = useDraw((_layoutRef$current = layoutRef.current) === null || _layoutRef$current === void 0 ? void 0 : _layoutRef$current.querySelector('.picture-overlay'), isOpenSelect),
-      _useDraw2 = _slicedToArray(_useDraw, 2),
-      selectArea = _useDraw2[0],
-      isEnd = _useDraw2[1]; // init loaded
-
+    _useDraw2 = _slicedToArray(_useDraw, 2),
+    selectArea = _useDraw2[0],
+    isEnd = _useDraw2[1];
 
+  // init loaded
   var loadImageSuccess = _useMemoizedFn(function () {
     if (!state.localUrl || !layoutRef.current || !domImgRef.current) {
       return;
     }
-
     var _getImgSize = getImgSize(layoutRef.current, domImgRef.current),
-        x = _getImgSize.x,
-        y = _getImgSize.y,
-        size = _getImgSize.size,
-        baseXOrY = _getImgSize.baseXOrY;
-
+      x = _getImgSize.x,
+      y = _getImgSize.y,
+      size = _getImgSize.size,
+      baseXOrY = _getImgSize.baseXOrY;
     var moveObj = moveActionRef.current;
     moveObj.updatePosition({
       x: x,
@@ -143,57 +125,49 @@ function Picture(_ref) {
         loadedTime: Date.now()
       });
     });
-  }); // 更新重绘
-
+  });
 
+  // 更新重绘
   _useUpdateLayoutEffect(function () {
     loadImageSuccess();
-  }, [size]); // 更新重绘
-
+  }, [size]);
 
+  // 更新重绘
   _useUpdateLayoutEffect(function () {
     // Rects重新计算
     updateState({
       forceUpdateKey: Date.now()
     });
   }, [state.loadedTime]);
+
   /**
    * 设置图片缩放
    */
-
-
   var setScale = _useMemoizedFn(function (changeValue) {
     var currentValue = state.scale;
-
     if (currentValue === 3 && changeValue > 0) {
       return;
     }
-
     if (currentValue === 1 && changeValue < 0) {
       return;
     }
-
     var scale = currentValue + changeValue;
-
     if (scale > 3) {
       scale = 3;
     }
-
     if (scale < 1) {
       scale = 1;
     }
-
     setState(function (old) {
       return _objectSpread(_objectSpread({}, old), {}, {
         scale: scale
       });
     });
   });
+
   /**
    * 设置图谱旋转
    */
-
-
   var setRotate = _useMemoizedFn(function (changeValue) {
     var currentValue = state.rotate;
     setState(function (old) {
@@ -202,11 +176,10 @@ function Picture(_ref) {
       });
     });
   });
+
   /**
    * 重置图片位置
    */
-
-
   var resetPicture = _useMemoizedFn(function (event) {
     event.stopPropagation();
     var moveObj = moveActionRef.current;
@@ -221,14 +194,13 @@ function Picture(_ref) {
       y: state.offset[1]
     });
   });
+
   /**
    * 拖拽更新位置
    */
-
-
   var onDragChange = _useMemoizedFn(function (_ref2) {
     var x = _ref2.x,
-        y = _ref2.y;
+      y = _ref2.y;
     return setState(function (old) {
       return _objectSpread(_objectSpread({}, old), {}, {
         x: x,
@@ -236,28 +208,26 @@ function Picture(_ref) {
       });
     });
   });
+
   /**
    * 拖拽结束更新位置，计算边界
    */
-
-
   var onDragEnd = _useMemoizedFn(function (_, currrentPosition) {
     if (!layoutRef.current || !domImgRef.current) {
       return undefined;
     }
-
     var _ref3 = size || {
-      width: 0,
-      height: 0
-    },
-        width = _ref3.width,
-        height = _ref3.height;
-
+        width: 0,
+        height: 0
+      },
+      width = _ref3.width,
+      height = _ref3.height;
     var imgw = domImgRef.current.width * state.scale;
     var imgh = domImgRef.current.height * state.scale;
     var scaleW = imgw - domImgRef.current.width;
-    var scaleH = imgh - domImgRef.current.height; // 校验x，y范围，超出回弹
+    var scaleH = imgh - domImgRef.current.height;
 
+    // 校验x，y范围，超出回弹
     var maxX = imgw < width ? width - imgw + scaleW / 2 : scaleW / 2;
     var maxY = imgh < height ? height - imgh + scaleH / 2 : scaleH / 2;
     var minX = imgw < width ? scaleW / 2 : -(imgw - width) / 2 + state.offset[0];
@@ -270,16 +240,15 @@ function Picture(_ref) {
       y: y
     });
   });
+
   /**
    * 获取结构化的小图(base64)
    */
-
-
   var getRectImage = _useMemoizedFn(function (rect) {
     return getRectImagePath(domImgRef.current, rect);
-  }); // eslint-disable-next-line react-hooks/exhaustive-deps
-
+  });
 
+  // eslint-disable-next-line react-hooks/exhaustive-deps
   var scaleRects = useMemo(function () {
     return computedRectScale({
       domImg: domImgRef.current,
@@ -296,7 +265,6 @@ function Picture(_ref) {
     getRectImage: getRectImage,
     containerEle: layoutRef.current
   };
-
   _useUpdateEffect(function () {
     if (isOpenSelect) {
       var moveObj = moveActionRef.current;
@@ -312,7 +280,6 @@ function Picture(_ref) {
       });
     }
   }, [isOpenSelect]);
-
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       className: "picture-view-layout ".concat(className),
@@ -372,7 +339,6 @@ function Picture(_ref) {
     }), children === null || children === void 0 ? void 0 : children(renderOptions)]
   });
 }
-
 Picture.defaultProps = {
   width: '100%',
   height: '100%',

package/es/Picture/utils.js

@@ -1,9 +1,9 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
-
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
-
-function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
-
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
 /* eslint-disable @typescript-eslint/no-unused-expressions */
 import { cloneDeep } from 'lodash-es';
 export function customContextMenu(e) {
@@ -14,7 +14,6 @@ export function cloneImageNode(image) {
   if (!image) {
     return Promise.reject();
   }
-
   var newImage = image.cloneNode();
   return new Promise(function (resolve, reject) {
     newImage.addEventListener('load', function () {
@@ -27,14 +26,11 @@ export function cloneImageNode(image) {
 }
 export function getCaptureRect(rect, type) {
   var rectArea = rect;
-
   if (rectArea.length !== 4) {
     console.error('区域有误 rect = "[x,y,w,h]"! ', rect);
     return [0, 0, 0, 0];
   }
-
   var x, y, w, h;
-
   switch (type) {
     case 'body':
       x = rectArea[0] - rectArea[2] * 0.2;
@@ -42,7 +38,6 @@ export function getCaptureRect(rect, type) {
       w = rectArea[2] * 1.4;
       h = rectArea[3] * 1.4;
       break;
-
     case 'nonVehicle':
     case 'vehicle':
     case 'thing':
@@ -51,7 +46,6 @@ export function getCaptureRect(rect, type) {
       w = rectArea[2];
       h = rectArea[3];
       break;
-
     default:
       // face
       x = rectArea[0] - rectArea[2] * 0.8;
@@ -60,27 +54,21 @@ export function getCaptureRect(rect, type) {
       h = rectArea[3] * 3.2;
       break;
   }
-
   return [x, y, w, h];
 }
 export function computedRectScale(_ref) {
   var _ref2, _ref3;
-
   var domImg = _ref.domImg,
-      rects = _ref.rects;
-
+    rects = _ref.rects;
   if (!domImg) {
     return [];
   }
-
   if (domImg.naturalWidth === 0 || domImg.naturalHeight === 0) {
     return [];
   }
-
   var _domImg$getBoundingCl = domImg.getBoundingClientRect(),
-      width = _domImg$getBoundingCl.width,
-      height = _domImg$getBoundingCl.height;
-
+    width = _domImg$getBoundingCl.width,
+    height = _domImg$getBoundingCl.height;
   var scaleOptions = {
     scaleX: (_ref2 = width / domImg.naturalWidth) !== null && _ref2 !== void 0 ? _ref2 : 1,
     scaleY: (_ref3 = height / domImg.naturalHeight) !== null && _ref3 !== void 0 ? _ref3 : 1
@@ -104,29 +92,29 @@ export function computedRectScale(_ref) {
 }
 export function getImgSize(dom, img) {
   var _layoutRect$width, _layoutRect$height;
-
   var naturalWidth = img.naturalWidth,
-      naturalHeight = img.naturalHeight;
+    naturalHeight = img.naturalHeight;
   var layoutRect = dom.getBoundingClientRect();
   var w = (_layoutRect$width = layoutRect === null || layoutRect === void 0 ? void 0 : layoutRect.width) !== null && _layoutRect$width !== void 0 ? _layoutRect$width : 0;
   var h = (_layoutRect$height = layoutRect === null || layoutRect === void 0 ? void 0 : layoutRect.height) !== null && _layoutRect$height !== void 0 ? _layoutRect$height : 0;
   var baseXOrY = naturalWidth > naturalHeight ? 'x' : 'y';
   var x = 0;
   var y = 0;
-  var size = []; // 横图
+  var size = [];
 
+  // 横图
   if (baseXOrY === 'x') {
     if (naturalWidth < w) {
       // 图片小于容器
       size[0] = naturalWidth;
       size[1] = naturalHeight;
       x = (w - naturalWidth) / 2;
-      y = Math.abs((h - naturalHeight) / 2);
+      y = (h - naturalHeight) / 2;
     } else {
       // 图片大于容器
       var imagescale = w / naturalWidth;
       var imgHeight = imagescale * naturalHeight;
-      y = Math.abs((imgHeight - h) / 2);
+      y = (h - imgHeight) / 2;
       size[0] = w;
       size[1] = imgHeight;
     }
@@ -135,19 +123,17 @@ export function getImgSize(dom, img) {
       // 图片小于容器
       size[0] = naturalWidth;
       size[1] = naturalHeight;
-      x = Math.abs(w - naturalWidth) / 2;
+      x = (w - naturalWidth) / 2;
       y = (h - naturalHeight) / 2;
     } else {
       // 图片大于容器
       var _imagescale = h / naturalHeight;
-
       var imgWidth = _imagescale * naturalWidth;
-      x = Math.abs((imgWidth - w) / 2);
+      x = (w - imgWidth) / 2;
       size[0] = imgWidth;
       size[1] = h;
     }
   }
-
   return {
     x: x,
     y: y,