@cloud-app-dev/vidc 3.1.4 → 3.1.6

package/es/ScreenPlayer/PlayerWithExt.d.ts

@@ -21,6 +21,7 @@ interface IFrontendPlayerWithExtProps extends Omit<ILivePlayerWithExtProps, 'url
     segments?: ISegmentType[];
     begin?: number;
     httpLoading: boolean;
+    localRecordTimeParams?: [string, string];
 }
-export declare function FrontendPlayerWithExt({ mode, style, className, segments, updatePlayer, onClick, pluginDownloadUrl, httpLoading, }: IFrontendPlayerWithExtProps): JSX.Element;
+export declare function FrontendPlayerWithExt({ mode, style, className, segments, updatePlayer, onClick, pluginDownloadUrl, httpLoading, localRecordTimeParams, }: IFrontendPlayerWithExtProps): JSX.Element;
 export {};

package/es/ScreenPlayer/PlayerWithExt.js

@@ -121,7 +121,9 @@ export function FrontendPlayerWithExt(_ref) {
       updatePlayer = _ref.updatePlayer,
       onClick = _ref.onClick,
       pluginDownloadUrl = _ref.pluginDownloadUrl,
-      httpLoading = _ref.httpLoading;
+      httpLoading = _ref.httpLoading,
+      _ref$localRecordTimeP = _ref.localRecordTimeParams,
+      localRecordTimeParams = _ref$localRecordTimeP === void 0 ? ['begin', 'end'] : _ref$localRecordTimeP;
 
   var _a;
 
@@ -143,13 +145,18 @@ export function FrontendPlayerWithExt(_ref) {
         begin = _ref2[0],
         end = _ref2[1];
     var videoUrl = new URL(segments[0].url);
-    videoUrl.searchParams.set('begin', "".concat(moment(begin).unix()));
-    videoUrl.searchParams.set('end', "".concat(moment(end).unix()));
+
+    var _localRecordTimeParam = _slicedToArray(localRecordTimeParams, 2),
+        startParams = _localRecordTimeParam[0],
+        endParams = _localRecordTimeParam[1];
+
+    videoUrl.searchParams.set(startParams, "".concat(moment(begin).unix()));
+    videoUrl.searchParams.set(endParams, "".concat(moment(end).unix()));
     setState({
       begin: begin,
       end: end,
       url: videoUrl.toString()
-    });
+    }); // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [segments]);
   var seekTo = useCallback(function (time) {
     if (!state.url) {
@@ -159,14 +166,20 @@ export function FrontendPlayerWithExt(_ref) {
     var endTime = moment().unix();
     var beginTime = moment(time).unix();
     var videoUrl = new URL(state.url);
-    videoUrl.searchParams.set('begin', "".concat(beginTime));
-    videoUrl.searchParams.set('end', "".concat(endTime));
+
+    var _localRecordTimeParam2 = _slicedToArray(localRecordTimeParams, 2),
+        startParams = _localRecordTimeParam2[0],
+        endParams = _localRecordTimeParam2[1];
+
+    videoUrl.searchParams.set(startParams, "".concat(beginTime));
+    videoUrl.searchParams.set(endParams, "".concat(endTime));
     setState(function (old) {
       return Object.assign(Object.assign({}, old), {
         url: videoUrl.toString()
       });
     });
-  }, [state.url]);
+  }, // eslint-disable-next-line react-hooks/exhaustive-deps
+  [state.url]);
 
   var forceUpdate = _useUpdate();
 

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, oneWinExtTools, allWinExtTools, fpsDelay, fps, queryRecordErrorHandle, ...options }: IRecordPlayerProps): JSX.Element;
+declare function RecordPlayer({ list, children, queryRecord, onIndexChange, onClose, onCloseAll, download, snapshot, defaultScreen, screenChange, defaultSelectIndex, oneWinExtTools, allWinExtTools, fpsDelay, fps, queryRecordErrorHandle, localRecordTimeParams, ...options }: IRecordPlayerProps): JSX.Element;
 export default RecordPlayer;

