@cloud-app-dev/vidc 2.3.0 → 3.0.2

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

@@ -0,0 +1,11 @@
+import { Map } from '../interface';
+import { AMap as AMapType } from '../AMap';
+import './index.less';
+export interface IUseMarkerProps {
+    map: Map;
+    center: [number, number];
+    createIcon: (options?: any) => any;
+    options?: AMapType.MarkerOptions;
+}
+declare function useMarker({ map, center, createIcon, options }: IUseMarkerProps): any;
+export default useMarker;

package/es/{WorkerFlow/Form/FormAuth.js → Map/useMarker/index.js}

@@ -1,7 +1,8 @@
-import "antd/lib/radio/style";
-import _Radio from "antd/lib/radio";
-import "antd/lib/table/style";
-import _Table from "antd/lib/table";
+function _construct(Parent, args, Class) { if (_isNativeReflectConstruct()) { _construct = Reflect.construct.bind(); } else { _construct = function _construct(Parent, args, Class) { var a = [null]; a.push.apply(a, args); var Constructor = Function.bind.apply(Parent, a); var instance = new Constructor(); if (Class) _setPrototypeOf(instance, Class.prototype); return instance; }; } return _construct.apply(null, arguments); }
+
+function _isNativeReflectConstruct() { if (typeof Reflect === "undefined" || !Reflect.construct) return false; if (Reflect.construct.sham) return false; if (typeof Proxy === "function") return true; try { Boolean.prototype.valueOf.call(Reflect.construct(Boolean, [], function () {})); return true; } catch (e) { return false; } }
+
+function _setPrototypeOf(o, p) { _setPrototypeOf = Object.setPrototypeOf ? Object.setPrototypeOf.bind() : function _setPrototypeOf(o, p) { o.__proto__ = p; return o; }; return _setPrototypeOf(o, p); }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -23,95 +24,71 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useCallback, useEffect, useState } from 'react';
-import Box from '../../Box';
-import { cloneDeep } from 'lodash-es';
+import { useEffect, useRef, useState } from 'react';
+import useMapType from '../hook/useMapType';
+import "./index.css";
+var _global = window;
 
