@fonixtree/magic-design 0.0.159 → 0.0.161

package/es/common/ImageModal/CommonModal/index.js

@@ -35,7 +35,6 @@ function CommonModal(_a) {
     okText: okText || 'Confirm',
     cancelText: cancelText || 'Cancel'
   };
-  console.log('CommonModal render');
   return /*#__PURE__*/_react["default"].createElement(_antd.Modal, _extends({}, modalCommonProps, modalOpts, {
     confirmLoading: confirmLoading,
     onCancel: onCancel,

package/es/common/LinkModal/FilteredProductModal/index.js

@@ -461,7 +461,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
                 startPrice: minimum * precision || '',
                 endPrice: maximum * precision || '',
                 // storeName:storeName,
-                cmpTypeId: promotions.key || '',
+                campaignType: promotions.key || '',
                 pageSize: paginationParams.pageSize,
                 pageIndex: paginationParams.current,
                 state: 'A'

package/es/common/SwiperBan/index.less

@@ -1,7 +1,7 @@
   .swiper-ban-wrap {
     position: absolute;
     width: 100%;
-    bottom: 6px;
+    bottom: 10px;
     display: flex;
     align-items: center;
     justify-content: center;

package/es/common/Video/index.js

@@ -344,7 +344,7 @@ function (_super) {
       contentWrap.appendChild(closeImgDom);
       modelWrap.appendChild(shadowWrap);
       modelWrap.appendChild(contentWrap);
-      (document.querySelector('[magic_designer]') || document.body).document.body.appendChild(modelWrap);
+      (document.querySelector('[magic_design]') || document.body).appendChild(modelWrap);
       createVideo('-modal-' + videoId, __assign(__assign({}, _this.props.opts), {
         autoplay: true
       }));
@@ -382,9 +382,8 @@ function (_super) {
 
             case 3:
               _a.player = _b.sent();
-              this.player.on('pause', function () {
-                if (!_this.props.opts.loop) {
-                  _this.props.onPause();
+              this.player.on('ended', function () {
+                if (!_this.props.opts.loop) {// this.props.onEnd();
                 }
               });
               _b.label = 4;
@@ -417,12 +416,16 @@ function (_super) {
   AComponent.prototype.render = function () {
     var _a = this.props,
         videoId = _a.videoId,
-        opts = _a.opts;
+        opts = _a.opts,
+        play = _a.play;
+    console.log('play: ', play);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-container"
     }, opts.source ? /*#__PURE__*/_react["default"].createElement("div", {
       id: 'video' + videoId
-    }) : null);
+    }) : null, !play && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "cover-video"
+    }));
   };
 
   AComponent.defaultProps = {

package/es/common/Video/index.less

@@ -6,6 +6,15 @@
   .prism-player .prism-cover {
     z-index: 0;
   }
+
+  .cover-video {
+    position: absolute;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    top: 0;
+    background-color: rgba(0, 0, 0, 0);
+  }
 }
 
 .pc-video-modal-wrap {

package/es/composite-comp/bol/components/Video/components/ShareBtn/index.less

@@ -11,8 +11,8 @@
 
   &.pc {
     position: absolute;
-    right: 48px;
-    bottom: 48px;
+    right: 20px;
+    bottom: 20px;
     height: 60px;
     width: 60px;
   }

package/es/composite-comp/bol/components/Video/components/VideoTag/index.js

@@ -17,6 +17,8 @@ var _index = _interopRequireDefault(require("../ShareBtn/index"));
 
 require("./index.less");
 
+var _AlignSelector = require("../../../../../../common/AlignSelector");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -61,6 +63,7 @@ function (_super) {
 
   VideoTag.prototype.render = function () {
     var _a = this.props,
+        onPlayClick = _a.onPlayClick,
         data = _a.data,
         _b = _a.position,
         position = _b === void 0 ? 'absolute' : _b,
@@ -79,14 +82,18 @@ function (_super) {
     }, showBtn && /*#__PURE__*/_react["default"].createElement("div", {
       className: "left-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "play-btn center"
+      className: "play-btn center",
+      onClick: onPlayClick
     }, /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
       src: _playCircle["default"]
     }))), /*#__PURE__*/_react["default"].createElement("div", {
       className: "right-wrap"
     }, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "tag-wrap"
+      className: "tag-wrap",
+      style: {
+        justifyContent: _AlignSelector.alignItemMap[align]
+      }
     }, data.imageTag.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "tag-image"
     }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {

package/es/composite-comp/bol/components/Video/components/VideoTag/index.less

@@ -12,6 +12,7 @@
     width: 85px;
     height: 100%;
     flex-shrink: 0;
+    align-self: end;
 
     .play-btn {
       position: absolute;
@@ -21,6 +22,10 @@
       width: 60px;
       height: 60px;
       z-index: 1;
+      cursor: pointer;
+      transform: translateX(-50%) !important;
+      bottom: 0;
+      top: unset !important;
 
       img {
         width: 100%;

package/es/composite-comp/bol/components/Video/mobile/Layout1/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('h5');
+          } 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-layout1-wrap"
     }, data.groupSource.map(function (group) {
-      var _a;
+      var _a, _b;
       /** 当前是否在播放 */
 
 
@@ -99,25 +120,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('h5');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        },
         style: {
           height: data.mobileHeight
         }
@@ -141,18 +143,25 @@ 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"]
-      })), /*#__PURE__*/_react["default"].createElement(_index["default"], {
+      })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_index["default"], {
         data: data
       }), !isPlaying && /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
         align: data.customize.align,
         data: group,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         share: __assign({
           url: (0, _commonUtil.addUrlQuery)(window.location.href, {
             scroll: 'node-' + data.id

package/es/composite-comp/bol/components/Video/mobile/Layout1/index.less

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

package/es/composite-comp/bol/components/Video/mobile/Layout2/index.js

@@ -94,6 +94,26 @@ function (_super) {
         }, 3000);
       }
     };
+
+    _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('h5');
+          } else {
+            _this.videoRefMap[group.id].playing = true;
+
+            _this.videoRefMap[group.id].el.player.play();
+          }
+        }
+
+        _this.setState({});
+      });
+    };
     /** 视频ref映射 */
 
 
