@cloud-app-dev/vidc 3.0.0 → 3.0.1

package/es/ErrorBoundary/index.d.ts

@@ -1,6 +1,6 @@
 import React, { Component, ErrorInfo } from 'react';
 export declare type IErrorBoundaryProps = {
-    fallback?: (() => JSX.Element) | React.ReactNode;
+    fallback?: React.ReactNode;
     children?: React.ReactNode;
 };
 declare type State = {
@@ -13,6 +13,6 @@ declare class ErrorBoundary extends Component<IErrorBoundaryProps, State> {
     };
     static getDerivedStateFromError(error: Error): State;
     componentDidCatch(error: Error, info: ErrorInfo): void;
-    render(): string | number | boolean | JSX.Element | React.ReactFragment;
+    render(): React.ReactNode;
 }
 export default ErrorBoundary;

package/es/ErrorBoundary/index.js

@@ -53,13 +53,7 @@ var ErrorBoundary = /*#__PURE__*/function (_Component) {
           fallback = _this$props.fallback;
 
       if (error) {
-        if ( /*#__PURE__*/React.isValidElement(fallback)) {
-          return fallback;
-        }
-
-        if (typeof fallback === 'function') {
-          return fallback();
-        }
+        return fallback;
       }
 
       return children;
@@ -67,6 +61,7 @@ var ErrorBoundary = /*#__PURE__*/function (_Component) {
   }], [{
     key: "getDerivedStateFromError",
     value: function getDerivedStateFromError(error) {
+      console.error(error);
       return {
         error: true
       };

package/es/Map/BasicMap/index.js

@@ -34,12 +34,12 @@ var Map = /*#__PURE__*/function (_React$Component) {
 
   var _super = _createSuper(Map);
 
-  function Map(props) {
+  function Map() {
     var _this;
 
     _classCallCheck(this, Map);
 
-    _this = _super.call(this, props);
+    _this = _super.apply(this, arguments);
     _this.domRef = /*#__PURE__*/React.createRef();
     return _this;
   }
@@ -51,8 +51,8 @@ var Map = /*#__PURE__*/function (_React$Component) {
         return;
       }
 
-      var instance = this.props.isL ? LeafletInstance : AMapInstance;
       var mapOptions = this.props.config;
+      var instance = this.props.isL ? LeafletInstance : AMapInstance;
       this.mapInstance = new instance(this.domRef.current, mapOptions);
       this.mapInstance.createMap();
       this.forceUpdate();
@@ -62,11 +62,6 @@ var Map = /*#__PURE__*/function (_React$Component) {
     value: function componentWillUnmount() {
       this.mapInstance.destoryMap();
     }
-  }, {
-    key: "componentDidCatch",
-    value: function componentDidCatch(error, errorInfo) {
-      console.log(error, errorInfo);
-    }
   }, {
     key: "render",
     value: function render() {

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/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;
     /**

package/es/Player/api/index.js

@@ -19,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) {
@@ -27,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 () {
@@ -243,24 +224,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
 

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/frontend_timeline.js

@@ -13,7 +13,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useEffect, useMemo, useState, startTransition } from 'react';
 import useBarStatus from './contraller_bar/useBarStatus';
 import { useTimes } from './timeline';
-import { dateFormat } from './util';
+import { FMT } from './util';
+import moment from 'moment';
 import "./style/timeline.css";
 
 function FrontendTimeLine(_ref) {
@@ -52,7 +53,7 @@ function FrontendTimeLine(_ref) {
   }, [begin]);
   var playPercent = useMemo(function () {
     return rTime / duration * 100;
-  }, [rTime]);
+  }, [duration, rTime]);
   var cTime = useMemo(function () {
     return begin + rTime * 1000;
   }, [begin, rTime]);
@@ -67,7 +68,7 @@ function FrontendTimeLine(_ref) {
         time: cTime - currentTime
       });
     });
-  }, [api, duration, begin, onSeek, currentTime]);
+  }, [duration, begin, onSeek, currentTime]);
   var onLineMouseOver = useCallback(function (e) {
     var rect = e.currentTarget.getBoundingClientRect();
     var left = e.pageX - rect.left;
@@ -78,7 +79,7 @@ function FrontendTimeLine(_ref) {
         markTime: begin + mTime * 1000
       });
     });
-  }, [begin]);
+  }, [begin, duration]);
   var onLineMouseOut = useCallback(function (e) {
     startTransition(function () {
       return setState(function (old) {
@@ -132,7 +133,7 @@ function TipTitle(_ref2) {
     style: {
       fontWeight: 600
     }
-  }, "\u5F55\u50CF\u4FE1\u606F"), /*#__PURE__*/React.createElement("div", null, "\u5F00\u59CB\uFF1A", dateFormat(begin)), /*#__PURE__*/React.createElement("div", null, "\u7ED3\u675F\uFF1A", dateFormat(end)), /*#__PURE__*/React.createElement("div", null, "\u523B\u5EA6\uFF1A", dateFormat(markTime)), /*#__PURE__*/React.createElement("div", null, "\u5F53\u524D\uFF1A", dateFormat(current)));
+  }, "\u5F55\u50CF\u4FE1\u606F"), /*#__PURE__*/React.createElement("div", null, "\u5F00\u59CB\uFF1A", moment(begin).format(FMT)), /*#__PURE__*/React.createElement("div", null, "\u7ED3\u675F\uFF1A", moment(end).format(FMT)), /*#__PURE__*/React.createElement("div", null, "\u523B\u5EA6\uFF1A", moment(markTime).format(FMT)), /*#__PURE__*/React.createElement("div", null, "\u5F53\u524D\uFF1A", moment(current).format(FMT)));
 }
 
 export default FrontendTimeLine;

package/es/Player/segment_timeline.js

@@ -16,7 +16,8 @@ function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useCallback, useMemo } from 'react';
 import { useTimes } from './timeline';
 import useBarStatus from './contraller_bar/useBarStatus';
-import { dateFormat } from './util';
+import moment from 'moment';
+import { FMT } from './util';
 import "./style/timeline.css";
 
 function SegmentTimeLine(_ref) {
@@ -40,7 +41,7 @@ function SegmentTimeLine(_ref) {
     }).reduce(function (a, b, i) {
       return i >= index ? a : a + b;
     }, 0);
-  }, [index]);
+  }, [index, segments]);
   var playPercent = useMemo(function () {
     return (currentTime + indexDuration) / duration * 100;
   }, [currentTime, duration, indexDuration]);
