@cloud-app-dev/vidc 3.2.22 → 3.2.33

package/es/DomMove/index.js

@@ -102,8 +102,10 @@ function DomMove(_ref) {
   });
 
   _useEventListener('mouseup', function (event) {
-    ref.current.isDrag = false;
-    onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd(event, ref.current.position);
+    if (ref.current.isDrag) {
+      ref.current.isDrag = false;
+      onDragEnd === null || onDragEnd === void 0 ? void 0 : onDragEnd(event, ref.current.position);
+    }
   }, {
     target: document.body
   });
@@ -147,8 +149,8 @@ function DomMove(_ref) {
 DomMove.defaultProps = {
   className: '',
   size: {
-    width: '100%',
-    height: '100%'
+    width: 'max-content',
+    height: 'max-content'
   }
 };
 export default /*#__PURE__*/React.forwardRef(function (props, ref) {

package/es/FullScreen/index.js

@@ -1,3 +1,5 @@
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+
 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."); }
@@ -10,7 +12,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useEffect } from 'react';
+import React from 'react';
 import useFullscreen from "../useFullscreen";
 import IconFont from "../IconFont";
 import "./index.less";
@@ -28,12 +30,11 @@ function FullScreen(_ref) {
       isFullscreen = _useFullscreen2[0],
       toggleFullscreen = _useFullscreen2[1].toggleFullscreen;
 
-  useEffect(function () {
-    if (isFullscreen) {
-      fullScreenChange === null || fullScreenChange === void 0 ? void 0 : fullScreenChange(isFullscreen);
-    } // eslint-disable-next-line react-hooks/exhaustive-deps
-
+  _useUpdateEffect(function () {
+    console.log(isFullscreen);
+    fullScreenChange === null || fullScreenChange === void 0 ? void 0 : fullScreenChange(isFullscreen); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [isFullscreen]);
+
   return /*#__PURE__*/_jsxs("span", {
     className: "tools-screen-layer ".concat(className !== null && className !== void 0 ? className : ''),
     onClick: toggleFullscreen,

package/es/Picture/component/Tools/index.d.ts

@@ -7,7 +7,7 @@ interface IToolsProps {
     setRotate: (rotate: number) => void;
     containerEle: HTMLDivElement;
     resetPicture: (event: React.MouseEvent) => void;
-    fullScreenChange: (flag: boolean) => void;
+    fullScreenChange: () => void;
 }
 declare function Tools({ scale, imgDownload, setScale, setRotate, containerEle, resetPicture, fullScreenChange }: IToolsProps): JSX.Element;
 export default Tools;

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

@@ -15,7 +15,7 @@ function Tools(_ref) {
       setRotate = _ref.setRotate,
       containerEle = _ref.containerEle,
       resetPicture = _ref.resetPicture,
-      fullScreenChange = _ref.fullScreenChange;
+      _fullScreenChange = _ref.fullScreenChange;
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       className: "picture-tools",
@@ -88,7 +88,11 @@ function Tools(_ref) {
           getContainer: function getContainer() {
             return containerEle;
           },
-          fullScreenChange: fullScreenChange
+          fullScreenChange: function fullScreenChange() {
+            return setTimeout(function () {
+              return _fullScreenChange();
+            }, 200);
+          }
         })
       })]
     })]

package/es/Picture/demo.js

@@ -1,19 +1,77 @@
 import "antd/lib/config-provider/style";
 import _ConfigProvider from "antd/lib/config-provider";
+import "antd/lib/button/style";
+import _Button from "antd/lib/button";
+
+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 _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+
 import React from 'react';
 import Picture from '.';
+import { useSimpleState } from '..';
 import { jsx as _jsx } from "react/jsx-runtime";
 export default function App() {
+  var _useSimpleState = useSimpleState({
+    open: false
+  }),
+      _useSimpleState2 = _slicedToArray(_useSimpleState, 2),
+      state = _useSimpleState2[0],
+      updateState = _useSimpleState2[1];
+
   return /*#__PURE__*/_jsx(_ConfigProvider, {
     prefixCls: "cloudapp",
     children: /*#__PURE__*/_jsx("div", {
       style: {
         width: 800,
-        height: 400
+        height: 600,
+        background: '#000'
       },
       children: /*#__PURE__*/_jsx(Picture, {
-        imagePath: "https://x0.ifengimg.com/cmpp/fck/2020_30/65cca65a549d6c2_w1024_h578.jpg",
-        isOpenSelect: false
+        onClickRect: console.log,
+        onMenuClick: console.log,
+        menus: [{
+          title: "菜单1",
+          pathname: "/",
+          icon: ""
+        }],
+        imagePath: "http://192.168.100.246:1443/image/v1/100005251/objects/63882cf105f5f58310107e95/1669910400.jpg?signature=ad407ae3019acb29b14b4ed2817ad12f&watermark=m_61646D696E0A323032323132303154313332373434&expires=1669910400",
+        isOpenSelect: state.open,
+        rects: [{
+          type: 'face',
+          rect: [698, 274, 23, 23],
+          needExpand: true
+        }, {
+          type: 'face',
+          rect: [754.0, 268.0, 23.0, 23.0],
+          needExpand: true
+        }, {
+          type: 'face',
+          rect: [430.0, 421.0, 49.0, 49.0],
+          needExpand: true
+        }, {
+          type: 'face',
+          rect: [240.0, 468.0, 41.0, 36.0],
+          needExpand: true
+        }],
+        children: function children(options) {
+          return /*#__PURE__*/_jsx(_Button, {
+            onClick: function onClick() {
+              updateState({
+                open: true
+              });
+            },
+            children: "\xDF\xDF \u622A\u56FE"
+          });
+        }
       })
     })
   });

package/es/Picture/index.js

@@ -1,6 +1,7 @@
 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 _resizeObserver from "@cloud-app-dev/utils/es/resizeObserver";
+import _useMemoizedFn from "ahooks/es/useMemoizedFn";
 var _excluded = ["className", "width", "height", "minHeight", "disabledDrag", "imagePath", "rects", "isOpenSelect", "disabledDrawMenu", "menus", "hasTool", "fullScreenEle"];
 
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return exports; }; var exports = {}, Op = Object.prototype, hasOwn = Op.hasOwnProperty, $Symbol = "function" == typeof Symbol ? Symbol : {}, iteratorSymbol = $Symbol.iterator || "@@iterator", asyncIteratorSymbol = $Symbol.asyncIterator || "@@asyncIterator", toStringTagSymbol = $Symbol.toStringTag || "@@toStringTag"; function define(obj, key, value) { return Object.defineProperty(obj, key, { value: value, enumerable: !0, configurable: !0, writable: !0 }), obj[key]; } try { define({}, ""); } catch (err) { define = function define(obj, key, value) { return obj[key] = value; }; } function wrap(innerFn, outerFn, self, tryLocsList) { var protoGenerator = outerFn && outerFn.prototype instanceof Generator ? outerFn : Generator, generator = Object.create(protoGenerator.prototype), context = new Context(tryLocsList || []); return generator._invoke = function (innerFn, self, context) { var state = "suspendedStart"; return function (method, arg) { if ("executing" === state) throw new Error("Generator is already running"); if ("completed" === state) { if ("throw" === method) throw arg; return doneResult(); } for (context.method = method, context.arg = arg;;) { var delegate = context.delegate; if (delegate) { var delegateResult = maybeInvokeDelegate(delegate, context); if (delegateResult) { if (delegateResult === ContinueSentinel) continue; return delegateResult; } } if ("next" === context.method) context.sent = context._sent = context.arg;else if ("throw" === context.method) { if ("suspendedStart" === state) throw state = "completed", context.arg; context.dispatchException(context.arg); } else "return" === context.method && context.abrupt("return", context.arg); state = "executing"; var record = tryCatch(innerFn, self, context); if ("normal" === record.type) { if (state = context.done ? "completed" : "suspendedYield", record.arg === ContinueSentinel) continue; return { value: record.arg, done: context.done }; } "throw" === record.type && (state = "completed", context.method = "throw", context.arg = record.arg); } }; }(innerFn, self, context), generator; } function tryCatch(fn, obj, arg) { try { return { type: "normal", arg: fn.call(obj, arg) }; } catch (err) { return { type: "throw", arg: err }; } } exports.wrap = wrap; var ContinueSentinel = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var IteratorPrototype = {}; define(IteratorPrototype, iteratorSymbol, function () { return this; }); var getProto = Object.getPrototypeOf, NativeIteratorPrototype = getProto && getProto(getProto(values([]))); NativeIteratorPrototype && NativeIteratorPrototype !== Op && hasOwn.call(NativeIteratorPrototype, iteratorSymbol) && (IteratorPrototype = NativeIteratorPrototype); var Gp = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(IteratorPrototype); function defineIteratorMethods(prototype) { ["next", "throw", "return"].forEach(function (method) { define(prototype, method, function (arg) { return this._invoke(method, arg); }); }); } function AsyncIterator(generator, PromiseImpl) { function invoke(method, arg, resolve, reject) { var record = tryCatch(generator[method], generator, arg); if ("throw" !== record.type) { var result = record.arg, value = result.value; return value && "object" == _typeof(value) && hasOwn.call(value, "__await") ? PromiseImpl.resolve(value.__await).then(function (value) { invoke("next", value, resolve, reject); }, function (err) { invoke("throw", err, resolve, reject); }) : PromiseImpl.resolve(value).then(function (unwrapped) { result.value = unwrapped, resolve(result); }, function (error) { return invoke("throw", error, resolve, reject); }); } reject(record.arg); } var previousPromise; this._invoke = function (method, arg) { function callInvokeWithMethodAndArg() { return new PromiseImpl(function (resolve, reject) { invoke(method, arg, resolve, reject); }); } return previousPromise = previousPromise ? previousPromise.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); }; } function maybeInvokeDelegate(delegate, context) { var method = delegate.iterator[context.method]; if (undefined === method) { if (context.delegate = null, "throw" === context.method) { if (delegate.iterator.return && (context.method = "return", context.arg = undefined, maybeInvokeDelegate(delegate, context), "throw" === context.method)) return ContinueSentinel; context.method = "throw", context.arg = new TypeError("The iterator does not provide a 'throw' method"); } return ContinueSentinel; } var record = tryCatch(method, delegate.iterator, context.arg); if ("throw" === record.type) return context.method = "throw", context.arg = record.arg, context.delegate = null, ContinueSentinel; var info = record.arg; return info ? info.done ? (context[delegate.resultName] = info.value, context.next = delegate.nextLoc, "return" !== context.method && (context.method = "next", context.arg = undefined), context.delegate = null, ContinueSentinel) : info : (context.method = "throw", context.arg = new TypeError("iterator result is not an object"), context.delegate = null, ContinueSentinel); } function pushTryEntry(locs) { var entry = { tryLoc: locs[0] }; 1 in locs && (entry.catchLoc = locs[1]), 2 in locs && (entry.finallyLoc = locs[2], entry.afterLoc = locs[3]), this.tryEntries.push(entry); } function resetTryEntry(entry) { var record = entry.completion || {}; record.type = "normal", delete record.arg, entry.completion = record; } function Context(tryLocsList) { this.tryEntries = [{ tryLoc: "root" }], tryLocsList.forEach(pushTryEntry, this), this.reset(!0); } function values(iterable) { if (iterable) { var iteratorMethod = iterable[iteratorSymbol]; if (iteratorMethod) return iteratorMethod.call(iterable); if ("function" == typeof iterable.next) return iterable; if (!isNaN(iterable.length)) { var i = -1, next = function next() { for (; ++i < iterable.length;) { if (hasOwn.call(iterable, i)) return next.value = iterable[i], next.done = !1, next; } return next.value = undefined, next.done = !0, next; }; return next.next = next; } } return { next: doneResult }; } function doneResult() { return { value: undefined, done: !0 }; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, define(Gp, "constructor", GeneratorFunctionPrototype), define(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, toStringTagSymbol, "GeneratorFunction"), exports.isGeneratorFunction = function (genFun) { var ctor = "function" == typeof genFun && genFun.constructor; return !!ctor && (ctor === GeneratorFunction || "GeneratorFunction" === (ctor.displayName || ctor.name)); }, exports.mark = function (genFun) { return Object.setPrototypeOf ? Object.setPrototypeOf(genFun, GeneratorFunctionPrototype) : (genFun.__proto__ = GeneratorFunctionPrototype, define(genFun, toStringTagSymbol, "GeneratorFunction")), genFun.prototype = Object.create(Gp), genFun; }, exports.awrap = function (arg) { return { __await: arg }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, asyncIteratorSymbol, function () { return this; }), exports.AsyncIterator = AsyncIterator, exports.async = function (innerFn, outerFn, self, tryLocsList, PromiseImpl) { void 0 === PromiseImpl && (PromiseImpl = Promise); var iter = new AsyncIterator(wrap(innerFn, outerFn, self, tryLocsList), PromiseImpl); return exports.isGeneratorFunction(outerFn) ? iter : iter.next().then(function (result) { return result.done ? result.value : iter.next(); }); }, defineIteratorMethods(Gp), define(Gp, toStringTagSymbol, "Generator"), define(Gp, iteratorSymbol, function () { return this; }), define(Gp, "toString", function () { return "[object Generator]"; }), exports.keys = function (object) { var keys = []; for (var key in object) { keys.push(key); } return keys.reverse(), function next() { for (; keys.length;) { var key = keys.pop(); if (key in object) return next.value = key, next.done = !1, next; } return next.done = !0, next; }; }, exports.values = values, Context.prototype = { constructor: Context, reset: function reset(skipTempReset) { if (this.prev = 0, this.next = 0, this.sent = this._sent = undefined, this.done = !1, this.delegate = null, this.method = "next", this.arg = undefined, this.tryEntries.forEach(resetTryEntry), !skipTempReset) for (var name in this) { "t" === name.charAt(0) && hasOwn.call(this, name) && !isNaN(+name.slice(1)) && (this[name] = undefined); } }, stop: function stop() { this.done = !0; var rootRecord = this.tryEntries[0].completion; if ("throw" === rootRecord.type) throw rootRecord.arg; return this.rval; }, dispatchException: function dispatchException(exception) { if (this.done) throw exception; var context = this; function handle(loc, caught) { return record.type = "throw", record.arg = exception, context.next = loc, caught && (context.method = "next", context.arg = undefined), !!caught; } for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i], record = entry.completion; if ("root" === entry.tryLoc) return handle("end"); if (entry.tryLoc <= this.prev) { var hasCatch = hasOwn.call(entry, "catchLoc"), hasFinally = hasOwn.call(entry, "finallyLoc"); if (hasCatch && hasFinally) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } else if (hasCatch) { if (this.prev < entry.catchLoc) return handle(entry.catchLoc, !0); } else { if (!hasFinally) throw new Error("try statement without catch or finally"); if (this.prev < entry.finallyLoc) return handle(entry.finallyLoc); } } } }, abrupt: function abrupt(type, arg) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc <= this.prev && hasOwn.call(entry, "finallyLoc") && this.prev < entry.finallyLoc) { var finallyEntry = entry; break; } } finallyEntry && ("break" === type || "continue" === type) && finallyEntry.tryLoc <= arg && arg <= finallyEntry.finallyLoc && (finallyEntry = null); var record = finallyEntry ? finallyEntry.completion : {}; return record.type = type, record.arg = arg, finallyEntry ? (this.method = "next", this.next = finallyEntry.finallyLoc, ContinueSentinel) : this.complete(record); }, complete: function complete(record, afterLoc) { if ("throw" === record.type) throw record.arg; return "break" === record.type || "continue" === record.type ? this.next = record.arg : "return" === record.type ? (this.rval = this.arg = record.arg, this.method = "return", this.next = "end") : "normal" === record.type && afterLoc && (this.next = afterLoc), ContinueSentinel; }, finish: function finish(finallyLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.finallyLoc === finallyLoc) return this.complete(entry.completion, entry.afterLoc), resetTryEntry(entry), ContinueSentinel; } }, catch: function _catch(tryLoc) { for (var i = this.tryEntries.length - 1; i >= 0; --i) { var entry = this.tryEntries[i]; if (entry.tryLoc === tryLoc) { var record = entry.completion; if ("throw" === record.type) { var thrown = record.arg; resetTryEntry(entry); } return thrown; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(iterable, resultName, nextLoc) { return this.delegate = { iterator: values(iterable), resultName: resultName, nextLoc: nextLoc }, "next" === this.method && (this.arg = undefined), ContinueSentinel; } }, exports; }
@@ -41,13 +42,15 @@ import WheelScale from "./component/WheelScale";
 import { computedBound } from "./dragBound";
 import { getRectImagePath } from "./loadCaptureRectImage";
 import useDraw from "./useDraw";
-import { cloneImageNode, computedRectScale, customContextMenu } from "./utils";
+import { computedRectScale, customContextMenu } from "./utils";
 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,
@@ -78,7 +81,8 @@ function Picture(_ref) {
     baseXOrY: 'x',
     forceUpdateKey: Date.now(),
     fullScreenStatus: false,
-    localUrl: ''
+    localUrl: '',
+    offset: [0, 0]
   }),
       _useSimpleState2 = _slicedToArray(_useSimpleState, 3),
       state = _useSimpleState2[0],
