@fonixtree/magic-design 0.1.76 → 0.1.78

package/es/common/Video/index.js

@@ -203,6 +203,8 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
     };
   }
 };
+/* eslint-disable @typescript-eslint/no-unused-expressions */
+
 
 /** 检查youtube依赖包 */
 var checkYoutuVIdeo = function checkYoutuVIdeo() {
@@ -587,6 +589,7 @@ function (_super) {
     /** YouTube播放器 */
 
     _this.ytPlayer = null;
+    _this.timer = null;
     /** 创建视频弹框显示 */
 
     _this.createVideoModal = function (videoId) {
@@ -714,7 +717,11 @@ function (_super) {
   }
 
   Video.prototype.componentDidMount = function () {
-    this.getInit();
+    this.timer = setTimeout(this.getInit, 1000);
+  };
+
+  Video.prototype.componentWillUnmount = function () {
+    this.timer && clearTimeout(this.timer);
   };
 
   Video.prototype.render = function () {
@@ -727,8 +734,9 @@ function (_super) {
     }, opts.source ? /*#__PURE__*/_react["default"].createElement("div", {
       className: "video-wrap",
       id: 'video' + videoId
-    }) : null, !play && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "cover-video"
+    }) : null, !play && opts.cover && /*#__PURE__*/_react["default"].createElement("img", {
+      className: "video-cover-img",
+      src: opts.cover
     }));
   };
 

package/es/common/Video/index.less

@@ -3,17 +3,21 @@
   height: 100%;
   background-image: linear-gradient(0, rgba(0, 0, 0, .2), rgba(0, 0, 0, .1), rgba(0, 0, 0, .2));
 
-  .prism-player .prism-cover {
-    z-index: 0;
-  }
 
-  .cover-video {
+  .video-cover-img {
     position: absolute;
-    left: 0;
+    top: 0;
     right: 0;
+    left: 0;
     bottom: 0;
-    top: 0;
-    background-color: rgba(0, 0, 0, 0);
+    object-fit: cover;
+    width: 100%;
+    height: 100%;
+    z-index: 0;
+  }
+
+  .prism-player .prism-cover {
+    z-index: 0;
   }
 
   .video-wrap {

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

@@ -208,6 +208,12 @@ function (_super) {
         style: _this.getBackgroundStyle(item)
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "carouselItem",
+        onClick: function onClick() {
+          /** PTO 定制GA */
+          if (window.magicDesign.pushGA) {
+            window.magicDesign.pushGA({}, 'select_promotion');
+          }
+        },
         onMouseEnter: _this.mouseEnterWrap,
         onMouseLeave: _this.mouseLeaveWrap,
         style: _this.getItemStyle(item)

package/es/composite-comp/bol/components/Carousel/index.js

@@ -15,6 +15,8 @@ var _defaultJSON = require("./defaultJSON");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
+var _decorator = require("../../../../decorator");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -65,21 +67,43 @@ function (_super) {
   __extends(Carousel, _super);
 
   function Carousel() {
-    return _super !== null && _super.apply(this, arguments) || this;
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.state = {
+      lazyShow: false
+    };
+    _this.carouselRef = /*#__PURE__*/_react["default"].createRef();
+    _this.intersectionObserver = null;
+    return _this;
   }
 
+  Carousel.prototype.componentDidMount = function () {};
+
+  Carousel.prototype.componentWillUnmount = function () {};
+
   Carousel.prototype.render = function () {
     var nodeData = this.props.nodeData;
-    return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
+    var lazyShow = this.state.lazyShow;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      ref: this.carouselRef,
+      style: {
+        height: lazyShow ? 'auto' : 300
+      }
+    }, lazyShow && (window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {
       data: nodeData
-    }));
+    })));
   };
 
   Carousel.defaultProps = {};
   Carousel.type = 'CAROUSEL';
   Carousel.getDefaultJSON = _defaultJSON.getDefaultJSON;
+
+  __decorate([(0, _decorator.lazy)('carouselRef')], Carousel.prototype, "componentDidMount", null);
+
+  __decorate([_decorator.lazyDestroy], Carousel.prototype, "componentWillUnmount", null);
+
   Carousel = __decorate([_compositeDecorator["default"]], Carousel);
   return Carousel;
 }(_react.Component);

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

@@ -73,24 +73,13 @@ var __assign = void 0 && (void 0).__assign || function () {
   return __assign.apply(this, arguments);
 };
 
