@cloud-app-dev/vidc 3.2.37 → 3.2.39

package/es/Picture/index.js

@@ -1,21 +1,15 @@
-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 _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 _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; }
-
 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 asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-
 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."); }
@@ -32,18 +26,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; }
 
-import React, { useCallback, useEffect, useMemo, useRef } from 'react';
+import React, { useEffect, useMemo, useRef } from 'react';
 import DomMove from "../DomMove";
 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 { computedBound } from "./dragBound";
-import "./index.less";
 import { getRectImagePath } from "./loadCaptureRectImage";
 import useDraw from "./useDraw";
-import { computedRectScale, customContextMenu } from "./utils";
+import { computedRectScale, customContextMenu, getImgSize } 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";
@@ -80,6 +73,7 @@ function Picture(_ref) {
     scale: 1,
     baseXOrY: 'x',
     forceUpdateKey: Date.now(),
+    loadedTime: 0,
     fullScreenStatus: false,
     localUrl: '',
     offset: [0, 0],
@@ -93,6 +87,9 @@ function Picture(_ref) {
   var layoutRef = useRef(null);
   var moveActionRef = useRef(null);
   var domImgRef = useRef(null);
+
+  var size = _useSize(layoutRef);
+
   useEffect(function () {
     if (!imagePath) {
       return undefined;
@@ -120,88 +117,46 @@ function Picture(_ref) {
       isEnd = _useDraw2[1]; // init loaded
 
 
-  var loadImageSuccess = _useMemoizedFn( /*#__PURE__*/_asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-    var _layoutRef$current2, _layoutRect$width, _layoutRect$height;
-
-    var img, naturalWidth, naturalHeight, layoutRect, w, h, baseXOrY, x, y, size, 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;
-              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;
-            size = []; // 横图
-
-            if (baseXOrY === 'x') {
-              if (naturalWidth < w) {
-                // 图片小于容器
-                size[0] = naturalWidth;
-                size[1] = naturalHeight;
-                x = (w - naturalWidth) / 2;
-                y = Math.abs((h - naturalHeight) / 2);
-              } else {
-                // 图片大于容器
-                imagescale = w / naturalWidth;
-                imgHeight = imagescale * naturalHeight;
-                y = Math.abs((imgHeight - h) / 2);
-                size[0] = w;
-                size[1] = imgHeight;
-              }
-            } else {
-              if (naturalHeight < h) {
-                // 图片小于容器
-                size[0] = naturalWidth;
-                size[1] = naturalHeight;
-                x = Math.abs(w - naturalWidth) / 2;
-                y = (h - naturalHeight) / 2;
-              } else {
-                // 图片大于容器
-                _imagescale = h / naturalHeight;
-                imgWidth = _imagescale * naturalWidth;
-                x = Math.abs((imgWidth - w) / 2);
-                size[0] = imgWidth;
-                size[1] = 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,
-                size: size
-              });
-            });
-
-          case 15:
-          case "end":
-            return _context.stop();
-        }
-      }
-    }, _callee);
-  })));
+  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;
+
+    var moveObj = moveActionRef.current;
+    moveObj.updatePosition({
+      x: x,
+      y: y
+    });
+    setState(function (old) {
+      return _objectSpread(_objectSpread({}, old), {}, {
+        x: x,
+        y: y,
+        offset: [x, y],
+        baseXOrY: baseXOrY,
+        size: size,
+        loadedTime: Date.now()
+      });
+    });
+  }); // 更新重绘
+
+
+  _useUpdateLayoutEffect(function () {
+    loadImageSuccess();
+  }, [size]); // 更新重绘
+
+
+  _useUpdateLayoutEffect(function () {
+    // Rects重新计算
+    updateState({
+      forceUpdateKey: Date.now()
+    });
+  }, [state.loadedTime]);
   /**
    * 设置图片缩放
    */