@@ -88,12 +92,12 @@ function Picture(_ref) {
   var layoutRef = useRef(null);
   var moveActionRef = useRef(null);
   var domImgRef = useRef(null);
-  var imageSourceRef = useRef(null);
   useEffect(function () {
     if (!imagePath) {
       return undefined;
     }
 
+    console.log(imagePath);
     var localUrl;
     fetch(imagePath).then(function (res) {
       return res.blob();
@@ -106,53 +110,80 @@ function Picture(_ref) {
     return function () {
       return URL.revokeObjectURL(localUrl);
     };
-  }, [imagePath]);
+  }, [imagePath]); // draw hooks
 
-  var _useDraw = useDraw(layoutRef.current, isOpenSelect),
+  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];
+      isEnd = _useDraw2[1]; // init loaded
+
 
-  var loadImageSuccess = useCallback( /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(flag) {
-      var nodeEle, _ref3, width, height;
+  var loadImageSuccess = _useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _layoutRef$current2, _layoutRect$width, _layoutRect$height;
 
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) {
-          switch (_context.prev = _context.next) {
-            case 0:
+    var img, naturalWidth, naturalHeight, layoutRect, w, h, baseXOrY, x, y, imagescale, imgHeight, _imagescale, imgWidth, moveObj;
+
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            if (state.localUrl) {
               _context.next = 2;
-              return cloneImageNode(domImgRef.current);
-
-            case 2:
-              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(),
-                  baseXOrY: width > height ? 'x' : 'y',
-                  fullScreenStatus: !!flag
-                });
+              break;
+            }
+
+            return _context.abrupt("return");
+
+          case 2:
+            img = domImgRef.current;
+            naturalWidth = img.naturalWidth, naturalHeight = img.naturalHeight;
+            layoutRect = (_layoutRef$current2 = layoutRef.current) === null || _layoutRef$current2 === void 0 ? void 0 : _layoutRef$current2.getBoundingClientRect();
+            w = (_layoutRect$width = layoutRect === null || layoutRect === void 0 ? void 0 : layoutRect.width) !== null && _layoutRect$width !== void 0 ? _layoutRect$width : 0;
+            h = (_layoutRect$height = layoutRect === null || layoutRect === void 0 ? void 0 : layoutRect.height) !== null && _layoutRect$height !== void 0 ? _layoutRect$height : 0;
+            baseXOrY = naturalWidth > naturalHeight ? 'x' : 'y';
+            x = 0;
+            y = 0;
+
+            if (baseXOrY === 'x') {
+              imagescale = w / naturalWidth;
+              imgHeight = imagescale * naturalHeight;
+              y = Math.abs((imgHeight - h) / 2);
+              img.width = w;
+            } else {
+              _imagescale = h / naturalHeight;
+              imgWidth = _imagescale * naturalWidth;
+              x = Math.abs((imgWidth - w) / 2);
+              img.height = h;
+            }
+
+            moveObj = moveActionRef.current;
+            moveObj.updatePosition({
+              x: x,
+              y: y
+            });
+            setState(function (old) {
+              return _objectSpread(_objectSpread({}, old), {}, {
+                x: x,
+                y: y,
+                offset: [x, y],
+                forceUpdateKey: Date.now(),
+                baseXOrY: baseXOrY
               });
+            });
 
-            case 6:
-            case "end":
-              return _context.stop();
-          }
+          case 14:
+          case "end":
+            return _context.stop();
         }
