@fonixtree/magic-design 0.1.77 → 0.1.79

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

@@ -11,7 +11,7 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
-var _lodash = require("lodash");
+var _debounce = _interopRequireDefault(require("lodash/debounce"));
 
 var _AlignSelector = require("../../../../../common/AlignSelector");
 
@@ -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;
   }
 
@@ -135,7 +227,7 @@ function (_super) {
     this.layout = data.customize.layout.pcLayout;
     this.pcRowNum = data.customize.pcRowNum;
     this.listenCardWidth();
-    window.addEventListener('resize', (0, _lodash.debounce)(this.listenCardWidth));
+    window.addEventListener('resize', (0, _debounce["default"])(this.listenCardWidth));
   };
 
   ImageTextPc.prototype.componentWillUnmount = function () {
@@ -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/lib/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/lib/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;

package/lib/composite-comp/bol/components/Location/index.js

@@ -0,0 +1,100 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports["default"] = void 0;
+
+var _react = _interopRequireWildcard(require("react"));
+
+var _defaultJSON = require("./defaultJSON");
+
+var _common = require("../../../../common");
+
+var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
+
+require("./index.less");
+
+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() {
+    return _super !== null && _super.apply(this, arguments) || this;
+  }
+
+  CustomCode.prototype.componentDidMount = function () {};
+
+  CustomCode.prototype.render = function () {
+    var nodeData = this.props.nodeData;
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null) : /*#__PURE__*/_react["default"].createElement("div", {
+      className: "location-mobile"
+    }, nodeData.logo.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      className: "logo",
+      color: nodeData.logo.color,
+      size: 20,
+      type: "icon-MapPin"
+    }), nodeData.address.open && /*#__PURE__*/_react["default"].createElement("div", {
+      className: "address"
+    }, "Display Location Address"), nodeData.icon.open && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
+      className: "logo",
+      color: nodeData.icon.color,
+      size: 16,
+      type: "icon-outlined-right"
+    })));
+  };
+
+  CustomCode.defaultProps = {};
+  CustomCode.type = 'LOCATION';
+  CustomCode.getDefaultJSON = _defaultJSON.getDefaultJSON;
+  CustomCode = __decorate([_compositeDecorator["default"]], CustomCode);
+  return CustomCode;
+}(_react.Component);
+
+var _default = CustomCode;
+exports["default"] = _default;

package/lib/composite-comp/bol/components/Location/index.less

@@ -0,0 +1,15 @@
+.location-mobile {
+  display: flex;
+  align-items: center;
+  .logo {
+    margin-right: 6px;
+  }
+  .address {
+    font-family: Open Sans;
+    font-size: 14px;
+    font-weight: 400;
+    line-height: 18px;
+    color: #fff;
+  }
+  
+}

package/lib/composite-comp/bol/components/Video/defaultJSON.js

@@ -101,6 +101,18 @@ var videoGroupSourceJSON = function videoGroupSourceJSON(parentId) {
         iconUrl: '',
         layout: 'right'
       },
