@cloud-app-dev/vidc 4.0.4 → 4.0.5

package/es/Player/single_player.js

@@ -3,7 +3,6 @@ import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 import _useMemoizedFn from "ahooks/es/useMemoizedFn";
 import _useLatest from "ahooks/es/useLatest";
 import _useToggle3 from "ahooks/es/useToggle";
-import _cache from "@cloud-app-dev/utils/es/cache";
 var _excluded = ["className", "url", "type", "hideContrallerBar", "isLive", "errorReloadTimer", "children", "onCanPlayerInit", "extActions"];
 function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
@@ -18,7 +17,6 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { Watermark } from 'antd';
 import React, { useEffect, useImperativeHandle, useMemo, useRef, useState } from 'react';
 import { usePlayerApi } from "./api";
 import { Provider } from "./context";
@@ -36,7 +34,6 @@ import { getVideoType, playUnload } from "./util";
 import "./style/index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var WatermarkConfig = _cache.getCache('WatermarkConfig', 'session');
 var SinglePlayer = /*#__PURE__*/React.forwardRef(function SinglePlayer(_ref, ref) {
   var _props$reload;
   var className = _ref.className,
@@ -248,28 +245,26 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function SinglePlayer(_ref, ref
     container: state.container,
     isLive: isLive,
     isFpsPlay: state.isFpsPlay,
-    children: /*#__PURE__*/_jsx(Watermark, _objectSpread(_objectSpread({}, WatermarkConfig), {}, {
-      children: /*#__PURE__*/_jsxs("div", {
-        className: "lm-player-container ".concat(className),
-        ref: domRef,
-        children: [/*#__PURE__*/_jsxs("div", {
-          className: "player-mask-layout",
-          children: [/*#__PURE__*/_jsx("video", _objectSpread(_objectSpread({}, videoProps), {}, {
-            style: {
-              objectFit: fit,
-              visibility: state.isFpsPlay ? 'hidden' : 'unset'
-            }
-          })), hasApiEventInit && hasLink && state.isFpsPlay ? /*#__PURE__*/_jsx(FPSPlay, {
-            fps: fps,
-            event: event,
-            api: playApi,
-            fpsDelay: fpsDelay
-          }) : /*#__PURE__*/_jsx(Empty, {})]
-        }), hasApiEventInit && hasLink ? /*#__PURE__*/_jsx(VideoMessage, {}) : /*#__PURE__*/_jsx(Empty, {}), hasApiEventInit && hasLink && !hideContrallerBar ? /*#__PURE__*/_jsx(ContrallerEvent, {
-          children: /*#__PURE__*/_jsx(ContrallerBar, _objectSpread({}, contrallerProps))
-        }) : /*#__PURE__*/_jsx(Empty, {}), hasApiEventInit ? customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/_jsx(Timeline, {}) : /*#__PURE__*/_jsx(Empty, {}) : /*#__PURE__*/_jsx(Empty, {}), children]
-      })
-    }))
+    children: /*#__PURE__*/_jsxs("div", {
+      className: "lm-player-container ".concat(className),
+      ref: domRef,
+      children: [/*#__PURE__*/_jsxs("div", {
+        className: "player-mask-layout",
+        children: [/*#__PURE__*/_jsx("video", _objectSpread(_objectSpread({}, videoProps), {}, {
+          style: {
+            objectFit: fit,
+            visibility: state.isFpsPlay ? 'hidden' : 'unset'
+          }
+        })), hasApiEventInit && hasLink && state.isFpsPlay ? /*#__PURE__*/_jsx(FPSPlay, {
+          fps: fps,
+          event: event,
+          api: playApi,
+          fpsDelay: fpsDelay
+        }) : /*#__PURE__*/_jsx(Empty, {})]
+      }), hasApiEventInit && hasLink ? /*#__PURE__*/_jsx(VideoMessage, {}) : /*#__PURE__*/_jsx(Empty, {}), hasApiEventInit && hasLink && !hideContrallerBar ? /*#__PURE__*/_jsx(ContrallerEvent, {
+        children: /*#__PURE__*/_jsx(ContrallerBar, _objectSpread({}, contrallerProps))
+      }) : /*#__PURE__*/_jsx(Empty, {}), hasApiEventInit ? customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/_jsx(Timeline, {}) : /*#__PURE__*/_jsx(Empty, {}) : /*#__PURE__*/_jsx(Empty, {}), children]
+    })
   });
 });
 SinglePlayer.defaultProps = {

package/es/ScreenPlayer/ScreenSelect.js

@@ -1,5 +1,6 @@
-import { Popover } from 'antd';
+import { Select } from 'antd';
 import React, { useMemo } from 'react';
+import CustomRenderSelect from "../CustomRenderSelect";
 import IconFont from "../Player/iconfont";
 import { ScreenType } from "./utils";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -13,71 +14,46 @@ function ScreenSelect(_ref) {
       return v.name === screenNum;
     })) === null || _ScreenType$find === void 0 ? void 0 : _ScreenType$find.icon;
   }, [screenNum]);