-      }, _callee);
-    }));
-
-    return function (_x) {
-      return _ref2.apply(this, arguments);
-    };
-  }(), []);
+      }
+    }, _callee);
+  })));
   /**
    * 设置图片缩放
    */
 
-  var setScale = useCallback(function (changeValue) {
+
+  var setScale = _useMemoizedFn(function (changeValue) {
     var currentValue = state.scale;
 
     if (currentValue === 3 && changeValue > 0) {
@@ -178,24 +209,26 @@ function Picture(_ref) {
         scale: scale
       });
     });
-  }, [state.scale]);
+  });
   /**
    * 设置图谱旋转
    */
 
-  var setRotate = useCallback(function (changeValue) {
+
+  var setRotate = _useMemoizedFn(function (changeValue) {
     var currentValue = state.rotate;
     setState(function (old) {
       return _objectSpread(_objectSpread({}, old), {}, {
         rotate: currentValue + changeValue
       });
     });
-  }, [state.rotate]);
+  });
   /**
    * 重置图片位置
    */
 
-  var resetPicture = useCallback(function (event) {
+
+  var resetPicture = _useMemoizedFn(function (event) {
     event.stopPropagation();
     var moveObj = moveActionRef.current;
     setState(function (old) {
@@ -205,17 +238,18 @@ function Picture(_ref) {
       });
     });
     moveObj.updatePosition({
-      x: 0,
-      y: 0
+      x: state.offset[0],
+      y: state.offset[1]
     });
-  }, []);
+  });
   /**
    * 拖拽更新位置
    */
 
