@cloud-app-dev/vidc 3.2.3 → 3.2.6

package/es/Picture/component/Tools/index.d.ts

@@ -1,6 +1,5 @@
 import React from 'react';
 import './index.less';
-import '../../../Player/style/iconfont';
 interface IToolsProps {
     scale: number;
     imgDownload: () => void;

package/es/Picture/component/Tools/index.js

@@ -1,10 +1,9 @@
 import "antd/lib/tooltip/style";
 import _Tooltip from "antd/lib/tooltip";
 import React from 'react';
-import IconFont from '../../../IconFont';
+import IconFont from '../../../Player/iconfont';
 import FullScreen from '../../../FullScreen';
 import "./index.css";
-import '../../../Player/style/iconfont';
 function Tools(_ref) {
   var scale = _ref.scale,
     imgDownload = _ref.imgDownload,

package/es/Player/contraller_bar/time.js

@@ -4,16 +4,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useContext } from 'react';
-import { Context } from '../context';
+import React from 'react';
 import { useTimes } from '../timeline';
 import { timeStamp } from '../util';
 function Time() {
-  var _useContext = useContext(Context),
-    api = _useContext.api,
-    event = _useContext.event,
-    isFpsPlay = _useContext.isFpsPlay;
-  var _useTimes = useTimes(api, event, isFpsPlay),
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 3),
     current = _useTimes2[0],
     duration = _useTimes2[2];

package/es/Player/contraller_bar/useBarStatus.d.ts

@@ -1,3 +1,2 @@
-import type VideoEventInstance from '../event';
-declare function useBarStatus(event: VideoEventInstance): number;
+declare function useBarStatus(): number;
 export default useBarStatus;

package/es/Player/contraller_bar/useBarStatus.js

@@ -4,10 +4,13 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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 { useState } from 'react';
+import { useContext, useState } from 'react';
+import { Context } from '../context';
 import { useRegisterPlayerEvents } from '../event';
 import EventName from '../event/eventName';
-function useBarStatus(event) {
+function useBarStatus() {
+  var _useContext = useContext(Context),
+    event = _useContext.event;
   var _useState = useState({
       status: 1
     }),

package/es/Player/frontend_player.js

@@ -41,7 +41,6 @@ function FrontendPlayer(_a) {
   var hasReady = api && event;
   var timeline = customTimeLine !== null && customTimeLine !== void 0 ? customTimeLine : /*#__PURE__*/React.createElement(FrontendTimeLine, {
     end: end,
-    url: url,
     onSeek: onSeek,
     begin: begin,
     duration: duration

package/es/Player/frontend_timeline.d.ts

@@ -5,7 +5,6 @@ interface ITimeLineProps {
     begin: number;
     end: number;
     onSeek?: (time: number) => void;
-    url?: string;
 }
-declare function FrontendTimeLine({ duration, begin, end, onSeek, url }: ITimeLineProps): JSX.Element;
+declare function FrontendTimeLine({ duration, begin, end, onSeek }: ITimeLineProps): JSX.Element;
 export default FrontendTimeLine;

package/es/Player/frontend_timeline.js

@@ -5,22 +5,17 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useMemo, useState, startTransition, useContext } from 'react';
+import React, { useMemo, useState, startTransition } from 'react';
 import useBarStatus from './contraller_bar/useBarStatus';
 import { useTimes } from './timeline';
 import { FMT } from './util';
 import moment from 'moment';
-import { Context } from './context';
 import "./style/timeline.css";
 function FrontendTimeLine(_ref) {
   var duration = _ref.duration,
     begin = _ref.begin,
     end = _ref.end,
-    onSeek = _ref.onSeek,
-    url = _ref.url;
-  var _useContext = useContext(Context),
-    api = _useContext.api,
-    event = _useContext.event;
+    onSeek = _ref.onSeek;
   // time 是记录seek时跳了多少
   var _useState = useState({
       time: 0,
@@ -31,9 +26,9 @@ function FrontendTimeLine(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var status = useBarStatus(event);
+  var status = useBarStatus();
   //获取视频当前播放时长单位s
-  var _useTimes = useTimes(api, event),
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 1),
     currentTime = _useTimes2[0];
   var rTime = useMemo(function () {

package/es/Player/live_heart.d.ts

@@ -1,8 +1,4 @@
-import type Api from './api';
-import type VideoEventInstance from './event';
-declare function useLiveHeart({ api, event, isLive }: {
-    api: Api;
-    event: VideoEventInstance;
+declare function useLiveHeart({ isLive }: {
     isLive: boolean;
 }): void;
 export default useLiveHeart;

package/es/Player/live_heart.js

@@ -1,12 +1,14 @@
 import _useRafInterval from "ahooks/es/useRafInterval";
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
 import _useDocumentVisibility from "ahooks/es/useDocumentVisibility";
-import { useRef } from 'react';
+import { useContext, useRef } from 'react';
+import { Context } from './context';
 import Events from './event/eventName';
 function useLiveHeart(_ref) {
-  var api = _ref.api,
-    event = _ref.event,
-    isLive = _ref.isLive;
+  var isLive = _ref.isLive;
+  var _useContext = useContext(Context),
+    api = _useContext.api,
+    event = _useContext.event;
   var documentVisibility = _useDocumentVisibility();
   var cTimeRef = useRef(null);
   var run = function run() {

package/es/Player/message.d.ts

@@ -1,11 +1,5 @@
 /// <reference types="react" />
-import Api from './api';
-import VideoEventInstance from './event';
 import './style/message.less';
-interface IVideoMessageProps {
-    event: VideoEventInstance;
-    api: Api;
-}
-declare function VideoMessage({ event, api }: IVideoMessageProps): JSX.Element;
+declare function VideoMessage(): JSX.Element;
 export declare const NoSource: () => JSX.Element;
 export default VideoMessage;

package/es/Player/message.js

@@ -4,17 +4,18 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useState, useMemo, useRef } from 'react';
+import React, { useState, useMemo, useRef, useContext } from 'react';
 import IconFont from './iconfont';
 import { useRegisterPlayerEvent, useVideoEvent } from './event';
 import EventName from './event/eventName';
+import { Context } from './context';
 import "./style/message.css";
-function VideoMessage(_ref) {
-  var event = _ref.event,
-    api = _ref.api;
+function VideoMessage() {
+  var _useContext = useContext(Context),
+    api = _useContext.api;
   var _useState = useState({
       status: null,
-      errorTimer: null,
+      errorTimer: 1,
       loading: false
     }),
     _useState2 = _slicedToArray(_useState, 2),

package/es/Player/segment_timeline.js

@@ -6,12 +6,11 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { startTransition, useContext, useMemo, useState } from 'react';
+import React, { startTransition, useMemo, useState } from 'react';
 import { useTimes } from './timeline';
 import useBarStatus from './contraller_bar/useBarStatus';
 import moment from 'moment';
 import { FMT } from './util';
-import { Context } from './context';
 import "./style/timeline.css";
 function SegmentTimeLine(_ref) {
   var index = _ref.index,
@@ -28,12 +27,8 @@ function SegmentTimeLine(_ref) {
     _useState2 = _slicedToArray(_useState, 2),
     state = _useState2[0],
     setState = _useState2[1];
-  var _useContext = useContext(Context),
-    api = _useContext.api,
-    event = _useContext.event,
-    isFpsPlay = _useContext.isFpsPlay;
-  var status = useBarStatus(event);
-  var _useTimes = useTimes(api, event, isFpsPlay),
+  var status = useBarStatus();
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 2),
     currentTime = _useTimes2[0],
     buffered = _useTimes2[1];

package/es/Player/single_player.js

@@ -1,4 +1,5 @@
 import _useUpdateEffect from "ahooks/es/useUpdateEffect";
+import _useLatest from "ahooks/es/useLatest";
 import _useToggle3 from "ahooks/es/useToggle";
 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."); }
@@ -85,6 +86,8 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   var hasLink = useMemo(function () {
     return !!url || !!flvConfig.mediaDataSource.segments && vType === 'flv';
   }, [url, flvConfig.mediaDataSource.segments, vType]);
+  var hlsRef = _useLatest(hls);
+  var flvRef = _useLatest(flv);
   // 存储容器
   useEffect(function () {
     setState(function (old) {
@@ -100,10 +103,10 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   }, [url]);
   // 特殊接口实现 reload是可能被重写的,但是API只暴露原生的方法
   var reload = function reload() {
-    return playReload(video, event, flv, hls, url);
+    return playReload(video, event, flvRef.current, hlsRef.current, url);
   };
   var unload = function unload() {
-    return playUnload(video, flv, hls);
+    return playUnload(video, flvRef.current, hlsRef.current);
   };
   var openFpsPlay = function openFpsPlay() {
     setState(function (old) {
@@ -165,18 +168,20 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
       container: state.container,
       api: playApi,
       event: playEvent,
-      plugins: [flv, hls],
+      plugins: [flvRef.current, hlsRef.current],
       fit: fit
     };
-  }, [video, state.container, playApi, playEvent, flv, hls, fit]);
+  },
+  // eslint-disable-next-line react-hooks/exhaustive-deps
+  [video, state.container, playApi, playEvent, fit]);
   _useUpdateEffect(function () {
     return api && event && video ? onCanPlayerInit === null || onCanPlayerInit === void 0 ? void 0 : onCanPlayerInit() : undefined;
   }, [api, event, video]);
   // 补货视频错误，自定义处理
   useErrorEvent({
     unload: unload,
-    flv: flv,
-    hls: hls,
+    flv: flvRef.current,
+    hls: hlsRef.current,
     api: playApi,
     event: event,
     reload: reload,
@@ -184,8 +189,6 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
   });
   // 直播缓冲追回
   useLiveHeart({
-    api: playApi,
-    event: event,
     isLive: isLive
   });
   var videoProps = {
@@ -228,15 +231,9 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function (_a, ref) {
     event: event,
     api: playApi,
     fpsDelay: fpsDelay
-  }) : /*#__PURE__*/React.createElement(Empty, null)), hasApiEventInit && hasLink ? /*#__PURE__*/React.createElement(VideoMessage, {
-    api: playApi,
-    event: event
-  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit && hasLink && !hideContrallerBar ? /*#__PURE__*/React.createElement(ContrallerEvent, {
+  }) : /*#__PURE__*/React.createElement(Empty, null)), hasApiEventInit && hasLink ? /*#__PURE__*/React.createElement(VideoMessage, null) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit && hasLink && !hideContrallerBar ? /*#__PURE__*/React.createElement(ContrallerEvent, {
     children: /*#__PURE__*/React.createElement(ContrallerBar, Object.assign({}, contrallerProps))
-  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit ? customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, {
-    api: playApi,
-    event: event
-  }) : /*#__PURE__*/React.createElement(Empty, null) : /*#__PURE__*/React.createElement(Empty, null), children));
+  }) : /*#__PURE__*/React.createElement(Empty, null), hasApiEventInit ? customTimeLine ? customTimeLine : !hideContrallerBar ? /*#__PURE__*/React.createElement(Timeline, null) : /*#__PURE__*/React.createElement(Empty, null) : /*#__PURE__*/React.createElement(Empty, null), children));
 });
 function Empty() {
   return /*#__PURE__*/React.createElement(React.Fragment, null);

package/es/Player/timeline.d.ts

@@ -1,11 +1,5 @@
 /// <reference types="react" />
-import type Api from './api';
-import type VideoEventInstance from './event';
 import './style/timeline.less';
-interface ITimeLineProps {
-    api: Api;
-    event: VideoEventInstance;
-}
-export declare function useTimes(api: Api, event: VideoEventInstance, isFpsPlay?: boolean): number[];
-declare function TimeLine({ api, event }: ITimeLineProps): JSX.Element;
+export declare function useTimes(): number[];
+declare function TimeLine(): JSX.Element;
 export default TimeLine;

package/es/Player/timeline.js

@@ -4,12 +4,15 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 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, { useMemo, useState } from 'react';
+import React, { useContext, useMemo, useState } from 'react';
 import useBarStatus from './contraller_bar/useBarStatus';
 import { useVideoEvent } from './event';
+import { Context } from './context';
 import "./style/timeline.css";
-export function useTimes(api, event, isFpsPlay) {
-  console.log(api, event);
+export function useTimes() {
+  var _useContext = useContext(Context),
+    api = _useContext.api,
+    isFpsPlay = _useContext.isFpsPlay;
   var _useState = useState({
       currentTime: 0,
       buffered: 0
@@ -43,11 +46,11 @@ export function useTimes(api, event, isFpsPlay) {
     return [state.currentTime, state.buffered, api.getDuration()];
   }, [state.currentTime, state.buffered, api]);
 }
-function TimeLine(_ref) {
-  var api = _ref.api,
-    event = _ref.event;
-  var status = useBarStatus(event);
-  var _useTimes = useTimes(api, event),
+function TimeLine() {
+  var _useContext2 = useContext(Context),
+    api = _useContext2.api;
+  var status = useBarStatus();
+  var _useTimes = useTimes(),
     _useTimes2 = _slicedToArray(_useTimes, 3),
     currentTime = _useTimes2[0],
     buffered = _useTimes2[1],

package/es/Player/util.js

@@ -48,11 +48,9 @@ export function createFlvPlayer(video, url, isLive, flvConfig) {
   return player;
 }
 export var playReload = function playReload(video, event, flv, hls, url) {
-  video.pause();
-  video.removeAttribute('src');
+  playUnload(video, flv, hls);
   if (flv) {
     tryCatch(function () {
-      flv.unload();
       flv.load();
       flv.play();
     });
@@ -61,7 +59,6 @@ export var playReload = function playReload(video, event, flv, hls, url) {
     tryCatch(function () {
       hls.swapAudioCodec();
       hls.recoverMediaError();
-      hls.stopLoad();
       hls.startLoad();
       hls.loadSource(url);
       video.play();

package/es/ScreenPlayer/PlayerWithExt.d.ts

@@ -15,6 +15,7 @@ interface ISegmentPlayerWithExtProps extends Omit<ILivePlayerWithExtProps, 'url'
     fpsDelay?: number;
     fps?: number;
     httpLoading: boolean;
+    screenIndex?: number;
 }
 export declare function SegmentPlayerWithExt({ begin, style, className, segments, mode, fpsDelay, fps, httpLoading, ...props }: ISegmentPlayerWithExtProps): JSX.Element;
 interface IFrontendPlayerWithExtProps extends Omit<ILivePlayerWithExtProps, 'url'> {
@@ -25,7 +26,9 @@ interface IFrontendPlayerWithExtProps extends Omit<ILivePlayerWithExtProps, 'url
         url: URL;
         begin: number;
         end: number;
+        screenIndex: number;
     }) => Promise<string>;
+    screenIndex?: number;
 }
-export declare function FrontendPlayerWithExt({ mode, style, className, segments, pluginDownloadUrl, httpLoading, ...props }: IFrontendPlayerWithExtProps): JSX.Element;
+export declare function FrontendPlayerWithExt({ mode, style, className, segments, pluginDownloadUrl, screenIndex, httpLoading, ...props }: IFrontendPlayerWithExtProps): JSX.Element;
 export {};

package/es/ScreenPlayer/PlayerWithExt.js

@@ -101,8 +101,9 @@ export function FrontendPlayerWithExt(_a) {
     className = _a.className,
     segments = _a.segments,
     pluginDownloadUrl = _a.pluginDownloadUrl,
+    screenIndex = _a.screenIndex,
     httpLoading = _a.httpLoading,
-    props = __rest(_a, ["mode", "style", "className", "segments", "pluginDownloadUrl", "httpLoading"]);
+    props = __rest(_a, ["mode", "style", "className", "segments", "pluginDownloadUrl", "screenIndex", "httpLoading"]);
   var _useState = useState({
       begin: 0,
       end: 0,
@@ -131,7 +132,8 @@ export function FrontendPlayerWithExt(_a) {
       props.getLocalRecordUrl({
         url: videoUrl,
         begin: moment(begin).unix(),
-        end: moment(end).unix()
+        end: moment(end).unix(),
+        screenIndex: screenIndex
       }).then(function (url) {
         return setState({
           begin: begin,
@@ -162,7 +164,8 @@ export function FrontendPlayerWithExt(_a) {
       props.getLocalRecordUrl({
         url: videoUrl,
         begin: begin,
-        end: end
+        end: end,
+        screenIndex: screenIndex
       }).then(function (url) {
         return setState(function (old) {
           return Object.assign(Object.assign({}, old), {

package/es/ScreenPlayer/Record.js

@@ -345,7 +345,8 @@ function RecordPlayer(_a) {
       mode: (_a = state.modes["".concat(item === null || item === void 0 ? void 0 : item.date, "-").concat(item.cid)]) !== null && _a !== void 0 ? _a : item.mode,
       fps: fps,
       fpsDelay: fpsDelay,
-      httpLoading: item.loading
+      httpLoading: item.loading,
+      screenIndex: index
     })) : /*#__PURE__*/React.createElement(FrontendPlayerWithExt, Object.assign({}, item, {
       className: state.selectIndex === index ? 'player-current-index' : '',
       segments: (item === null || item === void 0 ? void 0 : item.segments) || [],
@@ -367,7 +368,8 @@ function RecordPlayer(_a) {
       },
       httpLoading: item.loading,
       getLocalRecordUrl: props.getLocalRecordUrl,
-      pluginDownloadUrl: props.pluginDownloadUrl
+      pluginDownloadUrl: props.pluginDownloadUrl,
+      screenIndex: index
     }));
   })), /*#__PURE__*/React.createElement("div", {
     className: "player-tools-group"

package/package.json

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

package/test.html

@@ -1,16 +0,0 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <meta charset="UTF-8">
-  <meta http-equiv="X-UA-Compatible" content="IE=edge">
-  <meta name="viewport" content="width=device-width, initial-scale=1.0">
-  <title>Document</title>
-  <script src="./test.js"></script>
-</head>
-<body>
-  <script>
-    const html = `<p class=MsoNormal  ><span ><font face="仿宋_GB2312" >涉案服装合格证上带有</font><font face="仿宋_GB2312" >“售后服务热线：18928955232”等信息；购物小票显示该店地址为“芙蓉中路一段88号天健芙蓉盛，汇名仓外贸服装店（小门东1门旁）”，并且带有“合作热线：188-1184-0024、13360003040”等信息；店内宣传有“DHC二维码”等信息。涉案服装合格证上带有“‘</font></span><img width="720"  height="720"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2671.png" ><span ><font face="仿宋_GB2312" >’商标、</font></span><span><a href="http://www.dhcfs.com" ><u><span class="16"  ><font face="仿宋_GB2312" >www.dhcfs.com</font></span></u></a></span><span ><font face="仿宋_GB2312" >网址</font><font face="仿宋_GB2312" >”等信息，下方显示地址为“开平市幕沙路70号益华广场B幢131室”；购物小票上显示官网网址为“</font></span><span><a href="http://www.dhcfs.com" ><u><span class="16"  ><font face="仿宋_GB2312" >www.dhcfs.com</font></span></u></a></span><span ><font face="仿宋_GB2312" >”；购物塑料袋上带有“‘</font></span><img width="720"  height="720"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2672.png" ><a href="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2672.png">11111</a><span ><font face="仿宋_GB2312" >’商标、</font></span><span><a href="http://www.dhcfs.com" ><u><span class="16"  ><font face="仿宋_GB2312" >www.dhcfs.com</font></span></u></a></span><span ><font face="仿宋_GB2312" >网址</font><font face="仿宋_GB2312" >”等信息。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >1：同其他实物证据意见一致。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >2、4：同上意见。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >原：出示证据</font><font face="仿宋_GB2312" >12封存实物。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >？：各被告确认被控侵权产品封存是否完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >1：完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >2、4：完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >？：当庭开启，发表比对意见。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >原：（</font><font face="仿宋_GB2312" >1）1件蓝色棒球运动服，正面带有“</font></span><img width="1576"  height="1440"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2673.jpg" ><span ><font face="仿宋_GB2312" >” “YANKEES”标识，与原告第4336076号、第4336075号注册商标相同，背面带有“YANKEES”标识，与原告第4336075号注册商标相同，衣袖带有“</font></span><img width="2560"  height="1390"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2674.jpg" ><span ><font face="仿宋_GB2312" >”标识，与原告第1800888号注册商标相同，纽扣使用“MLB”标识，与原告第4336063号注册商标相同，水洗标带有“</font></span><img width="1249"  height="720"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2675.jpg" ><span ><font face="仿宋_GB2312" >” “MLB”标识，与原告第506821号、第4336063号注册商标相同；</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >（</font><font face="仿宋_GB2312" >2）1条紫色裤子，正面带有“</font></span><img width="1440"  height="1932"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2676.jpg" ><span ><font face="仿宋_GB2312" >” “</font></span><img width="1280"  height="652"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2677.jpg" ><span ><font face="仿宋_GB2312" >”标识，与原告第506820号、第4336084号注册商标相同，裤子的背面带有“</font></span><img width="2560"  height="1390"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2678.jpg" ><span ><font face="仿宋_GB2312" >”标识，与原告第1800888号注册商标相同，水洗标带有“</font></span><img width="1249"  height="720"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2679.jpg" ><span ><font face="仿宋_GB2312" >” “MLB”标识，与原告第506821号、第4336063号注册商标相同。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >1：真实性、合法性无异议，关联性不认可。该商品并非被告1销售，也没有证据证明该商品属于侵权商品，销售方有可能是从合法途径进货销售的。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >2、4：同被告1意见。关于购物袋和卡牌的意见与证据8一致。被告胡拔庆与</font></span><span ><font face="仿宋_GB2312" >大汇仓设计室旗下店铺</font><font face="仿宋_GB2312" >“汇名仓 外贸出口成衣工厂店”（长沙华创店）有其他自有品牌合作，没有授权其在该被控侵权产品上使用，该商品来源我方也不清楚，应当由该店铺经营者自行陈述。涉案产品也不是我方销售给涉案店铺的。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >原：出示证据</font><font face="仿宋_GB2312" >14封存实物。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >？：各被告确认被控侵权产品封存是否完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >1：完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >2、4：完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >？：当庭开启，发表比对意见。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >原：（</font><font face="仿宋_GB2312" >1）1件深蓝色棒球服，正面带有“</font></span><img width="1576"  height="1440"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2680.jpg" ><span ><font face="仿宋_GB2312" >” “YANKEES”标识，与原告第4336076号、第4336075号注册商标相同，背面带有“</font></span><img width="2560"  height="1386"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2681.jpg" ><span ><font face="仿宋_GB2312" >”标识，与原告第</font></span><span >1800888</span><span ><font face="仿宋_GB2312" >号注册商标相同，纽扣使用</font><font face="仿宋_GB2312" >“MLB”标识，与原告第4336063号注册商标相同，水洗标带有“</font></span><img width="1241"  height="720"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2682.jpg" ><span ><font face="仿宋_GB2312" >” “MLB”标识，与原告第</font></span><span >506821</span><span ><font face="仿宋_GB2312" >号、第</font><font face="仿宋_GB2312" >4336063号注册商标相同；</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >（</font><font face="仿宋_GB2312" >2）1件蓝色卫衣，正面带有“</font></span><img width="1440"  height="1540"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2683.jpg" ><span ><font face="仿宋_GB2312" >” “YANKEES”标识，与原告第</font></span><span >506836</span><span ><font face="仿宋_GB2312" >号、第</font><font face="仿宋_GB2312" >4336075号注册商标相同，水洗标带有“</font></span><img width="1241"  height="720"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2684.jpg" ><span ><font face="仿宋_GB2312" >” “MLB”标识，与原告第</font></span><span >506821</span><span ><font face="仿宋_GB2312" >号、第</font><font face="仿宋_GB2312" >4336063号注册商标相同。蓝色卫衣吊牌“大汇仓”商标以及网站与其他被控侵权产品实物一致，但是吊牌上售后服务热线为4008088140，经销商为南京庆创服饰有限公司。</font></span><span ><o:p></o:p></span></p><table class=MsoTableGrid  border=1  cellspacing=0  ><tr><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td></tr><tr><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td></tr><tr><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td></tr><tr><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td></tr><tr><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td></tr><tr><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td><td width=66  valign=top  ><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p></td></tr></table><p class=MsoNormal  ><span ><o:p>&nbsp;</o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >1：与其他侵权实物证据质证意见一致。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >2、4：公证书、实物真实性、合法性无异议，认可蓝色棒球服上的卡牌是被告、4提供，但是蓝色卫衣该吊牌上所显示公司并不存在，该卡牌长的与被告2、4提供的卡牌有部分相似之处，但并不是被告提供，不清楚来源，细看发现字体和颜色是有差异的。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >原：从蓝色卫衣上的大汇仓商标和网站信息可以将商品来源指向被告</font><font face="仿宋_GB2312" >2、4。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >原：出示证据</font><font face="仿宋_GB2312" >16封存实物。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >？：各被告确认被控侵权产品封存是否完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >1：完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >被</font><font face="仿宋_GB2312" >2、4：完好。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal  ><span ><font face="仿宋_GB2312" >？：当庭开启，发表比对意见。</font></span><span ><o:p></o:p></span></p><p class=MsoNormal ><span ><font face="仿宋_GB2312" >原：</font><font face="仿宋_GB2312" >1件蓝色棒球运动服，正面带有“</font></span><img width="1576"  height="1440"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2685.jpg" ><span ><font face="仿宋_GB2312" >” “YANKEES”标识，与原告第4336076号、第4336075号注册商标相同，背面带有“</font></span><img width="2560"  height="1390"  src="file:////private/var/folders/51/wvlmktvs2r3__qp4bg2q5nbm0000gn/T/com.kingsoft.wpsoffice.mac/wps-huang/ksohtml//wps2686.jpg" ><span ><font face="仿宋_GB2312" >”标识，与原告第1800888号注册商标相同，纽扣带有“MLB”标识，与原告第4336063号注册商标相同，水</font></span></p>`
-    document.body.innerHTML = parseHtml(html)
-  </script>
-</body>
-</html>

package/test.js

@@ -1,96 +0,0 @@
-const igrone_tag = ['table', 'ul', 'ol', 'img'];
-
-/**
- *
- * @param {string} html
- * @returns {HTMLElement}
- */
-function parseHtml(html) {
-  let htmlstr = '';
-  const doc = new DOMParser().parseFromString(html, 'text/html');
-  Array.from(doc.body.childNodes).forEach((item) => {
-    const tag = item.tagName ? item.tagName.toLowerCase() : '';
-    const html_str = getNodeHTML(item);
-    htmlstr += igrone_tag.includes(tag) ? html_str : `<p class="parse-html-p">${html_str}</p>`;
-  });
-  return htmlstr;
-}
-
-const filter_map = {
-  img: filterImgAttr,
-  table: filterTableAttr,
-};
-
-/**
- *
- * @param {HTMLElement} node HTML
- * @returns {string}
- */
-function getNodeHTML(node, html = '') {
-  if (node.nodeType === 3) {
-    html += node.textContent.replace(/\s/, '');
-    return html;
-  }
-
-  // 过滤其他
-  if (node.nodeType !== 1) {
-    return html;
-  }
-
-  const tag = node.tagName.toLowerCase();
-
-  switch (tag) {
-    case 'img':
-    case 'table':
-      filter_map[tag](node);
-      html += node.outerHTML;
-      break;
-    default:
-      const childNodes = node.childNodes;
-      if (childNodes.length > 0) {
-        Array.from(childNodes).forEach((item) => {
-          html += getNodeHTML(item); //  合并标签处理，并且递归处理子元素
-        });
-      } else {
-        html += node.innerText.replace(/\s/, '');
-      }
-      break;
-  }
-  return html;
-}
-
-/**
- *
- * @param {HTMLElement} node
- */
-function filterImgAttr(node) {
-  node.removeAttribute('width');
-  node.removeAttribute('height');
-
-  // 非顶层的img定义成行内元素，顶层定义为块元素
-  if (node.parentNode !== document.body) {
-    node.setAttribute('width', 40);
-    node.setAttribute('class', 'parse-html-img-inline');
-  } else {
-    node.style.display = 'block';
-    node.setAttribute('class', 'parse-html-img-block');
-  }
-}
-
-/**
- *
- * @param {HTMLTableElement} node
- */
-function filterTableAttr(node) {
-  // 表格自适应
-  node.setAttribute('width', '100%');
-  node.setAttribute('class', 'parse-html-table');
-  const tds = node.querySelectorAll('td');
-  Array.from(tds).forEach((item_td) => {
-    //td 自适应
-    item_td.removeAttribute('width');
-
-    //格式化td内容
-    item_td.innerHTML = parseHtml(item_td.innerHTML);
-  });
-}