@cloud-app-dev/vidc 3.0.26 → 3.0.28

package/es/List/DynamicList/index.d.ts

@@ -1,8 +1,8 @@
 /// <reference types="react" />
 import type { IDynamicListProps } from './interface';
 import './index.less';
-declare function DynamicDeviceList<T>({ renderItem, itemHeight, itemClassName, reloadDeps, loadPage }: IDynamicListProps<T>): JSX.Element;
-declare namespace DynamicDeviceList {
+declare function DynamicList<T>({ renderItem, itemHeight, itemClassName, reloadDeps, loadPage }: IDynamicListProps<T>): JSX.Element;
+declare namespace DynamicList {
     var defaultProps: {
         limit: number;
         itemHeight: number;
@@ -11,4 +11,4 @@ declare namespace DynamicDeviceList {
         itemClassName: string;
     };
 }
-export default DynamicDeviceList;
+export default DynamicList;

package/es/List/DynamicList/index.js

@@ -20,7 +20,7 @@ import { LIMIT, skeletonList } from './utils';
 import useInfiniteScroll from '../../useInfiniteScroll';
 import "./index.css";
 
-function DynamicDeviceList(_ref) {
+function DynamicList(_ref) {
   var renderItem = _ref.renderItem,
       itemHeight = _ref.itemHeight,
       itemClassName = _ref.itemClassName,
@@ -95,11 +95,11 @@ function DynamicDeviceList(_ref) {
   })));
 }
 
-DynamicDeviceList.defaultProps = {
+DynamicList.defaultProps = {
   limit: LIMIT,
   itemHeight: 40,
   params: {},
   itemKey: 'id',
   itemClassName: ''
 };
-export default DynamicDeviceList;
+export default DynamicList;

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 () {

package/es/Map/MapDrawSelect/demo.js

@@ -10,23 +10,33 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState } from 'react';
+import React, { useEffect, useState } from 'react';
 import MapDrawSelect from './index';
 import deviceList from '../points.json';
 
 var App = function App() {
-  var _useState = useState(),
+  var _useState = useState([]),
       _useState2 = _slicedToArray(_useState, 2),
-      type = _useState2[0],
-      setType = _useState2[1];
+      points = _useState2[0],
+      setPoints = _useState2[1];
 
+  var _useState3 = useState(),
+      _useState4 = _slicedToArray(_useState3, 2),
+      type = _useState4[0],
+      setType = _useState4[1];
+
+  useEffect(function () {
+    setTimeout(function () {
+      return setPoints(deviceList);
+    }, 5000);
+  }, []);
   return /*#__PURE__*/React.createElement("div", {
     style: {
       width: '100%',
       height: 800
     }
   }, /*#__PURE__*/React.createElement(MapDrawSelect, {
-    points: deviceList,
+    points: points,
     drawEnd: console.log,
     drawType: type,
     drawUi: /*#__PURE__*/React.createElement("div", {

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

@@ -8,6 +8,7 @@ export interface IMapDrawSelectProps {
     children?: React.ReactNode;
     drawUi?: React.ReactNode;
     drawType?: DrawType | 'clear' | 'close';
+    selectCenter?: [number, number];
     drawEnd?: (points: MapPoint[]) => void;
     onPointClick?: (point: MapPoint) => void;
 }

package/es/Map/MapDrawSelect/index.js

@@ -1,5 +1,5 @@
 import _useMount from "ahooks/es/useMount";
-import React, { useCallback, useContext, useMemo } from 'react';
+import React, { useCallback, useContext, useEffect, useMemo } from 'react';
 import ClusterLayer from '../ClusterLayer';
 import ResetTools from '../ResetTools';
 import withMap from '../withMap';
@@ -14,6 +14,7 @@ function MapDrawSelect(_ref) {
       children = _ref.children,
       drawUi = _ref.drawUi,
       drawType = _ref.drawType,
+      selectCenter = _ref.selectCenter,
       drawEnd = _ref.drawEnd,
       onPointClick = _ref.onPointClick;
 
@@ -35,6 +36,11 @@ function MapDrawSelect(_ref) {
     return mapRest();
   });
 
+  useEffect(function () {
+    if (selectCenter) {
+      instance.setZoomAndCenter(defaultZoom, selectCenter);
+    }
+  }, [defaultZoom, instance, selectCenter]);
   return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(ClusterLayer, {
     points: points,
     onPointClick: onPointClick

package/es/Map/MouseTool/useMouseTools.js

@@ -1,5 +1,5 @@
 import _useMount from "ahooks/es/useMount";
-import { useContext, useRef } from 'react';
+import { useContext, useEffect, useRef } from 'react';
 import { mapContext } from '../Context';
 
 function useMouseTools(onDrawEnd) {
@@ -13,13 +13,21 @@ function useMouseTools(onDrawEnd) {
     var map = instance.map;
     AMap.plugin(['AMap.MouseTool'], function () {
       mouseRef.current = new AMap.MouseTool(map);
-      mouseRef.current.on('draw', function (e) {
-        overlayersRef.current.push(e.obj);
-        onDrawEnd === null || onDrawEnd === void 0 ? void 0 : onDrawEnd(e.obj);
-      });
     });
   });
 
+  useEffect(function () {
+    var fn = function fn(e) {
+      overlayersRef.current.push(e.obj);
+      onDrawEnd === null || onDrawEnd === void 0 ? void 0 : onDrawEnd(e.obj);
+    };
+
+    mouseRef.current.on('draw', fn);
+    return function () {
+      mouseRef.current.off('draw', fn);
+    };
+  }, [onDrawEnd]);
+
   var draw = function draw(type) {
     if (!mouseRef.current) {
       return;

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/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.26",
+  "version": "3.0.28",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",