@fonixtree/magic-design 0.0.160 → 0.0.161

package/lib/composite-comp/bol/components/Video/pc/Layout1/index.js

@@ -77,6 +77,27 @@ function (_super) {
     /** 视频ref映射 */
 
     _this.videoRefMap = {};
+
+    _this.playOrPause = function (group) {
+      (0, _commonUtil.ensure)(function () {
+        if (_this.videoRefMap[group.id].playing) {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.videoRefMap[group.id].el.player.pause();
+        } else {
+          if (group.video.playPosition == 'Popup') {
+            _this.videoRefMap[group.id].el.fullPlay('pc');
+          } else {
+            _this.videoRefMap[group.id].playing = true;
+
+            _this.videoRefMap[group.id].el.player.play();
+          }
+        }
+
+        _this.setState({});
+      });
+    };
+
     return _this;
   }
 
@@ -90,7 +111,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-pc-layout1-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", null, data.groupSource.map(function (group) {
-      var _a;
+      var _a, _b;
       /** 当前是否在播放 */
 
 
@@ -98,25 +119,6 @@ function (_super) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "video-item-wrap",
-        onClick: function onClick() {
-          (0, _commonUtil.ensure)(function () {
-            if (_this.videoRefMap[group.id].playing) {
-              _this.videoRefMap[group.id].playing = false;
-
-              _this.videoRefMap[group.id].el.player.pause();
-            } else {
-              if (group.video.playPosition == 'Popup') {
-                _this.videoRefMap[group.id].el.fullPlay('pc');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        },
         style: {
           height: data.pcHeight
         }
@@ -135,9 +137,13 @@ function (_super) {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl
         }),
+        play: (_b = _this.videoRefMap[group.id]) === null || _b === void 0 ? void 0 : _b.playing,
         videoId: group.id
       }), !isPlaying && group.video.playButton == 'Middle' && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "play-btn center"
+        className: "play-btn center",
+        onClick: function onClick() {
+          _this.playOrPause(group);
+        }
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
@@ -145,6 +151,9 @@ function (_super) {
         align: data.customize.align,
         data: group,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         padding: 48
       }), data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
         data: __assign({

package/lib/composite-comp/bol/components/Video/pc/Layout2/index.js

@@ -79,6 +79,27 @@ function (_super) {
     /** 视频ref映射 */
 
     _this.videoRefMap = {};
+
+    _this.playOrPause = function (group) {
+      (0, _commonUtil.ensure)(function () {
+        if (_this.videoRefMap[group.id].playing) {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.videoRefMap[group.id].el.player.pause();
+        } else {
+          if (group.video.playPosition == 'Popup') {
+            _this.videoRefMap[group.id].el.fullPlay('pc');
+          } else {
+            _this.videoRefMap[group.id].playing = true;
+
+            _this.videoRefMap[group.id].el.player.play();
+          }
+        }
+
+        _this.setState({});
+      });
+    };
+
     return _this;
   }
 
@@ -102,22 +123,7 @@ function (_super) {
       }
     }, firstGroup && /*#__PURE__*/_react["default"].createElement("div", {
       key: firstGroup.id,
-      className: "video-left-wrap",
-      onClick: function onClick() {
-        (0, _commonUtil.ensure)(function () {
-          if (_this.videoRefMap[firstGroup.id].playing) {
-            _this.videoRefMap[firstGroup.id].playing = false;
-
-            _this.videoRefMap[firstGroup.id].el.player.pause();
-          } else {
-            _this.videoRefMap[firstGroup.id].playing = true;
-
-            _this.videoRefMap[firstGroup.id].el.player.play();
-          }
-
-          _this.setState({});
-        });
-      }
+      className: "video-left-wrap"
     }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
       ref: function ref(el) {
         if (!_this.videoRefMap[firstGroup.id]) {
@@ -133,9 +139,13 @@ function (_super) {
         cover: (0, _coreUtil.isPc)() ? firstGroup.overilay.content.pcImgSrc : firstGroup.overilay.content.h5ImgSrc,
         source: firstGroup.video.sourceUrl
       }),
+      play: isFirstGroupPlaying,
       videoId: firstGroup.id
     }), !isFirstGroupPlaying && firstGroup.video.playButton == 'Middle' && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "play-btn center"
+      className: "play-btn center",
+      onClick: function onClick() {
+        _this.playOrPause(firstGroup);
+      }
     }, /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
       src: _playCircle["default"]
