@fonixtree/magic-design 0.1.7 → 0.1.8

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

@@ -195,8 +195,18 @@ function (_super) {
 
     var data = this.props.data;
     var sliderIndex = this.state.sliderIndex;
-    var showText = data.customize.layout === 'layout2';
-    var colNum = showText ? 1 : Math.min(data.customize.pcRowNum, data.groupSource.length);
+    var _a = data.customize,
+        layout = _a.layout,
+        pcRowNum = _a.pcRowNum;
+    var colNum = 1;
+
+    if (layout === 'layout1') {
+      colNum = Math.min(pcRowNum, data.groupSource.length);
+    } else if (layout === 'layout3') {
+      colNum = Math.min(pcRowNum + 0.2, data.groupSource.length);
+    }
+
+    var floorColNum = Math.floor(colNum);
     var GAData = {
       moduleId: data.id,
       moduleName: data.moduleIndex + '.' + data.type
@@ -222,7 +232,8 @@ function (_super) {
         _this.setState({
           sliderIndex: newIndex
         });
-      }
+      },
+      variableWidth: true
     };
     var navStyle = {
       fontSize: data.setting.navigation.size,
@@ -235,7 +246,7 @@ function (_super) {
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "content",
       style: {
-        paddingBottom: data.setting.dots.open && data.groupSource.length / colNum > 1 ? dotsSpace : '0'
+        paddingBottom: data.setting.dots.open && data.groupSource.length / floorColNum > 1 ? dotsSpace : '0'
       }
     }, data.setting.navigation.open && /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       className: "carousel-icon-left",
@@ -267,10 +278,10 @@ function (_super) {
           groupId: item.id,
           groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
         }),
-        maxHeight: item.image.content.pcImgSrc ? 'unset' : PC_IMG_SIZE[colNum].defH,
-        minHeight: PC_IMG_SIZE[colNum].minH,
-        minWidth: PC_IMG_SIZE[colNum].minW
-      })), showText && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, item.title.open && !((0, _coreUtil.isPc)() && item.title.pcText === '') && /*#__PURE__*/_react["default"].createElement("div", {
+        maxHeight: item.image.content.pcImgSrc ? 'unset' : PC_IMG_SIZE[floorColNum].defH,
+        minHeight: PC_IMG_SIZE[floorColNum].minH,
+        minWidth: PC_IMG_SIZE[floorColNum].minW
+      })), 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, {
         data: item.title,
@@ -308,7 +319,7 @@ function (_super) {
           groupName: (0, _ConfigPanel.getSecondConfigName)(data, item.id)
         })
       }))));
