@fonixtree/magic-design 2.0.200 → 2.0.202

package/es/composite-comp/dito/components/GroupBuy/mobile/index.js

@@ -246,8 +246,11 @@ function (_super) {
     _this.getData = function () {
       return __awaiter(_this, void 0, void 0, function () {
         var res;
-        return __generator(this, function (_a) {
-          switch (_a.label) {
+
+        var _a, _b;
+
+        return __generator(this, function (_c) {
+          switch (_c.label) {
             case 0:
               return [4
               /*yield*/
@@ -256,14 +259,14 @@ function (_super) {
               }, 'GET')];
 
             case 1:
-              res = _a.sent();
+              res = _c.sent();
 
               if (!(0, _coreUtil.isDesignMode)()) {
-                (0, _storeUtil.setMagicStore)("groupBuy_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, res.pageInfo.list);
+                (0, _storeUtil.setMagicStore)("groupBuy_" + (window.magicDesign.pageId || '') + "_" + this.props.panelProps.id, (_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list);
               }
 
               this.setState({
-                list: res.pageInfo.list
+                list: (_b = res.pageInfo) === null || _b === void 0 ? void 0 : _b.list
               });
               return [2
               /*return*/

package/es/composite-comp/dito/components/PersonalInformation/defaultJSON.js

@@ -75,6 +75,25 @@ var getDefaultJSON = function getDefaultJSON() {
     login: {
       open: true
     },
+    decorationIcon: {
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'name2',
+        pcName: 'name2',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    },
     groupSource: [PersonalInfoGroupSourceJSON('Wishlist'), PersonalInfoGroupSourceJSON('Stores'), PersonalInfoGroupSourceJSON('Vouchers'), PersonalInfoGroupSourceJSON('Recently Viewed')],
     spacing: {
       pc: {

package/es/composite-comp/dito/components/PersonalInformation/mobile/index.js

@@ -499,7 +499,10 @@ function (_super) {
       className: "pInfoWrap"
     }, (0, _commonUtil.isLogin)() ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
       className: "photoWrap"
-    }, /*#__PURE__*/_react["default"].createElement("img", {
+    }, data.decorationIcon.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      className: "decorationIcon",
+      data: data.decorationIcon
+    }), /*#__PURE__*/_react["default"].createElement("img", {
       alt: "",
       className: "photo",
       src: userInfo.photo || _avatar["default"],
@@ -521,11 +524,14 @@ function (_super) {
     }, userInfo.firstName || userInfo.nickName), /*#__PURE__*/_react["default"].createElement("p", {
       className: "phone"
     }, userInfo.mobilePhone))) : /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
-      className: "photo"
-    }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
-      color: "#fff",
-      size: 32,
-      type: "icon-account"
+      className: "photoWrap"
+    }, data.decorationIcon.open && /*#__PURE__*/_react["default"].createElement(_components.MetaImage, {
+      className: "decorationIcon",
+      data: data.decorationIcon
+    }), /*#__PURE__*/_react["default"].createElement("img", {
+      alt: "",
+      className: "photo",
+      src: _avatar["default"]
     })), data.login.open && /*#__PURE__*/_react["default"].createElement("span", {
       className: "btnLogin",
       onClick: this.goLoginPage

package/es/composite-comp/dito/components/PersonalInformation/mobile/index.less

@@ -29,6 +29,14 @@
   height: 100%;
   opacity: 0;
 }
+.personal-information-mobile .top .pInfoWrap .photoWrap .decorationIcon {
+  position: absolute;
+  z-index: 1;
+  width: 1.4rem;
+  height: 1.4rem;
+  left: -0.26rem;
+  top: -0.26rem;
+}
 .personal-information-mobile .top .pInfoWrap .userInfo {
   display: inline-block;
   vertical-align: middle;
@@ -59,7 +67,6 @@
   line-height: 1.2rem;
   text-align: center;
   background: #7b7b7b;
-  margin-right: 0.3rem;
   border-radius: 50%;
 }
 .personal-information-mobile .top .pInfoWrap .btnLogin {

package/es/composite-comp/dito/components/Recommend/defaultJSON.js

@@ -278,6 +278,54 @@ var getDefaultJSON = function getDefaultJSON() {
           lineHeight: 18
         }
       },
+      sold: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: '',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: defaultFontFamily,
+          fontWeight: 400,
+          fontSize: 10,
+          color: '#545454',
+          urlDisabled: true
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      },
+      discountLabel: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'TEXT',
+        specialContent: [],
+        text: '',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: 'Montserrat',
+          fontWeight: 700,
+          fontSize: 12,
+          color: '#2C2C2C',
+          urlDisabled: true
+        },
+        underline: {
+          open: false,
+          textDecorationColor: '',
+          textDecorationStyle: 'solid'
+        },
+        vertical: {
+          open: false,
+          lineHeight: 18
+        }
+      },
       salesProgress: {
         open: true
       }
@@ -312,7 +360,13 @@ var getDefaultJSON = function getDefaultJSON() {
       opacity: 100,
       color: '#fff',
       image: '',
-      bgType: 'color'
+      bgType: 'color',
+      tabBackground: {
+        opacity: 100,
+        color: '#fff',
+        image: '',
+        tabBgType: 'color'
+      }
     }
   };
 };

package/es/composite-comp/dito/components/Recommend/mobile/index.js

@@ -13,6 +13,8 @@ require("./index.less");
 
 var _classnames = _interopRequireDefault(require("classnames"));
 
+var _card = _interopRequireDefault(require("./imgs/card.png"));
+
 var _mobx = require("../../../../../mobx");
 
 var _ProductItem = _interopRequireDefault(require("../../../../common/components/ProductItem"));
@@ -226,6 +228,26 @@ var __spreadArrays = void 0 && (void 0).__spreadArrays || function () {
   return r;
 };
 
+var defaultData = [{
+  imgUrlContent: {
+    url: _card["default"]
+  },
+  offerName: 'Product Name Long Long Long Long Long',
+  salesPrice: 10000,
+  specialPrice: null,
+  marketPrice: 20000,
+  salePercent: 500,
+  discountPercent: 90
+}, {
+  imgUrlContent: {
+    url: _card["default"]
+  },
+  offerName: 'Product Name',
+  salesPrice: 10000,
+  specialPrice: null,
+  marketPrice: 20000,
+  salePercent: 500
+}];
 var LAYOUT_IMAGE_SIZE = {
   layout1: {
     w: '100%',
@@ -572,6 +594,9 @@ function (_super) {
         hideTabs = _a.hideTabs,
         contentWidth = _a.contentWidth;
     var products = this.state["products" + tabIndex] || [];
+
+    var _products = products.length === 0 && (0, _coreUtil.isDesignMode)() ? defaultData : products;
+
     var isDivide = groupSource.length <= 3;
     var layout = panelProps.customize.layout.h5Layout;
 
@@ -587,10 +612,26 @@ function (_super) {
     }, 140);
     if (layout === 'layout1' && contentWidth) imgHeight = (contentWidth - 12) / 2;
     if (layout === 'layout3' && contentWidth) imgHeight = (contentWidth - 12 * 2) / 3;
+    var background = panelProps.background.tabBackground;
+    var tabStyle = {};
+
+    if (background) {
+      if (background.tabBgType === 'color') {
+        tabStyle.backgroundColor = background.color;
+        tabStyle.opacity = background.opacity ? background.opacity : 1;
+      } else {
+        tabStyle.backgroundImage = "url(" + background.image + ")";
+        tabStyle.backgroundPosition = 'center center';
+        tabStyle.backgroundSize = 'cover';
+        tabStyle.backgroundRepeat = 'no-repeat';
+      }
+    }
+
     return /*#__PURE__*/_react["default"].createElement("div", {
       className: "m-recommend-mobile recommend_" + panelProps.id
     }, !hideTabs && /*#__PURE__*/_react["default"].createElement("div", {
-      className: "tab-select-wrap"
+      className: "tab-select-wrap",
+      style: tabStyle
     }, groupSource.map(function (tab, index) {
       var _image = index == tabIndex && tab.hover.open && tab.hover.image.open ? tab.hover.image : tab.image;
 
@@ -619,7 +660,7 @@ function (_super) {
           tab.groupName.text = text;
         }
       }));
-    }), groupSource.length > 0 && /*#__PURE__*/_react["default"].createElement("div", {
+    }), groupSource.length > 1 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "active-line",
       style: {
         width: tabWidth,
@@ -629,7 +670,7 @@ function (_super) {
     })), ['layout1', 'layout2', 'layout3'].includes(layout) ? /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement("div", {
       key: "macyContainer",
       className: "macyContainer macyContainer_" + panelProps.id
-    }, products.map(function (item) {
+    }, _products.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
         key: item.productId,
         data: item // fixHeight={layout === 'layout3'}
@@ -653,7 +694,7 @@ function (_super) {
         panelProps: panelProps.content,
         showProgress: false
       });
-    })), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+    })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
     })) : /*#__PURE__*/_react["default"].createElement("div", {
@@ -663,7 +704,7 @@ function (_super) {
       })
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "scrollProductList"
-    }, products.map(function (item) {
+    }, _products.map(function (item) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         className: "productCard"
       }, /*#__PURE__*/_react["default"].createElement(_ProductItem["default"], {
@@ -684,7 +725,7 @@ function (_super) {
         panelProps: panelProps.content,
         showProgress: false
       }));
-    })), _seeAll.open && products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
+    })), _seeAll.open && _products.length > 0 && /*#__PURE__*/_react["default"].createElement(_components.MetaButton, {
       className: "btnSeeAll",
       data: _seeAll
     })));

