@fonixtree/magic-design 2.0.200 → 2.0.203

package/lib/utils/businessUtil.js

@@ -3,19 +3,169 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToTree = exports.isPlatform = exports.getPromotionList = exports.computeStyle = exports.canNumber = void 0;
+exports.renderPreview = exports.parseUrl = exports.newParseUrl = exports.listToTree = exports.isPlatform = exports.getTempCartCount = exports.getPromotionList = exports.getAdCoupon = exports.computeStyle = exports.canNumber = void 0;
 
 var _qs = _interopRequireDefault(require("qs"));
 
 var _pickBy = _interopRequireDefault(require("lodash/pickBy"));
 
+var _messageUtil = require("./messageUtil");
+
 var _commonUtil = require("./commonUtil");
 
+var _storeUtil = require("./storeUtil");
+
+var _locale = require("../locale");
+
 var _constants = require("../constants");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
+  function adopt(value) {
+    return value instanceof P ? value : new P(function (resolve) {
+      resolve(value);
+    });
+  }
+
+  return new (P || (P = Promise))(function (resolve, reject) {
+    function fulfilled(value) {
+      try {
+        step(generator.next(value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function rejected(value) {
+      try {
+        step(generator["throw"](value));
+      } catch (e) {
+        reject(e);
+      }
+    }
+
+    function step(result) {
+      result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected);
+    }
+
+    step((generator = generator.apply(thisArg, _arguments || [])).next());
+  });
+};
+
+var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
+  var _ = {
+    label: 0,
+    sent: function sent() {
+      if (t[0] & 1) throw t[1];
+      return t[1];
+    },
+    trys: [],
+    ops: []
+  },
+      f,
+      y,
+      t,
+      g;
+  return g = {
+    next: verb(0),
+    "throw": verb(1),
+    "return": verb(2)
+  }, typeof Symbol === "function" && (g[Symbol.iterator] = function () {
+    return this;
+  }), g;
+
+  function verb(n) {
+    return function (v) {
+      return step([n, v]);
+    };
+  }
+
+  function step(op) {
+    if (f) throw new TypeError("Generator is already executing.");
+
+    while (_) {
+      try {
+        if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
+        if (y = 0, t) op = [op[0] & 2, t.value];
+
+        switch (op[0]) {
+          case 0:
+          case 1:
+            t = op;
+            break;
+
+          case 4:
+            _.label++;
+            return {
+              value: op[1],
+              done: false
+            };
+
+          case 5:
+            _.label++;
+            y = op[1];
+            op = [0];
+            continue;
+
+          case 7:
+            op = _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+
+          default:
+            if (!(t = _.trys, t = t.length > 0 && t[t.length - 1]) && (op[0] === 6 || op[0] === 2)) {
+              _ = 0;
+              continue;
+            }
+
+            if (op[0] === 3 && (!t || op[1] > t[0] && op[1] < t[3])) {
+              _.label = op[1];
+              break;
+            }
+
+            if (op[0] === 6 && _.label < t[1]) {
+              _.label = t[1];
+              t = op;
+              break;
+            }
+
+            if (t && _.label < t[2]) {
+              _.label = t[2];
+
+              _.ops.push(op);
+
+              break;
+            }
+
+            if (t[2]) _.ops.pop();
+
+            _.trys.pop();
+
+            continue;
+        }
+
+        op = body.call(thisArg, _);
+      } catch (e) {
+        op = [6, e];
+        y = 0;
+      } finally {
+        f = t = 0;
+      }
+    }
+
+    if (op[0] & 5) throw op[1];
+    return {
+      value: op[0] ? op[1] : void 0,
+      done: true
+    };
+  }
+};
 /* eslint-disable import/no-cycle */
+
+
 var isPlatform = function isPlatform() {
   return window.magicDesign.partyType === 'P';
 };
@@ -110,6 +260,17 @@ var newParseUrl = function newParseUrl(urlObj) {
         }
       };
       break;
