@cloud-app-dev/vidc 3.2.16 → 3.2.18

package/es/Picture/component/DefaultRects/index.less

@@ -4,16 +4,19 @@
       border-top-color: @color;
       border-left-color: @color;
     }
+
     &::after {
       border-top-color: @color;
       border-right-color: @color;
     }
   }
+
   .border-bottom-decorator {
     &::before {
       border-bottom-color: @color;
       border-left-color: @color;
     }
+
     &::after {
       border-bottom-color: @color;
       border-right-color: @color;
@@ -25,6 +28,7 @@
   .rect-item {
     border-color: @lightColor;
     .border-decorator-color-mixin(@color);
+
     &:hover {
       border-color: @color;
       box-shadow: inset 0 0 24px 0 @shadowColor;
@@ -36,8 +40,8 @@
   .rect-info-list-wrapper {
     .data-type {
       .data-tag {
-        border: 1px solid @color;
         background: @bgColor;
+        border: 1px solid @color;
       }
     }
     // border-color: @color;
@@ -53,24 +57,28 @@
 }
 
 .rect-item-face-wrapper {
-  .rect-item-style-mixin(#ff5f57, rgba(255, 95, 87, 0.6), rgba(255, 95, 87, 0.4));
-  .rect-info-list-mixin(#FF5F57, rgba(255,95,87,0.6), rgba(179,49,43,0.6));
+  .rect-item-style-mixin(#ff5f57, rgba(255, 95, 87, .6), rgba(255, 95, 87, .4));
+  .rect-info-list-mixin(#FF5F57, rgba(255,95,87,.6), rgba(179,49,43,.6));
 }
+
 .rect-item-body-wrapper {
-  .rect-item-style-mixin(#ffbb22, rgba(255, 187, 34, 0.6), rgba(255, 187, 34, 0.4));
-  .rect-info-list-mixin(#FFBB22, rgba(255,187,34,0.6), rgba(176,94,0,0.6));
+  .rect-item-style-mixin(#ffbb22, rgba(255, 187, 34, .6), rgba(255, 187, 34, .4));
+  .rect-info-list-mixin(#FFBB22, rgba(255,187,34,.6), rgba(176,94,0,.6));
 }
+
 .rect-item-vehicle-wrapper {
-  .rect-item-style-mixin(#44aaff, rgba(68, 170, 255, 0.6), rgba(68, 170, 255, 0.4));
-  .rect-info-list-mixin(#44aaff, rgba(68,170,255,0.6), rgba(31,114,183,0.6));
+  .rect-item-style-mixin(#44aaff, rgba(68, 170, 255, .6), rgba(68, 170, 255, .4));
+  .rect-info-list-mixin(#44aaff, rgba(68,170,255,.6), rgba(31,114,183,.6));
 }
+
 .rect-item-nonVehicle-wrapper {
-  .rect-item-style-mixin(#50e9b2, rgba(80, 233, 178, 0.6), rgba(80, 233, 178, 0.4));
-  .rect-info-list-mixin(#50e9b2, rgba(80,233,178,0.6), rgba(15,196,132,0.6));
+  .rect-item-style-mixin(#50e9b2, rgba(80, 233, 178, .6), rgba(80, 233, 178, .4));
+  .rect-info-list-mixin(#50e9b2, rgba(80,233,178,.6), rgba(15,196,132,.6));
 }
+
 .rect-item-thing-wrapper {
-  .rect-item-style-mixin(#b946d2, rgba(185, 70, 210, 0.6), rgba(185, 70, 210, 0.4));
-  .rect-info-list-mixin(#b946d2, rgba(185, 70, 210, 0.6), rgba(155, 58, 177, 0.4));
+  .rect-item-style-mixin(#b946d2, rgba(185, 70, 210, .6), rgba(185, 70, 210, .4));
+  .rect-info-list-mixin(#b946d2, rgba(185, 70, 210, .6), rgba(155, 58, 177, .4));
 }
 
 .rect-item {
@@ -78,42 +86,51 @@
   border-width: 1px;
   border-style: solid;
   cursor: pointer;
+
   .border-top-decorator,
   .border-bottom-decorator {
     position: absolute;
-    pointer-events: none;
     width: 100%;
+    pointer-events: none;
+
     &::before,
     &::after {
-      content: '';
       display: block;
       width: 8px;
       height: 8px;
       border: 2px solid transparent;
+      content: '';
     }
+
     &::before {
       float: left;
       margin-left: -1px;
     }
+
     &::after {
       float: right;
       margin-right: -1px;
     }
   }
+
   .border-top-decorator {
     top: 0;
+
     &::before,
     &::after {
       margin-top: -1px;
     }
   }
+
   .border-bottom-decorator {
     bottom: 0;
+
     &::before,
     &::after {
       margin-bottom: -1px;
     }
   }
+
   &:hover + .rect-info-list-wrapper {
     display: block;
   }
@@ -121,22 +138,22 @@
 
 // 结构化窗体
 .rect-info-list-wrapper {
-  display: none;
-  background: rgba(16, 21, 36, 0.8);
   position: absolute;
   z-index: 11;
-  border: 1px solid transparent;
+  display: none;
   padding-top: 5px;
+  background: rgb(16 21 36 / 80%);
+  border: 1px solid transparent;
 
-  /*高低质量*/
+  /* 高低质量 */
   .data-type {
     padding: 0 5px;
     color: #fff;
 
     .data-tag {
       padding: 4px;
-      font-size: 12px;
       margin-right: 4px;
+      font-size: 12px;
 
       .anticon {
         margin-right: 4px;
@@ -144,42 +161,48 @@
       }
     }
   }
+
   .rect-card-corner {
     position: absolute;
     top: -9px;
     left: -1px;
   }
+
   .rect-info-arrow {
     position: absolute;
+    top: 6px;
+    left: -4px;
     display: block;
     background: transparent;
+    transform: rotate(45deg);
     border-style: solid;
     border-width: 4px;
-    border-color: rgba(16, 21, 36, 0.8);
-    transform: rotate(45deg);
-    left: -4px;
-    top: 6px;
+    border-color: rgb(16 21 36 / 80%);
   }
+
   .rect-info-list {
     height: 100%;
-    border-radius: 2px;
     padding: 3px 10px;
+    border-radius: 2px;
+
     .info-item {
       padding: 3px 0;
-      white-space: nowrap;
-      text-overflow: ellipsis;
       overflow: hidden;
-      line-height: 18px;
       font-size: var(--fs-small);
+      line-height: 18px;
       color: #fff;
+      text-overflow: ellipsis;
+      white-space: nowrap;
+
       .anticon {
         position: relative;
         top: 1px;
-        cursor: default;
+        padding-right: 4px;
         font-size: 16px;
         color: #fff;
-        padding-right: 4px;
+        cursor: default;
       }
+
       .item-label {
         margin: 0 4px;
       }

package/es/Picture/component/DrawRect/index.js

@@ -26,8 +26,10 @@ function DrawRect(_ref) {
     return rect[1] + rect[3];
   }, [rect]);
   var onMenuClickAction = useCallback(function (item) {
+    var _getRectImage;
+
     onMenuClick === null || onMenuClick === void 0 ? void 0 : onMenuClick(_objectSpread(_objectSpread({}, item), {}, {
-      base64: getRectImage(rect)
+      base64: (_getRectImage = getRectImage(rect)) !== null && _getRectImage !== void 0 ? _getRectImage : ''
     }));
   }, [getRectImage, onMenuClick, rect]);
   return /*#__PURE__*/_jsxs(_Fragment, {

package/es/Picture/component/DrawRect/index.less

@@ -1,8 +1,8 @@
 .select-rect-layout {
-  box-shadow: 0 0 0 9999em rgba(0, 0, 0, 0.4);
+  position: absolute;
   border: 1px solid;
+  box-shadow: 0 0 0 9999em rgb(0 0 0 / 40%);
   border-image-source: url('data:image/gif;base64,R0lGODlhCgAKAJECAAAAAP///////wAAACH/C05FVFNDQVBFMi4wAwEAAAAh/wtYTVAgRGF0YVhNUDw/eHBhY2tldCBiZWdpbj0i77u/IiBpZD0iVzVNME1wQ2VoaUh6cmVTek5UY3prYzlkIj8+IDx4OnhtcG1ldGEgeG1sbnM6eD0iYWRvYmU6bnM6bWV0YS8iIHg6eG1wdGs9IkFkb2JlIFhNUCBDb3JlIDUuMy1jMDExIDY2LjE0NTY2MSwgMjAxMi8wMi8wNi0xNDo1NjoyNyAgICAgICAgIj4gPHJkZjpSREYgeG1sbnM6cmRmPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5LzAyLzIyLXJkZi1zeW50YXgtbnMjIj4gPHJkZjpEZXNjcmlwdGlvbiByZGY6YWJvdXQ9IiIgeG1sbnM6eG1wTU09Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC9tbS8iIHhtbG5zOnN0UmVmPSJodHRwOi8vbnMuYWRvYmUuY29tL3hhcC8xLjAvc1R5cGUvUmVzb3VyY2VSZWYjIiB4bWxuczp4bXA9Imh0dHA6Ly9ucy5hZG9iZS5jb20veGFwLzEuMC8iIHhtcE1NOkRvY3VtZW50SUQ9InhtcC5kaWQ6OEI5RDc5MTFDNkE2MTFFM0JCMDZEODI2QTI4MzJBOTIiIHhtcE1NOkluc3RhbmNlSUQ9InhtcC5paWQ6OEI5RDc5MTBDNkE2MTFFM0JCMDZEODI2QTI4MzJBOTIiIHhtcDpDcmVhdG9yVG9vbD0iQWRvYmUgUGhvdG9zaG9wIENTNiAoTWFjaW50b3NoKSI+IDx4bXBNTTpEZXJpdmVkRnJvbSBzdFJlZjppbnN0YW5jZUlEPSJ4bXAuZGlkOjAyODAxMTc0MDcyMDY4MTE4MDgzQzNDMjA5MzREQ0ZDIiBzdFJlZjpkb2N1bWVudElEPSJ4bXAuZGlkOjAyODAxMTc0MDcyMDY4MTE4MDgzQzNDMjA5MzREQ0ZDIi8+IDwvcmRmOkRlc2NyaXB0aW9uPiA8L3JkZjpSREY+IDwveDp4bXBtZXRhPiA8P3hwYWNrZXQgZW5kPSJyIj8+Af/+/fz7+vn49/b19PPy8fDv7u3s6+rp6Ofm5eTj4uHg397d3Nva2djX1tXU09LR0M/OzczLysnIx8bFxMPCwcC/vr28u7q5uLe2tbSzsrGwr66trKuqqainpqWko6KhoJ+enZybmpmYl5aVlJOSkZCPjo2Mi4qJiIeGhYSDgoGAf359fHt6eXh3dnV0c3JxcG9ubWxramloZ2ZlZGNiYWBfXl1cW1pZWFdWVVRTUlFQT05NTEtKSUhHRkVEQ0JBQD8+PTw7Ojk4NzY1NDMyMTAvLi0sKyopKCcmJSQjIiEgHx4dHBsaGRgXFhUUExIREA8ODQwLCgkIBwYFBAMCAQAAIfkEBQoAAgAsAAAAAAoACgAAAhWEERkn7W3ei7KlagMWF/dKgYeyGAUAIfkEBQoAAgAsAAAAAAoACgAAAg+UYwLJ7RnQm7QmsCyVKhUAIfkEBQoAAgAsAAAAAAoACgAAAhCUYgLJHdiinNSAVfOEKoUCACH5BAUKAAIALAAAAAAKAAoAAAIRVISAdusPo3RAzYtjaMIaUQAAIfkEBQoAAgAsAAAAAAoACgAAAg+MDiem7Q8bSLFaG5il6xQAIfkEBQoAAgAsAAAAAAoACgAAAg+UYRLJ7QnQm7SmsCyVKhUAIfkEBQoAAgAsAAAAAAoACgAAAhCUYBLJDdiinNSEVfOEKoECACH5BAUKAAIALAAAAAAKAAoAAAIRFISBdusPo3RBzYsjaMIaUQAAOw==');
   border-image-repeat: repeat;
   border-image-slice: 1;
-  position: absolute;
 }

package/es/Picture/component/RectMenu/index.less

@@ -1,29 +1,34 @@
 .select-rect-menu-layout {
   position: absolute;
-  font-size: var(--fs-small);
   width: 105px;
   overflow: hidden;
+  font-size: var(--fs-small);
+
   .menu-action-item {
     padding: 4px 10px;
-    background: #ffffff;
     margin-bottom: 4px;
-    border-radius: 15px;
-    box-shadow: 0 0 2px rgba(0, 0, 0, 0.2);
-    color: rgba(0, 0, 0, 0.65);
+    color: rgb(0 0 0 / 65%);
     white-space: nowrap;
+    background: #fff;
+    border-radius: 15px;
+    box-shadow: 0 0 2px rgb(0 0 0 / 20%);
+
     .anticon {
       padding-right: 2px;
       font-size: 16px;
       color: #89b;
     }
+
     &:hover {
-      background: #ffaa00;
       color: #fff;
       cursor: pointer;
+      background: #fa0;
+
       .anticon {
         color: #fff;
       }
     }
+
     &:last-child {
       margin-bottom: 0;
     }

package/es/Picture/component/Tools/index.js

@@ -1,8 +1,8 @@
 import "antd/lib/tooltip/style";
 import _Tooltip from "antd/lib/tooltip";
 import React from 'react';
-import IconFont from "../../../Player/iconfont";
 import FullScreen from "../../../FullScreen";
+import IconFont from "../../../Player/iconfont";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";

package/es/Picture/component/Tools/index.less

@@ -1,12 +1,14 @@
 .picture-tools {
   position: absolute;
-  bottom: 10px;
   right: 10px;
+  bottom: 10px;
   background: #fff;
-  box-shadow: 0 2px 5px 0 rgba(0, 0, 0, 0.3);
+  box-shadow: 0 2px 5px 0 rgb(0 0 0 / 30%);
+
   &.actions-change-rotate {
     bottom: 150px;
   }
+
   & > div {
     width: 30px;
     height: 25px;
@@ -15,28 +17,32 @@
     cursor: pointer;
 
     &.disabled {
-      cursor: not-allowed;
       color: #999;
+      cursor: not-allowed;
+
       .anticon {
         color: #999;
       }
     }
   }
 }
+
 .picture-actions {
   position: absolute;
   top: 8px;
   right: 8px;
+
   & > div {
+    float: left;
     width: 28px;
     height: 28px;
+    margin-left: 4px;
     line-height: 28px;
-    background: #fff;
-    float: left;
     text-align: center;
-    margin-left: 4px;
     cursor: pointer;
+    background: #fff;
   }
+
   .tools-screen-layer .anticon {
     padding-right: 0;
   }

package/es/Picture/index.js

@@ -31,17 +31,17 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 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; }
 
-/* eslint-disable jsx-a11y/alt-text */
-import React, { useMemo, useRef, useState, useCallback, useEffect } from 'react';
+import React, { useCallback, useEffect, useMemo, useRef } from 'react';
 import DomMove from "../DomMove";
-import { getRectImagePath } from "./loadCaptureRectImage";
-import { computedBound } from "./dragBound";
-import { customContextMenu, computedRectScale, cloneImageNode } from "./utils";
-import useDraw from "./useDraw";
-import Tools from "./component/Tools";
+import useSimpleState from "../useSimpleState";
+import DefaultRects from "./component/DefaultRects";
 import DrawRect from "./component/DrawRect";
+import Tools from "./component/Tools";
 import WheelScale from "./component/WheelScale";
-import DefaultRects from "./component/DefaultRects";
+import { computedBound } from "./dragBound";
+import { getRectImagePath } from "./loadCaptureRectImage";
+import useDraw from "./useDraw";
+import { cloneImageNode, computedRectScale, customContextMenu } from "./utils";
 import "./index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -70,23 +70,43 @@ function Picture(_ref) {
       onMenuClick = _useMemo.onMenuClick,
       children = _useMemo.children;
 
-  var _useState = useState({
+  var _useSimpleState = useSimpleState({
     x: 0,
     y: 0,
     rotate: 0,
     scale: 1,
     baseXOrY: 'x',
     forceUpdateKey: Date.now(),
-    fullScreenStatus: false
+    fullScreenStatus: false,
+    localUrl: ''
   }),
-      _useState2 = _slicedToArray(_useState, 2),
-      state = _useState2[0],
-      setState = _useState2[1];
+      _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 imageSourceRef = useRef(null);
+  useEffect(function () {
+    if (!imagePath) {
+      return undefined;
+    }
+
+    var localUrl;
+    fetch(imagePath).then(function (res) {
+      return res.blob();
+    }).then(function (blob) {
+      localUrl = URL.createObjectURL(blob);
+      updateState({
+        localUrl: localUrl
+      });
+    });
+    return function () {
+      return URL.revokeObjectURL(localUrl);
+    };
+  }, [imagePath]);
 
   var _useDraw = useDraw(layoutRef.current, isOpenSelect),
       _useDraw2 = _slicedToArray(_useDraw, 2),
@@ -95,7 +115,7 @@ function Picture(_ref) {
 
   var loadImageSuccess = useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(flag) {
-      var _domImgRef$current, width, height;
+      var nodeEle, _ref3, width, height;
 
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) {
@@ -105,8 +125,9 @@ function Picture(_ref) {
               return cloneImageNode(domImgRef.current);
 
             case 2:
-              imageSourceRef.current = _context.sent;
-              _domImgRef$current = domImgRef.current, width = _domImgRef$current.width, height = _domImgRef$current.height;
+              nodeEle = _context.sent;
+              imageSourceRef.current = nodeEle;
+              _ref3 = domImgRef.current, width = _ref3.width, height = _ref3.height;
               setState(function (old) {
                 return _objectSpread(_objectSpread({}, old), {}, {
                   forceUpdateKey: Date.now(),
@@ -115,7 +136,7 @@ function Picture(_ref) {
                 });
               });
 
-            case 5:
+            case 6:
             case "end":
               return _context.stop();
           }
@@ -176,13 +197,14 @@ function Picture(_ref) {
 
   var resetPicture = useCallback(function (event) {
     event.stopPropagation();
+    var moveObj = moveActionRef.current;
     setState(function (old) {
       return _objectSpread(_objectSpread({}, old), {}, {
         scale: 1,
         rotate: 0
       });
     });
-    moveActionRef.current.updatePosition({
+    moveObj.updatePosition({
       x: 0,
       y: 0
     });
@@ -191,9 +213,9 @@ function Picture(_ref) {
    * 拖拽更新位置
    */
 
-  var onDragChange = useCallback(function (_ref3) {
-    var x = _ref3.x,
-        y = _ref3.y;
+  var onDragChange = useCallback(function (_ref4) {
+    var x = _ref4.x,
+        y = _ref4.y;
     return setState(function (old) {
       return _objectSpread(_objectSpread({}, old), {}, {
         x: x,
@@ -216,7 +238,8 @@ function Picture(_ref) {
     var position = computedBound(layoutRef.current, currrentPosition, scale, rotate);
 
     if (position) {
-      moveActionRef.current.updatePosition(position);
+      var moveObj = moveActionRef.current;
+      moveObj.updatePosition(position);
     }
   }, [state]);
   /**
@@ -262,7 +285,7 @@ function Picture(_ref) {
     return computedRectScale({
       imageSource: imageSourceRef.current,
       domImg: domImgRef.current,
-      rects: rects
+      rects: rects !== null && rects !== void 0 ? rects : []
     });
   }, [rects, state.forceUpdateKey]);
   var isEmpty = useMemo(function () {
@@ -324,7 +347,8 @@ function Picture(_ref) {
               maxHeight: baseXOrY === 'x' ? 'unset' : height || '100%'
             },
             draggable: false,
-            src: imagePath,
+            src: state.localUrl,
+            "data-src": imagePath,
             onLoad: function onLoad() {
               return loadImageSuccess();
             }
@@ -332,8 +356,8 @@ function Picture(_ref) {
             rect: selectArea,
             onMenuClick: onMenuClick,
             getRectImage: getRectImage,
-            menus: menus,
-            canRenderMenu: isEnd && !disabledDrawMenu && menus.length > 0,
+            menus: menus !== null && menus !== void 0 ? menus : [],
+            canRenderMenu: isEnd && !disabledDrawMenu && menus && menus.length > 0,
             containerDom: layoutRef.current
           }) : !isOpenSelect ? /*#__PURE__*/_jsx(DefaultRects, {
             rects: scaleRects,

package/es/Picture/index.less

@@ -1,13 +1,14 @@
 .picture-view-layout {
   position: relative;
+  min-height: 300px;
   overflow: hidden;
   user-select: none;
-  min-height: 300px;
+
   .picture-move-layout {
     & > div {
       width: 100%;
       height: 100%;
-      transition: all 0.3s;
+      transition: all .3s;
       overflow: hidden;
     }
   }

package/es/Picture/useDraw.js

@@ -12,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { useState, useRef, useCallback } from 'react';
+import { useCallback, useRef, useState } from 'react';
 export default function useDraw(dom, open) {
   var _useState = useState({
     rect: [0, 0, 0, 0],

package/es/Picture/utils.js

@@ -4,6 +4,7 @@ function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { va
 
 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; }
 
+/* eslint-disable @typescript-eslint/no-unused-expressions */
 import { cloneDeep } from 'lodash-es';
 export function customContextMenu(e) {
   e.preventDefault();
@@ -11,7 +12,7 @@ export function customContextMenu(e) {
 }
 export function cloneImageNode(image) {
   if (!image) {
-    return Promise.resolve();
+    return Promise.reject();
   }
 
   var newImage = image.cloneNode();
@@ -24,43 +25,11 @@ export function cloneImageNode(image) {
     }, false);
   });
 }
-export function computedRectScale(_ref) {
-  var imageSource = _ref.imageSource,
-      domImg = _ref.domImg,
-      rects = _ref.rects;
-
-  if (!imageSource || !domImg) {
-    return [];
-  }
-
-  var width = domImg.width;
-  var height = domImg.height;
-  var scaleOptions = {
-    scaleX: width / imageSource.width,
-    scaleY: height / imageSource.height
-  };
-  return rects.map(function (item) {
-    var rect = item.needExpand ? getCaptureRect(cloneDeep(item.rect), item.type) : cloneDeep(item.rect);
-    rect[0] = Math.round(rect[0] * scaleOptions.scaleX);
-    rect[0] < 0 && (rect[0] = 0);
-    rect[2] = Math.round(rect[2] * scaleOptions.scaleX);
-    rect[2] < 0 && (rect[2] = 0);
-    rect[1] = Math.round(rect[1] * scaleOptions.scaleY);
-    rect[1] < 0 && (rect[1] = 0);
-    rect[3] = Math.round(rect[3] * scaleOptions.scaleY);
-    rect[3] < 0 && (rect[3] = 0);
-    rect[2] > width - rect[0] && (rect[2] = width - rect[0]);
-    rect[3] > height - rect[1] && (rect[3] = height - rect[1]);
-    return _objectSpread(_objectSpread({}, item), {}, {
-      rect: rect
-    });
-  });
-}
 export function getCaptureRect(rect, type) {
   var rectArea = rect;
 
   if (rectArea.length !== 4) {
-    console.error('区域有误 实例：string = "x,y,w,h"! ', rect);
+    console.error('区域有误 rect = "[x,y,w,h]"! ', rect);
     return [0, 0, 0, 0];
   }
 
@@ -93,4 +62,36 @@ export function getCaptureRect(rect, type) {
   }
 
   return [x, y, w, h];
+}
+export function computedRectScale(_ref) {
+  var imageSource = _ref.imageSource,
+      domImg = _ref.domImg,
+      rects = _ref.rects;
+
+  if (!imageSource || !domImg) {
+    return [];
+  }
+
+  var width = domImg.width;
+  var height = domImg.height;
+  var scaleOptions = {
+    scaleX: width / imageSource.width,
+    scaleY: height / imageSource.height
+  };
+  return rects.map(function (item) {
+    var rect = item.needExpand ? getCaptureRect(cloneDeep(item.rect), item.type) : cloneDeep(item.rect);
+    rect[0] = Math.round(rect[0] * scaleOptions.scaleX);
+    rect[0] < 0 && (rect[0] = 0);
+    rect[2] = Math.round(rect[2] * scaleOptions.scaleX);
+    rect[2] < 0 && (rect[2] = 0);
+    rect[1] = Math.round(rect[1] * scaleOptions.scaleY);
+    rect[1] < 0 && (rect[1] = 0);
+    rect[3] = Math.round(rect[3] * scaleOptions.scaleY);
+    rect[3] < 0 && (rect[3] = 0);
+    rect[2] > width - rect[0] && (rect[2] = width - rect[0]);
+    rect[3] > height - rect[1] && (rect[3] = height - rect[1]);
+    return _objectSpread(_objectSpread({}, item), {}, {
+      rect: rect
+    });
+  });
 }