package/es/composite-comp/dito/components/Recommend/mobile/index.less

@@ -1,6 +1,7 @@
 .m-recommend-mobile {
   display: flex;
   flex-direction: column;
+  min-height: 4rem;
 }
 .m-recommend-mobile .cylon-tabs-nav-operations {
   display: none !important;
@@ -65,7 +66,7 @@
   align-items: flex-start;
 }
 .m-recommend-mobile .scrollContainer .scrollProductList .productCard {
-  margin-right: 0.24rem;
+  margin-right: 0.16rem;
 }
 .m-recommend-mobile .btnSeeAll {
   display: block;
@@ -74,3 +75,25 @@
   margin: 0 auto;
   flex: none;
 }
+.m-recommend-mobile .m-product-item-wrap {
+  border-radius: 0.16rem;
+}
+.m-recommend-mobile .m-product-item-wrap .img-wrap {
+  border-radius: 0.16rem 0.16rem 0 0;
+}
+.m-recommend-mobile .m-product-item-wrap.horizontal .img-wrap {
+  border-radius: 0.16rem 0 0 0.16rem;
+}
+.m-recommend-mobile .scrollContainer .m-product-item-wrap {
+  border: none;
+  background-color: transparent;
+}
+.m-recommend-mobile .scrollContainer .m-product-item-wrap .img-wrap {
+  border-radius: 0.16rem;
+}
+.m-recommend-mobile .scrollContainer .m-product-item-wrap .img-wrap .product-img {
+  border-radius: 0.16rem;
+}
+.m-recommend-mobile .scrollContainer .m-product-item-wrap .content-wrap {
+  padding: 0.16rem 0;
+}