+    // 商品卡片列表
+
+    case _constants.urlTypeMap.CARD_PRODUCT_LIST:
+      params = {
+        action: 'operation',
+        params: {
+          type: 'CARD_PRODUCT_LIST',
+          offerIds: value
+        }
+      };
+      break;
 
     case _constants.urlTypeMap.COUPONS:
       // 领取优惠券
@@ -497,10 +658,55 @@ var parseUrl = function parseUrl(url) {
     data: params
   };
 };
+
+exports.parseUrl = parseUrl;
+
+var getAdCoupon = function getAdCoupon(couponId) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var 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/h5/coupons/usercoupon', {
+            couponId: couponId
+          }, 'POST')];
+
+        case 1:
+          _a.sent();
+
+          _messageUtil.message.toast({
+            message: (0, _locale.i18n)('COLLECT_VOUCHER_SUCCESS'),
+            duration: 5000
+          });
+
+          window.sessionStorage.removeItem('adCouponId');
+          return [3
+          /*break*/
+          , 3];
+
+        case 2:
+          error_1 = _a.sent();
+          window.sessionStorage.setItem('adCouponId', couponId);
+          return [3
+          /*break*/
+          , 3];
+
+        case 3:
+          return [2
+          /*return*/
+          ];
+      }
+    });
+  });
+};
 /** 刷新预览区域 */
 
 
