@fonixtree/magic-design 1.0.5 → 1.0.7

package/es/utils/commonUtil.js

@@ -7,13 +7,14 @@ exports.addZero = exports.addUrlQuery = void 0;
 exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
+exports.compatibleNewPageData = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
 exports.covertKey = covertKey;
-exports.dragSource = void 0;
+exports.dragSource = exports.downloadBase64Image = void 0;
 exports.ensure = ensure;
-exports.getColorRgba = void 0;
+exports.getGAData = exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
 exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
 exports.pushGA = pushGA;
@@ -28,10 +29,30 @@ var _axios = _interopRequireDefault(require("axios"));
 
 var _lodash = require("lodash");
 
+var _uuid = require("uuid");
+
 var _qs = _interopRequireDefault(require("qs"));
 
+var _constants = require("../constants");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
+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) {
@@ -722,13 +743,18 @@ var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
 exports.asyncNextTick = asyncNextTick;
 
 var convertToRem = function convertToRem(value) {
-  return value; // PTO项目 解开注释
-  // if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
-  //   return value;
-  // }
-  // const pxValue = parseFloat(value);
-  // const remValue = pxValue / 50; // 假设1rem = 50px
-  // return `${remValue}rem`;
+  // return value; // PTO项目 解开注释
+  if (window.magicDesign.device === 'pc') {
+    return value + "px";
+  }
+
+  var baseFont = ensure(function () {
+    return window.getComputedStyle(document.getElementsByTagName('html')[0]).fontSize.replace('px', '');
+  }, 50);
+  var pxValue = parseFloat(value);
+  var remValue = pxValue / baseFont; // 假设1rem = 50px
+
+  return remValue + "rem";
 };
 /** px to rem */
 
@@ -736,30 +762,126 @@ var convertToRem = function convertToRem(value) {
 exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
-  return styleObj; // PTO项目 解开注释
-  // if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
-  //   return styleObj;
-  // }
-  // const remObj = {};
-  // for (const key in styleObj) {
-  //   if (styleObj.hasOwnProperty(key)) {
-  //     const value = styleObj[key];
-  //     if (typeof value === 'string' && value.endsWith('px')) {
-  //       remObj[key] = key === 'opacity' || key === 'lineHeight' ? value : convertToRem(value);
-  //     } else if (typeof value === 'number') {
-  //       remObj[key] = convertToRem(value);
-  //     } else if ((key === 'padding' || key === 'margin') && typeof value === 'string') {
-  //       const paddingValues = value.split(' ');
-  //       const remPaddingValues = paddingValues.map((paddingValue) => {
-  //         return paddingValue.endsWith('px') ? convertToRem(paddingValue) : paddingValue;
-  //       });
-  //       remObj[key] = remPaddingValues.join(' ');
-  //     } else {
-  //       remObj[key] = value;
-  //     }
-  //   }
-  // }
-  // return remObj;
+  // return styleObj; // PTO项目 解开注释
+  if (window.magicDesign.device === 'pc') {
+    return styleObj;
+  }
+
+  var remObj = {};
+
+  for (var key in styleObj) {
+    if (styleObj.hasOwnProperty(key)) {
+      var value = styleObj[key];
+
+      if (typeof value === 'string' && value.endsWith('px')) {
+        remObj[key] = convertToRem(value.split('px')[0]);
+      } else if (typeof value === 'number') {
+        remObj[key] = ['opacity', 'lineHeight', 'zIndex', 'fontWeight'].includes(key) ? value : convertToRem(value);
+      } else if ((key === 'padding' || key === 'margin') && typeof value === 'string') {
+        var paddingValues = value.split(' ');
+        var remPaddingValues = paddingValues.map(function (paddingValue) {
+          return paddingValue.endsWith('px') ? convertToRem(paddingValue) : paddingValue;
+        });
+        remObj[key] = remPaddingValues.join(' ');
+      } else {
+        remObj[key] = value;
+      }
+    }
+  }
+
+  return remObj;
+};
+/**
+ * 处理新老数据兼容问题
+ * @param pageData 大JSON
+ */
+
+
+exports.pxToRem = pxToRem;
+
+var compatibleNewPageData = function compatibleNewPageData(pageData) {
+  if (pageData.childNodes && pageData.childNodes.length > 0) {
+    pageData.childNodes.forEach(function (child) {
+      // 兼容新功能：banner 轮播的 dots 点 区分pc 移动
+      if (child.type === 'BANNER') {
+        if (!child.setting.dots.color.pc || !child.setting.dots.hoverColor.pc || !child.setting.dots.size.pc) {
+          child.setting.dots = __assign(__assign({}, child.setting.dots), {
+            color: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            hoverColor: {
+              pc: '#fff',
+              mobile: '#fff'
+            },
+            size: {
+              pc: 16,
+              mobile: 8
+            },
+            hoverSize: {
+              pc: 16,
+              mobile: 8
+            }
+          });
+        }
+      } // 兼容新开发的功能： video新增播放按钮 的设置
+
+
+      if (child.type === 'VIDEO') {
+        // console.log('--compatibleNewPageData -- video ');
+        child.groupSource.forEach(function (group) {
+          if (!group.playIcon) {
+            group.playIcon = {
+              open: true,
+              parentId: group.id,
+              id: (0, _uuid.v4)(),
+              type: 'PLAY',
+              size: 48,
+              pcSize: 60,
+              iconType: 'light-playicon-01',
+              iconColor: 'Light'
+            };
+          }
+        }); // console.log('--compatibleNewPageData -- video add group.playIcon ', child.groupSource);
+      } // 兼容新功能：SEARCH 新增控制购物车和消息图标的开关
+
+
+      if (child.type === 'SEARCH') {
+        if (!child.content.icon.cartIcon || !child.content.icon.messageIcon) {
+          child.content.icon.cartIcon = {
+            pc: true,
+            mobile: false
+          };
+          child.content.icon.messageIcon = {
+            pc: false,
+            mobile: true
+          };
+        }
+      }
+    });
+  }
+};
+
+exports.compatibleNewPageData = compatibleNewPageData;
+
+var getGAData = function getGAData(data) {
+  var _a;
+
+  return {
+    moduleId: data.id,
+    moduleName: data.moduleIndex + '.' + ((_a = _constants.compInfoMap[data.type]) === null || _a === void 0 ? void 0 : _a.name)
+  };
+};
+
+exports.getGAData = getGAData;
+
+var downloadBase64Image = function downloadBase64Image(base64String, filename) {
+  // 创建一个虚拟的链接元素
+  var link = document.createElement('a');
+  link.href = base64String;
+  link.download = filename; // 模拟点击下载
+
+  link.click();
 };
 
-exports.pxToRem = pxToRem;
+exports.downloadBase64Image = downloadBase64Image;

package/es/utils/coreUtil.js

@@ -303,9 +303,24 @@ var clickUrl = function clickUrl(url) {
 
   var _b = data.params,
       params = _b === void 0 ? {} : _b;
+  console.log('clicked data:', data);
+  console.log({
+    type: 'jumpBrowser',
+    params: {
+      url: params.link
+    }
+  });
 
-  if ((0, _androidUtil.browserVersion)().isApp) {
+  if ((0, _androidUtil.browserVersion)().isAshitaApp) {
     (0, _androidUtil.sendToApp)(data);
+  } else if ((0, _androidUtil.browserVersion)().isApp && params.link && params.link.startsWith('http')) {
+    // 兼容Nuri的 绝对路径跳转
+    (0, _androidUtil.sendToAndroid)({
+      type: 'jumpBrowser',
+      params: {
+        url: params.link
+      }
+    });
   } else {
     // 视频
     if (params.type === 'VIDEO') {
@@ -319,10 +334,9 @@ var clickUrl = function clickUrl(url) {
     if (params.type === 'GET_COUPON') {
       getCoupon(params.couponId);
       return;
-    } // 分享
-
+    }
 
-    if (params.type === 'SHARE_URL') {
+    if (params.type === 'SHARE_URL' || params.type === 'AFFILIATE_PRODUCT') {
       if (window.magicDesign.handleAction) {
         window.magicDesign.handleAction(params);
       }

package/es/utils/currencyUtil.js

@@ -15,7 +15,7 @@ function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "d
 
 /* eslint-disable */
 var precision = (0, _commonUtil.ensure)(function () {
-  return window.ecommerce.precision;
+  return window.systemParams.precision;
 }, '0'); // 千分位展示
 
 var addSeparators = function addSeparators(nStr, thousandsSep, decimalSep) {
@@ -42,7 +42,7 @@ exports.addSeparators = addSeparators;
 
 var getPricePrefix = function getPricePrefix() {
   var pricePrefix = (0, _commonUtil.ensure)(function () {
-    return window.ecommerce.prefix;
+    return window.systemParams.prefix;
   }, 'Rp');
   return pricePrefix;
 };
@@ -51,7 +51,7 @@ exports.getPricePrefix = getPricePrefix;
 
 var getPrecision = function getPrecision() {
   var ret = (0, _commonUtil.ensure)(function () {
-    return window.ecommerce.precision;
+    return window.systemParams.precision;
   }, '0');
   return Number(ret);
 }; // 格式化金额
@@ -61,13 +61,13 @@ exports.getPrecision = getPrecision;
 
 var formatCurrency = function formatCurrency(num) {
   var displayPrecision = (0, _commonUtil.ensure)(function () {
-    return window.ecommerce.displayCurrencyPrecision;
+    return window.systemParams.displayCurrencyPrecision;
   }, '0');
   var precision = (0, _commonUtil.ensure)(function () {
-    return window.ecommerce.precision;
+    return window.systemParams.precision;
   }, '0');
   var pricePrefix = (0, _commonUtil.ensure)(function () {
-    return window.ecommerce.prefix;
+    return window.systemParams.prefix;
   }, 'Rp');
   var numVal = num;
 
@@ -162,7 +162,7 @@ var currencyToFont = function currencyToFont(value, customPrecision, customDispl
     precision = Number(customPrecision);
   } else {
     precision = (0, _commonUtil.ensure)(function () {
-      return window.ecommerce.precision;
+      return window.systemParams.precision;
     }, '0');
   }
 
@@ -180,7 +180,7 @@ var currencyToFont = function currencyToFont(value, customPrecision, customDispl
     displayPrecision = Number(customDisplayPrecision);
   } else {
     displayPrecision = (0, _commonUtil.ensure)(function () {
-      return window.ecommerce.displayCurrencyPrecision;
+      return window.systemParams.displayCurrencyPrecision;
     }, 'Rp');
   }
 

package/lib/assets/fonts/magic-box-iconfont.css

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1686648198297') format('woff2'),
-       url('magic-box-iconfont.woff?t=1686648198297') format('woff'),
-       url('magic-box-iconfont.ttf?t=1686648198297') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1691480393512') format('woff2'),
+       url('magic-box-iconfont.woff?t=1691480393512') format('woff'),
+       url('magic-box-iconfont.ttf?t=1691480393512') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +13,70 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.magic-box-icon-ShoppingCartSimple1:before {
+  content: "\e680";
+}
+
+.magic-box-icon-erweima:before {
+  content: "\e67f";
+}
+
+.magic-box-icon-star:before {
+  content: "\e67d";
+}
+
+.magic-box-icon-MapPin:before {
+  content: "\e67e";
+}
+
+.magic-box-icon-HTML:before {
+  content: "\e67c";
+}
+
+.magic-box-icon-w-play-03:before {
+  content: "\e67b";
+}
+
+.magic-box-icon-b-play-03:before {
+  content: "\e671";
+}
+
+.magic-box-icon-select2:before {
+  content: "\e67a";
+}
+
+.magic-box-icon-b-play-02:before {
+  content: "\e672";
+}
+
+.magic-box-icon-b-play-05:before {
+  content: "\e673";
+}
+
+.magic-box-icon-b-play-01:before {
+  content: "\e674";
+}
+
+.magic-box-icon-w-play-01:before {
+  content: "\e675";
+}
+
+.magic-box-icon-w-play-04:before {
+  content: "\e676";
+}
+
+.magic-box-icon-w-play-02:before {
+  content: "\e677";
+}
+
+.magic-box-icon-b-play-04:before {
+  content: "\e678";
+}
+
+.magic-box-icon-w-play-05:before {
+  content: "\e679";
+}
+
 .magic-box-icon-ListBullets02:before {
   content: "\e670";
 }

package/lib/assets/fonts/magic-box-iconfont.css.bak

@@ -1,8 +1,8 @@
 @font-face {
   font-family: "magic-box-iconfont"; /* Project id 3317752 */
-  src: url('magic-box-iconfont.woff2?t=1686648198297') format('woff2'),
-       url('magic-box-iconfont.woff?t=1686648198297') format('woff'),
-       url('magic-box-iconfont.ttf?t=1686648198297') format('truetype');
+  src: url('magic-box-iconfont.woff2?t=1691480393512') format('woff2'),
+       url('magic-box-iconfont.woff?t=1691480393512') format('woff'),
+       url('magic-box-iconfont.ttf?t=1691480393512') format('truetype');
 }
 
 .magic-box-iconfont {
@@ -13,6 +13,70 @@
   -moz-osx-font-smoothing: grayscale;
 }
 
+.icon-ShoppingCartSimple1:before {
+  content: "\e680";
+}
+
+.icon-erweima:before {
+  content: "\e67f";
+}
+
+.icon-star:before {
+  content: "\e67d";
+}
+
+.icon-MapPin:before {
+  content: "\e67e";
+}
+
+.icon-HTML:before {
+  content: "\e67c";
+}
+
+.icon-w-play-03:before {
+  content: "\e67b";
+}
+
+.icon-b-play-03:before {
+  content: "\e671";
+}
+
+.icon-select2:before {
+  content: "\e67a";
+}
+
+.icon-b-play-02:before {
+  content: "\e672";
+}
+
+.icon-b-play-05:before {
+  content: "\e673";
+}
+
+.icon-b-play-01:before {
+  content: "\e674";
+}
+
+.icon-w-play-01:before {
+  content: "\e675";
+}
+
+.icon-w-play-04:before {
+  content: "\e676";
+}
+
+.icon-w-play-02:before {
+  content: "\e677";
+}
+
+.icon-b-play-04:before {
+  content: "\e678";
+}
+
+.icon-w-play-05:before {
+  content: "\e679";
+}
+
 .icon-ListBullets02:before {
   content: "\e670";
 }