-    }))), data.setting.dots.open && Math.ceil(data.groupSource.length / colNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
+    }))), data.setting.dots.open && Math.ceil(data.groupSource.length / floorColNum) > 1 && /*#__PURE__*/_react["default"].createElement("div", {
       className: "swiper-ban"
     }, data.groupSource.length > 1 && data.groupSource.map(function (item, i) {
       return /*#__PURE__*/_react["default"].createElement("div", {

package/lib/constants/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
+exports.urlTypeMap = exports.urlType = exports.respCodeMap = exports.quickMenuCode = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.STORAGE_KEY = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
   LOCALE: 'magicLocale',
   MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
@@ -45,6 +45,18 @@ var urlType = {
   VIDEO: 'video'
 };
 exports.urlType = urlType;
+var urlTypeMap = {
+  CATEGORY: 'Category',
+  CUSTOMIZED_PAGE: 'CustomizedPage',
+  PRODUCT_DETAIL_PAGE: 'ProductDetailPage',
+  FILTERED_PRODUCT: 'FilteredProduct',
+  FUNCTION_PAGE: 'FunctionPage',
+  COUPONS: 'Coupons',
+  BUNDLE_CAMPAIGN: 'BundleCampaign',
+  VIDEO: 'Video',
+  SHARE_URL: 'ShareURL'
+};
+exports.urlTypeMap = urlTypeMap;
 var respCodeMap = {
   NOT_LOGGED_IN: 'BUYER-WEB-06003'
 };

package/lib/constants/layout.js

@@ -29,6 +29,8 @@ var _carouselLayout = _interopRequireDefault(require("../assets/images/layout-ic
 
 var _carouselLayout2 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout2.png"));
 
+var _carouselLayout3 = _interopRequireDefault(require("../assets/images/layout-icon/carouselLayout3.png"));
+
 var _layoutImagetextP = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p1.png"));
 
 var _layoutImagetextP2 = _interopRequireDefault(require("../assets/images/layout-icon/layout-imagetext-p2.png"));
@@ -108,6 +110,10 @@ var carouselLayout = [{
   id: 'layout2',
   name: 'layout2',
   image: _carouselLayout2["default"]
+}, {
+  id: 'layout3',
+  name: 'layout3',
+  image: _carouselLayout3["default"]
 }];
 exports.carouselLayout = carouselLayout;
 var imageTextLayoutPc = [{

package/lib/utils/businessUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.renderPreview = exports.parseUrl = exports.listToTree = exports.getPromotionList = exports.computeStyle = exports.canNumber = void 0;
+exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToTree = exports.getPromotionList = exports.computeStyle = exports.canNumber = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 
@@ -16,6 +16,138 @@ var _constants = require("../constants");
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 /* eslint-disable import/no-cycle */
+var newParseUrl = function newParseUrl(urlObj) {
+  var link = urlObj.value;
+  var params;
+  var type = urlObj.type,
+      value = urlObj.value,
+      offerId = urlObj.offerId,
+      productId = urlObj.productId;
+
+  switch (type) {
+    // 商品详情
+    case _constants.urlTypeMap.PRODUCT_DETAIL_PAGE:
+      link = "/product/detail/" + offerId + "?productId=" + (productId !== null && productId !== void 0 ? productId : '');
+      params = {
+        action: 'jump',
+        params: {
+          type: 'PRODUCT_DETAIL',
+          offerId: offerId,
+          productId: productId
+        }
+      };
+      break;
+
+    case _constants.urlTypeMap.CATEGORY:
+      // 商品列表
+      link = "/product/list/" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'PRODUCT_LIST',
+          catgId: arg1
+        }
+      };
+      break;
+    // 海报页面
+
+    case _constants.urlTypeMap.CUSTOMIZED_PAGE:
+      link = "/poster/" + value;
+      params = {
+        action: 'jump',
+        data: {
+          type: 'NAVIGATE',
+          url: link
+        }
+      };
+      break;
+    // 商品列表
+
+    case _constants.urlTypeMap.FILTERED_PRODUCT:
+      link = "/product/list?" + value;
+      params = {
+        action: 'jump',
+        params: {
+          type: 'PRODUCT_LIST',
+          params: (0, _lodash.pickBy)(_qs["default"].parse(value), function (value) {
+            return value;
+          })
+        }
+      };
+      break;
+
+    case _constants.urlTypeMap.COUPONS:
+      // 领取优惠券
+      params = {
+        action: 'operation',
+        params: {
+          type: 'GET_COUPON',
+          couponId: value
+        }
+      };
+      break;
+
+    case _constants.urlTypeMap.VIDEO:
+      // 播放视频
+      params = {
+        action: 'operation',
+        params: {
+          type: 'VIDEO',
+          data: (0, _commonUtil.ensure)(function () {
+            return JSON.parse(value);
+          }, {})
+        }
+      };
+      break;
+
+    case _constants.urlTypeMap.SHARE_URL:
+      // 播放视频
+      params = {
+        action: 'operation',
+        params: {
+          type: 'SHARE_URL',
+          url: value
+        }
+      };
+      break;
+
+    default:
+      var map = {
+        '/main/cart': 'CART',
+        '/main/account': 'ACCOUNT',
+        '/my-coupon': 'MY_COUPON',
+        '/coupon-center': 'COUPON_CENTER',
+        '/main/community': 'COMMUNITY',
+        '/message-center': 'MESSAGE',
+        '/spike': 'FLASH',
+        '/check-in-gift': 'CHECK_IN',
+        '/invite': 'INVITE',
+        '/special-mission': 'SOCIAL_COMMERCE',
+        '/main/category': 'CATEGORY',
+        '/main/social-commerce': 'SOCIAL_COMMERCE',
+        '/social-commerce/my-cashback': 'CASHBACK',
+        '/account/wallet': 'WALLET',
+        '/product/GroupBuy': 'GROUP',
+        '/search-page': 'SEARCH_PAGE'
+      };
+      link = url;
+      params = {
+        action: 'jump',
+        params: {
+          type: map[url],
+          link: link
+        }
+      };
+  }
+
+  return {
+    link: link,
+    data: params
+  };
+};
+
+exports.newParseUrl = newParseUrl;
+
 var parseUrl = function parseUrl(url) {
   var link = url;
   var params;

package/lib/utils/commonUtil.js

@@ -208,8 +208,10 @@ function commonFetch(url, data, method) {
     var _a, _b;
 
     var isLoginUrl = url.includes('portal/login');
+    var credentials = localStorage.getItem('credentials');
     var headers = {
-      'Content-Type': isLoginUrl ? 'application/x-www-form-urlencoded' : 'application/json; charset=UTF-8'
+      'Content-Type': isLoginUrl ? 'application/x-www-form-urlencoded' : 'application/json; charset=UTF-8',
+      credentials: credentials
     };
 
     if (_method === 'GET') {

package/lib/utils/coreUtil.js

@@ -298,7 +298,7 @@ var clickUrl = function clickUrl(url) {
     return;
   }
 
-  var _a = (0, _businessUtil.parseUrl)(url),
+  var _a = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
       link = _a.link,
       data = _a.data;
 
@@ -323,6 +323,15 @@ var clickUrl = function clickUrl(url) {
 
     if (params.type === 'GET_COUPON') {
       getCoupon(params.couponId);
+      return;
+    } // 分享
+
+
+    if (params.type === 'SHARE_URL') {
+      if (window.magicDesign.handleAction) {
+        window.magicDesign.handleAction(params);
+      }
+
       return;
     }
 

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.1.7",
+  "version": "0.1.8",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",