@cloud-app-dev/vidc 3.2.36 → 3.2.38

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

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

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

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

package/es/Picture/demo.js

@@ -44,24 +44,13 @@ export default function App() {
           title: '菜单1',
           pathname: '/',
           icon: ''
-        }],
-        imagePath: "http://192.168.100.246:5463/oss/v1/100004008/objects/638da35805f5f0a8101021f9?client_token=100004008_0_1670313176_9a47a8459c120d977904c9feb2354a7e",
+        }] // imagePath="http://192.168.100.246:5463/oss/v1/100004008/objects/638da35805f5f0a8101021f9?client_token=100004008_0_1670313176_9a47a8459c120d977904c9feb2354a7e"
+        ,
         isOpenSelect: state.open,
+        imagePath: "https://img0.baidu.com/it/u=1439439032,129098198&fm=253&fmt=auto?w=120&h=80",
         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],
+          rect: [920.0, 843.0, 96.0, 94.0],
           needExpand: true
         }],
         children: function children() {
@@ -101,11 +90,29 @@ export default function App() {
         children: /*#__PURE__*/_jsx("div", {
           style: {
             width: 800,
-            height: 600
+            height: 600,
+            backgroundColor: '#000'
           },
           children: /*#__PURE__*/_jsx(Picture, {
             imagePath: "http://192.168.100.246:5463/oss/v1/100004008/objects/638da35805f5f0a8101021f9?client_token=100004008_0_1670313176_9a47a8459c120d977904c9feb2354a7e",
-            isOpenSelect: false
+            isOpenSelect: false,
+            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
+            }]
           })
         })
       })]

package/es/Picture/index.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
-import './index.less';
 import type { IPictureProps } from './interface';
+import './index.less';
 declare function Picture({ className, width, height, minHeight, disabledDrag, imagePath, rects, isOpenSelect, disabledDrawMenu, menus, hasTool, fullScreenEle, ...props }: IPictureProps): JSX.Element;
 declare namespace Picture {
     var defaultProps: {

package/es/Picture/index.js

@@ -1,7 +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); }
 
-import _resizeObserver from "@cloud-app-dev/utils/es/resizeObserver";
+import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
 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; }
@@ -32,18 +34,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";
@@ -82,7 +83,8 @@ function Picture(_ref) {
     forceUpdateKey: Date.now(),
     fullScreenStatus: false,
     localUrl: '',
-    offset: [0, 0]
+    offset: [0, 0],
+    size: ['auto', 'auto']
   }),
       _useSimpleState2 = _slicedToArray(_useSimpleState, 3),
       state = _useSimpleState2[0],
@@ -92,6 +94,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,15 +125,13 @@ function Picture(_ref) {
 
 
   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, imagescale, imgHeight, _imagescale, imgWidth, moveObj;
+    var _getImgSize, x, y, size, baseXOrY, moveObj;
 
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) {
         switch (_context.prev = _context.next) {
           case 0:
-            if (state.localUrl) {
+            if (!(!state.localUrl || !layoutRef.current || !domImgRef.current)) {
               _context.next = 2;
               break;
             }
@@ -136,27 +139,7 @@ function Picture(_ref) {
             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;
-            }
-
+            _getImgSize = getImgSize(layoutRef.current, domImgRef.current), x = _getImgSize.x, y = _getImgSize.y, size = _getImgSize.size, baseXOrY = _getImgSize.baseXOrY;
             moveObj = moveActionRef.current;
             moveObj.updatePosition({
               x: x,
@@ -167,18 +150,29 @@ function Picture(_ref) {
                 x: x,
                 y: y,
                 offset: [x, y],
-                forceUpdateKey: Date.now(),
-                baseXOrY: baseXOrY
+                baseXOrY: baseXOrY,
+                size: size
               });
-            });
+            }); // 异步触发rects重新计算
 
-          case 14:
+            _nextTick(function () {
+              return updateState({
+                forceUpdateKey: Date.now()
+              });
+            }, 'setTimeout');
+
+          case 7:
           case "end":
             return _context.stop();
         }
       }
     }, _callee);
-  })));
+  }))); // 更新重绘
+
+
+  _useUpdateEffect(function () {
+    loadImageSuccess();
+  }, [size]);
   /**
    * 设置图片缩放
    */
