@fonixtree/magic-design 0.1.19 → 0.1.20

package/es/common/Iconfont/index.js

@@ -11,8 +11,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _commonUtil = require("../../utils/commonUtil");
-
 require("./index.less");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -124,10 +122,10 @@ function (_super) {
 
     return /*#__PURE__*/_react["default"].createElement("span", _extends({
       className: (0, _classnames["default"])('icon_container', className),
-      style: (0, _commonUtil.pxToRem)({
+      style: {
         fontSize: _size,
         color: color
-      })
+      }
     }, rest), svg ? /*#__PURE__*/_react["default"].createElement("svg", {
       "aria-hidden": "true",
       className: "icon"

package/es/composite-comp/bol/components/Banner/pc/index.js

@@ -25,6 +25,8 @@ var _common = require("../../../../../common");
 
 var _ConfigPanel = require("../../../../../core/Designer/ConfigPanel");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -195,7 +197,7 @@ function (_super) {
         carouseIndex = _a.carouseIndex,
         hoverState = _a.hoverState;
     var navStyle = {
-      fontSize: data.setting.navigation.size,
+      fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
       color: data.setting.navigation.color
     };
     var autoplay = data.setting.autoplay.open;

package/es/composite-comp/bol/components/Carousel/pc/index.js

@@ -27,6 +27,8 @@ require("slick-carousel/slick/slick.css");
 
 require("slick-carousel/slick/slick-theme.css");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -236,7 +238,7 @@ function (_super) {
       variableWidth: true
     };
     var navStyle = {
-      fontSize: data.setting.navigation.size,
+      fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
       color: data.setting.navigation.color
     };
     var dotsSpace = Math.max(data.setting.dots.size, data.setting.dots.hoverSize) * 1.25 + 20 + "px";

package/es/composite-comp/dito/components/FlashDeal/pc/index.js

@@ -523,7 +523,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToLeftDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-left"
     })), /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.scrollRef,
@@ -551,7 +551,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToRightDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-right"
     })))));
   };

package/es/composite-comp/dito/components/PcNavigation/pc/index.js

@@ -405,7 +405,7 @@ function (_super) {
           style: _this.getCategoryStyle(index)
         }, item.model.catgName), item.children && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
           color: item.hoverActive ? '#CE1126' : '#232F46',
-          size: 14,
+          size: (0, _commonUtil.convertToRem)(14),
           type: "icon-outlined-right"
         }));
       }));

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

@@ -685,7 +685,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToLeftDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-left"
     })), layout === 'layout1' ? /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-list"
@@ -746,7 +746,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToRightDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-right"
     }))));
   };

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

@@ -265,7 +265,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.color) === null || _e === void 0 ? void 0 : _e.mobile,
-      size: 24,
+      size: (0, _commonUtil.convertToRem)(24),
       type: "icon-search2"
     })), data.content && ((_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
@@ -274,7 +274,7 @@ function (_super) {
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
-      size: 24,
+      size: (0, _commonUtil.convertToRem)(24),
       type: "icon-ChatDots"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"

package/es/composite-comp/dito/components/SearchBar/pc/index.js

@@ -19,6 +19,8 @@ var _common = require("../../../../../common");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -114,7 +116,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: "#fff",
-      size: 24,
+      size: (0, _commonUtil.convertToRem)(24),
       type: "icon-search2"
     }))), data.content && data.content.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "shopping-wrap",
@@ -127,7 +129,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: data.content.icon.color.pc,
-      size: 16,
+      size: (0, _commonUtil.convertToRem)(16),
       type: "icon-ShoppingCartSimple"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "shopping-txt"

package/es/utils/commonUtil.js

@@ -8,6 +8,7 @@ exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
 exports.convertImageUrl = convertImageUrl;
+exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
 exports.covertKey = covertKey;
 exports.dragSource = void 0;
@@ -711,10 +712,23 @@ var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
     });
   });
 };
+
+exports.asyncNextTick = asyncNextTick;
+
+var convertToRem = function convertToRem(value) {
+  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
+    return value;
+  }
+
+  var pxValue = parseFloat(value);
+  var remValue = pxValue / 50; // 假设1rem = 50px
+
+  return remValue + "rem";
+};
 /** px to rem */
 
 
-exports.asyncNextTick = asyncNextTick;
+exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
   if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
