wargerm 0.6.11 → 0.6.12

package/dist/components/VideoPlayer/index.d.ts

@@ -9,6 +9,7 @@ declare type propsType = {
     layoutIndex?: number;
     config?: Object;
     url?: string[];
+    onDoubleClickCapture?: any;
 };
 declare const _default: React.ForwardRefExoticComponent<propsType & React.RefAttributes<unknown>>;
 export default _default;

package/dist/index.esm.js

@@ -6629,7 +6629,6 @@ function Xgplay(_ref, fRef) {
       }
     }
 
-    console.log('playerRef.current', playerRef.current);
     return function () {
       var _playerRef$current, _playerRef$current2, _playerRef$current2$h, _playerRef$current3, _playerRef$current3$f, _playerRef$current4;
 
@@ -6682,6 +6681,7 @@ function VideoPlayer(_ref, ref) {
       _ref$config = _ref.config,
       config = _ref$config === void 0 ? {} : _ref$config,
       layoutIndex = _ref.layoutIndex,
+      _onDoubleClickCapture = _ref.onDoubleClickCapture,
       _ref$url = _ref.url,
       url = _ref$url === void 0 ? [] : _ref$url,
       _ref$layouts = _ref.layouts,
@@ -6753,9 +6753,12 @@ function VideoPlayer(_ref, ref) {
     return arr.map(function (item, index) {
       return /*#__PURE__*/React.createElement("div", {
         key: index,
-        className: "camera ".concat(currentPlayerIndex == index ? index !== 0 ? 'activeCamera' : 'noneborder' : ''),
+        className: "camera ".concat(currentPlayerIndex == index && arr.length > 1 ? 'activeCamera' : 'noneborder'),
         onClickCapture: function onClickCapture() {
           setCurrentPlayerIndex(index);
+        },
+        onDoubleClickCapture: function onDoubleClickCapture() {
+          _onDoubleClickCapture && _onDoubleClickCapture(index, !document.fullscreenElement);
         }
       }, urls[index] ? /*#__PURE__*/React.createElement(Xgplay$1, {
         setRef: function setRef(ref) {
@@ -6811,6 +6814,15 @@ function VideoPlayer(_ref, ref) {
 
     setUrls(function (urls) {
       urls[currentPlayerIndex] = url;
+      setCurrentPlayerIndex(function (pre) {
+        pre++;
+
+        if (pre == allLayouts[currentLayoutIndex || 0].span) {
+          return 0;
+        }
+
+        return pre;
+      });
       return _toConsumableArray(urls);
     });
   };
@@ -6838,7 +6850,7 @@ function VideoPlayer(_ref, ref) {
       key: index,
       className: "btnbox",
       onClick: function onClick() {
-        var playerIndex = allLayouts[index || 0].span > url.length ? url.length - 1 >= 0 ? url.length : 0 : allLayouts[index || 0].span - 1;
+        var playerIndex = allLayouts[index || 0].span > urls.length ? urls.length - 1 >= 0 ? urls.length : 0 : allLayouts[index || 0].span - 1;
         setCurrentPlayerIndex(playerIndex);
         setCurrentLayoutIndex(index);
       }

package/dist/index.js

@@ -6694,7 +6694,6 @@ function Xgplay(_ref, fRef) {
       }
     }
 
-    console.log('playerRef.current', playerRef.current);
     return function () {
       var _playerRef$current, _playerRef$current2, _playerRef$current2$h, _playerRef$current3, _playerRef$current3$f, _playerRef$current4;
 
@@ -6747,6 +6746,7 @@ function VideoPlayer(_ref, ref) {
       _ref$config = _ref.config,
       config = _ref$config === void 0 ? {} : _ref$config,
       layoutIndex = _ref.layoutIndex,
+      _onDoubleClickCapture = _ref.onDoubleClickCapture,
       _ref$url = _ref.url,
       url = _ref$url === void 0 ? [] : _ref$url,
       _ref$layouts = _ref.layouts,
@@ -6818,9 +6818,12 @@ function VideoPlayer(_ref, ref) {
     return arr.map(function (item, index) {
       return /*#__PURE__*/React__default['default'].createElement("div", {
         key: index,
-        className: "camera ".concat(currentPlayerIndex == index ? index !== 0 ? 'activeCamera' : 'noneborder' : ''),
+        className: "camera ".concat(currentPlayerIndex == index && arr.length > 1 ? 'activeCamera' : 'noneborder'),
         onClickCapture: function onClickCapture() {
           setCurrentPlayerIndex(index);
+        },
+        onDoubleClickCapture: function onDoubleClickCapture() {
+          _onDoubleClickCapture && _onDoubleClickCapture(index, !document.fullscreenElement);
         }
       }, urls[index] ? /*#__PURE__*/React__default['default'].createElement(Xgplay$1, {
         setRef: function setRef(ref) {
@@ -6876,6 +6879,15 @@ function VideoPlayer(_ref, ref) {
 
     setUrls(function (urls) {
       urls[currentPlayerIndex] = url;
+      setCurrentPlayerIndex(function (pre) {
+        pre++;
+
+        if (pre == allLayouts[currentLayoutIndex || 0].span) {
+          return 0;
+        }
+
+        return pre;
+      });
       return _toConsumableArray(urls);
     });
   };
@@ -6903,7 +6915,7 @@ function VideoPlayer(_ref, ref) {
       key: index,
       className: "btnbox",
       onClick: function onClick() {
-        var playerIndex = allLayouts[index || 0].span > url.length ? url.length - 1 >= 0 ? url.length : 0 : allLayouts[index || 0].span - 1;
+        var playerIndex = allLayouts[index || 0].span > urls.length ? urls.length - 1 >= 0 ? urls.length : 0 : allLayouts[index || 0].span - 1;
         setCurrentPlayerIndex(playerIndex);
         setCurrentLayoutIndex(index);
       }

package/package.json

@@ -1,92 +1,92 @@
-{
-  "private": false,
-  "name": "wargerm",
-  "version": "0.6.11",
-  "scripts": {
-    "dev": "dumi dev",
-    "docs:build": "dumi build",
-    "docs:deploy": "gh-pages -d docs-dist",
-    "build": "father-build",
-    "deploy": "npm run docs:build && npm run docs:deploy",
-    "release": "npm run build && npm publish",
-    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
-    "test": "umi-test",
-    "test:coverage": "umi-test --coverage"
-  },
-  "main": "dist/index.js",
-  "module": "dist/index.esm.js",
-  "unpkg": "dist/index.umd.min.js",
-  "typings": "dist/index.d.ts",
-  "author": "jinly2",
-  "license": "MIT",
-  "keywords": [
-    "React",
-    "Component"
-  ],
-  "gitHooks": {
-    "pre-commit": "lint-staged"
-  },
-  "repository": {
-    "type": "git",
-    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
-    "branch": "main"
-  },
-  "files": [
-    "dist",
-    "es",
-    "lib",
-    "index.css"
-  ],
-  "lint-staged": {
-    "*.{js,jsx,less,md,json}": [
-      "prettier --write"
-    ],
-    "*.ts?(x)": [
-      "prettier --parser=typescript --write"
-    ]
-  },
-  "dependencies": {
-    "@ant-design/pro-table": "^2.79.0",
-    "animate.css": "^4.1.1",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": "^4.17.21",
-    "moment": "^2.29.4",
-    "react-countup": "^6.0.0",
-    "react-dom": "^17.0.2",
-    "react-file-viewer": "^1.2.1",
-    "swiper": "^6.7.0",
-    "use-sync-external-store": "^1.2.0",
-    "xgplayer": "^2.31.6",
-    "xgplayer-flv": "^2.5.1",
-    "xgplayer-flv.js": "^2.3.0",
-    "xgplayer-hls": "^2.5.2",
-    "xgplayer-hls.js": "^2.6.1"
-  },
-  "peerDependencies": {
-    "@ant-design/icons": ">=4.2.0",
-    "antd": ">=4.7.0",
-    "classnames": ">=2.2.0",
-    "echarts": "^5.2.2",
-    "echarts-for-react": "^3.0.2",
-    "lodash-es": ">=4.17.21",
-    "react": ">=17.0.0"
-  },
-  "devDependencies": {
-    "@ant-design/icons": "^4.6.4",
-    "@types/lodash-es": "^4.17.6",
-    "@types/react-dom": "^17.0.11",
-    "@types/use-sync-external-store": "^0.0.3",
-    "@umijs/test": "^3.0.5",
-    "antd": "^4.16.13",
-    "babel-plugin-import": "^1.13.3",
-    "classnames": "^2.3.1",
-    "dumi": "^1.1.31",
-    "father-build": "^1.19.1",
-    "gh-pages": "^3.0.0",
-    "lint-staged": "^10.0.7",
-    "prettier": "^1.19.1",
-    "react": "^16.12.0",
-    "yorkie": "^2.0.0"
-  }
-}
+{
+  "private": false,
+  "name": "wargerm",
+  "version": "0.6.12",
+  "scripts": {
+    "dev": "dumi dev",
+    "docs:build": "dumi build",
+    "docs:deploy": "gh-pages -d docs-dist",
+    "build": "father-build",
+    "deploy": "npm run docs:build && npm run docs:deploy",
+    "release": "npm run build && npm publish",
+    "prettier": "prettier --write \"**/*.{js,jsx,tsx,ts,less,md,json}\"",
+    "test": "umi-test",
+    "test:coverage": "umi-test --coverage"
+  },
+  "main": "dist/index.js",
+  "module": "dist/index.esm.js",
+  "unpkg": "dist/index.umd.min.js",
+  "typings": "dist/index.d.ts",
+  "author": "jinly2",
+  "license": "MIT",
+  "keywords": [
+    "React",
+    "Component"
+  ],
+  "gitHooks": {
+    "pre-commit": "lint-staged"
+  },
+  "repository": {
+    "type": "git",
+    "url": "http://code.eblssmart.com/platform/web/wargerm-components.git",
+    "branch": "main"
+  },
+  "files": [
+    "dist",
+    "es",
+    "lib",
+    "index.css"
+  ],
+  "lint-staged": {
+    "*.{js,jsx,less,md,json}": [
+      "prettier --write"
+    ],
+    "*.ts?(x)": [
+      "prettier --parser=typescript --write"
+    ]
+  },
+  "dependencies": {
+    "@ant-design/pro-table": "^2.79.0",
+    "animate.css": "^4.1.1",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": "^4.17.21",
+    "moment": "^2.29.4",
+    "react-countup": "^6.0.0",
+    "react-dom": "^17.0.2",
+    "react-file-viewer": "^1.2.1",
+    "swiper": "^6.7.0",
+    "use-sync-external-store": "^1.2.0",
+    "xgplayer": "^2.31.6",
+    "xgplayer-flv": "^2.5.1",
+    "xgplayer-flv.js": "^2.3.0",
+    "xgplayer-hls": "^2.5.2",
+    "xgplayer-hls.js": "^2.6.1"
+  },
+  "peerDependencies": {
+    "@ant-design/icons": ">=4.2.0",
+    "antd": ">=4.7.0",
+    "classnames": ">=2.2.0",
+    "echarts": "^5.2.2",
+    "echarts-for-react": "^3.0.2",
+    "lodash-es": ">=4.17.21",
+    "react": ">=17.0.0"
+  },
+  "devDependencies": {
+    "@ant-design/icons": "^4.6.4",
+    "@types/lodash-es": "^4.17.6",
+    "@types/react-dom": "^17.0.11",
+    "@types/use-sync-external-store": "^0.0.3",
+    "@umijs/test": "^3.0.5",
+    "antd": "^4.16.13",
+    "babel-plugin-import": "^1.13.3",
+    "classnames": "^2.3.1",
+    "dumi": "^1.1.31",
+    "father-build": "^1.19.1",
+    "gh-pages": "^3.0.0",
+    "lint-staged": "^10.0.7",
+    "prettier": "^1.19.1",
+    "react": "^16.12.0",
+    "yorkie": "^2.0.0"
+  }
+}