@fonixtree/magic-design 2.0.140 → 2.0.142

package/es/common/LinkModal/FilteredProductModal/index.js

@@ -17,6 +17,8 @@ var _currencyUtil = require("../../../utils/currencyUtil");
 
 var _businessUtil = require("../../../utils/businessUtil");
 
+var _constants = require("../../../constants");
+
 require("./index.less");
 
 var _locale = require("../../../locale");
@@ -185,74 +187,82 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 };
 
 var FilteredProductModal = function FilteredProductModal(props) {
+  var _a;
+
   var onDataChange = props.onDataChange,
       _fetch = props._fetch;
   var Option = _antd.Select.Option;
   var InputGroup = _antd.Input.Group;
 
-  var _a = (0, _react.useState)([]),
-      tValue = _a[0],
-      settVal = _a[1];
-
   var _b = (0, _react.useState)([]),
-      brandId = _b[0],
-      settBrandId = _b[1];
+      tValue = _b[0],
+      settVal = _b[1];
 
-  var _c = (0, _react.useState)({}),
-      labelId = _c[0],
-      settLabelId = _c[1];
+  var _c = (0, _react.useState)([]),
+      brandId = _c[0],
+      settBrandId = _c[1];
 
-  var _d = (0, _react.useState)([]),
-      treeData = _d[0],
-      setTreeData = _d[1];
+  var _d = (0, _react.useState)({}),
+      labelId = _d[0],
+      settLabelId = _d[1];
 
   var _e = (0, _react.useState)([]),
-      brandData = _e[0],
-      setBrandData = _e[1];
+      treeData = _e[0],
+      setTreeData = _e[1];
 
   var _f = (0, _react.useState)([]),
-      labelData = _f[0],
-      setLabelData = _f[1];
+      brandData = _f[0],
+      setBrandData = _f[1];
 
-  var _g = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
-      storeId = _g[0],
-      setStoreId = _g[1];
+  var _g = (0, _react.useState)([]),
+      labelData = _g[0],
+      setLabelData = _g[1];
 
-  var _h = (0, _react.useState)([]),
-      storeList = _h[0],
-      setStoreList = _h[1];
+  var _h = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
+      storeId = _h[0],
+      setStoreId = _h[1];
 
-  var _j = (0, _react.useState)(''),
-      productName = _j[0],
-      setProductName = _j[1];
+  var _j = (0, _react.useState)([]),
+      storeList = _j[0],
+      setStoreList = _j[1];
 
   var _k = (0, _react.useState)(''),
-      minimum = _k[0],
-      setMinimum = _k[1];
+      productName = _k[0],
+      setProductName = _k[1];
 
   var _l = (0, _react.useState)(''),
-      maximum = _l[0],
-      setMaximum = _l[1];
+      minimum = _l[0],
+      setMinimum = _l[1];
 
-  var _m = (0, _react.useState)([]),
-      dataSource = _m[0],
-      setDataSource = _m[1];
+  var _m = (0, _react.useState)(''),
+      maximum = _m[0],
+      setMaximum = _m[1];
 
-  var _o = (0, _react.useState)({}),
-      promotions = _o[0],
-      setPromotions = _o[1];
+  var _o = (0, _react.useState)([]),
+      dataSource = _o[0],
+      setDataSource = _o[1];
 
-  var _p = (0, _react.useState)(false),
-      loading = _p[0],
-      setLoading = _p[1];
+  var _p = (0, _react.useState)({}),
+      promotions = _p[0],
+      setPromotions = _p[1];
 
-  var _q = (0, _react.useState)({
+  var _q = (0, _react.useState)(false),
+      loading = _q[0],
+      setLoading = _q[1];
+
+  var _r = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _q[0],
-      setPaginationParams = _q[1];
+      paginationParams = _r[0],
+      setPaginationParams = _r[1];
+
+  var FLASH_SALE = _constants.campaignTypes.FLASH_SALE,
+      GROUP_BY = _constants.campaignTypes.GROUP_BY,
+      SPECIAL_PRICE = _constants.campaignTypes.SPECIAL_PRICE,
+      OVER_SERIES = _constants.campaignTypes.OVER_SERIES;
+  var promotionOptions = ((_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode) === _constants.projectCodes.MONPAY ? [FLASH_SALE, SPECIAL_PRICE, OVER_SERIES] : [FLASH_SALE, GROUP_BY, OVER_SERIES];
 
   var onChange = function onChange(value) {
     settVal(value);
@@ -452,7 +462,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
             };
             return [4
             /*yield*/
-            , fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
 
           case 1:
             res = _a.sent();
@@ -627,13 +637,12 @@ var FilteredProductModal = function FilteredProductModal(props) {
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
     size: "small",
     value: promotions.value
-  }, /*#__PURE__*/_react["default"].createElement(Option, {
-    key: "2",
-    value: "Flash Sale"
-  }, (0, _locale.i18n)('FLASH_SALE')), /*#__PURE__*/_react["default"].createElement(Option, {
-    key: "4",
-    value: "Group By"
-  }, (0, _locale.i18n)('GROUP_BY')))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, promotionOptions.map(function (m) {
+    return /*#__PURE__*/_react["default"].createElement(Option, {
+      key: m.KEY,
+      value: m.VALUE
+    }, m.VALUE);
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "buttonStyle"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {

package/es/constants/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
+exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.campaignTypes = exports.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
   LOCALE: 'ZSMART_LOCALE',
   MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
@@ -60,6 +60,30 @@ var personalInfoType = {
   VIEWED: 'Recently Viewed'
 };
 exports.personalInfoType = personalInfoType;
+var projectCodes = {
+  MONPAY: 'MN',
+  PTO: 'pto'
+};
+exports.projectCodes = projectCodes;
+var campaignTypes = {
+  FLASH_SALE: {
+    KEY: 2,
+    VALUE: 'Flash Sale'
+  },
+  GROUP_BY: {
+    KEY: 4,
+    VALUE: 'Group By'
+  },
+  SPECIAL_PRICE: {
+    KEY: 14,
+    VALUE: 'Special Price'
+  },
+  OVER_SERIES: {
+    KEY: 1,
+    VALUE: 'Over Series'
+  }
+};
+exports.campaignTypes = campaignTypes;
 var urlType = {
   PRODUCT_DETAIL: 'proDetail',
   CATG_PROD_LIST: 'catg',

package/es/utils/coreUtil.js

@@ -303,23 +303,24 @@ function isUrl(string) {
 }
 
 var clickUrl = function clickUrl(url, state) {
-  var _a;
+  var _a, _b;
 
   if (url === void 0) {
     url = '';
   }
 
   console.log('clickUrl...', url, state); // 只读模式，设计模式，url为空，邮箱模版
-  // if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
-  //   return;
-  // }
 
-  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
-      link = _b.link,
-      data = _b.data;
+  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
+    return;
+  }
+
+  var _c = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
+      link = _c.link,
+      data = _c.data;
 
-  var _c = data.params,
-      params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
+  var _d = data.params,
+      params = _d === void 0 ? {} : _d; // console.log('clicked data:', data);
   // console.log({ type: 'jumpBrowser', params: { url: params.link } });
 
   /** 锚点跳转 */
@@ -351,6 +352,10 @@ var clickUrl = function clickUrl(url, state) {
         }
       });
     }
+  } else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http')) {
+    // pto 抽奖系统对接
+    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "token=" + (localStorage.getItem('h5Token') || '');
+    window.location.href = urlTemp;
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -398,6 +403,29 @@ var clickUrl = function clickUrl(url, state) {
       }
     } else {
       (0, _commonUtil.navigateTo)(link, state);
+    } // 判断是否是pto， pto跳外链需要带token
+
+
+    if (((_b = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _b === void 0 ? void 0 : _b.projectCode) === 'pto') {
+      // 输入的是完整的跳转地址
+      if (isUrl(link)) {
+        if (!link.includes(window.location.host)) {
+          // 跳转外链 需要把token带上
+          if (link.includes('?')) {
+            var a = link + "&token=" + (localStorage.getItem('h5Token') || '');
+            window.location.href = a;
+          } else {
+            var a = link + "?token=" + (localStorage.getItem('h5Token') || '');
+            window.location.href = a;
+          }
+        } else {
+          window.open(link);
+        }
+      } else {
+        (0, _commonUtil.navigateTo)(link, state);
+      }
+    } else {
+      (0, _commonUtil.navigateTo)(link, state);
     }
   }
 };

package/lib/common/LinkModal/FilteredProductModal/index.js

@@ -17,6 +17,8 @@ var _currencyUtil = require("../../../utils/currencyUtil");
 
 var _businessUtil = require("../../../utils/businessUtil");
 
+var _constants = require("../../../constants");
+
 require("./index.less");
 
 var _locale = require("../../../locale");
@@ -185,74 +187,82 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 };
 
 var FilteredProductModal = function FilteredProductModal(props) {
+  var _a;
+
   var onDataChange = props.onDataChange,
       _fetch = props._fetch;
   var Option = _antd.Select.Option;
   var InputGroup = _antd.Input.Group;
 
-  var _a = (0, _react.useState)([]),
-      tValue = _a[0],
-      settVal = _a[1];
-
   var _b = (0, _react.useState)([]),
-      brandId = _b[0],
-      settBrandId = _b[1];
+      tValue = _b[0],
+      settVal = _b[1];
 
-  var _c = (0, _react.useState)({}),
-      labelId = _c[0],
-      settLabelId = _c[1];
+  var _c = (0, _react.useState)([]),
+      brandId = _c[0],
+      settBrandId = _c[1];
 
-  var _d = (0, _react.useState)([]),
-      treeData = _d[0],
-      setTreeData = _d[1];
+  var _d = (0, _react.useState)({}),
+      labelId = _d[0],
+      settLabelId = _d[1];
 
   var _e = (0, _react.useState)([]),
-      brandData = _e[0],
-      setBrandData = _e[1];
+      treeData = _e[0],
+      setTreeData = _e[1];
 
   var _f = (0, _react.useState)([]),
-      labelData = _f[0],
-      setLabelData = _f[1];
+      brandData = _f[0],
+      setBrandData = _f[1];
 
-  var _g = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
-      storeId = _g[0],
-      setStoreId = _g[1];
+  var _g = (0, _react.useState)([]),
+      labelData = _g[0],
+      setLabelData = _g[1];
 
-  var _h = (0, _react.useState)([]),
-      storeList = _h[0],
-      setStoreList = _h[1];
+  var _h = (0, _react.useState)(window.magicDesign.storeId >= 0 ? window.magicDesign.storeId : ''),
+      storeId = _h[0],
+      setStoreId = _h[1];
 
-  var _j = (0, _react.useState)(''),
-      productName = _j[0],
-      setProductName = _j[1];
+  var _j = (0, _react.useState)([]),
+      storeList = _j[0],
+      setStoreList = _j[1];
 
   var _k = (0, _react.useState)(''),
-      minimum = _k[0],
-      setMinimum = _k[1];
+      productName = _k[0],
+      setProductName = _k[1];
 
   var _l = (0, _react.useState)(''),
-      maximum = _l[0],
-      setMaximum = _l[1];
+      minimum = _l[0],
+      setMinimum = _l[1];
 
-  var _m = (0, _react.useState)([]),
-      dataSource = _m[0],
-      setDataSource = _m[1];
+  var _m = (0, _react.useState)(''),
+      maximum = _m[0],
+      setMaximum = _m[1];
 
-  var _o = (0, _react.useState)({}),
-      promotions = _o[0],
-      setPromotions = _o[1];
+  var _o = (0, _react.useState)([]),
+      dataSource = _o[0],
+      setDataSource = _o[1];
 
-  var _p = (0, _react.useState)(false),
-      loading = _p[0],
-      setLoading = _p[1];
+  var _p = (0, _react.useState)({}),
+      promotions = _p[0],
+      setPromotions = _p[1];
 
-  var _q = (0, _react.useState)({
+  var _q = (0, _react.useState)(false),
+      loading = _q[0],
+      setLoading = _q[1];
+
+  var _r = (0, _react.useState)({
     pageSize: 20,
     current: 1,
     total: 0
   }),
-      paginationParams = _q[0],
-      setPaginationParams = _q[1];
+      paginationParams = _r[0],
+      setPaginationParams = _r[1];
+
+  var FLASH_SALE = _constants.campaignTypes.FLASH_SALE,
+      GROUP_BY = _constants.campaignTypes.GROUP_BY,
+      SPECIAL_PRICE = _constants.campaignTypes.SPECIAL_PRICE,
+      OVER_SERIES = _constants.campaignTypes.OVER_SERIES;
+  var promotionOptions = ((_a = window.systemParams) === null || _a === void 0 ? void 0 : _a.projectCode) === _constants.projectCodes.MONPAY ? [FLASH_SALE, SPECIAL_PRICE, OVER_SERIES] : [FLASH_SALE, GROUP_BY, OVER_SERIES];
 
   var onChange = function onChange(value) {
     settVal(value);
@@ -452,7 +462,7 @@ var FilteredProductModal = function FilteredProductModal(props) {
             };
             return [4
             /*yield*/
-            , fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
+            , _fetch("/designer/v1/" + window.magicDesign.MBaseUrl + "/offers/es", params, 'POST')];
 
           case 1:
             res = _a.sent();
@@ -627,13 +637,12 @@ var FilteredProductModal = function FilteredProductModal(props) {
     placeholder: (0, _locale.i18n)('PLEASE_SELECT'),
     size: "small",
     value: promotions.value
-  }, /*#__PURE__*/_react["default"].createElement(Option, {
-    key: "2",
-    value: "Flash Sale"
-  }, (0, _locale.i18n)('FLASH_SALE')), /*#__PURE__*/_react["default"].createElement(Option, {
-    key: "4",
-    value: "Group By"
-  }, (0, _locale.i18n)('GROUP_BY')))), /*#__PURE__*/_react["default"].createElement("div", {
+  }, promotionOptions.map(function (m) {
+    return /*#__PURE__*/_react["default"].createElement(Option, {
+      key: m.KEY,
+      value: m.VALUE
+    }, m.VALUE);
+  }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "buttonStyle"
   }, /*#__PURE__*/_react["default"].createElement(_antd.Button, {
     onClick: function onClick() {

package/lib/constants/index.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
+exports.walletType = exports.urlTypeMap = exports.urlType = exports.tempTypeMap = exports.respCodeMap = exports.quickMenuCode = exports.projectCodes = exports.personalInfoType = exports.partyTypeMap = exports.pageStateMap = exports.orderStatusType = exports.metaType = exports.metaInst = exports.metaInsType = exports.magicMode = exports.eventType = exports.deviceTypeWidthMap = exports.deviceTypeMap = exports.compInfoMap = exports.campaignTypes = exports.baseUrlMap = exports.STORE_KEY = exports.STORAGE_KEY = exports.ORDER_TYPE = exports.CREDIT_STATE = void 0;
 var STORAGE_KEY = {
   LOCALE: 'ZSMART_LOCALE',
   MAGIC_RENDER_HTML: 'MAGIC_RENDER_HTML',
@@ -60,6 +60,30 @@ var personalInfoType = {
   VIEWED: 'Recently Viewed'
 };
 exports.personalInfoType = personalInfoType;
+var projectCodes = {
+  MONPAY: 'MN',
+  PTO: 'pto'
+};
+exports.projectCodes = projectCodes;
+var campaignTypes = {
+  FLASH_SALE: {
+    KEY: 2,
+    VALUE: 'Flash Sale'
+  },
+  GROUP_BY: {
+    KEY: 4,
+    VALUE: 'Group By'
+  },
+  SPECIAL_PRICE: {
+    KEY: 14,
+    VALUE: 'Special Price'
+  },
+  OVER_SERIES: {
+    KEY: 1,
+    VALUE: 'Over Series'
+  }
+};
+exports.campaignTypes = campaignTypes;
 var urlType = {
   PRODUCT_DETAIL: 'proDetail',
   CATG_PROD_LIST: 'catg',

package/lib/utils/coreUtil.js

@@ -303,23 +303,24 @@ function isUrl(string) {
 }
 
 var clickUrl = function clickUrl(url, state) {
-  var _a;
+  var _a, _b;
 
   if (url === void 0) {
     url = '';
   }
 
   console.log('clickUrl...', url, state); // 只读模式，设计模式，url为空，邮箱模版
-  // if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
-  //   return;
-  // }
 
-  var _b = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
-      link = _b.link,
-      data = _b.data;
+  if (window.magicDesign.readOnly || window.magicDesign.mode !== 'renderer' || !url || window.magicDesign.outputType == 'html') {
+    return;
+  }
+
+  var _c = _typeof(url) === 'object' ? (0, _businessUtil.newParseUrl)(url) : (0, _businessUtil.parseUrl)(url),
+      link = _c.link,
+      data = _c.data;
 
-  var _c = data.params,
-      params = _c === void 0 ? {} : _c; // console.log('clicked data:', data);
+  var _d = data.params,
+      params = _d === void 0 ? {} : _d; // console.log('clicked data:', data);
   // console.log({ type: 'jumpBrowser', params: { url: params.link } });
 
   /** 锚点跳转 */
@@ -351,6 +352,10 @@ var clickUrl = function clickUrl(url, state) {
         }
       });
     }
+  } else if ((0, _androidUtil.browserVersion)().isDitoApp && params.link && params.link.startsWith('http')) {
+    // pto 抽奖系统对接
+    var urlTemp = "" + params.link + (params.link.includes('?') ? '&' : '?') + "token=" + (localStorage.getItem('h5Token') || '');
+    window.location.href = urlTemp;
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -398,6 +403,29 @@ var clickUrl = function clickUrl(url, state) {
       }
     } else {
       (0, _commonUtil.navigateTo)(link, state);
+    } // 判断是否是pto， pto跳外链需要带token
+
+
+    if (((_b = window === null || window === void 0 ? void 0 : window.magicDesign) === null || _b === void 0 ? void 0 : _b.projectCode) === 'pto') {
+      // 输入的是完整的跳转地址
+      if (isUrl(link)) {
+        if (!link.includes(window.location.host)) {
+          // 跳转外链 需要把token带上
+          if (link.includes('?')) {
+            var a = link + "&token=" + (localStorage.getItem('h5Token') || '');
+            window.location.href = a;
+          } else {
+            var a = link + "?token=" + (localStorage.getItem('h5Token') || '');
+            window.location.href = a;
+          }
+        } else {
+          window.open(link);
+        }
+      } else {
+        (0, _commonUtil.navigateTo)(link, state);
+      }
+    } else {
+      (0, _commonUtil.navigateTo)(link, state);
     }
   }
 };

package/package.json

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