@fonixtree/magic-design 0.0.160 → 0.0.162

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/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/es/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/es/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/es/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/es/core/Designer/PageCompList/index.js

@@ -15,6 +15,8 @@ var _immutabilityHelper = _interopRequireDefault(require("immutability-helper"))
 
 var _react = _interopRequireWildcard(require("react"));
 
+var _lodash = require("lodash");
+
 var _common = require("../../../common");
 
 var _coreUtil = require("../../../utils/coreUtil");
@@ -78,6 +80,15 @@ function PageCompList(_a) {
       setHoveredFloor = _e[1];
 
   var ref = (0, _react.useRef)();
+
+  var getActiveComponents = function getActiveComponents() {
+    var filter = components.filter(function (comp) {
+      return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
+    });
+    return filter;
+  };
+
+  var activeComponents = getActiveComponents();
   (0, _react.useEffect)(function () {
     setComponents(pageData || []);
   }, [pageData]);
@@ -109,7 +120,6 @@ function PageCompList(_a) {
   };
 
   var onDragEnter = function onDragEnter(e) {
-    console.log('drag enter');
     var hoverNodeId = e.currentTarget.dataset.nodeid;
 
     if (dragId === hoverNodeId) {
@@ -127,18 +137,36 @@ function PageCompList(_a) {
     }
   };
 
+  var getLastSameIndex = function getLastSameIndex(comps, index) {
+    var lastComps = comps.slice(0, index);
+    var newIndex = (0, _lodash.findLastIndex)(lastComps, function (comp) {
+      return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
+    });
+    return newIndex;
+  };
+
+  var getNextSameIndex = function getNextSameIndex(comps, index) {
+    var nextComps = comps.slice(index + 1);
+    var newIndex = (0, _lodash.findIndex)(nextComps, function (comp) {
+      return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
+    });
+    return newIndex + index + 1;
+  };
+
   var onMenuClick = function onMenuClick(activeComp, operType) {
     var newComponents = __spreadArrays(components);
 
     var index = newComponents.indexOf(activeComp);
 
     if (operType === operTypeMap.MOVE_UP) {
-      var temp = newComponents[index - 1];
-      newComponents[index - 1] = newComponents[index];
+      var newIndex = getLastSameIndex(newComponents, index);
+      var temp = newComponents[newIndex];
+      newComponents[newIndex] = newComponents[index];
       newComponents[index] = temp;
     } else if (operType === operTypeMap.MOVE_DOWN) {
-      var temp = newComponents[index + 1];
-      newComponents[index + 1] = newComponents[index];
+      var newIndex = getNextSameIndex(newComponents, index);
+      var temp = newComponents[newIndex];
+      newComponents[newIndex] = newComponents[index];
       newComponents[index] = temp;
     } else if (operType === operTypeMap.COPY) {
       var copyComponent = (0, _coreUtil.copyNode)(newComponents[index]);
@@ -193,7 +221,7 @@ function PageCompList(_a) {
     }, index !== 0 && /*#__PURE__*/_react["default"].createElement(_antd.Menu.Item, {
       className: "menu_item",
       value: "1"
-    }, (0, _locale.i18n)('MOVE_UP')), index !== components.length - 1 && /*#__PURE__*/_react["default"].createElement(_antd.Menu.Item, {
+    }, (0, _locale.i18n)('MOVE_UP')), index !== activeComponents.length - 1 && /*#__PURE__*/_react["default"].createElement(_antd.Menu.Item, {
       className: "menu_item",
       value: "2"
     }, (0, _locale.i18n)('MOVE_DOWN')), /*#__PURE__*/_react["default"].createElement(_antd.Menu.Item, {
@@ -277,14 +305,6 @@ function PageCompList(_a) {
     })));
   };
 
-  var getActiveComponents = function getActiveComponents() {
-    var filter = components.filter(function (comp) {
-      return (0, _coreUtil.isActiveFloor)(comp.activeTerminal);
-    });
-    return filter;
-  };
-
-  var activeComponents = getActiveComponents();
   return /*#__PURE__*/_react["default"].createElement("div", {
     className: "page-comp-wrap"
   }, /*#__PURE__*/_react["default"].createElement("div", {

package/es/utils/commonUtil.js

@@ -14,7 +14,7 @@ exports.dragSource = void 0;
 exports.ensure = ensure;
 exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
-exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
+exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
 exports.pushGA = pushGA;
 exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
@@ -474,4 +474,29 @@ function covertKey(data, func) {
   var newData = (0, _lodash.cloneDeep)(data);
   func(newData);
   return JSON.stringify(newData);
-}
+}
+
+var nextTick = function nextTick(func, interval, count) {
+  if (interval === void 0) {
+    interval = 100;
+  }
+
+  if (count === void 0) {
+    count = 5;
+  }
+
+  try {
+    func();
+  } catch (error) {
+    if (count == 0) {
+      console.error('nextTick 失败');
+      return;
+    }
+
+    setTimeout(function () {
+      nextTick(func, interval, count - 1);
+    }, interval);
+  }
+};
+
+exports.nextTick = nextTick;

package/lib/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) {