package/es/ScreenPlayer/Record.js

@@ -76,7 +76,8 @@ function RecordPlayer(_a) {
       fpsDelay = _a.fpsDelay,
       fps = _a.fps,
       queryRecordErrorHandle = _a.queryRecordErrorHandle,
-      options = __rest(_a, ["list", "children", "queryRecord", "onIndexChange", "onClose", "onCloseAll", "download", "snapshot", "defaultScreen", "screenChange", "defaultSelectIndex", "oneWinExtTools", "allWinExtTools", "fpsDelay", "fps", "queryRecordErrorHandle"]);
+      localRecordTimeParams = _a.localRecordTimeParams,
+      options = __rest(_a, ["list", "children", "queryRecord", "onIndexChange", "onClose", "onCloseAll", "download", "snapshot", "defaultScreen", "screenChange", "defaultSelectIndex", "oneWinExtTools", "allWinExtTools", "fpsDelay", "fps", "queryRecordErrorHandle", "localRecordTimeParams"]);
 
   var _useState = useState(Object.assign(Object.assign({}, cloneDeep(defaultState)), {
     screenNum: defaultScreen !== null && defaultScreen !== void 0 ? defaultScreen : defaultState.screenNum
@@ -184,7 +185,7 @@ function RecordPlayer(_a) {
             mergeList[i] = undefined;
           } else {
             if (!mergeList[i]) {
-              mergeList[i] = {};
+              mergeList[i] = cloneDeep(item);
             }
 
             mergeList[i].date = item.date;
@@ -453,7 +454,8 @@ function RecordPlayer(_a) {
         width: screenType.width,
         height: screenType.height
       },
-      httpLoading: state.winLoadingStatus[index]
+      httpLoading: state.winLoadingStatus[index],
+      localRecordTimeParams: localRecordTimeParams
     }));
   })), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-group"

package/es/ScreenPlayer/demo2.js

@@ -23,6 +23,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, { useMemo, useState } from 'react';
 import RecordPlayer from './Record';
 import moment from 'moment';
@@ -31,14 +32,16 @@ import { completionSegments } from './utils';
 var token = "eyJhbGciOiJIUzI1NiJ9.eyJvcmdhbml6YXRpb25JZCI6IjEwMDEwMTAwMDQ0NSIsImV4dCI6MTY2NTc0ODU1OTg5MSwidWlkIjoiMTAxMDAwMDAwNjk5IiwidmFsaWRTdGF0ZSI6MTA0NDA2LCJyb2xlSWQiOlsxMDAwMDAxMTA1MTgsMTAwMDAwMTEwNzI4XSwidmFsaWRUaW1lIjoxNzA0MzgzOTk5MDAwLCJvcHRDZW50ZXJJZCI6IjEwMDEwMDAwMDIzMyIsInVzZXJUeXBlIjoxMDA3MDQsImlhdCI6MTY2NTQ4OTM1OTg5MX0.zxxxxoaKjyO6CJhi2cs06gTOtjdLgPA9UI7zAQ0zzss";
 var cids = ['538509097', '539172446'];
 