-var MOBILE_IMG_SIZE = {
-  1: {
-    maxH: 282
-  },
-  2: {
-    maxH: 137
-  },
-  3: {
-    maxH: 87
-  },
-  4: {
-    maxH: 66
-  },
-  5: {
-    maxH: 50
-  }
-};
-
+// const MOBILE_IMG_SIZE = {
+//   1: { maxH: 282 },
+//   2: { maxH: 137 },
+//   3: { maxH: 87 },
+//   4: { maxH: 66 },
+//   5: { maxH: 50 },
+// };
 var CarouselMobile =
 /** @class */
 function (_super) {
@@ -247,7 +236,8 @@ function (_super) {
         GAData: __assign(__assign({}, GAData), {
           groupId: item.id,
           groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
-        })
+        }),
+        notNeedLazy: true
       })), layout === 'layout2' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && /*#__PURE__*/_react["default"].createElement("div", {
         className: "title"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
@@ -272,7 +262,8 @@ function (_super) {
           groupId: item.id,
           groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
         }),
-        maxHeight: 20
+        maxHeight: 20,
+        notNeedLazy: true
       }), item.buttonTag.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         data: item.buttonTag,
         GAData: __assign(__assign({}, GAData), {

package/es/composite-comp/bol/components/Carousel/pc/index.js

@@ -280,7 +280,8 @@ function (_super) {
         }),
         maxHeight: item.image.content.pcImgSrc ? 'unset' : PC_IMG_SIZE[floorColNum].defH,
         minHeight: PC_IMG_SIZE[floorColNum].minH,
-        minWidth: PC_IMG_SIZE[floorColNum].minW
+        minWidth: PC_IMG_SIZE[floorColNum].minW,
+        notNeedLazy: true
       })), layout === 'layout2' && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && !((0, _coreUtil.isPc)() && item.title.pcText === '') && /*#__PURE__*/_react["default"].createElement("div", {
         className: "title"
       }, /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
@@ -305,7 +306,8 @@ function (_super) {
           groupId: item.id,
           groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
         }),