@@ -66,7 +67,7 @@ function SegmentTimeLine(_ref) {
     } else {
       api.seekTo(currentTime);
     }
-  }, [api, segments, index]);
+  }, [segments, api, index, setIndex]);
   return /*#__PURE__*/React.createElement("div", {
     className: "player-timeline-layout player-segment-timeline-layout ".concat(status === 0 ? 'hide-time-line' : '')
   }, /*#__PURE__*/React.createElement("div", {
@@ -113,8 +114,8 @@ function TipTitle(_ref2) {
       var _end = begin + (segments[0].endTime - segments[0].beginTime);
 
       return {
-        start: dateFormat(_start),
-        end: dateFormat(_end)
+        start: moment(_start).format(FMT),
+        end: moment(_end).format(FMT)
       };
     }
 
@@ -126,8 +127,8 @@ function TipTitle(_ref2) {
     var start = begin + indexDuration;
     var end = start + (segments[index].endTime - segments[index].beginTime);
     return {
-      start: dateFormat(start),
-      end: dateFormat(end)
+      start: moment(start).format(FMT),
+      end: moment(end).format(FMT)
     };
   }, [index, segments, begin]),
       start = _useMemo.start,

package/es/Player/util.d.ts

@@ -22,28 +22,6 @@ export declare const playUnload: (video: HTMLVideoElement, flv?: Flvjs.Player, h
  */
 export declare function getVideoType(url: string): "flv" | "native" | "m3u8";
 export declare function timeStamp(second: number): string;
-/**
- * 日期格式化
- * @param {*} timetemp
- */
-export declare function dateFormat(timetemp: number): string;
-/**
- * 全屏
- * @param {*} element
- */
-export declare function fullscreen(element: HTMLElement): void;
-/**
- * exitFullscreen 退出全屏
- * @param  {Objct} element 选择器
- */
-export declare function exitFullscreen(): void;
-/**
- * 判读是否支持全屏
- */
-export declare function fullscreenEnabled(): boolean;
-/**
- * [isFullscreen 判断浏览器是否全屏]
- * @return [全屏则返回当前调用全屏的元素,不全屏返回false]
- */
-export declare function isFullscreen(ele: HTMLElement): boolean;
 export declare function getRandom(): string;
+export declare function tryCatch(fn: () => void | Promise<any>): Promise<void>;
+export declare const FMT = "YYYY-MM-DD HH:mm:ss";

package/es/Player/util.js

@@ -1,3 +1,8 @@
+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); }
+
+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; }
+
+import { __awaiter } from "tslib";
 import Flvjs from 'flv.zv.js';
 import Hls from 'hls.js';
 import Events from './event/eventName';