-var query = function query(_ref) {
-  var cid = _ref.cid,
-      date = _ref.date,
-      recordType = _ref.recordType;
+var query = function query(_a) {
   // return new Promise((reslove) => {
   //   setTimeout(() => reslove([]), 2000);
   // });
-  // console.log(cid, date, recordType);
+  var cid = _a.cid,
+      date = _a.date,
+      recordType = _a.recordType,
+      props = __rest(_a, ["cid", "date", "recordType"]);
+
+  console.log(cid, date, recordType, props);
   var m = moment(date);
   var beginTime = m.set({
     hours: 0,
@@ -131,7 +134,8 @@ export default function App() {
           }).valueOf(),
           cid: flag ? cids[0] : cids[1],
           type: flag ? 'hls' : 'flv',
-          recordType: flag ? 1 : 2
+          recordType: flag ? 1 : 2,
+          aaa: 111
         };
         return Object.assign(Object.assign({}, old), {
           list: _toConsumableArray(list)

package/es/ScreenPlayer/interface.d.ts

@@ -82,6 +82,8 @@ export interface IRecordPlayerProps {
 
   fpsDelay?: number;
   fps?: number;
+
+  localRecordTimeParams?: [string, string];
 }
 
 export interface IRecordPlayerState {

package/es/ScreenPlayer/useRecordList.js

@@ -126,11 +126,11 @@ function useRecordList(list, queryRecord, options) {
               }
 
               _context.next = 23;
-              return queryRecord({
+              return queryRecord(Object.assign(Object.assign({}, item), {
                 cid: item.cid,
                 date: item.date,
                 recordType: item.recordType
-              });
+              }));
 
             case 23:
               segments = _context.sent;
@@ -149,11 +149,11 @@ function useRecordList(list, queryRecord, options) {
               }
 
               _context.next = 30;
-              return queryRecord({
+              return queryRecord(Object.assign(Object.assign({}, item), {
                 cid: item.cid,
                 date: item.date,
                 recordType: item.recordType
-              });
+              }));
 
             case 30:
               _segments = _context.sent;
@@ -172,11 +172,11 @@ function useRecordList(list, queryRecord, options) {
               }
 
               _context.next = 37;
-              return queryRecord({
+              return queryRecord(Object.assign(Object.assign({}, item), {
                 cid: item.cid,
                 date: item.date,
                 recordType: item.recordType
-              });
+              }));
 
             case 37:
               _segments2 = _context.sent;

package/es/ThemeAntd/index.css

@@ -16,6 +16,15 @@ div .cloudapp-btn-primary:focus {
   border-color: var(--primary-dark);
   color: #fff;
 }
+div .cloudapp-btn-primary[disabled],
+div .cloudapp-btn-primary[disabled]:hover,
+div .cloudapp-btn-primary[disabled]:focus,
+div .cloudapp-btn-primary[disabled]:active {
+  background: var(--primary-dark);
+  border-color: var(--primary-dark);
+  color: #fff;
+  opacity: 0.8;
+}
 div .cloudapp-btn-background-ghost.cloudapp-btn-primary {
   color: var(--primary);
   border-color: var(--primary);
@@ -534,6 +543,10 @@ div .cloudapp .cloudapp-node-content-wrapper.cloudapp-node-selected {
   background-color: transparent;
   border-bottom: 1px solid var(--secondary2);
 }
+div .cloudapp-tree-checkbox-inner {
+  background-color: var(--form-bg);
+  border-color: var(--form-bd);
+}
 div .cloudapp-table {
   background-color: var(--table-bg);
   color: inherit;

package/es/ThemeAntd/style/button.css

@@ -16,6 +16,15 @@ div .cloudapp-btn-primary:focus {
   border-color: var(--primary-dark);
   color: #fff;
 }
+div .cloudapp-btn-primary[disabled],
+div .cloudapp-btn-primary[disabled]:hover,
+div .cloudapp-btn-primary[disabled]:focus,
+div .cloudapp-btn-primary[disabled]:active {
+  background: var(--primary-dark);
+  border-color: var(--primary-dark);
+  color: #fff;
+  opacity: 0.8;
+}
 div .cloudapp-btn-background-ghost.cloudapp-btn-primary {
   color: var(--primary);
   border-color: var(--primary);

package/es/ThemeAntd/style/tree.css

@@ -10,3 +10,7 @@ div .cloudapp .cloudapp-node-content-wrapper.cloudapp-node-selected {
   background-color: transparent;
   border-bottom: 1px solid var(--secondary2);
 }
+div .cloudapp-tree-checkbox-inner {
+  background-color: var(--form-bg);
+  border-color: var(--form-bd);
+}

package/package.json

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