@cloud-app-dev/vidc 3.0.39 → 3.0.41

package/es/Map/LevelCenter/DragMarker/index.js

@@ -31,7 +31,7 @@ function DragMarker(_ref) {
       var latlng = type.leaflet ? e.target.getLatLng() : e.target.getPosition();
       instance.setCenter(latlng);
       onChange === null || onChange === void 0 ? void 0 : onChange({
-        center: latlng
+        center: [latlng.getLng(), latlng.getLat()]
       });
     });
     instance.map.on('moveend', function () {

package/es/ROI/demo.js

@@ -4,7 +4,7 @@ import ROI from './index';
 var App = function App() {
   return /*#__PURE__*/React.createElement("div", {
     style: {
-      width: 600,
+      width: "100%",
       height: 400,
       background: '#999'
     }

package/es/ROI/index.d.ts

@@ -9,7 +9,7 @@ interface IRIOProps {
     /**
      * 绘制数据变化
      */
-    onChange?: (rio: number[][]) => void;
+    onChange?: (rio: number[][], areas: [number, number][][]) => void;
     /**
      * 开启/关闭 标识
      */

package/es/ROI/index.js

@@ -20,7 +20,8 @@ function RIO(_ref) {
       open = _useDrawROI.open,
       close = _useDrawROI.close,
       clear = _useDrawROI.clear,
-      rio = _useDrawROI.rio; // eslint-disable-next-line react-hooks/exhaustive-deps
+      rio = _useDrawROI.rio,
+      areas = _useDrawROI.areas; // eslint-disable-next-line react-hooks/exhaustive-deps
 
 
   useEffect(function () {
@@ -32,7 +33,7 @@ function RIO(_ref) {
   }, [renderKey]);
 
   _useUpdateEffect(function () {
-    return onChange === null || onChange === void 0 ? void 0 : onChange(rio);
+    return onChange === null || onChange === void 0 ? void 0 : onChange(rio, areas);
   }, [rio]);
 
   return /*#__PURE__*/React.createElement("div", {

package/es/useDrawROI/index.d.ts

@@ -9,5 +9,7 @@ declare function useDrawROI(target: BasicTarget<HTMLCanvasElement>, { row, rowIt
     clear: () => void;
     rio: number[][];
     status: string;
+    areas: [number, number][][];
+    deleteArea: (area: number[][]) => void;
 };
 export default useDrawROI;

package/es/useDrawROI/index.js

@@ -1,5 +1,5 @@
 import _useEventListener from "ahooks/es/useEventListener";
-import _useMount from "ahooks/es/useMount";
+import _useSize from "ahooks/es/useSize";
 import _useLatest from "ahooks/es/useLatest";
 
 function _toArray(arr) { return _arrayWithHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableRest(); }
@@ -47,16 +47,21 @@ function useDrawROI(target, _ref) {
 
   var isOpenRef = _useLatest(state.isOpen);
 
-  _useMount(function () {
-    var canvas = getTargetElement(target);
-
-    var _canvas$getBoundingCl = canvas.getBoundingClientRect(),
-        width = _canvas$getBoundingCl.width,
-        height = _canvas$getBoundingCl.height;
+  var size = _useSize(target);
 
-    canvas.width = width;
-    canvas.height = height;
-  });
+  useEffect(function () {
+    var canvas = getTargetElement(target);
+    canvas.width = size === null || size === void 0 ? void 0 : size.width;
+    canvas.height = size === null || size === void 0 ? void 0 : size.height;
+    console.warn('canvas，size变化，请重新绘制！');
+    setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        pos: [],
+        tempPos: [],
+        saveArea: []
+      });
+    }); // eslint-disable-next-line react-hooks/exhaustive-deps
+  }, [size === null || size === void 0 ? void 0 : size.height, size === null || size === void 0 ? void 0 : size.width]);
 
   _useEventListener('click', function (event) {
     if (!isOpenRef.current) {
@@ -275,9 +280,9 @@ function useDrawROI(target, _ref) {
       return rioArr;
     }
 
-    var _canvas$getBoundingCl2 = canvas.getBoundingClientRect(),
-        width = _canvas$getBoundingCl2.width,
-        height = _canvas$getBoundingCl2.height;
+    var _canvas$getBoundingCl = canvas.getBoundingClientRect(),
+        width = _canvas$getBoundingCl.width,
+        height = _canvas$getBoundingCl.height;
 
     var itemWidth = width / rowItems;
     var itemHeight = height / row; // 转换当前绘制完成的区域为多边形
@@ -310,12 +315,26 @@ function useDrawROI(target, _ref) {
 
     return rioArr;
   }, [row, rowItems, state.saveArea, target]);
+
+  var deleteArea = function deleteArea(area) {
+    setState(function (old) {
+      var newArea = old.saveArea.filter(function (v) {
+        return v.join('-') !== area.join('-');
+      });
+      return Object.assign(Object.assign({}, old), {
+        saveArea: _toConsumableArray(newArea)
+      });
+    });
+  };
+
   return {
     open: open,
     close: close,
     clear: clear,
     rio: rio,
-    status: status
+    status: status,
+    areas: state.saveArea,
+    deleteArea: deleteArea
   };
 }
 

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.0.39",
+  "version": "3.0.41",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",