@@ -62,7 +67,9 @@ export var playReload = function playReload(video, event, flv, hls, url) {
   if (flv) {
     flv.unload();
     flv.load();
-    flv.play();
+    tryCatch(function () {
+      return flv.play();
+    });
   }
 
   if (hls) {
@@ -71,12 +78,16 @@ export var playReload = function playReload(video, event, flv, hls, url) {
     hls.stopLoad();
     hls.startLoad();
     hls.loadSource(url);
-    video.play();
+    tryCatch(function () {
+      return video.play();
+    });
   }
 
   if (!flv && !hls) {
     video.setAttribute('src', url);
-    video.play();
+    tryCatch(function () {
+      return video.play();
+    });
   }
 
   event.emit(Events.RELOAD);
@@ -120,56 +131,34 @@ export function timeStamp(second) {
 
   return "".concat(h < 10 ? '0' + h : h, ":").concat(m < 10 ? '0' + m : m, ":").concat(s < 10 ? '0' + s : s);
 }
-/**
- * 日期格式化
- * @param {*} timetemp
- */
-
-export function dateFormat(timetemp) {
-  var date = new Date(timetemp);
-  var YYYY = date.getFullYear();
-  var DD = date.getDate();
-  var MM = date.getMonth() + 1;
-  var hh = date.getHours();
-  var mm = date.getMinutes();
-  var ss = date.getSeconds();
-  return "".concat(YYYY, ".").concat(MM > 9 ? MM : '0' + MM, ".").concat(DD > 9 ? DD : '0' + DD, " ").concat(hh > 9 ? hh : '0' + hh, ".").concat(mm > 9 ? mm : '0' + mm, ".").concat(ss > 9 ? ss : '0' + ss);
-}
-/**
- * 全屏
- * @param {*} element
- */
-
-export function fullscreen(element) {
-  element.requestFullscreen();
-}
-/**
- * exitFullscreen 退出全屏
- * @param  {Objct} element 选择器
- */
-
-export function exitFullscreen() {
-  document.exitFullscreen();
-}
-/**
- * 判读是否支持全屏
- */
-
-export function fullscreenEnabled() {
-  return document.fullscreenEnabled;
-}
-/**
- * [isFullscreen 判断浏览器是否全屏]
- * @return [全屏则返回当前调用全屏的元素,不全屏返回false]
- */
-
-export function isFullscreen(ele) {
-  if (!ele) {
-    return false;
-  }
-
-  return document.fullscreenElement === ele;
-}
 export function getRandom() {
   return Math.random().toString(36).substr(2);
-}
+}
+export function tryCatch(fn) {
+  return __awaiter(this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    return _regeneratorRuntime().wrap(function _callee$(_context) {
+      while (1) {
+        switch (_context.prev = _context.next) {
+          case 0:
+            _context.prev = 0;
+            _context.next = 3;
+            return fn();
+
+          case 3:
+            _context.next = 8;
+            break;
+
+          case 5:
+            _context.prev = 5;
+            _context.t0 = _context["catch"](0);
+            console.debug(_context.t0);
+
+          case 8:
+          case "end":
+            return _context.stop();
+        }
+      }
+    }, _callee, null, [[0, 5]]);
+  }));
+}
+export var FMT = 'YYYY-MM-DD HH:mm:ss';

package/es/PlayerExt/index.d.ts

