@cloud-app-dev/vidc 3.0.13 → 3.0.16

package/es/ScreenPlayer/index.css

@@ -42,6 +42,7 @@
   display: flex;
   align-items: center;
   justify-content: space-between;
+  position: relative;
 }
 .split-screen-player-wrapper .player-tools .player-tools-left,
 .split-screen-player-wrapper .player-tools .player-tools-right {

package/es/ScreenPlayer/index.js

@@ -1,8 +1,9 @@
-import withErrorBoundary from '../withErrorBoundary';
+import { withErrorBoundary } from 'react-error-boundary';
 import LivePlayer from './Live';
 import RecordPlayer from './Record';
+import { errorBoundaryOptions } from '../ErrorFallback';
 var Sceenplayer = {
-  LivePlayer: withErrorBoundary(LivePlayer),
-  RecordPlayer: withErrorBoundary(RecordPlayer)
+  LivePlayer: withErrorBoundary(LivePlayer, errorBoundaryOptions),
+  RecordPlayer: withErrorBoundary(RecordPlayer, errorBoundaryOptions)
 };
 export default Sceenplayer;

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/es/ScreenPlayer/useTimeSlider.js

@@ -381,7 +381,7 @@ function useTimeSlider(canvasRef, _ref2) {
     });
 
     _nextTick(function () {
-      return onHoursPerChange && onHoursPerChange(new_hoursPer);
+      return onHoursPerChange === null || onHoursPerChange === void 0 ? void 0 : onHoursPerChange(new_hoursPer);
     });
   }, {
     target: canvasRef
@@ -481,7 +481,7 @@ function useTimeSlider(canvasRef, _ref2) {
       });
 
       _nextTick(function () {
-        return onTimeChange && onTimeChange(new_current, outTimeline);
+        return onTimeChange === null || onTimeChange === void 0 ? void 0 : onTimeChange(new_current, outTimeline);
       });
     } // 清楚拖拽关联信息
 

package/es/Tree/index.js

@@ -18,18 +18,14 @@ function BaseTree(_a, ref) {
       icon = _a.icon,
       props = __rest(_a, ["treeData", "className", "showIcon", "treeNodeProps", "icon"]);
 
-  var _useMemo = useMemo(function () {
-    return treeNodeProps;
-  }, []),
-      prefix = _useMemo.prefix,
-      suffix = _useMemo.suffix,
-      keyword = _useMemo.keyword,
-      _useMemo$key = _useMemo.key,
-      key = _useMemo$key === void 0 ? 'id' : _useMemo$key,
-      _useMemo$nameKey = _useMemo.nameKey,
-      nameKey = _useMemo$nameKey === void 0 ? 'name' : _useMemo$nameKey,
-      RenderTreeTitle = _useMemo.RenderTreeTitle;
-
+  var prefix = treeNodeProps.prefix,
+      suffix = treeNodeProps.suffix,
+      keyword = treeNodeProps.keyword,
+      _treeNodeProps$key = treeNodeProps.key,
+      key = _treeNodeProps$key === void 0 ? 'id' : _treeNodeProps$key,
+      _treeNodeProps$nameKe = treeNodeProps.nameKey,
+      nameKey = _treeNodeProps$nameKe === void 0 ? 'name' : _treeNodeProps$nameKe,
+      RenderTreeTitle = treeNodeProps.RenderTreeTitle;
   var treeRef = useRef(null);
   useImperativeHandle(ref, function () {
     return {
@@ -42,6 +38,21 @@ function BaseTree(_a, ref) {
       }
     };
   }, [props.checkable]);
+
+  function defaultRenderTitle(node) {
+    return /*#__PURE__*/React.createElement("span", {
+      title: node[nameKey],
+      className: "tree-item-title"
+    }, /*#__PURE__*/React.createElement("span", null, showIcon && (icon === null || icon === void 0 ? void 0 : icon(node)), prefix === null || prefix === void 0 ? void 0 : prefix(node), /*#__PURE__*/React.createElement(HightLevel, {
+      keyword: keyword,
+      name: node[nameKey]
+    })), suffix === null || suffix === void 0 ? void 0 : suffix(node));
+  } // eslint-disable-next-line react-hooks/exhaustive-deps
+
+
+  var titleRender = useMemo(function () {
+    return RenderTreeTitle !== null && RenderTreeTitle !== void 0 ? RenderTreeTitle : defaultRenderTitle;
+  }, []);
   return /*#__PURE__*/React.createElement(_Tree, Object.assign({
     className: "cloudapp-c-base-tree-component ".concat(className),
     ref: treeRef,
@@ -59,15 +70,7 @@ function BaseTree(_a, ref) {
       title: nameKey
     },
     key: keyword,
-    titleRender: RenderTreeTitle ? RenderTreeTitle : function (node) {
-      return /*#__PURE__*/React.createElement("span", {
-        title: node[nameKey],
-        className: "tree-item-title"
-      }, /*#__PURE__*/React.createElement("span", null, showIcon && icon && icon(node), prefix && prefix(node), /*#__PURE__*/React.createElement(HightLevel, {
-        keyword: keyword,
-        name: node[nameKey]
-      })), suffix && suffix(node));
-    }
+    titleRender: titleRender
   }, props));
 }
 