-  var getScreenOptions = function getScreenOptions() {
-    return /*#__PURE__*/_jsx("div", {
-      className: "custom-select-dropdown",
-      children: ScreenType.map(function (item) {
-        return /*#__PURE__*/_jsxs("div", {
-          className: "ant-select-item ant-select-item-option",
-          style: item.name === screenNum ? {
-            color: 'var(--primary)',
-            backgroundColor: 'var(--form-bg-light)'
-          } : {},
-          onClick: function onClick() {
-            updateState({
-              screenNum: item.name
-            });
-          },
-          children: [/*#__PURE__*/_jsx("span", {
-            style: {
-              paddingRight: 4,
-              color: 'var(--icon)',
-              position: 'relative',
-              top: 1
-            },
-            children: /*#__PURE__*/_jsx(IconFont, {
-              type: item.icon
-            })
-          }), item.name, "\u5206\u5C4F"]
-        }, "".concat(item.name));
-      })
-    });
-  };
-  return (
-    /*#__PURE__*/
-    // <CustomRenderSelect
-    //   value={screenNum}
-    //   popupClassName="custom-select-dropdown "
-    //   customRender={() => (
-    //     <span className="select-current-screen-item">
-    //       <IconFont type={icon} />
-    //     </span>
-    //   )}
-    //   onChange={(v) => updateState({ screenNum: v })}
-    //   placement="topLeft"
-    // >
-    //   {ScreenType.map((item) => (
-    //     <Select.Option key={`${item.name}`} value={item.name}>
-    //       <span style={{ paddingRight: 4, color: 'var(--icon)', position: 'relative', top: 1 }}>
-    //         <IconFont type={item.icon} />
-    //       </span>
-    //       {item.name}分屏
-    //     </Select.Option>
-    //   ))}
-    // </CustomRenderSelect>
-    _jsx(Popover, {
-      trigger: "hover",
-      content: getScreenOptions,
-      getPopupContainer: function getPopupContainer(node) {
-        return node;
-      },
-      children: /*#__PURE__*/_jsx("span", {
+  return /*#__PURE__*/_jsx(CustomRenderSelect, {
+    value: screenNum,
+    popupClassName: "custom-select-dropdown ",
+    customRender: function customRender() {
+      return /*#__PURE__*/_jsx("span", {
         className: "select-current-screen-item",
         children: /*#__PURE__*/_jsx(IconFont, {
           type: icon
         })
-      })
+      });
+    },
+    onChange: function onChange(v) {
+      return updateState({
+        screenNum: v
+      });
+    },
+    placement: "topLeft",
+    children: ScreenType.map(function (item) {
+      return /*#__PURE__*/_jsxs(Select.Option, {
+        value: item.name,
+        children: [/*#__PURE__*/_jsx("span", {
+          style: {
+            paddingRight: 4,
+            color: 'var(--icon)',
+            position: 'relative',
+            top: 1
+          },
+          children: /*#__PURE__*/_jsx(IconFont, {
+            type: item.icon
+          })
+        }), item.name, "\u5206\u5C4F"]
+      }, "".concat(item.name));
     })
-  );
+  })
+  // <Popover trigger="hover" content={getScreenOptions} getPopupContainer={(node) => node}>
+  //   <span className="select-current-screen-item">
+  //     <IconFont type={icon} />
+  //   </span>
+  // </Popover>
+  ;
 }
+
 export default ScreenSelect;

package/es/ScreenPlayer/index.less

@@ -4,15 +4,10 @@
   box-sizing: border-box;
   user-select: none;
   min-width: 600px;
-
   .player-layout {
     height: calc(100% - 88px);
-
     .player-with-ext-layout {
-      float: left;
-
       .lm-player-ext-layout {
-        height: 100%;
         border: 1px solid var(--gray12);
         box-sizing: border-box;
       }
@@ -24,7 +19,6 @@
       }
     }
   }
