@fonixtree/magic-design 1.0.165 → 1.0.166

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

@@ -278,17 +278,34 @@ var LAYOUT_IMAGE_SIZE = {
  */
 
 var insertArrayRandomly = function insertArrayRandomly(arr1, arr2) {
-  // 创建一个复制的第一个数组，以免修改原数组
+  if (arr1.length < 1) {
+    return [];
+  }
+
+  if (arr1.length < 2) {
+    return __spreadArrays(arr1, arr2);
+  }
+
+  if (arr1.length === 2) {
+    return __spreadArrays([arr1[0]], arr2, [arr1[1]]);
+  }
+
+  if (arr1.length === 3) {
+    return __spreadArrays([arr1[0]], arr2, arr1.splice(1));
+  } // 创建一个复制的第一个数组，以免修改原数组
+
+
   var result = __spreadArrays(arr1); // 记录已插入元素的位置
 
 
   var insertedIndices = [];
 
   var _loop_1 = function _loop_1(i) {
-    var randomIndex; // 确保生成的随机索引与已插入的索引相隔至少两个位置
+    var randomIndex; // 确保生成的随机索引不在首尾，并且与已插入的索引相隔至少两个位置
 
     do {
-      randomIndex = Math.floor(Math.random() * (result.length + 1)); // eslint-disable-next-line no-loop-func
+      randomIndex = Math.floor(Math.random() * (result.length - 2)) + 1; // 1 到 result.length - 2
+      // eslint-disable-next-line no-loop-func
     } while (insertedIndices.some(function (index) {
       return Math.abs(index - randomIndex) < 2;
     })); // 在随机位置插入第二个数组的元素
@@ -308,10 +325,12 @@ var insertArrayRandomly = function insertArrayRandomly(arr1, arr2) {
   return result;
 };
 
-var getRandomItemsAndRemove = function getRandomItemsAndRemove(arr, count) {
+var getRandomItemsAndRemove = function getRandomItemsAndRemove(arr, list) {
+  var _count = Math.ceil(list.length / 5);
+
   var result = []; // eslint-disable-next-line no-plusplus
 
-  for (var i = 0; i < count && arr.length > 0; i++) {
+  for (var i = 0; i < _count && arr.length > 0; i++) {
     var randomIndex = Math.floor(Math.random() * arr.length);
     result.push(arr.splice(randomIndex, 1)[0]);
   }
@@ -379,7 +398,7 @@ function (_super) {
 
     _this.getAdvertise = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var res;
+        var ad;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -388,18 +407,16 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/ad/today/valid/MagicDesignRecommendation/list', {}, 'GET')];
 
             case 1:
-              res = _a.sent();
+              ad = _a.sent();
 
-              if (res === null || res === void 0 ? void 0 : res.length) {
+              if (ad === null || ad === void 0 ? void 0 : ad.length) {
                 return [2
                 /*return*/
-                , res.map(function (it) {
-                  var _a, _b, _c;
-
+                , ad[0].advertiseContents.map(function (it) {
                   return {
                     type: 'ad',
-                    url: (_b = (_a = it === null || it === void 0 ? void 0 : it.advertiseContents) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.url,
-                    adObj: (_c = it === null || it === void 0 ? void 0 : it.advertiseContents) === null || _c === void 0 ? void 0 : _c[0]
+                    url: it === null || it === void 0 ? void 0 : it.url,
+                    adObj: it
                   };
                 })];
               }
@@ -531,6 +548,9 @@ function (_super) {
               , 10];
 
             case 10:
+              if (!window.magicDesign.showRecommendAds) return [3
+              /*break*/
+              , 12];
               _h = this;
               return [4
               /*yield*/
@@ -538,9 +558,11 @@ function (_super) {
 
             case 11:
               _h.ads = _m.sent();
-              insertAds = getRandomItemsAndRemove(this.ads, 2);
+              insertAds = getRandomItemsAndRemove(this.ads, newData);
               newData = insertArrayRandomly(newData, insertAds);
+              _m.label = 12;
 
+            case 12:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
                 (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_k = {}, _k["products" + index] = newData, _k.endTime = Date.now() + 3 * 60 * 1000, _k)));

package/es/core/Renderer/index.js

@@ -45,7 +45,8 @@ var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
       device = props.device,
       isPreview = props.isPreview,
-      projectCode = props.projectCode;
+      projectCode = props.projectCode,
+      showRecommendAds = props.showRecommendAds;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
@@ -55,7 +56,8 @@ var setDesignConfig = function setDesignConfig(props) {
   }, config), {
     projectCode: projectCode,
     compSpacing: Number(config.compSpacing),
-    compWidth: Number(config.compWidth)
+    compWidth: Number(config.compWidth),
+    showRecommendAds: showRecommendAds
   });
 };
 /**

package/es/locale/en/en.json

@@ -1,5 +1,5 @@
 {
-  "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",

package/es/locale/es/es.json

@@ -1,5 +1,5 @@
 {
-  "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",

package/es/locale/id/id.json

@@ -1,5 +1,5 @@
 {
-  "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",

package/es/utils/commonUtil.js

@@ -523,9 +523,11 @@ var JsonToUrl = function JsonToUrl(data) {
 exports.JsonToUrl = JsonToUrl;
 
 var jumpUrlConfig = function jumpUrlConfig(item) {
-  var _a = item || {},
-      objType = _a.objType,
-      objValue = _a.objValue;
+  var _a, _b, _c;
+
+  var _d = item || {},
+      objType = _d.objType,
+      objValue = _d.objValue;
 
   var jumpUrl = '';
 
@@ -558,6 +560,14 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
         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);
@@ -579,10 +589,10 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
 
     case 'URL':
       {
-        if (objValue.urlRelaDto.openMode === 'new') {
+        if (((_a = objValue.urlRelaDto) === null || _a === void 0 ? void 0 : _a.openMode) === 'new') {
           window.open(objValue.urlRelaDto.url);
         } else {
-          window.location.href = objValue.urlRelaDto.url;
+          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;

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

@@ -278,17 +278,34 @@ var LAYOUT_IMAGE_SIZE = {
  */
 
 var insertArrayRandomly = function insertArrayRandomly(arr1, arr2) {
-  // 创建一个复制的第一个数组，以免修改原数组
+  if (arr1.length < 1) {
+    return [];
+  }
+
+  if (arr1.length < 2) {
+    return __spreadArrays(arr1, arr2);
+  }
+
+  if (arr1.length === 2) {
+    return __spreadArrays([arr1[0]], arr2, [arr1[1]]);
+  }
+
+  if (arr1.length === 3) {
+    return __spreadArrays([arr1[0]], arr2, arr1.splice(1));
+  } // 创建一个复制的第一个数组，以免修改原数组
+
+
   var result = __spreadArrays(arr1); // 记录已插入元素的位置
 
 
   var insertedIndices = [];
 
   var _loop_1 = function _loop_1(i) {
-    var randomIndex; // 确保生成的随机索引与已插入的索引相隔至少两个位置
+    var randomIndex; // 确保生成的随机索引不在首尾，并且与已插入的索引相隔至少两个位置
 
     do {
-      randomIndex = Math.floor(Math.random() * (result.length + 1)); // eslint-disable-next-line no-loop-func
+      randomIndex = Math.floor(Math.random() * (result.length - 2)) + 1; // 1 到 result.length - 2
+      // eslint-disable-next-line no-loop-func
     } while (insertedIndices.some(function (index) {
       return Math.abs(index - randomIndex) < 2;
     })); // 在随机位置插入第二个数组的元素
@@ -308,10 +325,12 @@ var insertArrayRandomly = function insertArrayRandomly(arr1, arr2) {
   return result;
 };
 
-var getRandomItemsAndRemove = function getRandomItemsAndRemove(arr, count) {
+var getRandomItemsAndRemove = function getRandomItemsAndRemove(arr, list) {
+  var _count = Math.ceil(list.length / 5);
+
   var result = []; // eslint-disable-next-line no-plusplus
 
-  for (var i = 0; i < count && arr.length > 0; i++) {
+  for (var i = 0; i < _count && arr.length > 0; i++) {
     var randomIndex = Math.floor(Math.random() * arr.length);
     result.push(arr.splice(randomIndex, 1)[0]);
   }
@@ -379,7 +398,7 @@ function (_super) {
 
     _this.getAdvertise = function () {
       return __awaiter(_this, void 0, void 0, function () {
-        var res;
+        var ad;
         return __generator(this, function (_a) {
           switch (_a.label) {
             case 0:
@@ -388,18 +407,16 @@ function (_super) {
               , (0, _commonUtil.commonFetch)('/designer/v1/h5/ad/today/valid/MagicDesignRecommendation/list', {}, 'GET')];
 
             case 1:
-              res = _a.sent();
+              ad = _a.sent();
 
-              if (res === null || res === void 0 ? void 0 : res.length) {
+              if (ad === null || ad === void 0 ? void 0 : ad.length) {
                 return [2
                 /*return*/
-                , res.map(function (it) {
-                  var _a, _b, _c;
-
+                , ad[0].advertiseContents.map(function (it) {
                   return {
                     type: 'ad',
-                    url: (_b = (_a = it === null || it === void 0 ? void 0 : it.advertiseContents) === null || _a === void 0 ? void 0 : _a[0]) === null || _b === void 0 ? void 0 : _b.url,
-                    adObj: (_c = it === null || it === void 0 ? void 0 : it.advertiseContents) === null || _c === void 0 ? void 0 : _c[0]
+                    url: it === null || it === void 0 ? void 0 : it.url,
+                    adObj: it
                   };
                 })];
               }
@@ -531,6 +548,9 @@ function (_super) {
               , 10];
 
             case 10:
+              if (!window.magicDesign.showRecommendAds) return [3
+              /*break*/
+              , 12];
               _h = this;
               return [4
               /*yield*/
@@ -538,9 +558,11 @@ function (_super) {
 
             case 11:
               _h.ads = _m.sent();
-              insertAds = getRandomItemsAndRemove(this.ads, 2);
+              insertAds = getRandomItemsAndRemove(this.ads, newData);
               newData = insertArrayRandomly(newData, insertAds);
+              _m.label = 12;
 
+            case 12:
               if (!(0, _coreUtil.isDesignMode)()) {
                 _cache = (0, _storeUtil.getMagicStore)("recommend_" + pageId + "_" + recommendId);
                 (0, _storeUtil.setMagicStore)("recommend_" + pageId + "_" + recommendId, __assign(__assign({}, _cache), (_k = {}, _k["products" + index] = newData, _k.endTime = Date.now() + 3 * 60 * 1000, _k)));

package/lib/core/Renderer/index.js

@@ -45,7 +45,8 @@ var setDesignConfig = function setDesignConfig(props) {
   var config = props.config,
       device = props.device,
       isPreview = props.isPreview,
-      projectCode = props.projectCode;
+      projectCode = props.projectCode,
+      showRecommendAds = props.showRecommendAds;
   window.magicDesign = __assign(__assign({
     pageBackground: '#f2f2f2',
     mode: 'renderer',
@@ -55,7 +56,8 @@ var setDesignConfig = function setDesignConfig(props) {
   }, config), {
     projectCode: projectCode,
     compSpacing: Number(config.compSpacing),
-    compWidth: Number(config.compWidth)
+    compWidth: Number(config.compWidth),
+    showRecommendAds: showRecommendAds
   });
 };
 /**

package/lib/locale/en/en.json

@@ -1,5 +1,5 @@
 {
-  "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",

package/lib/locale/es/es.json

@@ -1,5 +1,5 @@
 {
-  "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",

package/lib/locale/id/id.json

@@ -1,5 +1,5 @@
 {
-  "COLLECT_VOUCHER_SUCCESS": "Collect voucher success!",
+  "COLLECT_VOUCHER_SUCCESS": "Voucher collection successful!",
   "LOGIN_BUTTON": "Login Button",
   "SEARCH_ICON": "Search Icon",
   "NAVIGATION": "Navigation",

package/lib/utils/commonUtil.js

@@ -523,9 +523,11 @@ var JsonToUrl = function JsonToUrl(data) {
 exports.JsonToUrl = JsonToUrl;
 
 var jumpUrlConfig = function jumpUrlConfig(item) {
-  var _a = item || {},
-      objType = _a.objType,
-      objValue = _a.objValue;
+  var _a, _b, _c;
+
+  var _d = item || {},
+      objType = _d.objType,
+      objValue = _d.objValue;
 
   var jumpUrl = '';
 
@@ -558,6 +560,14 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
         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);
@@ -579,10 +589,10 @@ var jumpUrlConfig = function jumpUrlConfig(item) {
 
     case 'URL':
       {
-        if (objValue.urlRelaDto.openMode === 'new') {
+        if (((_a = objValue.urlRelaDto) === null || _a === void 0 ? void 0 : _a.openMode) === 'new') {
           window.open(objValue.urlRelaDto.url);
         } else {
-          window.location.href = objValue.urlRelaDto.url;
+          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;

package/package.json

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