package/es/index.d.ts

@@ -11,7 +11,7 @@ export { default as DisableMark } from './DisableMark';
 export { default as DomMove } from './DomMove';
 export { default as Drag } from './Drag';
 export { default as Drawer } from './Drawer';
-export { default as ErrorBoundary } from './ErrorBoundary';
+export { default as ErrorFallback } from './ErrorFallback';
 export { default as FrontendPlayer } from './FrontendPlayer';
 export { default as FullScreen } from './FullScreen';
 export { default as HightLevel } from './HightLevel';
@@ -36,7 +36,7 @@ export { default as TableLayout } from './TableLayout';
 export { default as ThemeAntd } from './ThemeAntd';
 export { default as Timeout } from './Timeout';
 export { default as Tree } from './Tree';
+export { default as useFullscreen } from './useFullscreen';
 export { default as useHistory } from './useHistory';
 export { default as useInfiniteScroll } from './useInfiniteScroll';
 export { default as useVirtualList } from './useVirtualList';
-export { default as withErrorBoundary } from './withErrorBoundary';

package/es/index.js

@@ -11,7 +11,7 @@ export { default as DisableMark } from './DisableMark';
 export { default as DomMove } from './DomMove';
 export { default as Drag } from './Drag';
 export { default as Drawer } from './Drawer';
-export { default as ErrorBoundary } from './ErrorBoundary';
+export { default as ErrorFallback } from './ErrorFallback';
 export { default as FrontendPlayer } from './FrontendPlayer';
 export { default as FullScreen } from './FullScreen';
 export { default as HightLevel } from './HightLevel';
@@ -36,7 +36,7 @@ export { default as TableLayout } from './TableLayout';
 export { default as ThemeAntd } from './ThemeAntd';
 export { default as Timeout } from './Timeout';
 export { default as Tree } from './Tree';
+export { default as useFullscreen } from './useFullscreen';
 export { default as useHistory } from './useHistory';
 export { default as useInfiniteScroll } from './useInfiniteScroll';
-export { default as useVirtualList } from './useVirtualList';
-export { default as withErrorBoundary } from './withErrorBoundary';
+export { default as useVirtualList } from './useVirtualList';

package/es/useFullscreen/demo.d.ts

@@ -0,0 +1,2 @@
+/// <reference types="react" />
+export default function App(): JSX.Element;

package/es/useFullscreen/demo.js