@@ -271,38 +226,49 @@ function Picture(_ref) {
    */
 
 
-  var onDragChange = useCallback(function (_ref3) {
-    var x = _ref3.x,
-        y = _ref3.y;
+  var onDragChange = _useMemoizedFn(function (_ref2) {
+    var x = _ref2.x,
+        y = _ref2.y;
     return setState(function (old) {
       return _objectSpread(_objectSpread({}, old), {}, {
         x: x,
         y: y
       });
     });
-  }, []);
+  });
   /**
    * 拖拽结束更新位置，计算边界
    */
 
-  var onDragEnd = _useMemoizedFn(function (_, currrentPosition) {
-    var scale = state.scale,
-        rotate = state.rotate;
 
-    if (!layoutRef.current) {
+  var onDragEnd = _useMemoizedFn(function (_, currrentPosition) {
+    if (!layoutRef.current || !domImgRef.current) {
       return undefined;
     }
 
-    var position = computedBound(layoutRef.current, currrentPosition, scale, rotate);
-
-    if (position) {
-      var moveObj = moveActionRef.current;
-      var flag = position.x === 0 && position.y === 0;
-      moveObj.updatePosition(flag ? {
-        x: state.offset[0],
-        y: state.offset[1]
-      } : position);
-    }
+    var _ref3 = size || {
+      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 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];
+    var minY = imgh < height ? scaleH / 2 : -(imgh - height) / 2 + state.offset[1];
+    var x = currrentPosition.x > maxX ? maxX : currrentPosition.x < minX ? minX : currrentPosition.x;
+    var y = currrentPosition.y > maxY ? maxY : currrentPosition.y < minY ? minY : currrentPosition.y;
+    var moveObj = moveActionRef.current;
+    moveObj.updatePosition({
+      x: x,
+      y: y
+    });
   });
   /**
    * 获取结构化的小图(base64)
@@ -311,30 +277,8 @@ function Picture(_ref) {
 
   var getRectImage = _useMemoizedFn(function (rect) {
     return getRectImagePath(domImgRef.current, rect);
-  });
+  }); // eslint-disable-next-line react-hooks/exhaustive-deps
 
-  useEffect(function () {
-    var timer;
-
-    var fn = function fn() {
-      clearTimeout(timer);
-      timer = setTimeout(function () {
-        setState(function (old) {
-          return _objectSpread(_objectSpread({}, old), {}, {
-            forceUpdateKey: Date.now()
-          });
-        });
-      }, 200);
-    };
-
-    var dom = layoutRef.current;
-
-    _resizeObserver.createResizeObserver(dom, fn);
-
-    return function () {
-      _resizeObserver.unResizeObserver(dom, fn);
-    };
-  }, []); // eslint-disable-next-line react-hooks/exhaustive-deps
 
   var scaleRects = useMemo(function () {
     return computedRectScale({
@@ -352,8 +296,14 @@ function Picture(_ref) {
     getRectImage: getRectImage,
     containerEle: layoutRef.current
   };
-  useEffect(function () {
-    if (isOpenSelect && (state.rotate !== 0 || state.scale !== 1)) {
+
+  _useUpdateEffect(function () {
+    if (isOpenSelect) {
+      var moveObj = moveActionRef.current;
+      moveObj.updatePosition({
+        x: state.offset[0],
+        y: state.offset[1]
+      });
       updateState({
         scale: 1,
         rotate: 0,
@@ -361,7 +311,8 @@ function Picture(_ref) {
         y: state.offset[1]
       });
     }
-  }, [isOpenSelect, state.rotate, state.scale]);
+  }, [isOpenSelect]);
+
   return /*#__PURE__*/_jsxs(_Fragment, {
     children: [/*#__PURE__*/_jsxs("div", {
       className: "picture-view-layout ".concat(className),
@@ -413,8 +364,7 @@ function Picture(_ref) {
         scale: state.scale,
         containerEle: fullScreenEle !== null && fullScreenEle !== void 0 ? fullScreenEle : layoutRef.current,
         resetPicture: resetPicture,
-        imgDownload: imgDownload,
-        fullScreenChange: loadImageSuccess
+        imgDownload: imgDownload
       }), /*#__PURE__*/_jsx(WheelScale, {
         setScale: setScale,
         dom: layoutRef.current

package/es/Picture/index.less

@@ -6,10 +6,15 @@
 
   .picture-move-layout {
     & > div {
-      width: 100%;
-      height: 100%;
+      width: max-content;
+      height: max-content;
       transition: all .3s;
       overflow: hidden;
+
+      img {
+        max-width: 100%;
+        max-height: 100%;
+      }
     }
   }
 }

package/es/Picture/utils.d.ts

@@ -18,3 +18,9 @@ export declare function computedRectScale({ domImg, rects }: {
     lowQuality?: boolean | undefined;
     base64?: string | undefined;
 }[];
+export declare function getImgSize(dom: HTMLDivElement, img: HTMLImageElement): {
+    x: number;
+    y: number;
+    size: (string | number)[];
+    baseXOrY: string;
+};

package/es/Picture/utils.js

@@ -77,8 +77,10 @@ export function computedRectScale(_ref) {
     return [];
   }
 
-  var width = domImg.width;
-  var height = domImg.height;
+  var _domImg$getBoundingCl = domImg.getBoundingClientRect(),
+      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
@@ -99,4 +101,57 @@ export function computedRectScale(_ref) {
       rect: rect
     });
   });
+}
+export function getImgSize(dom, img) {
+  var _layoutRect$width, _layoutRect$height;
+
+  var naturalWidth = img.naturalWidth,
+      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 = []; // 横图
+
+  if (baseXOrY === 'x') {
+    if (naturalWidth < w) {
+      // 图片小于容器
+      size[0] = naturalWidth;
+      size[1] = naturalHeight;
+      x = (w - naturalWidth) / 2;
+      y = Math.abs((h - naturalHeight) / 2);
+    } else {
+      // 图片大于容器
+      var imagescale = w / naturalWidth;
+      var imgHeight = imagescale * naturalHeight;
+      y = Math.abs((imgHeight - h) / 2);
+      size[0] = w;
+      size[1] = imgHeight;
+    }
+  } else {
+    if (naturalHeight < h) {
+      // 图片小于容器
+      size[0] = naturalWidth;
+      size[1] = naturalHeight;
+      x = Math.abs(w - naturalWidth) / 2;
+      y = (h - naturalHeight) / 2;
+    } else {
+      // 图片大于容器
+      var _imagescale = h / naturalHeight;
+
+      var imgWidth = _imagescale * naturalWidth;
+      x = Math.abs((imgWidth - w) / 2);
+      size[0] = imgWidth;
+      size[1] = h;
+    }
+  }
+
+  return {
+    x: x,
+    y: y,
+    size: size,
+    baseXOrY: baseXOrY
+  };
 }

package/es/Player/api/index.js

@@ -21,7 +21,8 @@ function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _d
 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; }
 
 import { useEffect, useState } from 'react';
-import { createFlvPlayer, createHlsPlayer, tryCatch } from "../util";
+import { tryCatch } from "../../utils";
+import { createFlvPlayer, createHlsPlayer } from "../util";
 
 var Api = /*#__PURE__*/function () {
   function Api(container) {

package/es/Player/contraller_bar/volume.js

@@ -1,7 +1,3 @@
-import "antd/lib/tooltip/style";
-import _Tooltip from "antd/lib/tooltip";
-import "antd/lib/slider/style";
-import _Slider from "antd/lib/slider";
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 import _useUpdate from "ahooks/es/useUpdate";
 
@@ -17,6 +13,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+import { Slider, Tooltip } from 'antd';
 import React, { useMemo, useState } from 'react';
 import IconFont from "../iconfont";
 import "../style/volume.less";
@@ -69,10 +66,10 @@ function Volume(_ref) {
     return api === null || api === void 0 ? void 0 : api.setVolume(val / 100);
   }, [val]);
 
-  return /*#__PURE__*/_jsx(_Tooltip, {
+  return /*#__PURE__*/_jsx(Tooltip, {
     showArrow: false,
     overlayClassName: "lm-player-volume-popup",
-    title: /*#__PURE__*/_jsx(_Slider, {
+    title: /*#__PURE__*/_jsx(Slider, {
       onChange: onChange,
       vertical: true,
       value: val