@fonixtree/magic-design 0.0.160 → 0.0.162

package/es/common/ImageModal/index.js

@@ -427,46 +427,18 @@ function ImageModal(_a) {
         }
       });
     });
-  };
-
-  var getPreConfig = function getPreConfig() {
-    return __awaiter(_this, void 0, void 0, function () {
-      var wapUrl_1, error_1;
-      return __generator(this, function (_a) {
-        switch (_a.label) {
-          case 0:
-            _a.trys.push([0, 2,, 3]);
-
-            return [4
-            /*yield*/
-            , (0, _commonUtil.commonFetch)("/designer/v1/" + window.magicDesign.MBaseUrl + "/pages/platforminfo")];
+  }; // const getPreConfig = async () => {
+  //   try {
+  //     const { wapUrl } = await commonFetch(`/designer/v1/${window.magicDesign.MBaseUrl}/pages/platforminfo`);
+  //     setWapUrl(wapUrl);
+  //   } catch (error) {
+  //     console.error(error);
+  //   }
+  // };
 
-          case 1:
-            wapUrl_1 = _a.sent().wapUrl;
-            setWapUrl(wapUrl_1);
-            return [3
-            /*break*/
-            , 3];
-
-          case 2:
-            error_1 = _a.sent();
-            console.error(error_1);
-            return [3
-            /*break*/
-            , 3];
-
-          case 3:
-            return [2
-            /*return*/
-            ];
-        }
-      });
-    });
-  };
 
   (0, _react.useEffect)(function () {
-    getContentCatgs();
-    getPreConfig();
+    getContentCatgs(); // getPreConfig();
   }, []);
 
   var selectFolder = function selectFolder(id) {

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

@@ -310,7 +310,32 @@ function (_super) {
     var _this = _super !== null && _super.apply(this, arguments) || this;
 
     _this.state = {};
-    _this.player = null;
+    _this.player = {
+      play: function play() {
+        if (_this.aliPlayer) {
+          _this.aliPlayer.play();
+        }
+
+        if (_this.ytPlayer) {
+          _this.ytPlayer.playVideo();
+        }
+      },
+      pause: function pause() {
+        if (_this.aliPlayer) {
+          _this.aliPlayer.play();
+        }
+
+        if (_this.ytPlayer) {
+          _this.ytPlayer.pauseVideo();
+        }
+      }
+    };
+    /** 阿里播放器 */
+
+    _this.aliPlayer = null;
+    /** YouTube播放器 */
+
+    _this.ytPlayer = null;
     /** 创建视频弹框显示 */
 
     _this.createVideoModal = function (videoId) {
@@ -352,7 +377,7 @@ function (_super) {
 
     _this.getInit = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var _a;
+        var videoId_1, _a;
 
         var _this = this;
 
@@ -372,24 +397,60 @@ function (_super) {
               _b.label = 2;
 
             case 2:
-              if (!this.props.opts.source) return [3
+              if (!!window.YT) return [3
               /*break*/
               , 4];
+              return [4
+              /*yield*/
+              , Promise.all([(0, _commonUtil.importAsync)('https://www.youtube.com/iframe_api', 'js')])];
+
+            case 3:
+              _b.sent();
+
+              _b.label = 4;
+
+            case 4:
+              if (!this.props.opts.source) return [3
+              /*break*/
+              , 7];
+              if (!/youtu/.test(this.props.opts.source)) return [3
+              /*break*/
+              , 5];
+              videoId_1 = this.props.opts.source.split('youtu.be/')[1];
+              (0, _commonUtil.nextTick)(function () {
+                _this.ytPlayer = new YT.Player('video' + _this.props.videoId, {
+                  height: '100%',
+                  width: '100%',
+                  videoId: videoId_1,
+                  events: {
+                    onReady: function onReady() {
+                      console.log('onReady');
+                    },
+                    onStateChange: function onStateChange() {
+                      console.log('onStateChange');
+                    }
+                  }
+                });
+              }, 500, 10);
+              return [3
+              /*break*/
+              , 7];
+
+            case 5:
               _a = this;
               return [4
               /*yield*/
               , createVideo(this.props.videoId, this.props.opts)];
 
-            case 3:
-              _a.player = _b.sent();
-              this.player.on('pause', function () {
-                if (!_this.props.opts.loop) {
-                  _this.props.onPause();
+            case 6:
+              _a.aliPlayer = _b.sent();
+              this.aliPlayer.on('ended', function () {
+                if (!_this.props.opts.loop) {// this.props.onEnd();
                 }
               });
-              _b.label = 4;
+              _b.label = 7;
 
-            case 4:
+            case 7:
               return [2
               /*return*/
               ];
@@ -398,13 +459,8 @@ function (_super) {
       });
     };
 
-    _this.fullPlay = function (type) {
-      // if (type == 'h5') {
-      //   this.player.fullscreenService.requestFullScreen();
-      // }
-      // if (type == 'pc') {
-      _this.createVideoModal(_this.props.videoId); // }
-
+    _this.fullPlay = function () {
+      _this.createVideoModal(_this.props.videoId);
     };
 
     return _this;
@@ -417,12 +473,16 @@ function (_super) {
   AComponent.prototype.render = function () {
     var _a = this.props,
         videoId = _a.videoId,
-        opts = _a.opts;
+        opts = _a.opts,
+        play = _a.play;
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-container"
     }, opts.source ? /*#__PURE__*/_react["default"].createElement("div", {
+      className: "video-wrap",
       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,20 @@
   .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);
+  }
+
+  .video-wrap {
+    width: 100%;
+    height: 100%;
+  }
 }
 
 .pc-video-modal-wrap {

package/es/composite-comp/bol/components/Banner/defaultJSON.js

@@ -7,10 +7,6 @@ exports.getDefaultJSON = exports.bannerGroupSourceJSON = void 0;
 
 var _uuid = require("uuid");
 
-var _banner = _interopRequireDefault(require("./imgs/banner.png"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
   var groupId = (0, _uuid.v4)();
   return {
@@ -23,8 +19,8 @@ var bannerGroupSourceJSON = function bannerGroupSourceJSON() {
       content: {
         h5Name: 'name2',
         pcName: 'name2',
-        h5ImgSrc: _banner["default"],
-        pcImgSrc: _banner["default"],
+        h5ImgSrc: '',
+        pcImgSrc: '',
         clickUrl: ''
       },
       hover: {

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

@@ -63,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,
@@ -81,7 +82,8 @@ 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"]

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;
@@ -22,6 +23,9 @@
       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/defaultJSON.js

@@ -7,10 +7,6 @@ exports.videoGroupSourceJSON = exports.getDefaultJSON = void 0;
 
 var _uuid = require("uuid");
 
-var _banner = _interopRequireDefault(require("./imgs/banner.png"));
-
-function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
-
 var videoGroupSourceJSON = function videoGroupSourceJSON(parentId) {
   var groupId = (0, _uuid.v4)();
   return {
@@ -24,8 +20,8 @@ var videoGroupSourceJSON = function videoGroupSourceJSON(parentId) {
       content: {
         h5Name: 'name2',
         pcName: 'name2',
-        h5ImgSrc: _banner["default"],
-        pcImgSrc: _banner["default"],
+        h5ImgSrc: '',
+        pcImgSrc: '',
         clickUrl: ''
       },
       hover: {
@@ -141,8 +137,8 @@ var videoGroupSourceJSON = function videoGroupSourceJSON(parentId) {
       content: {
         h5Name: 'name2',
         pcName: 'name2',
-        h5ImgSrc: _banner["default"],
-        pcImgSrc: _banner["default"],
+        h5ImgSrc: '',
+        pcImgSrc: '',
         clickUrl: ''
       },
       hover: {}

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,9 +143,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"]
@@ -153,6 +159,9 @@ 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

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,6 +189,9 @@ 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

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%;

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,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"]
@@ -154,6 +160,9 @@ function (_super) {
         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

@@ -37,8 +37,8 @@
       }
 
       &.bottomLeft {
-        left: 16px;
-        bottom: 16px;
+        left: 12px;
+        bottom: 10px;
         transform: unset;
         top: unset;
       }