@@ -143,37 +153,21 @@ function (_super) {
       align: data.customize.align,
       data: firstGroup,
       noShare: true,
+      onPlayClick: function onPlayClick() {
+        return _this.playOrPause(firstGroup);
+      },
       padding: 32
     })), /*#__PURE__*/_react["default"].createElement("div", {
       className: "right-list-wrap"
     }, data.groupSource.slice(1).map(function (group) {
-      var _a;
+      var _a, _b;
       /** 当前是否在播放 */
 
 
       var isPlaying = !!((_a = _this.videoRefMap[group.id]) === null || _a === void 0 ? void 0 : _a.playing);
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
-        className: "video-item-wrap",
-        onClick: function onClick() {
-          (0, _commonUtil.ensure)(function () {
-            if (_this.videoRefMap[group.id].playing) {
-              _this.videoRefMap[group.id].playing = false;
-
-              _this.videoRefMap[group.id].el.player.pause();
-            } else {
-              if (group.video.playPosition == 'Popup') {
-                _this.videoRefMap[group.id].el.fullPlay('pc');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        }
+        className: "video-item-wrap"
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {
           if (!_this.videoRefMap[group.id]) {
@@ -189,16 +183,23 @@ function (_super) {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl
         }),
+        play: (_b = _this.videoRefMap[group.id]) === null || _b === void 0 ? void 0 : _b.playing,
         videoId: group.id
       }), !isPlaying && group.video.playButton == 'Middle' && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "play-btn center"
+        className: "play-btn center",
+        onClick: function onClick() {
+          _this.playOrPause(group);
+        }
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
-      })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+      })), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
         align: data.customize.align,
         data: group,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         padding: 32
       }));
     })), data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {

package/lib/composite-comp/bol/components/Video/pc/Layout3/index.js

@@ -79,6 +79,27 @@ function (_super) {
     /** 视频ref映射 */
 
     _this.videoRefMap = {};
+
+    _this.playOrPause = function (group) {
+      (0, _commonUtil.ensure)(function () {
+        if (_this.videoRefMap[group.id].playing) {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.videoRefMap[group.id].el.player.pause();
+        } else {
+          if (group.video.playPosition == 'Popup') {
+            _this.videoRefMap[group.id].el.fullPlay('pc');
+          } else {
+            _this.videoRefMap[group.id].playing = true;
+
+            _this.videoRefMap[group.id].el.player.play();
+          }
+        }
+
+        _this.setState({});
+      });
+    };
+
     return _this;
   }
 
@@ -94,7 +115,7 @@ function (_super) {
       style: {
         height: data.pcHeight
       }
-    }, !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
+    }, data.share.open && !hasPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
       data: __assign({
         url: (0, _commonUtil.addUrlQuery)(window.location.href, {
           scroll: 'node-' + data.id
@@ -102,33 +123,14 @@ function (_super) {
       }, data.share),
       pc: true
     }), data.groupSource.map(function (group) {
-      var _a;
+      var _a, _b;
       /** 当前是否在播放 */
 
 
       var isPlaying = !!((_a = _this.videoRefMap[group.id]) === null || _a === void 0 ? void 0 : _a.playing);
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
-        className: "video-item-wrap",
-        onClick: function onClick() {
-          (0, _commonUtil.ensure)(function () {
-            if (_this.videoRefMap[group.id].playing) {
-              _this.videoRefMap[group.id].playing = false;
-
-              _this.videoRefMap[group.id].el.player.pause();
-            } else {
-              if (group.video.playPosition == 'Popup') {
-                _this.videoRefMap[group.id].el.fullPlay('pc');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        }
+        className: "video-item-wrap"
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {
         ref: function ref(el) {
           if (!_this.videoRefMap[group.id]) {
@@ -144,16 +146,23 @@ function (_super) {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl
         }),
+        play: (_b = _this.videoRefMap[group.id]) === null || _b === void 0 ? void 0 : _b.playing,
         videoId: group.id
       }), !isPlaying && group.video.playButton == 'Middle' && /*#__PURE__*/_react["default"].createElement("div", {
-        className: "play-btn center"
+        className: "play-btn center",
+        onClick: function onClick() {
+          _this.playOrPause(group);
+        }
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
-      })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
+      })), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
         align: data.customize.align,
         data: group,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         padding: 20
       }));
     }));

package/lib/composite-comp/bol/components/Video/pc/Layout4/index.js

