@fonixtree/magic-design 2.0.72 → 2.0.73

package/lib/common/ProductSource/index.js

@@ -15,7 +15,7 @@ var _commonUtil = require("../../utils/commonUtil");
 
 var _Button = _interopRequireDefault(require("../Button"));
 
-var _ProductModal = _interopRequireDefault(require("../ProductModal"));
+var _ProductModal = _interopRequireWildcard(require("../ProductModal"));
 
 require("./index.less");
 
@@ -27,6 +27,22 @@ function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "functio
 
 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; }
 
+var __assign = void 0 && (void 0).__assign || function () {
+  __assign = Object.assign || function (t) {
+    for (var s, i = 1, n = arguments.length; i < n; i++) {
+      s = arguments[i];
+
+      for (var p in s) {
+        if (Object.prototype.hasOwnProperty.call(s, p)) t[p] = s[p];
+      }
+    }
+
+    return t;
+  };
+
+  return __assign.apply(this, arguments);
+};
+
 var __awaiter = void 0 && (void 0).__awaiter || function (thisArg, _arguments, P, generator) {
   function adopt(value) {
     return value instanceof P ? value : new P(function (resolve) {
@@ -175,7 +191,8 @@ function ProductSource(_a) {
 
   var value = _a.value,
       onChange = _a.onChange,
-      isAffiliate = _a.isAffiliate;
+      isAffiliate = _a.isAffiliate,
+      prodType = _a.prodType;
 
   var _b = (0, _react.useState)([]),
       selectedProds = _b[0],
@@ -187,27 +204,22 @@ function ProductSource(_a) {
 
   var onSelectProduct = function onSelectProduct() {
     return __awaiter(_this, void 0, void 0, function () {
-      var url, param, list;
+      var url, param, list, url, param, list, url, param, list_1;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
             if (!(value && value.length > 0)) return [3
             /*break*/
+            , 7];
+            if (!isAffiliate) return [3
+            /*break*/
             , 2];
-            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/product/list";
             param = {
-              products: value
+              affiliateProductIds: value,
+              pageSize: value.length,
+              pageIndex: 1
             };
-
-            if (isAffiliate) {
-              url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/distributor/product/list";
-              param = {
-                affiliateProductIds: value,
-                pageSize: value.length,
-                pageIndex: 1
-              };
-            }
-
             return [4
             /*yield*/
             , (0, _commonUtil.commonFetch)(url, param, 'GET')];
@@ -217,13 +229,61 @@ function ProductSource(_a) {
             setSelectedProds(list || []);
             return [3
             /*break*/
-            , 3];
+            , 6];
 
           case 2:
-            setSelectedProds([]);
-            _a.label = 3;
+            if (!(prodType === 'sku')) return [3
+            /*break*/
+            , 4];
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/products";
+            param = {
+              products: value,
+              state: 'A'
+            };
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(url, param, 'GET')];
 
           case 3:
+            list = _a.sent().list;
+            setSelectedProds((0, _ProductModal.formatData)(list || []));
+            return [3
+            /*break*/
+            , 6];
+
+          case 4:
+            url = "/designer/v1/" + window.magicDesign.MBaseUrl + "/offers";
+            param = {
+              offers: value,
+              state: 'A',
+              isDefaultCover: 'Y',
+              onlyQryPublishSku: true,
+              auditState: 'S',
+              crmFlag: 'on'
+            };
+            return [4
+            /*yield*/
+            , (0, _commonUtil.commonFetch)(url, param, 'GET')];
+
+          case 5:
+            list_1 = _a.sent().list;
+            setSelectedProds((0, _ProductModal.formatData)((0, _commonUtil.ensure)(function () {
+              return list_1.map(function (m) {
+                return __assign(__assign({}, m.products[0]), m);
+              });
+            }, []), prodType));
+            _a.label = 6;
+
+          case 6:
+            return [3
+            /*break*/
+            , 8];
+
+          case 7:
+            setSelectedProds([]);
+            _a.label = 8;
+
+          case 8:
             setVisbile(true);
             return [2
             /*return*/
@@ -233,7 +293,7 @@ function ProductSource(_a) {
     });
   };
 
-  var handleModalSave = function handleModalSave(list) {
+  var handleModalSave = function handleModalSave(list, type) {
     var ids = '';
 
     if (isAffiliate) {
@@ -242,11 +302,11 @@ function ProductSource(_a) {
       }).join(',');
     } else {
       ids = list.map(function (prod) {
-        return prod.productId;
+        return prod.id;
       }).join(',');
     }
 
-    onChange(ids);
+    onChange(ids, type);
   };
 
   var getLength = function getLength() {
@@ -281,6 +341,7 @@ function ProductSource(_a) {
     defaultList: selectedProds,
     handleModalSave: handleModalSave,
     maxSelect: 100,
+    prodType: prodType,
     visible: visible
   })));
 }

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

@@ -308,14 +308,14 @@ function (_super) {
 
     _this.getProductList = function (index) {
       return __awaiter(_this, void 0, void 0, function () {
-        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, intelligentType, _e, intelligentValue, _f, maxProdNum, newData, res, res, e_1, _cache;
+        var panelProps, groupSource, recommendId, pageId, cache, _a, _b, sourceType, _c, prodIds, _d, prodType, _e, intelligentType, _f, intelligentValue, _g, maxProdNum, newData, params, res, res, e_1, _cache;
 
-        var _g, _h, _j;
+        var _h, _j, _k;
 
         var _this = this;
 
-        return __generator(this, function (_k) {
-          switch (_k.label) {
+        return __generator(this, function (_l) {
+          switch (_l.label) {
             case 0:
               panelProps = this.props.panelProps;
               groupSource = this.state.groupSource;
@@ -327,7 +327,7 @@ function (_super) {
 
                 if (cache) {
                   if ("products" + index in cache) {
-                    this.setState((_g = {}, _g["products" + index] = cache["products" + index], _g), function () {
+                    this.setState((_h = {}, _h["products" + index] = cache["products" + index], _h), function () {
                       _this.resetLayout();
                     });
                     /** 如果数据未过期 */
@@ -339,12 +339,12 @@ function (_super) {
                 }
               }
 
-              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.intelligentType, intelligentType = _d === void 0 ? '' : _d, _e = _a.intelligentValue, intelligentValue = _e === void 0 ? [] : _e, _f = _a.maxProdNum, maxProdNum = _f === void 0 ? 10 : _f;
+              _a = groupSource[index] || {}, _b = _a.sourceType, sourceType = _b === void 0 ? '' : _b, _c = _a.prodIds, prodIds = _c === void 0 ? '' : _c, _d = _a.prodType, prodType = _d === void 0 ? '' : _d, _e = _a.intelligentType, intelligentType = _e === void 0 ? '' : _e, _f = _a.intelligentValue, intelligentValue = _f === void 0 ? [] : _f, _g = _a.maxProdNum, maxProdNum = _g === void 0 ? 10 : _g;
               newData = [];
-              _k.label = 1;
+              _l.label = 1;
 
             case 1:
-              _k.trys.push([1, 9,, 10]);
+              _l.trys.push([1, 9,, 10]);
 
               if (!(groupSource.length > 0)) return [3
               /*break*/
@@ -352,22 +352,25 @@ function (_super) {
               if (!(sourceType === 'select')) return [3
               /*break*/
               , 3];
+              if (!prodIds) return [2
+              /*return*/
+              ];
+              params = {
+                state: 'A'
+              };
 
-              if (!prodIds) {
-                return [2
-                /*return*/
-                ];
+              if (prodType === 'spu') {
+                params.offers = prodIds;
+              } else {
+                params.products = prodIds;
               }
 
               return [4
               /*yield*/
-              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', {
-                products: prodIds,
-                state: 'A'
-              }, 'GET')];
+              , (0, _commonUtil.commonFetch)('/designer/v1/h5/products', params, 'GET')];
 
             case 2:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.list);
               return [3
               /*break*/
@@ -390,7 +393,7 @@ function (_super) {
               }, 'POST')];
 
             case 4:
-              res = _k.sent();
+              res = _l.sent();
               newData = __spreadArrays(res.pageInfo.list);
               return [3
               /*break*/
@@ -398,7 +401,7 @@ function (_super) {
 
             case 5:
               newData = [];
-              _k.label = 6;
+              _l.label = 6;
 
             case 6:
               return [3
@@ -407,7 +410,7 @@ function (_super) {
 
             case 7:
               newData = [];
-              _k.label = 8;
+              _l.label = 8;
 
             case 8:
               return [3
@@ -415,7 +418,7 @@ function (_super) {
               , 10];
 
             case 9:
-              e_1 = _k.sent();
+              e_1 = _l.sent();
               newData = [];
               return [3
               /*break*/
@@ -424,10 +427,10 @@ function (_super) {
             case 10:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
-                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_h = {}, _h["products" + index] = newData, _h.endTime = Date.now() + 3 * 60 * 1000, _h)));
+                (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_j = {}, _j["products" + index] = newData, _j.endTime = Date.now() + 3 * 60 * 1000, _j)));
               }
 
-              this.setState((_j = {}, _j["products" + index] = newData, _j), function () {
+              this.setState((_k = {}, _k["products" + index] = newData, _k), function () {
                 _this.resetLayout();
               });
               return [2

package/lib/composite-comp/dito/second-config-panels/RecommendSecondConfig/index.js

@@ -114,11 +114,13 @@ function (_super) {
       }, (0, _locale.i18n)('AI_RECOMMENDATION')))), /*#__PURE__*/_react["default"].createElement("div", {
         className: "greyBg"
       }, panelProps.sourceType === 'select' && /*#__PURE__*/_react["default"].createElement(_common.ProductSource, {
-        onChange: function onChange(v) {
-          panelProps.prodIds = v;
+        onChange: function onChange(ids, type) {
+          panelProps.prodIds = ids;
+          panelProps.prodType = type;
 
           _this.selfRender();
         },
+        prodType: panelProps.prodType,
         value: panelProps.prodIds
       }), panelProps.sourceType === 'recommend' && /*#__PURE__*/_react["default"].createElement(_AIRecommendation["default"], {
         onChange: function onChange(val) {

package/lib/locale/en/en.json

@@ -1,6 +1,6 @@
 {
   "PUSH": "Push",
-  "SET_AS_TEMPLATE":"Set as Template",
+  "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
   "NAME": "Name",
   "ADD_MENU": "Add Menu",
@@ -97,7 +97,8 @@
   "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
-  "PRODUCT_CODE": "Product Code",
+  "SKU_CODE": "SKU Code",
+  "SPU_CODE": "SPU Code",
   "SKU": "SKU",
   "PRICE": "Price",
   "BRAND": "Brand",

package/lib/locale/es/es.json

@@ -1,6 +1,6 @@
 {
   "PUSH": "Push",
-  "SET_AS_TEMPLATE":"Set as Template",
+  "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
   "NAME": "Name",
   "ADD_MENU": "Add Menu",
@@ -97,7 +97,8 @@
   "BANNER_HEIGHT": "Altura del banner",
   "IMAGE": "Imagen",
   "PRODUCT_NAME": "Nombre del producto",
-  "PRODUCT_CODE": "Código de producto",
+  "SKU_CODE": "Código SKU",
+  "SPU_CODE": "Código spu",
   "SKU": "SKU",
   "PRICE": "Precio",
   "BRAND": "Marca",

package/lib/locale/id/id.json

@@ -1,6 +1,6 @@
 {
   "PUSH": "Push",
-  "SET_AS_TEMPLATE":"Set as Template",
+  "SET_AS_TEMPLATE": "Set as Template",
   "DISPLAY_PAGE": "Display page",
   "NAME": "Name",
   "ADD_MENU": "Add Menu",
@@ -97,7 +97,8 @@
   "BANNER_HEIGHT": "Banner Height",
   "IMAGE": "Image",
   "PRODUCT_NAME": "Product Name",
-  "PRODUCT_CODE": "Product Code",
+  "SKU_CODE": "SKU Code",
+  "SPU_CODE": "SPU Code",
   "SKU": "SKU",
   "PRICE": "Price",
   "BRAND": "Brand",

package/lib/utils/commonUtil.js

@@ -291,14 +291,22 @@ var navigateTo = function navigateTo(url) {
     return;
   }
 
-  if (url.startsWith('/')) {
-    if (window.magicDesign.history && !window.magicDesign.navigatePreUrl) {
-      window.magicDesign.history.push(url);
-    } else {
+  var _a = url.split(';'),
+      h5Url = _a[0],
+      appUrl = _a[1]; // 未配置App路径并且h5绝对路径时直接跳转，其他情况让业务层处理
+
+
+  if (!appUrl && !h5Url.startsWith('/')) {
+    window.location.href = h5Url;
+  } else if (window.magicDesign.history) {
+    window.magicDesign.history.push(url);
+  } else if (window.magicDesign.navigatePreUrl) {
+    // 预览模式跳转
+    if (h5Url.startsWith('/')) {
       window.location.href = "" + window.magicDesign.navigatePreUrl + url;
+    } else {
+      window.location.href = h5Url;
     }
-  } else {
-    window.location.href = url;
   }
 };
 

package/package.json

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