-  var onDragChange = useCallback(function (_ref4) {
-    var x = _ref4.x,
-        y = _ref4.y;
+
+  var onDragChange = useCallback(function (_ref3) {
+    var x = _ref3.x,
+        y = _ref3.y;
     return setState(function (old) {
       return _objectSpread(_objectSpread({}, old), {}, {
         x: x,
@@ -227,7 +261,7 @@ function Picture(_ref) {
    * 拖拽结束更新位置，计算边界
    */
 
-  var onDragEnd = useCallback(function (_, currrentPosition) {
+  var onDragEnd = _useMemoizedFn(function (_, currrentPosition) {
     var scale = state.scale,
         rotate = state.rotate;
 
@@ -239,25 +273,31 @@ function Picture(_ref) {
 
     if (position) {
       var moveObj = moveActionRef.current;
-      moveObj.updatePosition(position);
+      var flag = position.x === 0 && position.y === 0;
+      moveObj.updatePosition(flag ? {
+        x: state.offset[0],
+        y: state.offset[1]
+      } : position);
     }
-  }, [state]);
+  });
   /**
    * 获取结构化的小图(base64)
    */
 
-  var getRectImage = useCallback(function (rect) {
+
+  var getRectImage = _useMemoizedFn(function (rect) {
     var scale = state.scale,
         rotate = state.rotate,
         x = state.x,
         y = state.y;
-    return getRectImagePath(imageSourceRef.current, domImgRef.current, rect, {
+    return getRectImagePath(domImgRef.current, rect, {
       scale: scale,
       rotate: rotate,
       x: x,
       y: y
     });
-  }, [state]);
+  });
+
   useEffect(function () {
     var timer;
 
@@ -283,7 +323,6 @@ function Picture(_ref) {
 
   var scaleRects = useMemo(function () {
     return computedRectScale({
-      imageSource: imageSourceRef.current,
       domImg: domImgRef.current,
       rects: rects !== null && rects !== void 0 ? rects : []
     });
@@ -291,24 +330,23 @@ function Picture(_ref) {
   var isEmpty = useMemo(function () {
     return selectArea.includes(0);
   }, [selectArea]);
-
-  var _useMemo2 = useMemo(function () {
-    return state;
-  }, [state]),
-      x = _useMemo2.x,
-      y = _useMemo2.y,
-      scale = _useMemo2.scale,
-      rotate = _useMemo2.rotate,
-      baseXOrY = _useMemo2.baseXOrY;
-
   var renderOptions = {
     isEnd: isEnd,
     isOpenSelect: isOpenSelect,
     selectArea: selectArea,
     getRectImage: getRectImage,
-    containerEle: layoutRef.current,
-    fullScreenStatus: state.fullScreenStatus
+    containerEle: layoutRef.current
   };
+  useEffect(function () {
+    if (isOpenSelect && (state.rotate !== 0 || state.scale !== 1)) {
+      updateState({
+        scale: 1,
+        rotate: 0,
+        x: state.offset[0],
+        y: state.offset[1]
+      });
+    }
+  }, [isOpenSelect, state.rotate, state.scale]);
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       className: "picture-view-layout ".concat(className),
@@ -322,37 +360,21 @@ function Picture(_ref) {
       children: [/*#__PURE__*/_jsx(DomMove, {
         className: "picture-move-layout",
         disabled: isOpenSelect || disabledDrag,
-        position: {
-          x: x,
-          y: y
-        },
         ref: moveActionRef,
         onDragChange: onDragChange,
         onDragEnd: onDragEnd,
-        style: {
-          minHeight: minHeight
-        },
-        size: {
-          width: '100%',
-          height: '100%'
-        },
         children: /*#__PURE__*/_jsxs("div", {
+          className: "picture-overlay",
           style: {
-            transform: "scale(".concat(scale, ") rotate(").concat(rotate, "deg)")
+            transform: "scale(".concat(state.scale, ") rotate(").concat(state.rotate, "deg)")
           },
           children: [/*#__PURE__*/_jsx("img", {
             ref: domImgRef,
-            style: {
-              maxWidth: baseXOrY === 'x' ? width || '100%' : 'unset',
-              maxHeight: baseXOrY === 'x' ? 'unset' : height || '100%'
-            },
             draggable: false,
             src: state.localUrl,
             "data-src": imagePath,
-            onLoad: function onLoad() {
-              return loadImageSuccess();
-            }
-          }, imagePath), !isEmpty ? /*#__PURE__*/_jsx(DrawRect, {
+            onLoad: loadImageSuccess
+          }), !isEmpty ? /*#__PURE__*/_jsx(DrawRect, {
             rect: selectArea,
             onMenuClick: onMenuClick,
             getRectImage: getRectImage,
@@ -369,7 +391,7 @@ function Picture(_ref) {
       }), hasTool && /*#__PURE__*/_jsx(Tools, {
         setScale: setScale,
         setRotate: setRotate,
-        scale: scale,
+        scale: state.scale,
         containerEle: fullScreenEle !== null && fullScreenEle !== void 0 ? fullScreenEle : layoutRef.current,
         resetPicture: resetPicture,
         imgDownload: imgDownload,

package/es/Picture/loadCaptureRectImage.d.ts

@@ -1,8 +1,8 @@
 import { ImageType } from './interface';
 export declare function loadCaptureRectImage(image: HTMLImageElement, rect: number[], imageType: ImageType): Promise<string>;
-export declare function getRectImagePath(sourceImage: HTMLImageElement, cuurentImage: HTMLImageElement, rect: number[], options?: {
+export declare function getRectImagePath(image: HTMLImageElement, rect: number[], options?: {
     scale: number;
     rotate: number;
     x: number;
     y: number;
-}): string | null;
+}): string;

package/es/Picture/loadCaptureRectImage.js

@@ -67,18 +67,13 @@ function _loadCaptureRectImage() {
   return _loadCaptureRectImage.apply(this, arguments);
 }
 
-export function getRectImagePath(sourceImage, cuurentImage, rect) {
-  var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {
+export function getRectImagePath(image, rect) {
+  var options = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : {
     scale: 1,
     rotate: 0,
     x: 0,
     y: 0
   };
-
-  if (!sourceImage || !cuurentImage) {
-    return null;
-  }
-
   var scale = options.scale,
       rotate = options.rotate;
 
@@ -88,28 +83,29 @@ export function getRectImagePath(sourceImage, cuurentImage, rect) {
       w = _rect[2],
       h = _rect[3];
 
-  var width = sourceImage.width,
-      height = sourceImage.height;
+  var naturalWidth = image.naturalWidth,
+      naturalHeight = image.naturalHeight,
+      width = image.width,
+      height = image.height;
   var sourceSize = {
-    width: width,
-    height: height,
-    cwidth: cuurentImage.width,
-    cheight: cuurentImage.height,
-    wScale: width / cuurentImage.width,
-    hScale: height / cuurentImage.height
+    width: naturalWidth,
+    height: naturalHeight,
+    cwidth: width,
+    cheight: height,
+    wScale: naturalWidth / width,
+    hScale: naturalHeight / height
   };
   var area = [x * sourceSize.wScale, y * sourceSize.hScale, w * sourceSize.wScale, h * sourceSize.hScale];
   var fullCanvas = document.createElement('canvas');
   var fullCtx = fullCanvas.getContext('2d');
-  fullCanvas.width = width;
-  fullCanvas.height = height;
+  fullCanvas.width = naturalWidth;
+  fullCanvas.height = naturalHeight;
   fullCtx.save(); // fullCtx.transform;
   // document.body.appendChild(fullCanvas);
 
-  fullCtx.setTransform(scale, 0, 0, scale, options.x * sourceSize.wScale - (scale - 1) * width / 2, options.y * sourceSize.hScale - (scale - 1) * height / 2);
-  fullCtx.translate(width / 2, height / 2);
+  fullCtx.translate(naturalWidth / 2, naturalHeight / 2);
   fullCtx.rotate(rotate * Math.PI / 180);
-  fullCtx.drawImage(sourceImage, -width / 2, -height / 2, width, height);
+  fullCtx.drawImage(image, -naturalWidth / 2, -naturalHeight / 2, naturalWidth, naturalHeight);
   fullCtx.restore();
   var imageData = fullCtx.getImageData(area[0], area[1], area[2], area[3]);
   var tempCanvas = document.createElement('canvas');

package/es/Picture/utils.d.ts

@@ -2,8 +2,7 @@ import { ImageType, RectType } from './interface';
 export declare function customContextMenu(e: any): boolean;
 export declare function cloneImageNode(image: HTMLImageElement): Promise<Node>;
 export declare function getCaptureRect(rect: number[], type: ImageType): number[];
-export declare function computedRectScale({ imageSource, domImg, rects }: {
-    imageSource: HTMLImageElement;
+export declare function computedRectScale({ domImg, rects }: {
     domImg: HTMLImageElement;
     rects: RectType[];
 }): {

package/es/Picture/utils.js

@@ -64,19 +64,24 @@ export function getCaptureRect(rect, type) {
   return [x, y, w, h];
 }
 export function computedRectScale(_ref) {
-  var imageSource = _ref.imageSource,
-      domImg = _ref.domImg,
+  var _ref2, _ref3;
+
+  var domImg = _ref.domImg,
       rects = _ref.rects;
 
-  if (!imageSource || !domImg) {
+  if (!domImg) {
+    return [];
+  }
+
+  if (domImg.naturalWidth === 0 || domImg.naturalHeight === 0) {
     return [];
   }
 
   var width = domImg.width;
   var height = domImg.height;
   var scaleOptions = {
-    scaleX: width / imageSource.width,
-    scaleY: height / imageSource.height
+    scaleX: (_ref2 = width / domImg.naturalWidth) !== null && _ref2 !== void 0 ? _ref2 : 1,
+    scaleY: (_ref3 = height / domImg.naturalHeight) !== null && _ref3 !== void 0 ? _ref3 : 1
   };
   return rects.map(function (item) {
     var rect = item.needExpand ? getCaptureRect(cloneDeep(item.rect), item.type) : cloneDeep(item.rect);

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.2.22",
+  "version": "3.2.33",
   "scripts": {
     "docs:deploy": "gh-pages -d docs-dist",
     "build": "npm run entry && father build",
@@ -66,7 +66,7 @@
     "@types/react-dom": "^18.0.6",
     "antd": "^4.22.6",
     "babel-plugin-import": "^1.13.5",
-    "dumi": "^2.0.5",
+    "dumi": "^2.0.9",
     "gh-pages": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",