@@ -81,6 +81,27 @@ function (_super) {
     /** 视频ref映射 */
 
     _this.videoRefMap = {};
+
+    _this.playOrPause = function (group) {
+      (0, _commonUtil.ensure)(function () {
+        if (_this.videoRefMap[group.id].playing) {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.videoRefMap[group.id].el.player.pause();
+        } else {
+          if (group.video.playPosition == 'Popup') {
+            _this.videoRefMap[group.id].el.fullPlay('pc');
+          } else {
+            _this.videoRefMap[group.id].playing = true;
+
+            _this.videoRefMap[group.id].el.player.play();
+          }
+        }
+
+        _this.setState({});
+      });
+    };
+
     return _this;
   }
 
@@ -91,7 +112,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-layout4-wrap"
     }, data.groupSource.map(function (group) {
-      var _a;
+      var _a, _b;
       /** 当前是否在播放 */
 
 
@@ -101,25 +122,6 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "video-item-wrap",
-        onClick: function onClick() {
-          (0, _commonUtil.ensure)(function () {
-            if (_this.videoRefMap[group.id].playing) {
-              _this.videoRefMap[group.id].playing = false;
-
-              _this.videoRefMap[group.id].el.player.pause();
-            } else {
-              if (group.video.playPosition == 'Popup') {
-                _this.videoRefMap[group.id].el.fullPlay('pc');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        },
         style: {
           height: data.pcHeight
         }
@@ -138,12 +140,16 @@ function (_super) {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl
         }),
+        play: (_b = _this.videoRefMap[group.id]) === null || _b === void 0 ? void 0 : _b.playing,
         videoId: group.id
       }), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])('play-btn', {
           middle: group.video.playButton == 'Middle',
           bottomLeft: group.video.playButton == 'Bottom Left'
-        })
+        }),
+        onClick: function onClick() {
+          _this.playOrPause(group);
+        }
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
@@ -162,6 +168,9 @@ function (_super) {
         data: group,
         layout: 'pc-' + data.customize.layout.pcLayout,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         position: "relative"
       })));
     }));

package/lib/composite-comp/bol/components/Video/pc/Layout5/index.js

@@ -81,6 +81,27 @@ function (_super) {
     /** 视频ref映射 */
 
     _this.videoRefMap = {};
+
+    _this.playOrPause = function (group) {
+      (0, _commonUtil.ensure)(function () {
+        if (_this.videoRefMap[group.id].playing) {
+          _this.videoRefMap[group.id].playing = false;
+
+          _this.videoRefMap[group.id].el.player.pause();
+        } else {
+          if (group.video.playPosition == 'Popup') {
+            _this.videoRefMap[group.id].el.fullPlay('pc');
+          } else {
+            _this.videoRefMap[group.id].playing = true;
+
+            _this.videoRefMap[group.id].el.player.play();
+          }
+        }
+
+        _this.setState({});
+      });
+    };
+
     return _this;
   }
 
@@ -91,7 +112,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-layout5-wrap"
     }, data.groupSource.map(function (group) {
-      var _a;
+      var _a, _b;
       /** 当前是否在播放 */
 
 
@@ -101,25 +122,6 @@ function (_super) {
       }, /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "video-item-wrap",
-        onClick: function onClick() {
-          (0, _commonUtil.ensure)(function () {
-            if (_this.videoRefMap[group.id].playing) {
-              _this.videoRefMap[group.id].playing = false;
-
-              _this.videoRefMap[group.id].el.player.pause();
-            } else {
-              if (group.video.playPosition == 'Popup') {
-                _this.videoRefMap[group.id].el.fullPlay('pc');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        },
         style: {
           height: data.pcHeight
         }
@@ -138,12 +140,16 @@ function (_super) {
           cover: (0, _coreUtil.getVideoCover)(group),
           source: group.video.sourceUrl
         }),
+        play: (_b = _this.videoRefMap[group.id]) === null || _b === void 0 ? void 0 : _b.playing,
         videoId: group.id
       }), !isPlaying && /*#__PURE__*/_react["default"].createElement("div", {
         className: (0, _classnames["default"])('play-btn', {
           middle: group.video.playButton == 'Middle',
           bottomLeft: group.video.playButton == 'Bottom Left'
-        })
+        }),
+        onClick: function onClick() {
+          _this.playOrPause(group);
+        }
       }, /*#__PURE__*/_react["default"].createElement("img", {
         alt: "",
         src: _playCircle["default"]
@@ -162,6 +168,9 @@ function (_super) {
         data: group,
         layout: 'pc-' + data.customize.layout.pcLayout,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         position: "relative"
       })));
     }));

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.0.160",
+  "version": "0.0.161",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",