@cloud-app-dev/vidc 4.0.14 → 4.0.15

package/.prettierrc.js

@@ -1,7 +1,7 @@
 module.exports = {
   pluginSearchDirs: false,
   plugins: [require.resolve('prettier-plugin-organize-imports'), require.resolve('prettier-plugin-packagejson')],
-  printWidth: 180,
+  printWidth: 200,
   proseWrap: 'never',
   singleQuote: true,
   trailingComma: 'all',

package/es/Picture/demo.js

@@ -79,6 +79,7 @@ export default function App() {
           });
         },
         width: 844,
+        destroyOnClose: true,
         children: /*#__PURE__*/_jsx("div", {
           style: {
             width: 800,

package/es/Player/single_player.js

@@ -30,7 +30,7 @@ import FPSPlay from "./fps_play";
 import useLiveHeart from "./live_heart";
 import VideoMessage from "./message";
 import Timeline from "./timeline";
-import { getVideoType, playUnload } from "./util";
+import { createProxy, getVideoType, playUnload } from "./util";
 import "./style/index.less";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
@@ -153,22 +153,14 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function SinglePlayer(_ref, ref
     if (!api) {
       return undefined;
     }
-    var map = _objectSpread({
+    var extmap = _objectSpread({
       reload: reload,
       unload: unload,
       toggleFit: toggle,
       openFpsPlay: openFpsPlay,
       closeFpsPlay: closeFpsPlay
     }, extActions);
-    return new Proxy(api, {
-      get: function get(target, key) {
-        var _map$key;
-        return (_map$key = map[key]) !== null && _map$key !== void 0 ? _map$key : target[key];
-      },
-      set: function set() {
-        return true;
-      }
-    });
+    return createProxy(api, extmap);
     // eslint-disable-next-line react-hooks/exhaustive-deps
   }, [api]);
 
@@ -177,14 +169,7 @@ var SinglePlayer = /*#__PURE__*/React.forwardRef(function SinglePlayer(_ref, ref
     if (!event) {
       return undefined;
     }
-    return new Proxy(event, {
-      get: function get(target, key) {
-        return target[key];
-      },
-      set: function set() {
-        return true;
-      }
-    });
+    return createProxy(event);
   }, [event]);
 
   // ref暴露接口

package/es/Player/style/message.less

@@ -46,11 +46,11 @@
 }
 
 @keyframes loading-animation-frames {
-  form {
+  from {
     transform: rotate(0deg);
   }
 
-  100% {
+  to {
     transform: rotate(360deg);
   }
 }

package/es/Player/util.d.ts

@@ -40,3 +40,4 @@ export declare function timeStamp(second: number): string;
 export declare function getRandom(): string;
 export declare const FMT = "YYYY-MM-DD HH:mm:ss";
 export declare function getDomStyleValue(dom: HTMLElement, styleKey: string): string;
+export declare function createProxy<T>(obj: T, getObj?: any): T;

package/es/Player/util.js

@@ -161,7 +161,7 @@ export function timeStamp(second) {
   return "".concat(h < 10 ? '0' + h : h, ":").concat(m < 10 ? '0' + m : m, ":").concat(s < 10 ? '0' + s : s);
 }
 export function getRandom() {
-  return Math.random().toString(36).substr(2);
+  return Math.random().toString(36).substring(2);
 }
 export var FMT = 'YYYY-MM-DD HH:mm:ss';
 export function getDomStyleValue(dom, styleKey) {
@@ -169,4 +169,21 @@ export function getDomStyleValue(dom, styleKey) {
     return '';
   }
   return window.getComputedStyle(dom).getPropertyValue(styleKey);
+}
+export function createProxy(obj, getObj) {
+  var handler = {
+    get: function get(target, key, recevier) {
+      if (_typeof(target[key]) === 'object') {
+        createProxy(target[key]);
+      }
+      if (getObj && getObj[key]) {
+        return Reflect.get(getObj, key);
+      }
+      return Reflect.get(target, key, recevier);
+    },
+    set: function set(target, key, value) {
+      return Reflect.set(target, key, value);
+    }
+  };
+  return new Proxy(obj, handler);
 }

package/es/index.d.ts

@@ -26,7 +26,6 @@ export { default as List } from './List';
 export { default as ListWithSizeAnimate } from './ListWithSizeAnimate';
 export { default as LoaderScript } from './LoaderScript';
 export { default as Map } from './Map';
-export { default as Map3D } from './Map3D';
 export { default as Picture } from './Picture';
 export { default as Player } from './Player';
 export { default as PlayerExt } from './PlayerExt';

package/es/index.js

@@ -26,7 +26,6 @@ export { default as List } from "./List";
 export { default as ListWithSizeAnimate } from "./ListWithSizeAnimate";
 export { default as LoaderScript } from "./LoaderScript";
 export { default as Map } from "./Map";
-export { default as Map3D } from "./Map3D";
 export { default as Picture } from "./Picture";
 export { default as Player } from "./Player";
 export { default as PlayerExt } from "./PlayerExt";

package/package.json

@@ -2,7 +2,7 @@
   "private": false,
   "name": "@cloud-app-dev/vidc",
   "description": "Video Image Data Componennts",
-  "version": "4.0.14",
+  "version": "4.0.15",
   "scripts": {
     "docs:deploy": "gh-pages -d docs-dist",
     "build": "npm run entry && father build",
@@ -17,6 +17,9 @@
     "lint:es": "eslint \"{src,test}/**/*.{js,jsx,ts,tsx}\"",
     "stylelint": "stylelint --fix \"**/*.less\" --custom-syntax postcss-less"
   },
+  "publishConfig": {
+    "registry": "https://registry.npmjs.org/"
+  },
   "main": "es/index.js",
   "module": "es/index.js",
   "typings": "es/index.d.ts",
@@ -49,30 +52,31 @@
     "ahooks": "^3.7.2",
     "axios": "^1.2.1",
     "dayjs": "^1.11.6",
+    "db.js": "^0.15.0",
     "history": "^5.3.0",
-    "hls.js": "^1.2.8",
+    "hls.js": "^1.4.0",
     "immer": "^9.0.16",
+    "js-cookie": "^2.2.1",
     "lodash-es": "^4.17.21",
     "react-error-boundary": "^3.1.4",
     "react-hotkeys-hook": "^4.0.4",
     "screenfull": "^6.0.2",
-    "socket.io-client": "1.4.5",
-    "js-cookie": "^2.2.1",
-    "db.js": "^0.15.0"
+    "socket.io-client": "1.4.5"
   },
   "devDependencies": {
-    "@types/socket.io-client": "^1.4.36",
     "@commitlint/cli": "^17.1.2",
     "@commitlint/config-conventional": "^17.1.0",
+    "@types/db.js": "^0.14.7",
     "@types/leaflet": "^1.9.0",
     "@types/lodash-es": "^4.17.6",
     "@types/node": "^18.11.11",
     "@types/react": "^18.0.26",
     "@types/react-dom": "^18.0.9",
+    "@types/socket.io-client": "^1.4.36",
     "@umijs/lint": "^4.0.52",
     "antd": "^5.2.2",
     "babel-plugin-import": "^1.13.5",
-    "dumi": "^2.1.17",
+    "dumi": "^2.1.19",
     "eslint": "^8.28.0",
     "father": "^4.1.7",
     "gh-pages": "^4.0.0",

package/es/Map3D/demo.d.ts

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

package/es/Map3D/demo.js

@@ -1,13 +0,0 @@
-import React from 'react';
-import Map3D from '.';
-import { jsx as _jsx } from "react/jsx-runtime";
-var App = function App() {
-  return /*#__PURE__*/_jsx("div", {
-    style: {
-      width: 1000,
-      height: 400
-    },
-    children: /*#__PURE__*/_jsx(Map3D, {})
-  });
-};
-export default App;

package/es/Map3D/index.d.ts

@@ -1,4 +0,0 @@
-/// <reference types="react" />
-import './index.less';
-declare function withLoadMap(): JSX.Element;
-export default withLoadMap;

package/es/Map3D/index.js

@@ -1,84 +0,0 @@
-import React, { useEffect, useRef } from 'react';
-import LoaderScript from "../LoaderScript";
-import "./index.less";
-
-// const options: IOptionsLoader[] = [
-//   { scripts: ['http://192.168.101.38:8888/twinmap/resources/TwinMap3D/lib/Cesium/Cesium.js'] },
-//   { scripts: ['http://192.168.101.38:8888/twinmap/resources/TwinMap3D/TwinMap3D.js'] },
-// ];
-import { jsx as _jsx } from "react/jsx-runtime";
-var options = [{
-  scripts: []
-}, {
-  scripts: []
-}];
-var _this = window;
-function Map3D() {
-  var ref = useRef(null);
-  useEffect(function () {
-    var viewer = new _this.Cesium.Viewer(ref.current, {
-      infoBox: false,
-      selectionIndicator: false,
-      navigation: false,
-      animation: false,
-      shouldAnimate: false,
-      timeline: false,
-      baseLayerPicker: false,
-      geocoder: false,
-      homeButton: false,
-      sceneModePicker: false,
-      navigationHelpButton: false,
-      fullscreenButton: !1
-    });
-    var url = 'http://192.168.101.38:8888/twinmap/twin3dMap/model/b3dms/tileset.json';
-    var tileset = new _this.Cesium.Cesium3DTileset({
-      url: url
-    });
-    viewer.scene.primitives.add(tileset).readyPromise.then(function (t) {
-      console.log(t);
-      viewer.zoomTo(t);
-      tileset.maximumScreenSpaceError = 1;
-      var plotDraw = new _this.TwinMap3D.Tools.GeoPlotDraw(viewer);
-      plotDraw.activate('marker');
-
-      // const params = {
-      //   tx: 116.044332, //模型中心X轴坐标（经度，单位：十进制度）
-      //   ty: 30.110653, //模型中心Y轴坐标（纬度，单位：十进制度）
-      //   tz: 0, //模型中心Z轴坐标（高程，单位：米）
-      //   rx: 0, //X轴（经度）方向旋转角度（单位：度）
-      //   ry: 0, //Y轴（纬度）方向旋转角度（单位：度）
-      //   rz: 0, //Z轴（高程）方向旋转角度（单位：度）
-      // };
-      //平移、贴地、旋转模型
-      //旋转
-      // const mx = _this.Cesium.Matrix3.fromRotationX(_this.Cesium.Math.toRadians(params.rx));
-      // const my = _this.Cesium.Matrix3.fromRotationY(_this.Cesium.Math.toRadians(params.ry));
-      // const mz = _this.Cesium.Matrix3.fromRotationZ(_this.Cesium.Math.toRadians(params.rz));
-      // const rotationX = _this.Cesium.Matrix4.fromRotationTranslation(mx);
-      // const rotationY = _this.Cesium.Matrix4.fromRotationTranslation(my);
-      // const rotationZ = _this.Cesium.Matrix4.fromRotationTranslation(mz);
-      //平移
-      // const position = _this.Cesium.Cartesian3.fromDegrees(params.tx, params.ty, params.tz);
-      // const m = _this.Cesium.Transforms.eastNorthUpToFixedFrame(position);
-      //旋转、平移矩阵相乘
-      // _this.Cesium.Matrix4.multiply(m, rotationX, m);
-      // _this.Cesium.Matrix4.multiply(m, rotationY, m);
-      // _this.Cesium.Matrix4.multiply(m, rotationZ, m);
-      //赋值给tileset
-      // tileset._root.transform = m;
-    }).otherwise(function (e) {
-      console.log(e);
-    });
-  }, []);
-  return /*#__PURE__*/_jsx("div", {
-    className: "map-3d-container",
-    ref: ref
-  });
-}
-function withLoadMap() {
-  return /*#__PURE__*/_jsx(LoaderScript, {
-    options: options,
-    children: /*#__PURE__*/_jsx(Map3D, {})
-  });
-}
-export default withLoadMap;

package/es/Map3D/index.less

@@ -1,4 +0,0 @@
-.map-3d-container {
-  width: 100%;
-  height: 100%;
-}