-        maxHeight: 30
+        maxHeight: 30,
+        notNeedLazy: true
       }), item.buttonTag.open && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
         data: item.buttonTag,
         GAData: __assign(__assign({}, GAData), {

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

@@ -0,0 +1,39 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var getDefaultJSON = function getDefaultJSON() {
+  return {
+    id: (0, _uuid.v4)(),
+    type: 'CUSTOM_CODE',
+    content: {
+      pcHtml: '',
+      h5Html: ''
+    },
+    spacing: {
+      pc: {
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
+      }
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;

package/es/composite-comp/bol/components/CustomCode/index.js

@@ -0,0 +1,138 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _defaultJSON = require("./defaultJSON");
+
+var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
+
+var _coreUtil = require("../../../../utils/coreUtil");
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
+
+function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
+
+function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { "default": obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj["default"] = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
+
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+
+var __extends = void 0 && (void 0).__extends || function () {
+  var _extendStatics = function extendStatics(d, b) {
+    _extendStatics = Object.setPrototypeOf || {
+      __proto__: []
+    } instanceof Array && function (d, b) {
+      d.__proto__ = b;
+    } || function (d, b) {
+      for (var p in b) {
+        if (b.hasOwnProperty(p)) d[p] = b[p];
+      }
+    };
+
+    return _extendStatics(d, b);
+  };
+
+  return function (d, b) {
+    _extendStatics(d, b);
+
+    function __() {
+      this.constructor = d;
+    }
+
+    d.prototype = b === null ? Object.create(b) : (__.prototype = b.prototype, new __());
+  };
+}();
+
+var __decorate = void 0 && (void 0).__decorate || function (decorators, target, key, desc) {
+  var c = arguments.length,
+      r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc,
+      d;
+  if ((typeof Reflect === "undefined" ? "undefined" : _typeof(Reflect)) === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);else for (var i = decorators.length - 1; i >= 0; i--) {
+    if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
+  }
+  return c > 3 && r && Object.defineProperty(target, key, r), r;
+};
+
+var CustomCode =
+/** @class */
+function (_super) {
+  __extends(CustomCode, _super);
+
+  function CustomCode() {
+    var _this = _super !== null && _super.apply(this, arguments) || this;
+
+    _this.htmlTemp = ''; // createHtml = () => {
+    //   const { nodeData } = this.props;
+    //   const htmlCode = window.magicDesign.device === 'pc' ? nodeData.content.pcHtml : nodeData.content.h5Html;
+    //   this.htmlTemp = htmlCode;
+    //   if (document.getElementById('custom-wrap')) {
+    //     document.getElementById('custom-wrap').innerHTML = htmlCode;
+    //   }
+    // }
+
+    _this.handleClick = function (e) {
+      console.log(e.target.getAttribute('href'));
+      (0, _coreUtil.clickUrl)(e.target.getAttribute('href'));
+    };
+
+    return _this;
+  }
+
+  CustomCode.prototype.componentDidMount = function () {
+    var _this = this;
+
+    var aElements = document.querySelectorAll('#custom-wrap a');
+    aElements.forEach(function (element) {
+      element.addEventListener('click', _this.handleClick);
+    });
+  };
+
+  CustomCode.prototype.componentWillUnmount = function () {
+    var _this = this;
+
+    var aElements = document.querySelectorAll('#custom-wrap a');
+    aElements.forEach(function (element) {
+      element.removeEventListener('click', _this.handleClick);
+    });
+  }; // componentWillReceiveProps(prevProps) {
+  //   console.log('111111');
+  //   if (window.magicDesign.device === 'pc') {
+  //     console.log('22222222');
+  //     if (prevProps.nodeData.content.pcHtml != this.props.nodeData.content.pcHtml) {
+  //       console.log('4444444');
+  //       this.createHtml();
+  //     }
+  //   } else {
+  //     console.log('3333333333', this.htmlTemp, this.props.nodeData.content);
+  //     if (this.htmlTemp != this.props.nodeData.content.h5Html) {
+  //       console.log('5555555');
+  //       this.createHtml();
+  //     }
+  //   }
+  // }
+
+
+  CustomCode.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement("div", {
+      id: "custom-wrap"
+    }, /*#__PURE__*/_react["default"].createElement("div", {
+      dangerouslySetInnerHTML: {
+        __html: window.magicDesign.device === 'pc' ? nodeData.content.pcHtml : nodeData.content.h5Html
+      }
+    }));
+  };
+
+  CustomCode.defaultProps = {};
+  CustomCode.type = 'CUSTOM_CODE';
+  CustomCode.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  CustomCode = __decorate([_compositeDecorator["default"]], CustomCode);
+  return CustomCode;
+}(_react.Component);
+
+var _default = CustomCode;
+exports["default"] = _default;

package/es/composite-comp/bol/components/ImageText/pc/index.js

@@ -111,12 +111,24 @@ function (_super) {
     _this.getCardStyle = function (source, i) {
       var data = _this.props.data;
       var cardStyle = {
-        width: _this.calcWidth(data.customize.pcRowNum),
-        marginRight: (1 + i) % data.customize.pcRowNum !== 0 ? '2%' : 0,
         alignItems: _AlignSelector.alignItemMap[data.customize.align],
         textAlign: data.customize.align
       };
+
+      if (data.customize.layout.pcLayout === 'leftImage' || data.customize.layout.pcLayout === 'rightImage') {
+        if ((data === null || data === void 0 ? void 0 : data.groupSource.length) > 1 && i != (data === null || data === void 0 ? void 0 : data.groupSource.length) - 1) {
+          cardStyle.marginBottom = 48;
+        }
+
+        cardStyle.alignItems = 'center';
+      } else {
+        cardStyle.marginRight = (1 + i) % data.customize.pcRowNum !== 0 ? '2%' : 0;
+        cardStyle.width = _this.calcWidth(data.customize.pcRowNum);
+        cardStyle.alignItems = _AlignSelector.alignItemMap[data.customize.align];
+      }
+
       var wrapStyle = (0, _businessUtil.computeStyle)(source, window.magicDesign.device);
+      console.log('cc wrapStyle', source, wrapStyle);
       var hoverIndex = _this.state.hoverIndex;
       var hoverStyle = {};
 
@@ -127,6 +139,86 @@ function (_super) {
       return __assign(__assign(__assign({}, cardStyle), wrapStyle), hoverStyle);
     };
 
+    _this.getContentStyle = function () {
+      var data = _this.props.data;
+      return {
+        alignItems: _AlignSelector.alignItemMap[data.customize.align]
+      };
+    };
+
+    _this.getAnotherLayout = function () {
+      var data = _this.props.data;
+      var hoverIndex = _this.state.hoverIndex;
+      var GAData = (0, _commonUtil.getGAData)(data);
+      console.log('ff--image text', data);
+      return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, (data === null || data === void 0 ? void 0 : data.groupSource.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+        className: "group-wrap"
+      }, data.groupSource.map(function (source, i) {
+        return /*#__PURE__*/_react["default"].createElement("div", {
+          key: source.id,
+          className: "one-card",
+          onMouseEnter: function onMouseEnter() {
+            if (source.hover.open) {
+              _this.setState({
+                hoverIndex: i
+              });
+            }
+          },
+          onMouseLeave: function onMouseLeave() {
+            _this.setState({
+              hoverIndex: -1
+            });
+          },
+          style: _this.getCardStyle(source, i)
+        }, (source.image.open && hoverIndex != i || hoverIndex == i && source.hover.image.open) && /*#__PURE__*/_react["default"].createElement("div", {
+          className: "card-image-wrap"
+        }, /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+          className: "card-image",
+          data: hoverIndex == i ? source.hover.image : source.image,
+          GAData: __assign(__assign({}, GAData), {
+            groupId: source.id,
+            groupName: (0, _ConfigPanel.getSecondConfigName)(data, source.id)
+          }),
+          maxWidth: 654,
+          minWidth: 300,
+          scale: 0.5
+        })), /*#__PURE__*/_react["default"].createElement("div", {
+          className: "content-wrap",
+          style: _this.getContentStyle()
+        }, (source.title.open && hoverIndex != i || hoverIndex == i && source.hover.title.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+          className: "card-title",
+          data: hoverIndex == i ? source.hover.title : source.title,
+          GAData: __assign(__assign({}, GAData), {
+            groupId: source.id,
+            groupName: (0, _ConfigPanel.getSecondConfigName)(data, source.id)
+          })
+        }), (source.text.open && hoverIndex != i || hoverIndex == i && source.hover.text.open) && /*#__PURE__*/_react["default"].createElement(_components.MetaText, {
+          className: "card-text",
+          data: hoverIndex == i ? source.hover.text : source.text,
+          GAData: __assign(__assign({}, GAData), {
+            groupId: source.id,
+            groupName: (0, _ConfigPanel.getSecondConfigName)(data, source.id)
+          })
+        }), /*#__PURE__*/_react["default"].createElement("div", {
+          className: "card-btn-wrap"
+        }, (source.button.open && hoverIndex != i || source.hover.button.open && hoverIndex == i) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+          className: "card-first-btn",
+          data: hoverIndex == i ? source.hover.button : source.button,
+          GAData: __assign(__assign({}, GAData), {
+            groupId: source.id,
+            groupName: (0, _ConfigPanel.getSecondConfigName)(data, source.id)
+          })
+        }), (source.secondButton.open && hoverIndex != i || source.hover.secondButton.open && hoverIndex == i) && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+          className: "card-second-btn",
+          data: hoverIndex == i ? source.hover.secondButton : source.secondButton,
+          GAData: __assign(__assign({}, GAData), {
+            groupId: source.id,
+            groupName: (0, _ConfigPanel.getSecondConfigName)(data, source.id)
+          })
+        }))));
+      })));
+    };
+
     return _this;
   }
 