@@ -1,5 +1,5 @@
 /// <reference types="react" />
-import { ISegmentType } from 'src/Player/player';
+import { ISegmentType } from '../Player/player';
 import './index.less';
 export declare type PlayModeType = 1 | 2;
 export interface IPluginProps {

package/es/ScreenPlayer/PlayerWithExt.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
-import type { ExportPlayerType, ISegmentType, ISinglePlayerProps } from 'src/Player/player';
-import type { PlayModeType } from 'src/PlayerExt';
+import type { ExportPlayerType, ISegmentType, ISinglePlayerProps } from '../Player/player';
+import type { PlayModeType } from '../PlayerExt';
 interface ILivePlayerWithExtProps extends ISinglePlayerProps {
     mode?: PlayModeType;
     style: React.CSSProperties;

package/es/ScreenPlayer/index.d.ts

@@ -1,6 +1,5 @@
-/// <reference types="react" />
-declare const _default: {
+declare const Sceenplayer: {
     LivePlayer: import("react").ComponentType<import("./interface").ILivePlayerProps>;
     RecordPlayer: import("react").ComponentType<import("./interface").IRecordPlayerProps>;
 };
-export default _default;
+export default Sceenplayer;

package/es/ScreenPlayer/index.js

@@ -1,7 +1,8 @@
-import withErrorBoundary from 'src/withErrorBoundary';
+import withErrorBoundary from '../withErrorBoundary';
 import LivePlayer from './Live';
 import RecordPlayer from './Record';
-export default {
+var Sceenplayer = {
   LivePlayer: withErrorBoundary(LivePlayer),
   RecordPlayer: withErrorBoundary(RecordPlayer)
-};
+};
+export default Sceenplayer;

package/es/ScreenPlayer/useRecordList.d.ts

@@ -1,3 +1,3 @@
-import { ISegmentType } from 'src/Player/player';
+import { ISegmentType } from '../Player/player';
 import { RecordItem } from './interface';
 export default function useRecordList(list: RecordItem[], queryRecord: (options: any) => Promise<ISegmentType[]>): RecordItem[];

package/es/ScreenPlayer/utils.d.ts

@@ -1,4 +1,4 @@
-import { ISegmentType } from 'src/Player/player';
+import { ISegmentType } from '../Player/player';
 export declare const ScreenType: {
     name: number;
     width: string;

package/es/Timeout/index.d.ts

@@ -0,0 +1,33 @@
+/// <reference types="react" />
+import { BasicTarget } from 'ahooks/es/utils/domTarget';
+import 'antd/es/modal/style/css';
+interface ITimeoutProps {
+    /**
+     *ß
+     */
+    contianer?: BasicTarget;
+    /**
+     * 超时时长单位s
+     */
+    time?: number;
+    /**
+     * 超时动作，默认退出登录
+     */
+    onTimeout?: () => void;
+}
+/**
+ *
+ */
+declare function Timeout({ contianer, time, onTimeout }: ITimeoutProps): JSX.Element;
+declare namespace Timeout {
+    var defaultProps: {
+        time: number;
+        contianer: HTMLElement;
+        onTimeout: typeof defaultTimeoutAction;
+    };
+}
+declare function defaultTimeoutAction(): {
+    destroy: () => void;
+    update: (configUpdate: import("antd").ModalFuncProps | ((prevConfig: import("antd").ModalFuncProps) => import("antd").ModalFuncProps)) => void;
+};
+export default Timeout;

package/es/Timeout/index.js

@@ -0,0 +1,83 @@
+import "antd/lib/modal/style";
+import _Modal from "antd/lib/modal";
+import _useEventListener from "ahooks/es/useEventListener";
+import _useRafInterval from "ahooks/es/useRafInterval";
+
+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, useRef, useState } from 'react';
+//此处antd有bug不能定制样式前缀
+import 'antd/es/modal/style/css';
+/**
+ *
+ */
+
+function Timeout(_ref) {
+  var contianer = _ref.contianer,
+      time = _ref.time,
+      onTimeout = _ref.onTimeout;
+  var cuurentTimeRef = useRef(Date.now());
+  var lockstatusRef = useRef(false);
+
+  var _useState = useState({
+    timelock: Date.now()
+  }),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  _useRafInterval(function () {
+    return setState(function (old) {
+      return Object.assign(Object.assign({}, old), {
+        timelock: Date.now()
+      });
+    });
+  }, 1 * 1000);
+
+  useEffect(function () {
+    if (!lockstatusRef.current && state.timelock - cuurentTimeRef.current > time * 1000) {
+      lockstatusRef.current = true;
+      onTimeout && onTimeout();
+      setTimeout(function () {
+        return lockstatusRef.current = false;
+      }, 1000);
+    } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+  }, [state.timelock, time]);
+
+  _useEventListener('mousemove', function () {
+    return cuurentTimeRef.current = Date.now();
+  }, {
+    target: contianer
+  });
+
+  return /*#__PURE__*/React.createElement(React.Fragment, null);
+}
+
+function defaultTimeoutAction() {
+  return _Modal.warning({
+    title: '系统提示',
+    content: /*#__PURE__*/React.createElement("p", null, "\u60A8\u957F\u65F6\u95F4\u672A\u64CD\u4F5C\u7CFB\u7EDF\uFF0C\u8BF7\u91CD\u65B0\u767B\u5F55\uFF01"),
+    onOk: function onOk() {
+      sessionStorage.clear();
+      window.location.replace('/login');
+    }
+  });
+}
+
+Timeout.defaultProps = {
+  time: 15 * 60,
+  contianer: document.body,
+  onTimeout: defaultTimeoutAction
+};
+export default Timeout;

package/es/index.d.ts

@@ -32,6 +32,7 @@ export { default as SegmentPlayer } from './SegmentPlayer';
 export { default as Service } from './Service';
 export { default as TableLayout } from './TableLayout';
 export { default as ThemeAntd } from './ThemeAntd';
+export { default as Timeout } from './Timeout';
 export { default as Tree } from './Tree';
 export { default as useHistory } from './useHistory';
 export { default as useInfiniteScroll } from './useInfiniteScroll';

package/es/index.js

@@ -32,6 +32,7 @@ export { default as SegmentPlayer } from './SegmentPlayer';
 export { default as Service } from './Service';
 export { default as TableLayout } from './TableLayout';
 export { default as ThemeAntd } from './ThemeAntd';
+export { default as Timeout } from './Timeout';
 export { default as Tree } from './Tree';
 export { default as useHistory } from './useHistory';
 export { default as useInfiniteScroll } from './useInfiniteScroll';

package/es/withErrorBoundary/index.d.ts

@@ -5,4 +5,5 @@ import { IErrorBoundaryProps } from '../ErrorBoundary';
  * @param Component 业务组件
  * @param errorBoundaryProps error boundary的props
  */
-export default function withErrorBoundary<P>(Component: React.ComponentType<P>, errorBoundaryProps?: IErrorBoundaryProps): React.ComponentType<P>;
+declare function withErrorBoundary<P>(Component: React.ComponentType<P>, errorBoundaryProps?: IErrorBoundaryProps): React.ComponentType<P>;
+export default withErrorBoundary;

package/es/withErrorBoundary/index.js

@@ -29,7 +29,7 @@ var Fallback = function Fallback() {
  */
 
 
-export default function withErrorBoundary(Component, errorBoundaryProps) {
+function withErrorBoundary(Component, errorBoundaryProps) {
   var Wrapped = function Wrapped(props) {
     return /*#__PURE__*/React.createElement(ErrorBoundary, Object.assign({
       fallback: /*#__PURE__*/React.createElement(Fallback, null)
@@ -40,4 +40,6 @@ export default function withErrorBoundary(Component, errorBoundaryProps) {
   var name = Component.displayName || Component.name || 'Unknown';
   Wrapped.displayName = "withErrorBoundary(".concat(name, ")");
   return Wrapped;
-}
+}
+
+export default withErrorBoundary;

package/package.json

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

package/release-build.sh

@@ -0,0 +1,19 @@
+#! /bin/sh
+
+npm run build
+
+npm run deploy
+
+git add .
+
+git commit -m "新版本构建发布"
+
+git pull
+
+git push
+
+nrm use npm
+
+npm publish
+
+exit 1