-function FormAuth(_ref) {
-  var form = _ref.form,
-      onChange = _ref.onChange;
+function useMarker(_ref) {
+  var map = _ref.map,
+      center = _ref.center,
+      createIcon = _ref.createIcon,
+      options = _ref.options;
 
   var _useState = useState({
-    form: cloneDeep(form)
+    marker: null
   }),
       _useState2 = _slicedToArray(_useState, 2),
       state = _useState2[0],
       setState = _useState2[1];
 
-  var onFormAuthChange = useCallback(function (options) {
-    var newForm = state.form;
-    newForm.forEach(function (item) {
-      if (item.name === options.name) {
-        item.auth = options.auth;
-      }
-    });
-    setState(function (old) {
-      return Object.assign(Object.assign({}, old), {
-        form: _toConsumableArray(newForm)
-      });
-    });
-  }, [state.form]);
+  var inMap = useRef(false);
+  var type = useMapType();
   useEffect(function () {
-    return onChange({
-      form: state.form
-    });
-  }, [state.form]);
-  return /*#__PURE__*/React.createElement(Box.InfoBox, {
-    className: "user-form-auth-layout",
-    title: "\u8868\u5355\u64CD\u4F5C\u6743\u9650"
-  }, /*#__PURE__*/React.createElement(_Table, {
-    className: "user-form-table",
-    pagination: false,
-    rowKey: "name",
-    columns: [{
-      title: '表单字段',
-      dataIndex: 'label',
-      align: 'center'
-    }, {
-      title: '可编辑',
-      align: 'center',
-      render: function render(item) {
-        return /*#__PURE__*/React.createElement(_Radio, {
-          checked: item.auth === 1,
-          onClick: function onClick() {
-            return onFormAuthChange({
-              name: item.name,
-              auth: 1
-            });
-          }
+    if (!(center && center.length === 2) || !map) {
+      return;
+    }
+
+    if (type.leaflet) {
+      var L = window.L;
+      var latlng = L.latLng(center);
+
+      if (inMap.current) {
+        state.marker.setLatLng(latlng);
+      } else {
+        var marker = L.marker(latlng, {
+          icon: createIcon(),
+          draggable: true,
+          zIndexOffset: 10
         });
-      }
-    }, {
-      title: '只读',
-      align: 'center',
-      render: function render(item) {
-        return /*#__PURE__*/React.createElement(_Radio, {
-          checked: item.auth === 2,
-          onClick: function onClick() {
-            return onFormAuthChange({
-              name: item.name,
-              auth: 2
-            });
-          }
+        map.addLayer(marker);
+        setState({
+          marker: marker
         });
+        inMap.current = true;
       }
-    }, {
-      title: '隐藏',
-      align: 'center',
-      render: function render(item) {
-        return /*#__PURE__*/React.createElement(_Radio, {
-          checked: item.auth === 0,
-          onClick: function onClick() {
-            return onFormAuthChange({
-              name: item.name,
-              auth: 0
-            });
-          }
+    }
+
+    if (type.AMap) {
+      var AMap = _global.AMap;
+
+      if (inMap.current) {
+        state.marker.setPosition(_construct(AMap.LngLat, _toConsumableArray(center)));
+      } else {
+        var _marker = new AMap.Marker(Object.assign({
+          position: _construct(AMap.LngLat, _toConsumableArray(center))
+        }, options));
+
+        map.add(_marker);
+        setState({
+          marker: _marker
         });
+        inMap.current = true;
       }
-    }],
-    dataSource: state.form
-  }));
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [center, map, options]);
+  return state.marker;
 }
 
-export default FormAuth;
+export default useMarker;

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

@@ -0,0 +1,2 @@
+declare function withMap<P>(Component: any, className?: string): (props: P) => JSX.Element;
+export default withMap;

package/es/Map/withMap/index.js

@@ -0,0 +1,12 @@
+import React from 'react';
+import Map from '../BasicMap';
+
+function withMap(Component, className) {
+  return function withMapComponent(props) {
+    return /*#__PURE__*/React.createElement(Map, {
+      className: className
+    }, /*#__PURE__*/React.createElement(Component, Object.assign({}, props)));
+  };
+}
+
+export default withMap;

package/es/Modal/index.js

@@ -19,8 +19,8 @@ import { __rest } from "tslib";
 import React, { useContext, useEffect, useImperativeHandle, useMemo, useState } from 'react';
 import * as ReactDOMClient from 'react-dom/client';
 import CC from '../ConfigContext';
-import "./index.css";
 import ConfigContext from '../ConfigContext';
+import "./index.css";
 
 function Modal(_a) {
   var children = _a.children,
@@ -69,15 +69,16 @@ function useModal() {
 
   var root = useMemo(function () {
     return ReactDOMClient.createRoot(div);
-  }, []);
+  }, [div]);
   useEffect(function () {
     container.appendChild(div);
     return function () {
+      // eslint-disable-next-line no-sequences
       setTimeout(function () {
         return root.unmount(), div.remove();
       }, 100);
     };
-  }, []);
+  }, [container, div, root]);
   useEffect(function () {
     root.render( /*#__PURE__*/React.createElement(_ConfigProvider, {
       prefixCls: prefixCls,
@@ -96,7 +97,7 @@ function useModal() {
       className: state.className,
       getContainer: false
     }, state.content)));
-  }, [state.content, state.visible, state.title, state.onOk, state.width, state.className]);
+  }, [state.content, state.visible, state.title, state.onOk, state.width, state.className, root, prefixCls, container]);
 
   var open = function open(options) {
     setState(function (old) {
@@ -152,7 +153,8 @@ var RefModal = /*#__PURE__*/React.forwardRef(function RefModal(_, ref) {
         visible: false
       });
     });
-  };
+  }; // eslint-disable-next-line react-hooks/exhaustive-deps
+
 
   useImperativeHandle(ref, function () {
     return {

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

@@ -1,6 +1,6 @@
 /// <reference types="react" />
+import { MenuRectType } from '../../../Picture/interface';
 import './index.less';
-import { MenuRectType } from 'src/Picture/interface';
 interface IRectMenuProps {
     x: number;
     y: number;

package/es/Picture/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { IPictureProps } from './interface';
+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 {

package/es/Picture/index.js

@@ -18,7 +18,7 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
 import { __awaiter, __rest } from "tslib";
 import React, { useMemo, useRef, useState, useCallback, useEffect } from 'react';
-import MoveContent from './component/MoveContent';
+import DomMove from '../DomMove';
 import { getRectImagePath } from './loadCaptureRectImage';
 import { computedBound } from './dragBound';
 import { customContextMenu, computedRectScale, cloneImageNode } from './utils';
@@ -276,7 +276,7 @@ function Picture(_a) {
     },
     ref: layoutRef,
     onContextMenu: customContextMenu
-  }, /*#__PURE__*/React.createElement(MoveContent, {
+  }, /*#__PURE__*/React.createElement(DomMove, {
     className: "picture-move-layout",
     disabled: isOpenSelect || disabledDrag,
     position: {

package/es/Player/api/index.d.ts

@@ -5,14 +5,6 @@ declare class Api {
     container: HTMLElement;
     constructor(container: HTMLElement);
     get video(): HTMLVideoElement;
-    /**
-     * 全屏
-     */
-    requestFullScreen: () => void;
-    /**
-     * 退出全屏
-     */
-    cancelFullScreen: () => void;
     play: () => void;
     pause: () => void;
     /**
@@ -59,6 +51,8 @@ declare class Api {
     snapshot: () => string;
     unload: () => void;
     reload: () => void;
+    toggleFit: () => void;
+    setIndex: (i: number) => void;
     destroy: () => void;
 }
 export declare type TypeAndPlay = {

package/es/Player/api/index.js

@@ -1,3 +1,5 @@
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
+
 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."); }
@@ -17,7 +19,7 @@ function _defineProperties(target, props) { for (var i = 0; i < props.length; i+
 function _createClass(Constructor, protoProps, staticProps) { if (protoProps) _defineProperties(Constructor.prototype, protoProps); if (staticProps) _defineProperties(Constructor, staticProps); Object.defineProperty(Constructor, "prototype", { writable: false }); return Constructor; }
 
 import { useEffect, useState } from 'react';
-import { fullscreen, isFullscreen, exitFullscreen, createFlvPlayer, createHlsPlayer } from '../util';
+import { createFlvPlayer, createHlsPlayer, tryCatch } from '../util';
 
 var Api = /*#__PURE__*/function () {
   function Api(container) {
@@ -25,29 +27,10 @@ var Api = /*#__PURE__*/function () {
 
     _classCallCheck(this, Api);
 
-    /**
-     * 全屏
-     */
-    this.requestFullScreen = function () {
-      if (!isFullscreen(_this.container)) {
-        fullscreen(_this.container);
-      }
-    };
-    /**
-     * 退出全屏
-     */
-
-
-    this.cancelFullScreen = function () {
-      if (isFullscreen(_this.container)) {
-        exitFullscreen();
-      }
-    };
-
     this.play = function () {
-      if (_this.video.paused) {
-        _this.video.play();
-      }
+      tryCatch(function () {
+        return _this.video.play();
+      });
     };
 
     this.pause = function () {
@@ -180,6 +163,10 @@ var Api = /*#__PURE__*/function () {
 
     this.reload = function () {};
 
+    this.toggleFit = function () {};
+
+    this.setIndex = function (i) {};
+
     this.destroy = function () {
       _this.container = null;
     };
@@ -239,24 +226,29 @@ export function useTypeAndPlay(url, type, isLive, container, segments, flvConfig
       video.setAttribute('src', url);
     }
 
-    try {
-      video.play();
-    } catch (_) {}
-
+    url && video.paused && tryCatch(function () {
+      return video.play();
+    });
     setState(options);
     return function () {
       if (options.flv) {
-        options.flv.destroy();
-      }
-
-      if (options.hls) {
-        options.hls.destroy();
+        options.flv.pause();
+        tryCatch(function () {
+          return options.flv.destroy();
+        });
+      } else if (options.hls) {
+        video.pause();
+        tryCatch(function () {
+          return options.hls.destroy();
+        });
+      } else {
+        video.pause();
+        video.removeAttribute('src');
       }
 
-      video.removeAttribute('src');
       setState({});
     };
-  }, [url, container, segments, type]);
+  }, [url, container, segments, type, isLive, flvConfig, hlsConfig]);
   return [state.type, state.flv, state.hls];
 } //创建Api
 
@@ -276,7 +268,9 @@ export function usePlayerApi(url, type, isLive, container, segments, flvConfig,
     var api = new Api(container);
     setApi(api);
     return function () {
-      return api.destroy();
+      return _nextTick(function () {
+        return api.destroy();
+      });
     };
   }, [container, segments]);
   return [api, typePlay];

package/es/Player/contraller_bar/left_bar.js

@@ -46,6 +46,7 @@ function LeftBar(_ref) {
     };
   }, [event]);
   var video = container.querySelector('video'); //缓存值
+  // eslint-disable-next-line react-hooks/exhaustive-deps
 
   var paused = useMemo(function () {
     return video === null || video === void 0 ? void 0 : video.paused;
@@ -60,7 +61,6 @@ function LeftBar(_ref) {
   var _useTimes = useTimes(api, event, hideTimeProgress),
       _useTimes2 = _slicedToArray(_useTimes, 3),
       current = _useTimes2[0],
-      _ = _useTimes2[1],
       duration = _useTimes2[2]; //TODO 方法
 
 
@@ -72,7 +72,7 @@ function LeftBar(_ref) {
     } else {
       api.pause();
     }
-  }, [video, api, isLive]);
+  }, [video, api]);
   return /*#__PURE__*/React.createElement("div", {
     className: "contraller-left-bar"
   }, leftExtContents, /*#__PURE__*/React.createElement(Bar, null, /*#__PURE__*/React.createElement(IconFont, {

package/es/Player/contraller_bar/right_bar.d.ts

@@ -9,5 +9,5 @@ interface IRightBarProps {
     rightExtContents: React.ReactNode;
     rightMidExtContents: React.ReactNode;
 }
-declare function RightBar({ container, api, rightExtContents, rightMidExtContents }: IRightBarProps): JSX.Element;
+declare function RightBar({ container, rightExtContents, rightMidExtContents }: IRightBarProps): JSX.Element;
 export default RightBar;

package/es/Player/contraller_bar/right_bar.js

@@ -1,3 +1,5 @@
+import _useFullscreen3 from "ahooks/es/useFullscreen";
+
 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."); }
@@ -10,45 +12,29 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import React, { useState, useMemo, useEffect, useCallback } from 'react';
+import React from 'react';
 import IconFont from '../iconfont';
 import Bar from './bar';
-import { isFullscreen } from '../util';
 
 function RightBar(_ref) {
   var container = _ref.container,
-      api = _ref.api,
       rightExtContents = _ref.rightExtContents,
       rightMidExtContents = _ref.rightMidExtContents;
 
-  var _useState = useState(Date.now()),
-      _useState2 = _slicedToArray(_useState, 2),
-      dep = _useState2[0],
-      setDep = _useState2[1];
-
-  useEffect(function () {
-    var update = function update() {
-      return setDep(Date.now());
-    };
-
-    document.addEventListener('fullscreenchange', update);
-    return function () {
-      return document.removeEventListener('fullscreenchange', update);
-    };
-  }, []);
-  var isfull = useMemo(function () {
-    return isFullscreen(container);
-  }, [dep, container]);
-  var fullscreen = useCallback(function () {
-    !isFullscreen(container) ? api.requestFullScreen() : api.cancelFullScreen();
-    setDep(Date.now());
-  }, [api, container]);
+  var _useFullscreen = _useFullscreen3(container),
+      _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
+      isFullScreen = _useFullscreen2[0],
+      _useFullscreen2$ = _useFullscreen2[1],
+      enterFullscreen = _useFullscreen2$.enterFullscreen,
+      exitFullscreen = _useFullscreen2$.exitFullscreen;
+
+  var fullscreen = isFullScreen ? exitFullscreen : enterFullscreen;
   return /*#__PURE__*/React.createElement("div", {
     className: "contraller-right-bar"
   }, rightMidExtContents, /*#__PURE__*/React.createElement(Bar, null, /*#__PURE__*/React.createElement(IconFont, {
-    title: isfull ? '窗口' : '全屏',
+    title: isFullScreen ? '窗口' : '全屏',
     onClick: fullscreen,
-    type: isfull ? 'lm-player-ExitFull_Main' : 'lm-player-Full_Main'
+    type: isFullScreen ? 'lm-player-ExitFull_Main' : 'lm-player-Full_Main'
   })), rightExtContents);
 }
 

package/es/Player/demo.js

@@ -122,37 +122,29 @@ function Demo1() {
   }));
 }
 
+var begin = Date.now();
+
 function Demo2() {
   var _useState3 = useState({
     isLive: 1,
     segments: [{
-      duration: 60,
+      beginTime: begin,
+      endTime: begin + 60 * 1000,
       url: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4'
     }, {
-      duration: 60
+      beginTime: begin + 60 * 1000,
+      endTime: begin + 2 * 60 * 1000
     }, {
-      duration: 60,
+      beginTime: begin + 2 * 60 * 1000,
+      endTime: begin + 3 * 60 * 1000,
       url: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4?date=1'
     }, {
-      duration: 60
+      beginTime: begin + 3 * 60 * 1000,
+      endTime: begin + 4 * 60 * 1000
     }, {
-      duration: 60,
+      beginTime: begin + 4 * 60 * 1000,
+      endTime: begin + 5 * 60 * 1000,
       url: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4?date=2'
-    }, {
-      duration: 60
-    }, {
-      duration: 60,
-      url: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4?date=3'
-    }, {
-      duration: 60
-    }, {
-      duration: 60,
-      url: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4?date=4'
-    }, {
-      duration: 60
-    }, {
-      duration: 60,
-      url: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4?date=5'
     }],
     tempUrl: ''
   }),
@@ -197,7 +189,7 @@ function Demo2() {
       });
     }
   }, "\u64AD\u653E")), /*#__PURE__*/React.createElement(SegmentPlayer, {
-    begin: Date.now(),
+    begin: begin,
     segments: state.segments,
     isLive: false
   }));
@@ -205,7 +197,7 @@ function Demo2() {
 
 function Demo3() {
   var _useState5 = useState({
-    url: 'http://192.168.101.161:18090/flv/vod/2b9cb54836e136630_34/187981bd526bdf548.flv?origin_url=sdk%3A%2F%2Fadmin%3Aabc12345%40192.168.14.3%3A8000%2Fcam%2Fplayback%3Ffactory%3Dhikvision%26channel%3D34%26subType%3D0%26startTime%3D1652889636%26endTime%3D1652890200',
+    url: 'http://clips.vorwaerts-gmbh.de/big_buck_bunny.mp4',
     tempUrl: '',
     begin: 1652889636,
     end: 1652890200
@@ -216,7 +208,8 @@ function Demo3() {
 
   return /*#__PURE__*/React.createElement("div", {
     style: {
-      width: '100%',
+      width: '600px',
+      height: '400px',
       marginTop: 20
     }
   }, /*#__PURE__*/React.createElement("h3", null, " \u524D\u7AEF\u5F55\u50CF\u89C6\u9891\u64AD\u653E"), /*#__PURE__*/React.createElement("div", {
@@ -255,7 +248,11 @@ function Demo3() {
     end: state.end,
     url: state.url,
     onSeek: function onSeek(time) {
-      return console.log(time);
+      return setState(function (old) {
+        return Object.assign(Object.assign({}, old), {
+          url: "".concat(old.url, "?").concat(time)
+        });
+      });
     }
   }));
 }

package/es/Player/event/index.js

@@ -1,3 +1,5 @@
+import _nextTick from "@cloud-app-dev/utils/es/nextTick";
+
 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."); }
@@ -119,7 +121,9 @@ export function usePlayerEvent(video) {
     var event = new VideoEventInstance(video);
     setEvent(event);
     return function () {
-      return event.destroy();
+      return _nextTick(function () {
+        return event.destroy();
+      });
     };
   }, [video]);
   return event;

package/es/Player/frontend_player.d.ts

@@ -2,8 +2,7 @@
 import type { IFrontendPlayerProps } from './player';
 /**
  * @desc 主组件，负责片段整体逻辑控制
- * @param param0
- * @returns
+ * @return JSX.Element
  */
-declare function FrontendPlayer({ url, begin, end, onSeek, ...props }: IFrontendPlayerProps): JSX.Element;
+declare function FrontendPlayer({ url, begin, end, onSeek, forwordRef, customTimeLine, onCanPlayerInit, ...props }: IFrontendPlayerProps): JSX.Element;
 export default FrontendPlayer;