@fonixtree/magic-design 0.0.159 → 0.0.161

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

@@ -28,6 +28,7 @@
       width: 100px;
       height: 100px;
       z-index: 1;
+      cursor: pointer;
 
       img {
         width: 100%;

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/Layout4/index.less

@@ -30,6 +30,7 @@
       width: 70px;
       height: 70px;
       z-index: 1;
+      cursor: pointer;
 
       img {
         width: 100%;

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/lib/composite-comp/bol/components/Video/pc/Layout5/index.less

@@ -27,6 +27,7 @@
       width: 60px;
       height: 60px;
       z-index: 1;
+      cursor: pointer;
 
       img {
         width: 100%;

package/lib/locale/en/en.json

@@ -1,4 +1,5 @@
 {
+  "VIDEO": "Video",
   "BACK": "Back",
   "VIDEO_HEIGHT": "Video Height",
   "HEIGHT": "Height",

package/lib/locale/es/es.json

@@ -1,4 +1,5 @@
 {
+  "VIDEO": "Video",
   "BACK": "Back",
   "VIDEO_HEIGHT": "Video Height",
   "HEIGHT": "Height",

package/lib/locale/id/id.json

@@ -1,4 +1,5 @@
 {
+  "VIDEO": "Video",
   "BACK": "Back",
   "VIDEO_HEIGHT": "Video Height",
   "HEIGHT": "Height",

package/package.json

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