@cloud-app-dev/vidc 3.0.15 → 3.0.16

package/es/ScreenPlayer/Live.d.ts

@@ -1,7 +1,7 @@
 /// <reference types="react" />
 import type { ILivePlayerProps } from './interface';
 import './index.less';
-declare function LivePlayer({ list, children, onIndexChange, onClose, onCloseAll, snapshot, defaultScreen, screenChange, defaultSelectIndex }: ILivePlayerProps): JSX.Element;
+declare function LivePlayer({ list, children, onIndexChange, onClose, onCloseAll, snapshot, defaultScreen, screenChange, defaultSelectIndex, ...options }: ILivePlayerProps): JSX.Element;
 declare namespace LivePlayer {
     var defaultProps: {
         list: any[];

package/es/ScreenPlayer/Live.js

@@ -20,6 +20,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
+import { __rest } from "tslib";
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { ScreenType, mergeFill } from './utils';
 import { LivePlayerWithExt } from './PlayerWithExt';
@@ -27,16 +28,17 @@ import Tools from './LiveTools';
 import useVideoFit from './useVideoFit';
 import "./index.css";
 
-function LivePlayer(_ref) {
-  var list = _ref.list,
-      children = _ref.children,
-      onIndexChange = _ref.onIndexChange,
-      onClose = _ref.onClose,
-      onCloseAll = _ref.onCloseAll,
-      snapshot = _ref.snapshot,
-      defaultScreen = _ref.defaultScreen,
-      screenChange = _ref.screenChange,
-      defaultSelectIndex = _ref.defaultSelectIndex;
+function LivePlayer(_a) {
+  var list = _a.list,
+      children = _a.children,
+      onIndexChange = _a.onIndexChange,
+      onClose = _a.onClose,
+      onCloseAll = _a.onCloseAll,
+      snapshot = _a.snapshot,
+      defaultScreen = _a.defaultScreen,
+      screenChange = _a.screenChange,
+      defaultSelectIndex = _a.defaultSelectIndex,
+      options = __rest(_a, ["list", "children", "onIndexChange", "onClose", "onCloseAll", "snapshot", "defaultScreen", "screenChange", "defaultSelectIndex"]);
 
   var _useState = useState({
     screenNum: defaultScreen !== null && defaultScreen !== void 0 ? defaultScreen : 4,
@@ -51,18 +53,24 @@ function LivePlayer(_ref) {
 
   var _useVideoFit = useVideoFit(domRef, []),
       fit = _useVideoFit.fit,
-      toggleFit = _useVideoFit.toggleFit; // 缓存所有player对象
+      toggleFit = _useVideoFit.toggleFit; // 若外部来控制screenNum 则由外部完全控制
 
 
+  var screenNum = useMemo(function () {
+    var _a;
+
+    return (_a = options.screenNum) !== null && _a !== void 0 ? _a : state.screenNum;
+  }, [options.screenNum, state.screenNum]); // 缓存所有player对象
+
   var playerRef = useRef([]);
   var screenType = useMemo(function () {
     return ScreenType.find(function (v) {
-      return v.name === state.screenNum;
+      return v.name === screenNum;
     });
-  }, [state.screenNum]);
+  }, [screenNum]);
   var screenList = useMemo(function () {
-    return mergeFill(state.screenNum, list, {});
-  }, [list, state.screenNum]); // 获取选中player对象
+    return mergeFill(screenNum, list, {});
+  }, [list, screenNum]); // 获取选中player对象
 
   var getPlayerItem = function getPlayerItem() {
     var _a;
@@ -75,9 +83,15 @@ function LivePlayer(_ref) {
     var obj = {};
 
     if (newState.hasOwnProperty('screenNum')) {
-      obj.screenNum = newState.screenNum;
+      if (options.screenNum) {
+        // 若外部控制，不需要update state
+        screenChange === null || screenChange === void 0 ? void 0 : screenChange(newState.screenNum);
+      } else {
+        obj.screenNum = newState.screenNum;
+      } // 修正选中索引
+
 
-      if (obj.screenNum < state.selectIndex) {
+      if (newState.screenNum < state.selectIndex) {
         obj.selectIndex = 0;
       }
     }
@@ -166,7 +180,7 @@ function LivePlayer(_ref) {
     disabled: !segmentItem.url,
     toggleFit: toggleFit,
     getPlayerItem: getPlayerItem,
-    screenNum: state.screenNum,
+    screenNum: screenNum,
     mode: state.modes[state.selectIndex],
     containerRef: domRef,
     updateState: updateState,

package/es/ScreenPlayer/Record.d.ts

@@ -6,5 +6,5 @@ import './index.less';
  * @param param0
  * @returns
  */
-declare function RecordPlayer({ list, children, queryRecord, onIndexChange, onClose, onCloseAll, download, snapshot, defaultScreen, screenChange, defaultSelectIndex, }: IRecordPlayerProps): JSX.Element;
+declare function RecordPlayer({ list, children, queryRecord, onIndexChange, onClose, onCloseAll, download, snapshot, defaultScreen, screenChange, defaultSelectIndex, ...options }: IRecordPlayerProps): JSX.Element;
 export default RecordPlayer;

package/es/ScreenPlayer/Record.js

@@ -27,7 +27,7 @@ function _iterableToArrayLimit(arr, i) { var _i = arr == null ? null : typeof Sy
 
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 
-import { __awaiter } from "tslib";
+import { __awaiter, __rest } from "tslib";
 import React, { useCallback, useEffect, useMemo, useRef, useState } from 'react';
 import { ScreenType, mergeFill, differenceWithIndexs, FILTER_KEY } from './utils';
 import { SegmentPlayerWithExt, FrontendPlayerWithExt } from './PlayerWithExt';
@@ -53,39 +53,46 @@ var defaultState = {
  * @returns
  */
 
-function RecordPlayer(_ref) {
+function RecordPlayer(_a) {
   var _this = this;
 
-  var list = _ref.list,
-      children = _ref.children,
-      queryRecord = _ref.queryRecord,
-      onIndexChange = _ref.onIndexChange,
-      onClose = _ref.onClose,
-      onCloseAll = _ref.onCloseAll,
-      download = _ref.download,
-      snapshot = _ref.snapshot,
-      defaultScreen = _ref.defaultScreen,
-      screenChange = _ref.screenChange,
-      defaultSelectIndex = _ref.defaultSelectIndex;
+  var list = _a.list,
+      children = _a.children,
+      queryRecord = _a.queryRecord,
+      onIndexChange = _a.onIndexChange,
+      onClose = _a.onClose,
+      onCloseAll = _a.onCloseAll,
+      download = _a.download,
+      snapshot = _a.snapshot,
+      defaultScreen = _a.defaultScreen,
+      screenChange = _a.screenChange,
+      defaultSelectIndex = _a.defaultSelectIndex,
+      options = __rest(_a, ["list", "children", "queryRecord", "onIndexChange", "onClose", "onCloseAll", "download", "snapshot", "defaultScreen", "screenChange", "defaultSelectIndex"]);
 
   var _useState = useState(Object.assign(Object.assign({}, defaultState), {
     screenNum: defaultScreen !== null && defaultScreen !== void 0 ? defaultScreen : defaultState.screenNum
   })),
       _useState2 = _slicedToArray(_useState, 2),
       state = _useState2[0],
-      setState = _useState2[1];
+      setState = _useState2[1]; // 若外部来控制screenNum 则由外部完全控制
 
+
+  var screenNum = useMemo(function () {
+    var _a;
+
+    return (_a = options.screenNum) !== null && _a !== void 0 ? _a : state.screenNum;
+  }, [options.screenNum, state.screenNum]);
   var domRef = useRef(null);
   var screenType = useMemo(function () {
     return ScreenType.find(function (v) {
-      return v.name === state.screenNum;
+      return v.name === screenNum;
     });
-  }, [state.screenNum]);
+  }, [screenNum]);
   var screenList = useMemo(function () {
-    return mergeFill(state.screenNum, list, {
+    return mergeFill(screenNum, list, {
       recordType: 1
     });
-  }, [state.screenNum, list]);
+  }, [screenNum, list]);
 
   var _useVideoFit = useVideoFit(domRef, []),
       fit = _useVideoFit.fit,
@@ -198,9 +205,15 @@ function RecordPlayer(_ref) {
     var obj = {};
 
     if (newState.hasOwnProperty('screenNum')) {
-      obj.screenNum = newState.screenNum;
+      if (options.screenNum) {
+        // 若外部控制，不需要update state
+        screenChange === null || screenChange === void 0 ? void 0 : screenChange(newState.screenNum);
+      } else {
+        obj.screenNum = newState.screenNum;
+      } // 修正选中索引
+
 
-      if (obj.screenNum < state.selectIndex) {
+      if (newState.screenNum < state.selectIndex) {
         obj.selectIndex = 0;
       }
     }
@@ -404,7 +417,7 @@ function RecordPlayer(_ref) {
     fit: fit,
     toggleFit: toggleFit,
     getPlayerItem: getPlayerItem,
-    screenNum: state.screenNum,
+    screenNum: screenNum,
     mode: state.modes[state.selectIndex],
     containerRef: domRef,
     updateState: updateState,

package/es/ScreenPlayer/interface.d.ts

@@ -46,6 +46,8 @@ export interface IRecordPlayerProps {
 
   defaultScreen?: 1 | 4 | 6 | 9 | 16;
 
+  screenNum?: 1 | 4 | 6 | 9 | 16;
+
   defaultSelectIndex?: number;
 }
 
@@ -122,6 +124,8 @@ export interface ILivePlayerProps {
 
   defaultScreen?: 1 | 4 | 6 | 9 | 16;
 
+  screenNum?: 1 | 4 | 6 | 9 | 16;
+
   defaultSelectIndex?: number;
 }
 

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.0.15",
+  "version": "3.0.16",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -42,6 +42,8 @@
   },
   "devDependencies": {
     "@cloud-app-dev/utils": "^4.0.1",
+    "@testing-library/react-hooks": "^8.0.1",
+    "@types/jest": "^29.0.1",
     "@types/leaflet": "^1.7.11",
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^18.7.6",