@@ -163,7 +255,7 @@ function (_super) {
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('image-text-pc', data.customize.layout.pcLayout),
       style: wrapStyle
-    }, (data === null || data === void 0 ? void 0 : data.groupSource.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    }, data.customize.layout.pcLayout === 'leftImage' || data.customize.layout.pcLayout === 'rightImage' ? this.getAnotherLayout() : (data === null || data === void 0 ? void 0 : data.groupSource.length) > 0 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "group-wrap"
     }, data.groupSource.map(function (source, i) {
       return /*#__PURE__*/_react["default"].createElement("div", {

package/es/composite-comp/bol/components/ImageText/pc/index.less

@@ -116,3 +116,35 @@
     }
   }
 }
+
+
+.leftImage .group-wrap .one-card {
+  flex-direction: row;
+  .card-image-wrap  .card-image {
+    margin: 0 32px 0 0;
+  }
+}
+.rightImage .group-wrap .one-card {
+  flex-direction: row-reverse;
+  .card-image-wrap  .card-image {
+    margin: 0 0 0 32px;
+  }
+}
+
+.leftImage, .rightImage {
+  padding: 48px 108px;
+  .group-wrap {
+    flex-direction: column;
+    .one-card {
+      // flex-direction: row;
+      .card-image-wrap {
+        width: fit-content;
+      }
+      .content-wrap {
+        flex: 1;
+        display: flex;
+        flex-direction: column;
+      }
+    }
+  }
+}

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

@@ -0,0 +1,60 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var getDefaultJSON = function getDefaultJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    type: 'LOCATION',
+    logo: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      color: '#fff'
+    },
+    address: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true
+    },
+    icon: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      color: '#fff'
+    },
+    spacing: {
+      pc: {
+        paddingTop: 10,
+        paddingBottom: 10,
+        marginBottom: 0
+      },
+      mobile: {
+        paddingTop: 12,
+        paddingBottom: 12,
+        paddingLeft: 12,
+        marginBottom: 0
+      }
+    },
+    customize: {
+      layout: {
+        pcLayout: 'top',
+        h5Layout: 'top'
+      }
+    },
+    background: {
+      opacity: 100,
+      color: '#597EF7',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;