package/es/composite-comp/dito/components/SearchBanner/defaultJSON.js

@@ -0,0 +1,234 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.groupSourceJSON = exports.getDefaultJSON = void 0;
+
+var _uuid = require("uuid");
+
+var _constants = require("../../../../constants");
+
+var _index = require("../../../../assets/images/base64/index");
+
+var groupSourceJSON = function groupSourceJSON() {
+  var groupId = (0, _uuid.v4)();
+  return {
+    id: groupId,
+    image: {
+      parentId: groupId,
+      id: (0, _uuid.v4)(),
+      open: true,
+      type: 'IMAGE',
+      content: {
+        h5Name: 'Image Name',
+        pcName: 'Image Name',
+        h5ImgSrc: '',
+        pcImgSrc: '',
+        clickUrl: ''
+      },
+      hover: {
+        open: false,
+        backgroundType: 'enlarge',
+        magnification: 1.5,
+        pcImgHoverUrl: '',
+        h5ImgHoverUrl: ''
+      }
+    }
+  };
+};
+
+exports.groupSourceJSON = groupSourceJSON;
+
+var getDefaultJSON = function getDefaultJSON() {
+  var _a;
+
+  var defaultFontFamily = _constants.projectFontFamily[(_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode] || 'Open Sans';
+  var compId = (0, _uuid.v4)();
+  return {
+    id: compId,
+    type: 'SEARCH_BANNER',
+    content: {
+      logo: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: '',
+          pcImgSrc: '',
+          clickUrl: ''
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      box: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        color: {
+          pc: '#fff',
+          mobile: '#fff'
+        },
+        backgroundColor: {
+          pc: 'transparent',
+          mobile: 'transparent'
+        }
+      },
+      keyword: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'InputField',
+        placeholder: 'Tshirt Woman',
+        content: {
+          sizeType: 'Customize font styles',
+          fontFamily: defaultFontFamily,
+          fontWeight: 600,
+          fontSize: 12,
+          pcFontSize: 14,
+          color: '#CE1126'
+        }
+      },
+      placeholder: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        text: ''
+      },
+      cartIcon: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: _index.searchCartIcon,
+          pcImgSrc: '',
+          clickUrl: {
+            name: '/main/cart',
+            value: '/main/cart'
+          }
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      chatbotIcon: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: _index.searchChatbotIcon,
+          pcImgSrc: '',
+          clickUrl: {
+            name: '/new-chat',
+            value: '/new-chat'
+          }
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      },
+      messageIcon: {
+        id: (0, _uuid.v4)(),
+        open: true,
+        type: 'IMAGE',
+        content: {
+          h5Name: 'name2',
+          pcName: 'name2',
+          h5ImgSrc: _index.searchMessageIcon,
+          pcImgSrc: '',
+          clickUrl: {
+            name: '/message-center',
+            value: '/message-center'
+          }
+        },
+        hover: {
+          open: false,
+          backgroundType: 'enlarge',
+          magnification: 1.5,
+          pcImgHoverUrl: '',
+          h5ImgHoverUrl: ''
+        }
+      }
+    },
+    groupSource: [groupSourceJSON()],
+    setting: {
+      // 自动轮播
+      autoplay: {
+        open: true,
+        interval: 4
+      },
+      // 切换按钮
+      navigation: {
+        open: true,
+        size: 16,
+        hoverSize: 16,
+        color: '#aaa',
+        hoverColor: '#fff'
+      },
+      // 面板指示点
+      dots: {
+        open: true,
+        layout: 'layout1',
+        color: {
+          pc: '#fff',
+          mobile: '#fff'
+        },
+        hoverColor: {
+          pc: '#fff',
+          mobile: '#fff'
+        },
+        size: {
+          pc: 16,
+          mobile: 8
+        },
+        hoverSize: {
+          pc: 16,
+          mobile: 8
+        }
+      }
+    },
+    spacing: {
+      pc: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        marginBottom: window.magicDesign.compSpacing * 1.5,
+        fillUp: false
+      },
+      mobile: {
+        paddingTop: 0,
+        paddingBottom: 0,
+        paddingLeft: 0,
+        paddingRight: 0,
+        marginBottom: window.magicDesign.compSpacing
+      }
+    },
+    customize: {
+      layout: 'left',
+      align: 'left'
+    },
+    background: {
+      opacity: 100,
+      color: '#fff',
+      image: '',
+      bgType: 'color'
+    }
+  };
+};
+
+exports.getDefaultJSON = getDefaultJSON;