-
   &.split-screen-player-live-wrapper {
     .player-layout {
       height: calc(100% - 42px);
@@ -186,7 +180,7 @@
   /* ------------------------6分屏---------------------- */
   .container6 {
     display: grid;
-    grid-template-columns: repeat(3, 33.3%);
+    grid-template-columns: repeat(3, 33.33333333%);
     grid-template-rows: repeat(2, 50%);
     grid-auto-flow: row dense; //排列顺序先行后列 紧密排列
     place-content: center;
@@ -195,67 +189,66 @@
   /* -----------------------8分屏---------------------- */
   .container8 {
     display: grid;
-    grid-template-columns: repeat(379, 0.264%);
-    grid-template-rows: repeat(846, 0.1182%);
+    grid-template-columns: repeat(24, 4.166666666666667%);
+    grid-template-rows: repeat(24, 4.166666666666667%);
     grid-auto-flow: row dense; //排列顺序先行后列 紧密排列
     place-content: center;
   }
 
   .item8-1 {
     grid-column-start: 1;
-    grid-column-end: 164;
+    grid-column-end: 13;
     grid-row-start: 1;
-    grid-row-end: 424;
+    grid-row-end: 13;
   }
 
   .item8-2 {
-    grid-column-start: 164;
-    grid-column-end: 271;
+    grid-column-start: 13;
+    grid-column-end: 19;
     grid-row-start: 1;
-    grid-row-end: 282;
+    grid-row-end: 9;
   }
 
   .item8-3 {
-    grid-column-start: 271;
-    grid-column-end: 380;
+    grid-column-start: 19;
+    grid-column-end: 25;
     grid-row-start: 1;
-    grid-row-end: 282;
+    grid-row-end: 9;
   }
 
   .item8-4 {
-    grid-column-start: 1;
-    grid-column-end: 164;
-    grid-row-start: 424;
-    grid-row-end: 847;
+    grid-column-start: 13;
+    grid-column-end: 19;
+    grid-row-start: 9;
+    grid-row-end: 17;
   }
 
   .item8-5 {
-
-    grid-column-start: 164;
-    grid-column-end: 271;
-    grid-row-start: 282;
-    grid-row-end: 563;
+    grid-column-start: 19;
+    grid-column-end: 25;
+    grid-row-start: 9;
+    grid-row-end: 17;
   }
 
   .item8-6 {
-    grid-column-start: 271;
-    grid-column-end: 380;
-    grid-row-start: 282;
-    grid-row-end: 563;
+    grid-column-start: 1;
+    grid-column-end: 13;
+    grid-row-start: 13;
+    grid-row-end: 25;
   }
 
   .item8-7 {
-    grid-column-start: 164;
-    grid-column-end: 271;
-    grid-row-start: 563;
-    grid-row-end: 847;
+    grid-column-start: 13;
+    grid-column-end: 19;
+    grid-row-start: 17;
+    grid-row-end: 25;
   }
 
   .item8-8 {
-    grid-column-start: 271;
-    grid-column-end: 380;
-    grid-row-start: 563;
-    grid-row-end: 847;
+    grid-column-start: 19;
+    grid-column-end: 25;
+    grid-row-start: 17;
+    grid-row-end: 25;
   }
 
   /* ------------------------9分屏---------------------- */
@@ -291,7 +284,6 @@
     grid-row-end: 3;
   }
 
-
   /* ------------------------13分屏---------------------- */
 
   .container13 {
@@ -360,4 +352,4 @@
   cursor: pointer;
   border: 1px solid var(--gray1);
   border-radius: 2px;
-}
+}

package/es/utils.d.ts

@@ -10,5 +10,5 @@ declare const getEleScrollHeight: (el: Document | Element) => number;
 export declare const getHeader: () => {
     Authorization: any;
 };
-declare function likeGo<T>(fn: () => Promise<T>): Promise<[T, Error]>;
+declare function likeGo<T, S>(fn: () => Promise<T>): Promise<[T, S]>;
 export { getScrollTop, getScrollHeight, getClientHeight, getEleScrollHeight, likeGo };

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "4.0.4",
+  "version": "4.0.5",
   "scripts": {
     "docs:deploy": "gh-pages -d docs-dist",
     "build": "npm run entry && father build",
@@ -67,7 +67,7 @@
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
     "@umijs/lint": "^4.0.36",
-    "antd": "^5.1.7",
+    "antd": "^5.2.2",
     "babel-plugin-import": "^1.13.5",
     "dumi": "^2.1.10",
     "eslint": "^8.28.0",