@@ -723,13 +737,6 @@ var pxToRem = function pxToRem(styleObj) {
 
   var remObj = {};
 
-  var convertToRem = function convertToRem(value) {
-    var pxValue = parseFloat(value);
-    var remValue = pxValue / 50; // 假设1rem = 50px
-
-    return remValue + "rem";
-  };
-
   for (var key in styleObj) {
     if (styleObj.hasOwnProperty(key)) {
       var value = styleObj[key];

package/lib/common/Iconfont/index.js

@@ -11,8 +11,6 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _react = _interopRequireWildcard(require("react"));
 
-var _commonUtil = require("../../utils/commonUtil");
-
 require("./index.less");
 
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
@@ -124,10 +122,10 @@ function (_super) {
 
     return /*#__PURE__*/_react["default"].createElement("span", _extends({
       className: (0, _classnames["default"])('icon_container', className),
-      style: (0, _commonUtil.pxToRem)({
+      style: {
         fontSize: _size,
         color: color
-      })
+      }
     }, rest), svg ? /*#__PURE__*/_react["default"].createElement("svg", {
       "aria-hidden": "true",
       className: "icon"

package/lib/composite-comp/bol/components/Banner/pc/index.js

@@ -25,6 +25,8 @@ var _common = require("../../../../../common");
 
 var _ConfigPanel = require("../../../../../core/Designer/ConfigPanel");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -195,7 +197,7 @@ function (_super) {
         carouseIndex = _a.carouseIndex,
         hoverState = _a.hoverState;
     var navStyle = {
-      fontSize: data.setting.navigation.size,
+      fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
       color: data.setting.navigation.color
     };
     var autoplay = data.setting.autoplay.open;

package/lib/composite-comp/bol/components/Carousel/pc/index.js

@@ -27,6 +27,8 @@ require("slick-carousel/slick/slick.css");
 
 require("slick-carousel/slick/slick-theme.css");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
@@ -236,7 +238,7 @@ function (_super) {
       variableWidth: true
     };
     var navStyle = {
-      fontSize: data.setting.navigation.size,
+      fontSize: (0, _commonUtil.convertToRem)(data.setting.navigation.size),
       color: data.setting.navigation.color
     };
     var dotsSpace = Math.max(data.setting.dots.size, data.setting.dots.hoverSize) * 1.25 + 20 + "px";

package/lib/composite-comp/dito/components/FlashDeal/pc/index.js

@@ -523,7 +523,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToLeftDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-left"
     })), /*#__PURE__*/_react["default"].createElement("div", {
       ref: this.scrollRef,
@@ -551,7 +551,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToRightDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-right"
     })))));
   };

package/lib/composite-comp/dito/components/PcNavigation/pc/index.js

@@ -405,7 +405,7 @@ function (_super) {
           style: _this.getCategoryStyle(index)
         }, item.model.catgName), item.children && /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
           color: item.hoverActive ? '#CE1126' : '#232F46',
-          size: 14,
+          size: (0, _commonUtil.convertToRem)(14),
           type: "icon-outlined-right"
         }));
       }));

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

@@ -685,7 +685,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToLeftDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-left"
     })), layout === 'layout1' ? /*#__PURE__*/_react["default"].createElement("div", {
       className: "tab-list"
@@ -746,7 +746,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_Iconfont["default"], {
       color: scrollToRightDisabled ? '#BDC1C8' : '#232F46',
-      size: 20,
+      size: (0, _commonUtil.convertToRem)(20),
       type: "icon-outlined-right"
     }))));
   };

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

@@ -265,7 +265,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: (_e = (_d = data.content.box) === null || _d === void 0 ? void 0 : _d.color) === null || _e === void 0 ? void 0 : _e.mobile,
-      size: 24,
+      size: (0, _commonUtil.convertToRem)(24),
       type: "icon-search2"
     })), data.content && ((_f = data.content.icon) === null || _f === void 0 ? void 0 : _f.open) && /*#__PURE__*/_react["default"].createElement("div", {
       className: "message-wrap"
@@ -274,7 +274,7 @@ function (_super) {
       onClick: function onClick() {
         return (0, _coreUtil.clickUrl)('/message-center');
       },
-      size: 24,
+      size: (0, _commonUtil.convertToRem)(24),
       type: "icon-ChatDots"
     }), !!messageNum && /*#__PURE__*/_react["default"].createElement("span", {
       className: "num"

package/lib/composite-comp/dito/components/SearchBar/pc/index.js

@@ -19,6 +19,8 @@ var _common = require("../../../../../common");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 var __extends = void 0 && (void 0).__extends || function () {
@@ -114,7 +116,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: "#fff",
-      size: 24,
+      size: (0, _commonUtil.convertToRem)(24),
       type: "icon-search2"
     }))), data.content && data.content.icon.open && /*#__PURE__*/_react["default"].createElement("div", {
       className: "shopping-wrap",
@@ -127,7 +129,7 @@ function (_super) {
       }
     }, /*#__PURE__*/_react["default"].createElement(_common.Iconfont, {
       color: data.content.icon.color.pc,
-      size: 16,
+      size: (0, _commonUtil.convertToRem)(16),
       type: "icon-ShoppingCartSimple"
     }), /*#__PURE__*/_react["default"].createElement("span", {
       className: "shopping-txt"

package/lib/utils/commonUtil.js

@@ -8,6 +8,7 @@ exports.asyncDataURLtoImage = asyncDataURLtoImage;
 exports.checkFileName = exports.calcLastTime = exports.asyncNextTick = void 0;
 exports.commonFetch = commonFetch;
 exports.convertImageUrl = convertImageUrl;
+exports.convertToRem = void 0;
 exports.copy2ClipBoard = copy2ClipBoard;
 exports.covertKey = covertKey;
 exports.dragSource = void 0;
@@ -711,10 +712,23 @@ var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
     });
   });
 };
+
+exports.asyncNextTick = asyncNextTick;
+
+var convertToRem = function convertToRem(value) {
+  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
+    return value;
+  }
+
+  var pxValue = parseFloat(value);
+  var remValue = pxValue / 50; // 假设1rem = 50px
+
+  return remValue + "rem";
+};
 /** px to rem */
 
 
-exports.asyncNextTick = asyncNextTick;
+exports.convertToRem = convertToRem;
 
 var pxToRem = function pxToRem(styleObj) {
   if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
@@ -723,13 +737,6 @@ var pxToRem = function pxToRem(styleObj) {
 
   var remObj = {};
 
-  var convertToRem = function convertToRem(value) {
-    var pxValue = parseFloat(value);
-    var remValue = pxValue / 50; // 假设1rem = 50px
-
-    return remValue + "rem";
-  };
-
   for (var key in styleObj) {
     if (styleObj.hasOwnProperty(key)) {
       var value = styleObj[key];

package/package.json

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