+      spacing: {
+        pc: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        },
+        mobile: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        }
+      },
       text: 'Button Tag'
     },
     secondButtonTag: {
@@ -126,6 +138,18 @@ var videoGroupSourceJSON = function videoGroupSourceJSON(parentId) {
         borderColor: '',
         borderRadius: 4
       },
+      spacing: {
+        pc: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        },
+        mobile: {
+          paddingTop: 0,
+          paddingBottom: 0,
+          marginBottom: 0
+        }
+      },
       buttonIcon: {
         iconUrl: '',
         layout: 'right'

package/lib/composite-comp/bol/components/Video/index.js

@@ -91,8 +91,7 @@ function (_super) {
 
 
   Video.prototype.render = function () {
-    var nodeData = this.props.nodeData; // console.log('---Video', nodeData);
-
+    var nodeData = this.props.nodeData;
     return /*#__PURE__*/_react["default"].createElement("div", null, window.magicDesign.device === 'pc' ? /*#__PURE__*/_react["default"].createElement(_pc["default"], {
       data: nodeData
     }) : /*#__PURE__*/_react["default"].createElement(_mobile["default"], {

package/lib/composite-comp/bol/components/Wallet/defaultJSON.js

@@ -12,39 +12,40 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(parentId) {
   return {
     id: groupId,
     parentId: parentId,
-    image: {
+    title: {
       parentId: groupId,
       id: (0, _uuid.v4)(),
       open: true,
-      type: 'IMAGE',
+      type: 'TEXT',
+      specialContent: [],
+      text: 'Cashback',
       content: {
-        h5Name: 'Group Name',
-        pcName: 'Group Name',
-        h5ImgSrc: '',
-        pcImgSrc: '',
-        clickUrl: ''
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 700,
+        fontSize: 18,
+        color: '#fff',
+        textAlign: 'center'
       },
-      hover: {
+      underline: {
         open: false,
-        backgroundType: 'enlarge',
-        magnification: 1.5,
-        pcImgHoverUrl: '',
-        h5ImgHoverUrl: ''
-      }
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
     },
-    title: {
+    amount: {
       parentId: groupId,
       id: (0, _uuid.v4)(),
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'Cashback',
+      text: 'RM1000',
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
-        fontWeight: 400,
-        fontSize: 14,
-        pcFontSize: 20,
+        fontWeight: 700,
+        fontSize: 38,
         color: '#fff',
         textAlign: 'center'
       },
@@ -55,19 +56,19 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(parentId) {
       },
       vertical: {}
     },
-    amount: {
+    sourceType: 'Cashback',
+    text: {
       parentId: groupId,
       id: (0, _uuid.v4)(),
       open: true,
       type: 'TEXT',
       specialContent: [],
-      text: 'RM1000',
+      text: 'Make money and shop on Cendol!',
       content: {
         sizeType: 'Customize font styles',
         fontFamily: 'Open Sans',
-        fontWeight: 700,
-        fontSize: 18,
-        pcFontSize: 42,
+        fontWeight: 400,
+        fontSize: 14,
         color: '#fff',
         textAlign: 'center'
       },
@@ -78,75 +79,75 @@ var imagesGroupSourceJSON = function imagesGroupSourceJSON(parentId) {
       },
       vertical: {}
     },
-    sourceType: 'Cashback',
-    hover: {
-      open: false,
-      image: {
-        parentId: groupId,
-        id: (0, _uuid.v4)(),
-        open: true,
-        type: 'IMAGE',
-        content: {
-          h5Name: 'Group Name',
-          pcName: 'Group Name',
-          h5ImgSrc: '',
-          pcImgSrc: '',
-          clickUrl: ''
-        },
-        hover: {
-          open: false,
-          backgroundType: 'enlarge',
-          magnification: 1.5,
-          pcImgHoverUrl: '',
-          h5ImgHoverUrl: ''
-        }
+    button: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'BUTTON',
+      text: 'Button',
+      content: {
+        url: '',
+        backgroundColor: '#fff'
       },
-      title: {
-        parentId: groupId,
-        id: (0, _uuid.v4)(),
-        open: true,
-        type: 'TEXT',
-        specialContent: [],
-        text: 'Cashback',
-        content: {
-          sizeType: 'Customize font styles',
-          fontFamily: 'Open Sans',
-          fontWeight: 400,
-          fontSize: 14,
-          pcFontSize: 20,
-          color: '#fff',
-          textAlign: 'center'
-        },
-        underline: {
-          open: false,
-          textDecorationColor: '',
-          textDecorationStyle: 'solid'
-        },
-        vertical: {}
+      buttonText: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 700,
+        fontSize: 13,
+        fontStyle: 'normal',
+        color: '#F52D85'
       },
-      amount: {
-        parentId: groupId,
-        id: (0, _uuid.v4)(),
+      buttonBorder: {
         open: true,
-        type: 'TEXT',
-        specialContent: [],
-        text: 'RM1000',
-        content: {
-          sizeType: 'Customize font styles',
-          fontFamily: 'Open Sans',
-          fontWeight: 700,
-          fontSize: 18,
-          pcFontSize: 42,
-          color: '#fff',
-          textAlign: 'center'
-        },
-        underline: {
-          open: false,
-          textDecorationColor: '',
-          textDecorationStyle: 'solid'
+        borderColor: '',
+        borderRadius: 4
+      },
+      buttonIcon: {
+        iconUrl: '',
+        layout: 'right'
+      },
+      spacing: {
+        pc: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 16,
+          paddingRight: 16
         },
-        vertical: {}
+        mobile: {
+          paddingTop: 6,
+          paddingBottom: 6,
+          paddingLeft: 16,
+          paddingRight: 16
+        }
       }
+    },
+    peek: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'TEXT',
+      specialContent: [],
+      text: '',
+      content: {
+        sizeType: 'Customize font styles',
+        fontFamily: 'Open Sans',
+        fontWeight: 400,
+        fontSize: 12,
+        color: '#fff',
+        textAlign: 'center'
+      },
+      underline: {
+        open: false,
+        textDecorationColor: '',
+        textDecorationStyle: 'solid'
+      },
+      vertical: {}
+    },
+    background: {
+      opacity: 100,
+      color: '#F52D85',
+      image: '',
+      bgType: 'color'
     }
   };
 };
@@ -185,7 +186,30 @@ var getDefaultJSON = function getDefaultJSON() {
         }
       }
     },
-    groupSource: [imagesGroupSourceJSON(groupId), imagesGroupSourceJSON(groupId)],
+    groupSource: [imagesGroupSourceJSON(groupId)],
+    setting: {
+      // 自动轮播
+      autoplay: {
+        open: true,
+        interval: 3
+      },
+      // 切换按钮
+      navigation: {
+        open: true,
+        size: 16,
+        hoverSize: 16,
+        color: '#eee',
+        hoverColor: '#fff'
+      },
+      // 面板指示点
+      dots: {
+        open: true,
+        color: '#eee',
+        hoverColor: '#fff',
+        size: 8,
+        hoverSize: 8
+      }
+    },
     spacing: {
       pc: {
         paddingTop: 48,