@@ -124,7 +144,7 @@ function (_super) {
         transform: "translateX(-" + sliderIndex * 100 + "%)"
       }
     }, data.groupSource.map(function (group) {
-      var _a;
+      var _a, _b;
       /** 当前是否在播放 */
 
 
@@ -132,25 +152,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('h5');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        },
         style: {
           height: data.mobileHeight
         }
@@ -174,9 +175,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"]
@@ -184,14 +189,17 @@ function (_super) {
         align: data.customize.align,
         data: group,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         share: __assign({
           url: (0, _commonUtil.addUrlQuery)(window.location.href, {
             scroll: 'node-' + data.id
           })
         }, data.share)
+      }), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_index["default"], {
+        data: data
       }));
-    }), /*#__PURE__*/_react["default"].createElement(_index["default"], {
-      data: data
     }))), /*#__PURE__*/_react["default"].createElement(_common.SwiperBan, {
       data: data.groupSource,
       onChange: function onChange(i) {

package/es/composite-comp/bol/components/Video/mobile/Layout2/index.less

@@ -2,7 +2,7 @@
   display: flex;
   flex-direction: column;
   position: relative;
-  padding-bottom: 16px;
+  padding-bottom: 36px;
 
   .slider-wrap {
     width: 100%;
@@ -37,6 +37,7 @@
         width: 60px;
         height: 60px;
         z-index: 1;
+        cursor: pointer;
 
         img {
           width: 100%;

package/es/composite-comp/bol/components/Video/mobile/Layout3/index.js

@@ -78,8 +78,29 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
+
+    _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('h5');
+          } else {
+            _this.videoRefMap[group.id].playing = true;
+
+            _this.videoRefMap[group.id].el.player.play();
+          }
+        }
+
+        _this.setState({});
+      });
+    };
     /** 视频ref映射 */
 
+
     _this.videoRefMap = {};
     return _this;
   }
@@ -91,7 +112,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-layout3-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('h5');
-              } else {
-                _this.videoRefMap[group.id].playing = true;
-
-                _this.videoRefMap[group.id].el.player.play();
-              }
-            }
-
-            _this.setState({});
-          });
-        },
         style: {
           height: data.mobileHeight
         }
@@ -138,22 +140,29 @@ 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"]
-      })), data.share.open && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
+      })), data.share.open && !isPlaying && /*#__PURE__*/_react["default"].createElement(_ShareBtn["default"], {
         data: data.share
       })), /*#__PURE__*/_react["default"].createElement(_VideoTag["default"], {
         align: data.customize.align,
         data: group,
         layout: 'h5-' + data.customize.layout.h5Layout,
         noShare: true,
+        onPlayClick: function onPlayClick() {
+          return _this.playOrPause(group);
+        },
         position: "relative",
         share: __assign({
           url: (0, _commonUtil.addUrlQuery)(window.location.href, {

package/es/composite-comp/bol/components/Video/mobile/Layout3/index.less

@@ -29,6 +29,7 @@
       width: 60px;
       height: 60px;
       z-index: 1;
+      cursor: pointer;
 
       img {
         width: 100%;
@@ -36,8 +37,8 @@
       }
 
       &.bottomLeft {
-        left: 16px;
-        bottom: 16px;
+        left: 12px;
+        bottom: 10px;
         transform: unset;
         top: unset;
       }

package/es/composite-comp/bol/components/Video/mobile/index.js

@@ -98,7 +98,6 @@ function (_super) {
 
   BannerMobile.prototype.render = function () {
     var data = this.props.data;
-    console.log('data: ', data);
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-video-mobile"
     }, data.customize.layout.h5Layout == 'layout1' && /*#__PURE__*/_react["default"].createElement(_Layout["default"], {

package/es/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/es/composite-comp/bol/components/Video/pc/Layout1/index.less

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