@cloud-app-dev/vidc 3.0.25 → 3.0.27

package/es/Map/LevelCenter/DragMarker/index.d.ts

@@ -4,6 +4,7 @@ export interface IDragMarkerProps {
     onChange?: (options: {
         center: [number, number];
     }) => void;
+    title?: string;
 }
-declare function DragMarker({ center, onChange }: IDragMarkerProps): JSX.Element;
+declare function DragMarker({ center, title, onChange }: IDragMarkerProps): JSX.Element;
 export default DragMarker;

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

@@ -6,6 +6,7 @@ import useMapType from '../../hook/useMapType';
 
 function DragMarker(_ref) {
   var center = _ref.center,
+      title = _ref.title,
       onChange = _ref.onChange;
 
   var _useContext = useContext(mapContext),
@@ -17,7 +18,8 @@ function DragMarker(_ref) {
     center: center,
     createIcon: createMapCenterIcon,
     options: {
-      draggable: true
+      draggable: true,
+      title: title
     }
   });
   useEffect(function () {
@@ -32,7 +34,7 @@ function DragMarker(_ref) {
         center: latlng
       });
     });
-    instance.map.on('zoomend', function (e) {
+    instance.map.on('moveend', function () {
       var latlng = type.leaflet ? marker.getLatLng() : marker.getPosition();
       onChange === null || onChange === void 0 ? void 0 : onChange({
         center: [latlng.getLng(), latlng.getLat()]

package/es/Map/LevelCenter/demo.d.ts

@@ -0,0 +1,2 @@
+declare const App: () => JSX.Element;
+export default App;

package/es/Map/LevelCenter/demo.js

@@ -0,0 +1,48 @@
+import "antd/lib/config-provider/style";
+import _ConfigProvider from "antd/lib/config-provider";
+
+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, { useEffect, useState } from 'react';
+import LevelCenter from './index';
+import deviceList from '../points.json';
+
+var App = function App() {
+  var _useState = useState({
+    center: [113, 30],
+    zoom: 10
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  useEffect(function () {
+    console.log(state);
+  }, [state]);
+  return /*#__PURE__*/React.createElement(_ConfigProvider, {
+    prefixCls: "cloudapp"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: '100%',
+      height: 800
+    }
+  }, /*#__PURE__*/React.createElement(LevelCenter, Object.assign({}, state, {
+    enableClick: true,
+    points: deviceList,
+    onLevelCenterChange: function onLevelCenterChange(s) {
+      return setState(s);
+    }
+  }))));
+};
+
+export default App;

package/es/Map/LevelCenter/index.d.ts

@@ -4,7 +4,7 @@ import './index.less';
 export interface ILevelCenter {
     center?: [number, number];
     zoom?: number;
-    points: MapPoint[];
+    points?: MapPoint[];
     enableClick?: boolean;
     onLevelCenterChange?: (options: {
         center: [number, number] | LatLng;

package/es/Map/LevelCenter/index.js

@@ -44,14 +44,14 @@ function LevelCenter(_ref) {
       instance.setCenter(_center);
       onLevelCenterChange === null || onLevelCenterChange === void 0 ? void 0 : onLevelCenterChange({
         center: _center,
-        zoom: defaultZoom
+        zoom: instance.getZoom()
       });
     }
   });
-  useMapEvent('zoomed', function (event) {
+  useMapEvent('zoomend', function () {
     onLevelCenterChange === null || onLevelCenterChange === void 0 ? void 0 : onLevelCenterChange({
       center: defaultCenter,
-      zoom: event.target.getZoom()
+      zoom: instance.getZoom()
     });
   });
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ClusterLayer, {
@@ -64,7 +64,7 @@ function LevelCenter(_ref) {
       var center = _ref2.center;
       return onLevelCenterChange === null || onLevelCenterChange === void 0 ? void 0 : onLevelCenterChange({
         center: center,
-        zoom: defaultZoom
+        zoom: instance.getZoom()
       });
     }
   }), children);

package/es/Map/MapDrawSelect/index.d.ts

@@ -9,6 +9,7 @@ export interface IMapDrawSelectProps {
     drawUi?: React.ReactNode;
     drawType?: DrawType | 'clear' | 'close';
     drawEnd?: (points: MapPoint[]) => void;
+    onPointClick?: (point: MapPoint) => void;
 }
 declare const _default: (props: IMapDrawSelectProps) => JSX.Element;
 export default _default;

package/es/Map/MapDrawSelect/index.js

@@ -14,7 +14,8 @@ function MapDrawSelect(_ref) {
       children = _ref.children,
       drawUi = _ref.drawUi,
       drawType = _ref.drawType,
-      drawEnd = _ref.drawEnd;
+      drawEnd = _ref.drawEnd,
+      onPointClick = _ref.onPointClick;
 
   var _useContext = useContext(mapContext),
       instance = _useContext.instance;
@@ -35,7 +36,8 @@ function MapDrawSelect(_ref) {
   });
 
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ClusterLayer, {
-    points: points
+    points: points,
+    onPointClick: onPointClick
   }), /*#__PURE__*/React.createElement(ResetTools, {
     onMapReset: mapRest
   }), /*#__PURE__*/React.createElement(MouseTool, {

package/es/Map/SinglePoint/index.d.ts

@@ -2,9 +2,22 @@ import React from 'react';
 import { MapPoint } from '../interface';
 import './index.less';
 export interface ISinglePlayerProps {
+    /**
+     * 点位经纬度
+     */
     center?: [number, number];
+    /**
+     * 展示标题
+     */
+    title?: string;
     points: MapPoint[];
+    /**
+     * 开启点击设置
+     */
     enableClick?: boolean;
+    /**
+     * 中心点变化
+     */
     onCenterChange?: (options: {
         center: [number, number];
     }) => void;

package/es/Map/SinglePoint/index.js

@@ -13,14 +13,15 @@ function SinglePoint(_ref) {
       points = _ref.points,
       onCenterChange = _ref.onCenterChange,
       enableClick = _ref.enableClick,
+      title = _ref.title,
       children = _ref.children;
 
   var _useContext = useContext(mapContext),
       instance = _useContext.instance;
 
   var mapRest = useCallback(function () {
-    return instance.setZoomAndCenter(instance.config.zoom, instance.config.center);
-  }, [instance]);
+    return instance.setZoomAndCenter(instance.config.zoom, center !== null && center !== void 0 ? center : instance.config.center);
+  }, [center, instance]);
 
   _useMount(function () {
     if (enableClick) {
@@ -44,6 +45,7 @@ function SinglePoint(_ref) {
   }), /*#__PURE__*/React.createElement(ResetTools, {
     onMapReset: mapRest
   }), /*#__PURE__*/React.createElement(DragMarker, {
+    title: title,
     center: center,
     onChange: function onChange(_ref2) {
       var center = _ref2.center;

package/es/useDrawRIO/index.js

@@ -29,6 +29,7 @@ import { useEffect, useMemo, useState } from 'react';
 import { lineString } from '@turf/helpers';
 import lineToPolygon from '@turf/line-to-polygon';
 import booleanDisjoint from '@turf/boolean-disjoint';
+import { useHotkeys } from 'react-hotkeys-hook';
 
 function useDrawRIO(target, _ref) {
   var row = _ref.row,
@@ -254,8 +255,17 @@ function useDrawRIO(target, _ref) {
         tempPos: []
       });
     });
-  };
+  }; //快捷键处理
+
 
+  useHotkeys('esc', function () {
+    return setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        pos: [],
+        tempPos: []
+      });
+    });
+  });
   var rio = useMemo(function () {
     var rioArr = [];
     var canvas = getTargetElement(target);

package/es/useInfiniteScroll/index.js

@@ -39,7 +39,9 @@ function useInfiniteScroll(fetcher, options) {
   }, [state.data]);
 
   var loadMore = function loadMore(flag) {
-    if (noMore) {
+    var _a;
+
+    if (!flag && ((_a = isNoMore === null || isNoMore === void 0 ? void 0 : isNoMore(state.data)) !== null && _a !== void 0 ? _a : false)) {
       return;
     }
 

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.0.25",
+  "version": "3.0.27",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -41,6 +41,7 @@
     "lodash-es": "^4.17.21",
     "moment": "^2.29.4",
     "react-error-boundary": "^3.1.4",
+    "react-hotkeys-hook": "^3.4.7",
     "screenfull": "^6.0.2"
   },
   "devDependencies": {