@@ -0,0 +1,51 @@
+import _useFullscreen3 from "ahooks/es/useFullscreen";
+
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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, { useRef } from 'react';
+export default function App() {
+  var ref1 = useRef();
+  var ref2 = useRef();
+
+  var _useFullscreen = _useFullscreen3(ref1),
+      _useFullscreen2 = _slicedToArray(_useFullscreen, 2),
+      fullscreen1 = _useFullscreen2[0],
+      options1 = _useFullscreen2[1];
+
+  var _useFullscreen4 = _useFullscreen3(ref2),
+      _useFullscreen5 = _slicedToArray(_useFullscreen4, 2),
+      fullscreen2 = _useFullscreen5[0],
+      options2 = _useFullscreen5[1];
+
+  return /*#__PURE__*/React.createElement("div", {
+    className: "App"
+  }, /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: 400,
+      height: 400,
+      background: 'blue'
+    },
+    ref: ref1
+  }, /*#__PURE__*/React.createElement("button", {
+    onClick: options1.toggleFullscreen
+  }, "\u7236\u5143\u7D20", fullscreen1 ? '退出全屏' : '全屏'), /*#__PURE__*/React.createElement("div", {
+    style: {
+      width: 200,
+      height: 200,
+      background: 'red'
+    },
+    ref: ref2
+  }, /*#__PURE__*/React.createElement("button", {
+    onClick: options2.toggleFullscreen
+  }, "\u5B50\u5143\u7D20", fullscreen2 ? '退出全屏' : '全屏'))), /*#__PURE__*/React.createElement("div", null));
+}

package/es/useFullscreen/index.d.ts

@@ -0,0 +1,12 @@
+import type { BasicTarget } from 'ahooks/es/utils/domTarget';
+export interface Options {
+    onExit?: () => void;
+    onEnter?: () => void;
+}
+declare const useFullscreen: (target: BasicTarget, options?: Options) => readonly [boolean, {
+    readonly enterFullscreen: () => void;
+    readonly exitFullscreen: () => void;
+    readonly toggleFullscreen: () => void;
+    readonly isEnabled: boolean;
+}];
+export default useFullscreen;

package/es/useFullscreen/index.js

@@ -0,0 +1,95 @@
+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."); }
+
+function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
+
+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 useLatest from 'ahooks/es/useLatest';
+import useMemoizedFn from 'ahooks/es/useMemoizedFn';
+import useUnmount from 'ahooks/es/useUnmount';
+import { getTargetElement } from 'ahooks/es/utils/domTarget';
+import screenfull from 'screenfull';
+
+var useFullscreen = function useFullscreen(target, options) {
+  var _ref = options || {},
+      onExit = _ref.onExit,
+      onEnter = _ref.onEnter;
+
+  var onExitRef = useLatest(onExit);
+  var onEnterRef = useLatest(onEnter);
+
+  var _useState = useState(false),
+      _useState2 = _slicedToArray(_useState, 2),
+      state = _useState2[0],
+      setState = _useState2[1];
+
+  var onChange = function onChange() {
+    var _a, _b;
+
+    if (screenfull.isEnabled) {
+      var el = getTargetElement(target);
+      var isFullscreen = document.fullscreenElement === el;
+
+      if (isFullscreen) {
+        (_a = onEnterRef.current) === null || _a === void 0 ? void 0 : _a.call(onEnterRef);
+      } else {
+        screenfull.off('change', onChange);
+        (_b = onExitRef.current) === null || _b === void 0 ? void 0 : _b.call(onExitRef);
+      }
+
+      setState(isFullscreen);
+    }
+  };
+
+  var enterFullscreen = function enterFullscreen() {
+    var el = getTargetElement(target);
+
+    if (!el) {
+      return;
+    }
+
+    if (screenfull.isEnabled) {
+      try {
+        screenfull.request(el);
+        screenfull.on('change', onChange);
+      } catch (error) {
+        console.error(error);
+      }
+    }
+  };
+
+  var exitFullscreen = function exitFullscreen() {
+    if (screenfull.isEnabled) {
+      screenfull.exit();
+    }
+  };
+
+  var toggleFullscreen = function toggleFullscreen() {
+    if (state) {
+      exitFullscreen();
+    } else {
+      enterFullscreen();
+    }
+  };
+
+  useUnmount(function () {
+    if (screenfull.isEnabled) {
+      screenfull.off('change', onChange);
+    }
+  });
+  return [state, {
+    enterFullscreen: useMemoizedFn(enterFullscreen),
+    exitFullscreen: useMemoizedFn(exitFullscreen),
+    toggleFullscreen: useMemoizedFn(toggleFullscreen),
+    isEnabled: screenfull.isEnabled
+  }];
+};
+
+export default useFullscreen;