@@ -248,7 +242,7 @@ function Picture(_ref) {
    */
 
 
-  var onDragChange = useCallback(function (_ref3) {
+  var onDragChange = _useMemoizedFn(function (_ref3) {
     var x = _ref3.x,
         y = _ref3.y;
     return setState(function (old) {
@@ -257,29 +251,40 @@ function Picture(_ref) {
         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 _ref4 = size || {
+      width: 0,
+      height: 0
+    },
+        width = _ref4.width,
+        height = _ref4.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)
@@ -288,30 +293,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({
@@ -365,8 +348,8 @@ function Picture(_ref) {
             draggable: false,
             src: state.localUrl,
             style: {
-              width: state.baseXOrY === 'x' ? '100%' : 'auto',
-              height: state.baseXOrY === 'y' ? '100%' : 'auto'
+              width: state.size[0],
+              height: state.size[1]
             },
             "data-src": imagePath,
             onLoad: loadImageSuccess
@@ -390,8 +373,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,11 @@ 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;
+
+  console.log(width, height, domImg.naturalWidth, domImg.naturalHeight);
   var scaleOptions = {
     scaleX: (_ref2 = width / domImg.naturalWidth) !== null && _ref2 !== void 0 ? _ref2 : 1,
     scaleY: (_ref3 = height / domImg.naturalHeight) !== null && _ref3 !== void 0 ? _ref3 : 1
@@ -87,16 +90,69 @@ export function computedRectScale(_ref) {
     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[2] = Math.round(rect[2] * scaleOptions.scaleX);
+    rect[2] < 0 && (rect[2] = 0);
+    rect[2] > width - rect[0] && (rect[2] = width - rect[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 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/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.2.36",
+  "version": "3.2.38",
   "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.10",
+    "dumi": "^2.0.13",
     "gh-pages": "^4.0.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",

package/es/Picture/dragBound.d.ts

@@ -1,5 +0,0 @@
-import { PositionType } from './interface';
-export declare function computedBound(ele: HTMLElement, currentPosition: PositionType, scale: number, rotate: number): {
-    x: number;
-    y: number;
-} | undefined;

package/es/Picture/dragBound.js

@@ -1,77 +0,0 @@
-export function computedBound(ele, currentPosition, scale, rotate) {
-  var data = currentPosition;
-  var eleRect = ele.getBoundingClientRect();
-  var isHorizontal = Math.abs(rotate) % 180 === 0;
-  var w = eleRect.width;
-  var h = eleRect.height;
-  var lx = 0,
-      ly = 0;
-
-  if (scale === 1 && isHorizontal) {
-    return {
-      x: 0,
-      y: 0
-    };
-  }
-
-  if (scale === 1 && !isHorizontal) {
-    lx = 0;
-    ly = (w - h) / 2;
-  } else {
-    //TODO 这是限制x区域，应该是使用原来高度的缩放大小来计算，
-    if (h * scale < w && !isHorizontal) {
-      //TODO 放大后竖向是 h*scale<w是 x = 0，
-      lx = 0;
-    } else {
-      //TODO 得到缩放后可移动区域 在减去误差 (w - h) / 2
-      lx = !isHorizontal ? Math.round(h * (scale - 1) / 2 - (w - h) / 2) : Math.round(w * (scale - 1) / 2);
-    } //TODO y的限制区域应该是原来宽度的限制区域计算后还要加上原始的（w-h）/2
-
-
-    ly = !isHorizontal ? Math.round(w * (scale - 1) / 2 + (w - h) / 2) : Math.round(h * (scale - 1) / 2);
-  }
-
-  var x = 0,
-      y = 0;
-
-  if (data.x >= 0 && data.x > lx) {
-    x = lx;
-  }
-
-  if (data.x >= 0 && data.x < lx) {
-    x = data.x;
-  }
-
-  if (data.x < 0 && data.x < -lx) {
-    x = -lx;
-  }
-
-  if (data.x < 0 && data.x > -lx) {
-    x = data.x;
-  }
-
-  if (data.y >= 0 && data.y > ly) {
-    y = ly;
-  }
-
-  if (data.y >= 0 && data.y < ly) {
-    y = data.y;
-  }
-
-  if (data.y < 0 && data.y < -ly) {
-    y = -ly;
-  }
-
-  if (data.y < 0 && data.y > -ly) {
-    y = data.y;
-  }
-
-  if (x !== data.x || y !== data.y) {
-    return {
-      x: x,
-      y: y
-    };
-  } else {
-    return undefined;
-  }
-}