@cloud-app-dev/vidc 3.2.9 → 3.2.11

package/es/List/DynamicGridList/Demo.js

@@ -28,9 +28,10 @@ function loadPage() {
   d.page ? d.page++ : d.page = 1;
   d.list ? d.list = [].concat(_toConsumableArray(d.list), _toConsumableArray(resultData)) : d.list = resultData;
   return new Promise(function (resolve) {
+    console.log(d.page);
     setTimeout(function () {
       return resolve(d);
-    }, 500);
+    }, 10);
   });
 }
 var App = function App() {

package/es/List/DynamicGridList/index.js

@@ -26,7 +26,7 @@ function DynamicGridList(_a) {
     data = _useInfiniteScroll.data,
     noMore = _useInfiniteScroll.noMore;
   _useUpdateEffect(function () {
-    return noMore && _message.success('数据已全部加载完成！');
+    noMore && _message.success('数据已全部加载完成！');
   }, [noMore]);
   function getItemData(data) {
     return {

package/es/Picture/index.js

@@ -8,6 +8,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { __awaiter, __rest } from "tslib";
+/* eslint-disable jsx-a11y/alt-text */
 import React, { useMemo, useRef, useState, useCallback, useEffect } from 'react';
 import DomMove from '../DomMove';
 import { getRectImagePath } from './loadCaptureRectImage';
@@ -257,9 +258,7 @@ function Picture(_a) {
       transform: "scale(".concat(scale, ") rotate(").concat(rotate, "deg)")
     }
   }, /*#__PURE__*/React.createElement("img", {
-    alt: "",
     ref: domImgRef,
-    crossOrigin: "anonymous",
     style: {
       maxWidth: baseXOrY === 'x' ? width || '100%' : 'unset',
       maxHeight: baseXOrY === 'x' ? 'unset' : height || '100%'

package/es/ScreenPlayer/Record.js

@@ -1,6 +1,6 @@
 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); }
-import _useMemoizedFn from "ahooks/es/useMemoizedFn";
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+import _useMemoizedFn from "ahooks/es/useMemoizedFn";
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return 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; }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
@@ -10,7 +10,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 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 { __awaiter, __rest } from "tslib";
-import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
+import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { ScreenType, mergeFill, sleep } from './utils';
 import { SegmentPlayerWithExt, FrontendPlayerWithExt } from './PlayerWithExt';
 import RecordTools from './RecordTools';
@@ -25,7 +25,11 @@ var defaultState = {
   modes: {},
   currentTimes: {},
   seekTo: {},
-  timeMode: 24
+  timeMode: 24,
+  begins: {}
+};
+var getKey = function getKey(item) {
+  return "".concat(item.cid, "-").concat(item.date);
 };
 /**
  * @desc 录像设计的时间全部需要到毫秒
@@ -33,7 +37,6 @@ var defaultState = {
  * @returns
  */
 function RecordPlayer(_a) {
-  var _this = this;
   var _b;
   var list = _a.list,
     children = _a.children,
@@ -75,21 +78,23 @@ function RecordPlayer(_a) {
   var getPlayerItem = function getPlayerItem() {
     var _a, _b;
     var item = screenList[state.selectIndex];
-    return item ? (_b = (_a = playerRef.current) === null || _a === void 0 ? void 0 : _a["".concat(item.cid, "-").concat(item.date)]) === null || _b === void 0 ? void 0 : _b.current : null;
+    return item ? (_b = (_a = playerRef.current) === null || _a === void 0 ? void 0 : _a["".concat(getKey(item))]) === null || _b === void 0 ? void 0 : _b.current : null;
   };
   // 当前窗口信息
   var segmentItem = useMemo(function () {
     return screenList[state.selectIndex] || {};
   }, [state.selectIndex, screenList]);
   var timeBegin = useMemo(function () {
-    return segmentItem.date;
-  }, [segmentItem.date]);
+    var _a;
+    return (_a = state.begins["".concat(getKey(segmentItem))]) !== null && _a !== void 0 ? _a : segmentItem.date - state.timeMode / 2 * 3600 * 1000;
+  }, [segmentItem, state.begins, state.timeMode]);
   var currentTime = useMemo(function () {
+    var _a;
     var item = screenList[state.selectIndex];
     if (!item) {
       return undefined;
     }
-    return state.currentTimes["".concat(item.cid, "-").concat(item.date)];
+    return (_a = state.currentTimes["".concat(getKey(item))]) !== null && _a !== void 0 ? _a : item.date;
   }, [state.currentTimes, screenList, state.selectIndex]);
   /**
    * @desc seek hook
@@ -181,7 +186,7 @@ function RecordPlayer(_a) {
     if (newState.hasOwnProperty('mode')) {
       var item = screenList[state.selectIndex];
       var newModes = Object.assign({}, state.modes);
-      newModes["".concat(item.cid, "-").concat(item.date)] = newState.mode;
+      newModes["".concat(getKey(item))] = newState.mode;
       obj.modes = newModes;
     }
     if (newState.hasOwnProperty('timeMode')) {
@@ -192,68 +197,62 @@ function RecordPlayer(_a) {
     });
   };
   /**
-   * @desc 两种情况：
+   * @desc currentTime两种情况：
    * 1:time在片断内，修改cuurentTime，更新seekTo交给seek hook去处理；
    * 2:不在片断内，查询新的片段，更新mergeSegments和seekTo后交给seek hook处理
+   *
+   * @desc begin 处理时间轴开始绘制的刻度
+   *
    */
-  var onTimeChange = useCallback(function (time, outTimeline) {
-    return __awaiter(_this, void 0, void 0, /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
-      var _c, index;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) {
-          switch (_context2.prev = _context2.next) {
-            case 0:
-              if (!(!Array.isArray(segmentItem.segments) || seekLoading)) {
-                _context2.next = 2;
-                break;
-              }
-              return _context2.abrupt("return");
-            case 2:
-              if (!(outTimeline && segmentItem.recordType === 1)) {
-                _context2.next = 5;
-                break;
-              }
-              // 云录像 若点击了缺失的片段，直接忽略
-              console.warn('当前录像片段缺失！');
-              return _context2.abrupt("return");
-            case 5:
-              if (!(time > Date.now())) {
-                _context2.next = 8;
-                break;
-              }
-              console.warn('查询时间超出正常范围！');
-              return _context2.abrupt("return");
-            case 8:
-              index = segmentItem.segments.findIndex(function (v) {
-                return time >= v.beginTime && time < v.endTime;
-              });
-              if (index === -1) {
-                // 触发回调
-                (_c = props.onTimeLineChange) === null || _c === void 0 ? void 0 : _c.call(props, time);
-              }
-              //更新time
-              setState(function (old) {
-                var currentTimes = Object.assign({}, old.currentTimes);
-                var item = screenList[old.selectIndex];
-                currentTimes["".concat(item.cid, "-").concat(item.date)] = time;
-                return Object.assign(Object.assign({}, old), {
-                  currentTimes: currentTimes,
-                  seekTo: Object.assign(Object.assign({}, old.seekTo), _defineProperty({}, "".concat(item.cid, "-").concat(item.date), time))
-                });
-              });
-            case 11:
-            case "end":
-              return _context2.stop();
-          }
-        }
-      }, _callee2);
-    }));
-  },
-  // eslint-disable-next-line react-hooks/exhaustive-deps
-  [segmentItem.cid, segmentItem.recordType, segmentItem.segments, seekLoading]);
+  var onTimeChange = _useMemoizedFn(function (options, outTimeline) {
+    var _a;
+    if (options.currentTime) {
+      var time = options.currentTime;
+      if (!Array.isArray(segmentItem.segments) || seekLoading) {
+        return;
+      }
+      if (outTimeline && segmentItem.recordType === 1) {
+        // 云录像 若点击了缺失的片段，直接忽略
+        console.warn('当前录像片段缺失！');
+        return;
+      }
+      if (time > Date.now()) {
+        console.warn('查询时间超出正常范围！');
+        return;
+      }
+      var index = segmentItem.segments.findIndex(function (v) {
+        return time >= v.beginTime && time < v.endTime;
+      });
+      if (index === -1) {
+        // 触发回调
+        (_a = props.onTimeLineChange) === null || _a === void 0 ? void 0 : _a.call(props, time);
+      }
+      //更新time
+      setState(function (old) {
+        var currentTimes = Object.assign({}, old.currentTimes);
+        var item = screenList[old.selectIndex];
+        currentTimes["".concat(getKey(item))] = time;
+        return Object.assign(Object.assign({}, old), {
+          currentTimes: currentTimes,
+          seekTo: Object.assign(Object.assign({}, old.seekTo), _defineProperty({}, "".concat(getKey(item)), time))
+        });
+      });
+    }
+    if (options.begin) {
+      //更新begin
+      setState(function (old) {
+        var begins = Object.assign({}, old.begins);
+        var item = screenList[old.selectIndex];
+        begins["".concat(getKey(item))] = options.begin;
+        return Object.assign(Object.assign({}, old), {
+          begins: begins
+        });
+      });
+    }
+  });
   var _updatePlayer = function updatePlayer(player, index) {
     var item = screenList[index];
-    playerRef.current["".concat(item.cid, "-").concat(item.date)] = player;
+    playerRef.current["".concat(getKey(item))] = player;
     setState(function (old) {
       return Object.assign({}, old);
     });
@@ -278,21 +277,22 @@ function RecordPlayer(_a) {
   // eslint-disable-next-line react-hooks/exhaustive-deps
   _useUpdateEffect(function () {
     var _a;
-    return (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, state.selectIndex);
+    (_a = props.onIndexChange) === null || _a === void 0 ? void 0 : _a.call(props, state.selectIndex);
   }, [state.selectIndex]);
   /**
    * 通知screenNum变化
    */
   _useUpdateEffect(function () {
     var _a;
-    return (_a = props.screenChange) === null || _a === void 0 ? void 0 : _a.call(props, state.screenNum);
+    (_a = props.screenChange) === null || _a === void 0 ? void 0 : _a.call(props, state.screenNum);
   }, [state.screenNum]);
+  // 单窗口关闭，清楚缓存key
   var onClose = _useMemoizedFn(function () {
     var _a;
     setState(function (old) {
       var item = screenList[old.selectIndex];
       if (item && item.cid && item.date) {
-        var key = "".concat(item.cid, "-").concat(item.date);
+        var key = "".concat(getKey(item));
         var currentTimes = Object.assign({}, old.currentTimes);
         var modes = Object.assign({}, old.modes);
         delete currentTimes[key];
@@ -307,6 +307,7 @@ function RecordPlayer(_a) {
     });
     (_a = props.onClose) === null || _a === void 0 ? void 0 : _a.call(props);
   });
+  // 关闭所以，清楚缓存key
   var onCloseAll = _useMemoizedFn(function () {
     var _a;
     setState(function (old) {

package/es/ScreenPlayer/RecordTools.d.ts

@@ -3,21 +3,24 @@ import { ExportPlayerType } from '../Player/player';
 import { PlayModeType } from '../PlayerExt';
 interface IToolsProps {
     containerRef: React.MutableRefObject<HTMLDivElement>;
+    screenNum: number;
+    mode: PlayModeType;
+    fit?: string;
+    timeMode: number;
+    time?: number;
     updateState: (state: {
         screenNum?: number;
         mode?: PlayModeType;
         timeMode?: number;
     }) => void;
-    screenNum: number;
-    mode: PlayModeType;
-    getPlayerItem: () => ExportPlayerType | undefined;
-    fit?: string;
+    onTimeChange?: (options: {
+        curentTime?: number;
+        begin?: number;
+    }) => void;
     toggleFit?: () => void;
-    time?: number;
-    onTimeChange?: (time: number) => void;
     onClose?: () => void;
     onCloseAll?: () => void;
-    timeMode: number;
+    getPlayerItem: () => ExportPlayerType | undefined;
     download?: () => void;
     snapshot?: (base64: string) => void;
     /**

package/es/ScreenPlayer/RecordTools.js

@@ -137,7 +137,11 @@ function RecordTools(_a) {
     }
   })), /*#__PURE__*/React.createElement(TimeSelect, {
     time: time,
-    onChange: props.onTimeChange
+    onChange: function onChange(time) {
+      return props.onTimeChange({
+        curentTime: time
+      });
+    }
   }), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-item",
     onClick: playToggle

package/es/ScreenPlayer/SegmentTimeLine.d.ts

@@ -3,7 +3,10 @@ import { ISegmentType } from '../Player/player';
 interface ISegmentTimeLineProps {
     begin?: number;
     segments?: ISegmentType[];
-    onTimeChange?: (time: number) => void;
+    onTimeChange?: (options: {
+        currentTime?: number;
+        begin?: number;
+    }) => void;
     timeMode: number;
     updateState: (state: {
         timeMode: number;

package/es/ScreenPlayer/SegmentTimeLine.js

@@ -1,6 +1,6 @@
 import _useThrottleFn2 from "ahooks/es/useThrottleFn";
 import moment from 'moment';
-import React, { useMemo, useRef } from 'react';
+import React, { useRef } from 'react';
 import useTimeSlider from './useTimeSlider';
 function SegmentTimeLine(_ref) {
   var begin = _ref.begin,
@@ -9,21 +9,23 @@ function SegmentTimeLine(_ref) {
     timeMode = _ref.timeMode,
     updateState = _ref.updateState,
     currentTime = _ref.currentTime;
+  var _a;
   var ref = useRef();
   var _useThrottleFn = _useThrottleFn2(onTimeChange, {
       wait: 300
     }),
     run = _useThrottleFn.run;
-  var time = useMemo(function () {
-    return begin !== null && begin !== void 0 ? begin : moment().set({
+  useTimeSlider(ref, {
+    begin: begin !== null && begin !== void 0 ? begin : moment().set({
       hours: 0,
       minutes: 0,
       seconds: 0
-    }).valueOf();
-  }, [begin]);
-  useTimeSlider(ref, {
-    begin: time - timeMode / 2 * 3600 * 1000,
-    currentTime: currentTime !== null && currentTime !== void 0 ? currentTime : time,
+    }).valueOf() - timeMode / 2 * 3600 * 1000,
+    currentTime: (_a = currentTime !== null && currentTime !== void 0 ? currentTime : begin) !== null && _a !== void 0 ? _a : moment().set({
+      hours: 0,
+      minutes: 0,
+      seconds: 0
+    }).valueOf(),
     onTimeChange: run,
     segments: segments,
     hoursPer: timeMode,

package/es/ScreenPlayer/demo2.js

@@ -20,7 +20,7 @@ import RecordPlayer from './Record';
 import moment from 'moment';
 import { completionSegments } from './utils';
 import Service from '../Service';
-var token = "eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2ODI1OTg2NjQyNywidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2ODAwMDY2NjQyN30.LukoTVo52uE6X5nqlXhDuXLX02mAbpRA5pR1ROObmKA";
+var token = "eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2ODg1NzQ3Mjc4NiwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2ODU5ODI3Mjc4Nn0.F0R_k3GRQfZ5yoL5MMUS4O2ghw0boWgnVs0Spf0pa0Q";
 var cids = ['560077633', '560073578'];
 var query = function query(_a) {
   var cid = _a.cid,

package/es/ScreenPlayer/interface.d.ts

@@ -119,6 +119,11 @@ export interface IRecordPlayerState {
    */
   currentTimes: { [key: string]: number };
 
+  /**
+   * 
+   */
+  begins: { [key: string]: number };
+
   /**
    * 需要seek的时间针对当前窗口，为0时忽略
    */

package/es/ScreenPlayer/useTimeSlider.d.ts

@@ -5,7 +5,10 @@ export interface ITimeSliderOptions {
     begin?: number;
     segments?: TimeCellItem[];
     currentTime?: number;
-    onTimeChange?: (time: number, outTimeline?: boolean) => void;
+    onTimeChange?: (options: {
+        currentTime?: number;
+        begin?: number;
+    }, outTimeline?: boolean) => void;
     onHoursPerChange?: (hour: number) => void;
 }
 export declare type ITimeSliderState = {

package/es/ScreenPlayer/useTimeSlider.js

@@ -158,7 +158,7 @@ function useTimeSlider(canvasRef, _ref2) {
       if (date.get('hours') === 0 && date.get('minutes') === 0) {
         lineH = 10;
         var big_date = graduation_title(date.valueOf());
-        var x = graduation_left - 12;
+        var x = graduation_left - 30;
         drawText(ctx, {
           fillStyle: normalLineColor,
           font: '10px Arial',
@@ -362,7 +362,7 @@ function useTimeSlider(canvasRef, _ref2) {
       return;
     }
     var clickDelay = Date.now() - extRef.current.mousedownTime;
-    if (clickDelay < 300 && e.target === canvas) {
+    if (clickDelay < 200 && e.target === canvas) {
       // click 事件
       var pos_x = get_cursor_x_position(e); //鼠标距离 px
       var ms_per_px = state.hoursPer * 3600 * 1000 / width; // ms/px
@@ -380,7 +380,9 @@ function useTimeSlider(canvasRef, _ref2) {
         });
       });
       _nextTick(function () {
-        return onTimeChange === null || onTimeChange === void 0 ? void 0 : onTimeChange(new_current, outTimeline);
+        return onTimeChange === null || onTimeChange === void 0 ? void 0 : onTimeChange({
+          currentTime: new_current
+        }, outTimeline);
       });
     }
     // 清楚拖拽关联信息
@@ -389,6 +391,7 @@ function useTimeSlider(canvasRef, _ref2) {
   }, {
     target: document
   });
+  var moveTimerRef = useRef(null);
   /**
    * 拖动处理
    */
@@ -396,6 +399,7 @@ function useTimeSlider(canvasRef, _ref2) {
     if (!extRef.current.mousedownTime) {
       return;
     }
+    clearTimeout(moveTimerRef.current);
     // 触发拖动
     var pos_x = get_cursor_x_position(e);
     var px_per_ms = width / (state.hoursPer * 60 * 60 * 1000); // px/ms
@@ -405,6 +409,11 @@ function useTimeSlider(canvasRef, _ref2) {
     update({
       begin: new_begin
     });
+    moveTimerRef.current = setTimeout(function () {
+      return onTimeChange === null || onTimeChange === void 0 ? void 0 : onTimeChange({
+        begin: new_begin
+      });
+    }, 300);
   }, {
     target: document
   });

package/package.json

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