package/es/utils.js

@@ -49,7 +49,7 @@ export function getPlaceCodesWithParent(areaCode) {
     return v[key] === areaCode;
   });
 
-  if (info && info.pcodes) {
+  if (info === null || info === void 0 ? void 0 : info.pcodes) {
     return info.pcodes.reverse();
   }
 

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "3.0.13",
+  "version": "3.0.16",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",
@@ -36,10 +36,14 @@
     "hls.js": "^1.2.1",
     "immer": "^9.0.15",
     "lodash-es": "^4.17.21",
-    "moment": "^2.29.4"
+    "moment": "^2.29.4",
+    "react-error-boundary": "^3.1.4",
+    "screenfull": "^6.0.2"
   },
   "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",

package/test.html

@@ -0,0 +1,16 @@
+<!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,48 +1,96 @@
-const data = [
-  { beginTime: 1660492800000, endTime: 1660495901000 },
-  { beginTime: 1660495901000, endTime: 1660500078000 },
-  { beginTime: 1660500078000, endTime: 1660504255000 },
-  { beginTime: 1660504255000, endTime: 1660508434000 },
-  { beginTime: 1660508434000, endTime: 1660512614000 },
-  { beginTime: 1660512614000, endTime: 1660516805000 },
-  { beginTime: 1660516805000, endTime: 1660520999000 },
-  { beginTime: 1660520999000, endTime: 1660525198000 },
-  { beginTime: 1660525198000, endTime: 1660529393000 },
-  { beginTime: 1660529393000, endTime: 1660533595000 },
-  { beginTime: 1660533595000, endTime: 1660537792000 },
-  { beginTime: 1660537792000, endTime: 1660541987000 },
-  { beginTime: 1660541987000, endTime: 1660546174000 },
-  { beginTime: 1660546174000, endTime: 1660550358000 },
-  { beginTime: 1660550358000, endTime: 1660554546000 },
-  { beginTime: 1660554546000, endTime: 1660557065000 },
-  { beginTime: 1660557065000, endTime: 1660554546000 },
-  { beginTime: 1660558743000, endTime: 1660562938000 },
-  { beginTime: 1660562938000, endTime: 1660567141000 },
-  { beginTime: 1660567141000, endTime: 1660571333000 },
-  { beginTime: 1660571333000, endTime: 1660575521000 },
-  { beginTime: 1660575521000, endTime: 1660579199000 },
-];
-
-function completionSegments(start, end, segments) {
-  const arr = [];
-  if (segments.length > 0 && start < +segments[0].beginTime) {
-    arr.push({ beginTime: start, endTime: +segments[0].beginTime - start });
+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;
   }
-  segments.reduce((prev, current, idx) => {
-    if (arr.length === 0) {
-      prev.push(current);
-    } else if (segments[idx - 1].endTime !== current.beginTime) {
-      prev.push({ beginTime: segments[idx - 1].endTime, endTime: current.beginTime }, current);
-    } else {
-      prev.push(current);
-    }
-
-    return prev;
-  }, arr);
-
-  if (end > +segments[segments.length - 1].endTime) {
-    arr.push({ beginTime: segments[segments.length - 1].endTime, endTime: end });
+
+  // 过滤其他
+  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 arr;
+  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);
+  });
 }
-console.log(completionSegments(1660492800000, 1660579199000, data))

package/es/ErrorBoundary/index.d.ts

@@ -1,18 +0,0 @@
-import React, { Component, ErrorInfo } from 'react';
-export declare type IErrorBoundaryProps = {
-    fallback?: React.ReactNode;
-    children?: React.ReactNode;
-};
-declare type State = {
-    error: boolean;
-};
-declare class ErrorBoundary extends Component<IErrorBoundaryProps, State> {
-    state: State;
-    static defaultProps: {
-        fallback: () => JSX.Element;
-    };
-    static getDerivedStateFromError(error: Error): State;
-    componentDidCatch(error: Error, info: ErrorInfo): void;
-    render(): React.ReactNode;
-}
-export default ErrorBoundary;