@fonixtree/magic-design 0.1.77 → 1.0.2-0.1

package/lib/utils/commonUtil.js

@@ -7,7 +7,7 @@ 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.convertCount = exports.compatibleNewPageData = void 0;
 exports.convertImageUrl = convertImageUrl;
 exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
@@ -27,7 +27,7 @@ exports.styleStringify = void 0;
 
 var _axios = _interopRequireDefault(require("axios"));
 
-var _lodash = require("lodash");
+var _cloneDeep = _interopRequireDefault(require("lodash/cloneDeep"));
 
 var _uuid = require("uuid");
 
@@ -640,7 +640,7 @@ function pushGA(data, eventName) {
 
 
 function covertKey(data, func) {
-  var newData = (0, _lodash.cloneDeep)(data);
+  var newData = (0, _cloneDeep["default"])(data);
   func(newData);
   return JSON.stringify(newData);
 }
@@ -743,8 +743,9 @@ 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; // PTO项目 解开注释
+
+  if (window.magicDesign.device === 'pc') {
     return value + "px";
   }
 
@@ -762,8 +763,9 @@ 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; // PTO项目 解开注释
+
+  if (window.magicDesign.device === 'pc') {
     return styleObj;
   }
 
@@ -774,9 +776,9 @@ var pxToRem = function pxToRem(styleObj) {
       var value = styleObj[key];
 
       if (typeof value === 'string' && value.endsWith('px')) {
-        remObj[key] = key === 'opacity' || key === 'lineHeight' ? value : convertToRem(value);
+        remObj[key] = convertToRem(value.split('px')[0]);
       } else if (typeof value === 'number') {
-        remObj[key] = convertToRem(value);
+        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) {
@@ -843,6 +845,20 @@ var compatibleNewPageData = function compatibleNewPageData(pageData) {
             };
           }
         }); // 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
+          };
+        }
       }
     });
   }
@@ -870,4 +886,18 @@ var downloadBase64Image = function downloadBase64Image(base64String, filename) {
   link.click();
 };
 
-exports.downloadBase64Image = downloadBase64Image;
+exports.downloadBase64Image = downloadBase64Image;
+
+var convertCount = function convertCount(value) {
+  var newValue = value;
+
+  if (value >= 1000000) {
+    newValue = Number(value / 1000000).toFixed(1) + "M";
+  } else if (value >= 1000) {
+    newValue = Number(value / 1000).toFixed(1) + "K";
+  }
+
+  return newValue;
+};
+
+exports.convertCount = convertCount;

package/lib/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)().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') {

package/lib/utils/currencyUtil.js

@@ -3,7 +3,7 @@
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
+exports.numberToFixed = exports.getPricePrefix = exports.getPrecision = exports.formatCurrencyWithSymbol = exports.formatCurrency = exports.formatBackendCurrency = exports.currencyToFont = exports.calcFloatCount = exports.addSeparators = void 0;
 
 var _divide = _interopRequireDefault(require("lodash/divide"));
 
@@ -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,23 +51,42 @@ 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);
-}; // 格式化金额
+};
+/**
+ * 前端数值转换为后端数值
+ * @param num
+ */
 
 
 exports.getPrecision = getPrecision;
 
+var formatBackendCurrency = function formatBackendCurrency(num) {
+  var precision = (0, _commonUtil.ensure)(function () {
+    return window.systemParams.precision;
+  }, '0');
+
+  if (!num) {
+    return num;
+  }
+
+  return num * Math.pow(10, precision);
+}; // 格式化金额
+
+
+exports.formatBackendCurrency = formatBackendCurrency;
+
 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 +181,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 +199,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/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@fonixtree/magic-design",
   "author": "Cylon Team",
-  "version": "0.1.77",
+  "version": "1.0.20.1",
   "description": "Magic Design",
   "license": "MIT",
   "module": "es/index.js",
@@ -20,18 +20,21 @@
     "push:biz": "cp -r ./pub-dist/es ../bizme/node_modules/@fonixtree/magic-design/"
   },
   "dependencies": {
+    "@types/quill": "^2.0.10",
     "antd": "4.24.8",
     "axios": "0.27.2",
     "immutability-helper": "3.1.1",
     "interactjs": "1.10.17",
     "lodash": "4.17.21",
     "macy": "2.5.1",
-    "marked": "4",
+    "marked": "4.3.0",
     "mobx": "6.6.1",
     "mobx-react": "7.5.2",
     "moment": "2.29.3",
     "postcss-pxtorem": "^6.0.0",
+    "quill": "^1.3.7",
     "ramda": "^0.28.0",
+    "react-ace": "^10.1.0",
     "react-color": "2.17.0",
     "react-router-dom": "5.3.0",
     "react-slick": "^0.29.0",