-exports.parseUrl = parseUrl;
+exports.getAdCoupon = getAdCoupon;
 
 var renderPreview = function renderPreview() {
   var evt = new Event('render-view', {
@@ -616,5 +822,14 @@ var computeStyle = function computeStyle(_a, device) {
 
   return wrapStyle;
 };
+/** 获取临时购物车 数量 */
+
+
+exports.computeStyle = computeStyle;
+
+var getTempCartCount = function getTempCartCount() {
+  var tempCarts = (0, _storeUtil.getStore)(_constants.STORE_KEY.TEMP_CART) || [];
+  return tempCarts.length;
+};
 
-exports.computeStyle = computeStyle;
+exports.getTempCartCount = getTempCartCount;

package/lib/utils/commonUtil.js

@@ -3,11 +3,12 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.addZero = exports.addUrlQuery = void 0;
+exports.addZero = exports.addUrlQuery = exports.JsonToUrl = void 0;
+exports.afterLogOut = afterLogOut;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkLogin = exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
-exports.convertCount = exports.compatibleNewPageData = void 0;
+exports.convertCount = exports.compatibleNewPageData = exports.compareVersion = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -20,6 +21,7 @@ exports.getUrlParams = void 0;
 exports.goLogin = goLogin;
 exports.importAsync = void 0;
 exports.isLogin = isLogin;
+exports.jumpUrlConfig = void 0;
 exports.navigateBack = navigateBack;
 exports.onListenTouch = exports.nextTick = exports.needReverse = exports.navigateTo = void 0;
 exports.pushGA = pushGA;
@@ -30,6 +32,7 @@ exports.shareTwitter = shareTwitter;
 exports.sleep = sleep;
 exports.styleStringify = void 0;
 exports.triggerBuryingPointEvent = triggerBuryingPointEvent;
+exports.xssDecode = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
@@ -43,6 +46,10 @@ var _androidUtil = require("./androidUtil");
 
 var _storeUtil = require("./storeUtil");
 
+var _businessUtil = require("./businessUtil");
+
+var _coreUtil = require("./coreUtil");
+
 var _constants = require("../constants");
 
 var _mobx = require("../mobx");
@@ -251,7 +258,8 @@ function commonFetch(url, data, method) {
       'Content-Type': 'application/json; charset=UTF-8',
       credentials: credentials,
       accessToken: credentials,
-      'X-CSRF-TOKEN': csrf
+      'X-CSRF-TOKEN': csrf,
+      'Device-Type': (0, _coreUtil.isPc)() ? 'pc' : 'web'
     };
 
     if (url.endsWith('portal/login')) {
@@ -366,6 +374,21 @@ function navigateBack(depth) {
 
 function isLogin() {
   return localStorage.getItem('isLogin') === 'Y';
+} // export function removeCookie(key) {
+//   return Cookies.remove(key);
+// }
+
+
+function afterLogOut() {
+  // removeCookie('eshopByPcIsLogin', 'Y');
+  localStorage.removeItem('isLogin');
+  localStorage.removeItem('currentUser');
+  localStorage.removeItem('h5Token');
+  localStorage.removeItem('accountPageValue');
+  localStorage.removeItem('isGiveCoupon');
+  sessionStorage.removeItem('channelPurchase');
+
+  _mobx.userState.clearUserState();
 }
 /**
  * 跳转登陆页面
@@ -395,6 +418,10 @@ function goLogin(state, replaceFlag) {
     navigateTo(signUrl, state);
   }
 }
+
+var xssDecode = function xssDecode(html) {
+  return html.replace(/&lt;/g, '<').replace(/&gt;/g, '>');
+};
 /**
  * 检查是否登录 未登录返回登录页
  * @param {boolean?} isLead 是否引导登录
@@ -402,6 +429,8 @@ function goLogin(state, replaceFlag) {
  */
 
 
+exports.xssDecode = xssDecode;
+
 var checkLogin = function checkLogin(isLead, redirectUrl, replaceFlag) {
   if (isLead === void 0) {
     isLead = true;
@@ -531,13 +560,113 @@ var reverseStrArr = function reverseStrArr(arr) {
 
   return arr.join(' ').replace(' +', '+').replace(' :', ':');
 };
+
+exports.reverseStrArr = reverseStrArr;
+
+var JsonToUrl = function JsonToUrl(data) {
+  var tempArr = [];
+
+  for (var i in data) {
+    var keyData = encodeURIComponent(i);
+    var value = encodeURIComponent(data[i]) === 'null' ? '' : encodeURIComponent(data[i]);
+    tempArr.push(keyData + "=" + value);
+  }
+
+  var urlParamsStr = tempArr.join('&');
+  return urlParamsStr;
+};
+
+exports.JsonToUrl = JsonToUrl;
+
+var jumpUrlConfig = function jumpUrlConfig(item) {
+  var _a, _b, _c;
+
+  var _d = item || {},
+      objType = _d.objType,
+      objValue = _d.objValue;
+
+  var jumpUrl = '';
+
+  switch (objType) {
+    // 新增case
+    case 'ProductList':
+      {
+        var offerIdList = objValue.filteredProductsRela.offerIdList;
+        jumpUrl = "/product/list?from=home&objType=ProductList&offerIdList=" + offerIdList;
+        break;
+      }
+
+    case 'Category':
+      jumpUrl = (0, _coreUtil.isPc)() ? "/product/list?from=home&objType=Category&catgIds=" + objValue.objId : "/product/list/" + objValue.objId;
+      break;
+
+    case 'StoreCategory':
+      jumpUrl = (0, _coreUtil.isPc)() ? "/product/list?from=home&objType=Category&catgIds=" + objValue.objId + "&storeCatgIds=" + objValue.objId : "/product/list/" + objValue.objId + "?storeCatgIds=" + objValue.objId;
+      break;
+
+    case 'Coupons':
+      (0, _businessUtil.getAdCoupon)(objValue.objId);
+      return;
+
+    case 'ProductDetail':
+      {
+        var offerId = objValue.objId && objValue.objId.split(',')[0];
+        var productId = objValue.objId && objValue.objId.split(',')[1];
+        jumpUrl = "/product/detail/" + offerId + "?productId=" + productId;
+        break;
+      }
+
+    case 'ProductDetailPage':
+      {
+        var offerId = objValue.objId && objValue.objId.split(',')[0];
+        var productId = objValue.objId && objValue.objId.split(',')[1];
+        jumpUrl = "/product/detail/" + offerId + "?productId=" + productId;
+        break;
+      }
+
+    case 'FilteredProducts':
+      {
+        var params = JsonToUrl(objValue.filteredProductsRela);
+        params = params.replace('productName', 'q').replace('cmpTypeId', 'campaignType');
+        jumpUrl = (0, _coreUtil.isPc)() ? "/product/list?from=home&objType=FilteredProducts&" + params : "/product/list/null?" + params;
+        break;
+      }
+
+    case 'FunctionPage':
+      {
+        var url = objValue.objId && objValue.objId.split(',')[1];
+        jumpUrl = "" + url;
+        break;
+      }
+
+    case 'CustomizedPage':
+      jumpUrl = "/poster/" + objValue.objId;
+      break;
+
+    case 'URL':
+      {
+        if (((_a = objValue.urlRelaDto) === null || _a === void 0 ? void 0 : _a.openMode) === 'new') {
+          window.open(objValue.urlRelaDto.url);
+        } else {
+          window.location.href = (_c = (_b = objValue === null || objValue === void 0 ? void 0 : objValue.urlRelaDto) === null || _b === void 0 ? void 0 : _b.url) !== null && _c !== void 0 ? _c : objValue.url;
+        }
+
+        return;
+      }
+
+    default:
+      break;
+  }
+
+  (0, _coreUtil.clickUrl)(jumpUrl);
+};
 /**
  * 补0 函数
  * @param {*} num 数字
  */
 
 
-exports.reverseStrArr = reverseStrArr;
+exports.jumpUrlConfig = jumpUrlConfig;
 
 var addZero = function addZero(num) {
   return String(num).length === 1 ? "0" + String(num) : String(num);
@@ -600,9 +729,31 @@ function convertImageUrl(imageObj, type) {
     return encodeURI(imageObj[typeMap] || imageObj.url);
   }, '');
 }
+
+var compareVersion = function compareVersion(v1, v2) {
+  // 将两个版本号拆成数组
+  var arr1 = v1.split('.');
+  var arr2 = v2.split('.');
+  var minLength = Math.min(arr1.length, arr2.length); // 依次比较版本号每一位大小
+
+  for (var i = 0; i < minLength; i += 1) {
+    if (parseInt(arr1[i], 10) !== parseInt(arr2[i], 10)) {
+      return parseInt(arr1[i], 10) > parseInt(arr2[i], 10) ? 1 : -1;
+    }
+  } // 若前几位分隔相同，则按分隔数比较。
+
+
+  if (arr1.length === arr2.length) {
+    return 0;
+  }
+
+  return arr1.length > arr2.length ? 1 : -1;
+};
 /** 序列化 style对象 */
 
 
+exports.compareVersion = compareVersion;
+
 var styleStringify = function styleStringify(style, _a) {
   var _b = (_a === void 0 ? {} : _a).suffix,
       suffix = _b === void 0 ? 'px' : _b;

package/lib/utils/coreUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isAutoAudit = exports.isActiveFloor = exports.getVideoCover = exports.copyNode = exports.clickUrl = void 0;
+exports.setMagicDesign = exports.renderPreview = exports.isPc = exports.isDesignMode = exports.isAutoAudit = exports.isActiveFloor = exports.getVideoCover = exports.createProdCardModal = exports.copyNode = exports.clickUrl = void 0;
 
 var _uuid = require("uuid");
 
@@ -21,6 +21,8 @@ var _locale = require("../locale");
 
 var _Video = require("../common/Video");
 
+var _mobx = require("../mobx");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -302,6 +304,51 @@ function isUrl(string) {
   }
 }
 
+var createProdCardModal = function createProdCardModal(ids) {
+  return __awaiter(void 0, void 0, void 0, function () {
+    var res, resList;
+
+    var _a;
+
+    return __generator(this, function (_b) {
+      switch (_b.label) {
+        case 0:
+          if (ids.length === 0) return [2
+          /*return*/
+          ];
+          return [4
+          /*yield*/
+          , (0, _commonUtil.commonFetch)('/designer/v1/h5/offers', {
+            pageIndex: 1,
+            pageSize: 20,
+            offerIdList: ids || []
+          }, 'POST')];
+
+        case 1:
+          res = _b.sent();
+          resList = ((_a = res.pageInfo) === null || _a === void 0 ? void 0 : _a.list) || [];
+          if (resList.length === 0) return [2
+          /*return*/
+          ];
+          document.body.classList.add('no-scroll');
+
+          _mobx.frameStore.setState({
+            pcProdCardModalState: {
+              visible: true,
+              data: resList
+            }
+          });
+
+          return [2
+          /*return*/
+          ];
+      }
+    });
+  });
+};
+
+exports.createProdCardModal = createProdCardModal;
+
 var clickUrl = function clickUrl(url, state) {
   var _a, _b;
 
@@ -320,11 +367,15 @@ var clickUrl = function clickUrl(url, state) {
       data = _c.data;
 
   var _d = data.params,
-      params = _d === void 0 ? {} : _d; // console.log('clicked data:', data);
-  // console.log({ type: 'jumpBrowser', params: { url: params.link } });
+      params = _d === void 0 ? {} : _d; // PC商品卡片弹窗
 
+  if (params.type === 'CARD_PRODUCT_LIST') {
+    createProdCardModal(params.offerIds);
+    return;
+  }
   /** 锚点跳转 */
 
+
   if (params.type === 'ANCHOR') {
     (0, _commonUtil.ensure)(function () {
       var nodeId = isPc() ? params.data.pcNodeId : params.data.mobileNodeId;
@@ -420,7 +471,11 @@ var clickUrl = function clickUrl(url, state) {
           window.open(link);
         }
       } else {
-        (0, _commonUtil.navigateTo)(link, state);
+        if (isPc()) {
+          window.location.href += "web" + link;
+        } else {
+          (0, _commonUtil.navigateTo)(link, state);
+        }
       }
     } else {
       (0, _commonUtil.navigateTo)(link, state);

package/lib/utils/messageUtil.js

@@ -0,0 +1,40 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.message = void 0;
+exports.toast = toast;
+
+var _mobx = require("../mobx");
+
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+
+function toast(config) {
+  var defaults = {
+    message: 'success',
+    duration: 3000,
+    onClose: function onClose() {},
+    visible: true
+  };
+
+  var _a = _extends(defaults, config),
+      message = _a.message,
+      duration = _a.duration,
+      onClose = _a.onClose,
+      visible = _a.visible;
+
+  _mobx.frameStore.setState({
+    toastState: {
+      message: message,
+      duration: duration,
+      onClose: onClose,
+      visible: visible
+    }
+  });
+}
+
+var message = {
+  toast: toast
+};
+exports.message = message;

package/lib/utils/pluginsUtil.js

@@ -0,0 +1 @@
+"use strict";

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "2.0.200",
+  "version": "2.0.203",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -25,6 +25,8 @@
     "antd": "4.24.8",
     "antd4": "npm:antd@4.24.8",
     "axios": "0.27.2",
+    "framer-motion": "6.x",
+    "html2canvas": "^1.4.1",
     "immutability-helper": "3.1.1",
     "interactjs": "1.10.17",
     "lodash": "4.17.21",
@@ -32,7 +34,8 @@
     "marked": "4.3.0",
     "mobx": "6.6.1",
     "mobx-react": "7.5.2",
-    "moment": "2.30",
+    "moment": "2.29.3",
+    "motion": "^10.12.18",
     "postcss-pxtorem": "^6.0.0",
     "quill": "^1.3.7",
     "ramda": "^0.28.0",