@fonixtree/magic-design 0.1.14 → 0.1.16

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

@@ -213,7 +213,7 @@ var JsonToUrl = function JsonToUrl(data) {
 
   for (var i in data) {
     var keyData = encodeURIComponent(i);
-    var value = encodeURIComponent(data[i]) === 'null' ? null : encodeURIComponent(data[i]);
+    var value = encodeURIComponent(data[i]) === 'null' ? '' : encodeURIComponent(data[i]);
     tempArr.push(keyData + "=" + value);
   }
 

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

@@ -1,89 +1,76 @@
 .m-recommend-mobile {
   display: flex;
   flex-direction: column;
-
-  .ant-tabs-nav-operations {
-    display: none !important;
-  }
-
-  ::-webkit-scrollbar {
-    width: 0;
-    height: 0;
-    display: none;
-  }
-
-
-  .tab-select-wrap {
-    display: flex;
-    align-items: center;
-    height: 50px;
-    background: rgb(255 255 255);
-    overflow: auto;
-    position: relative;
-    margin-bottom: 15px;
-
-    .tabTitle {
-      display: flex;
-      align-items: center;
-      text-align: center;
-      padding: 0 16px;
-      width: fit-content;
-      height: 100%;
-      justify-content: center;
-      white-space: nowrap;
-      flex-direction: column;
-
-      img {
-        height: 20px;
-        width: 20px;
-        margin-bottom: 2px;
-      }
-    }
-
-    .active-line {
-      position: absolute;
-      bottom: 0;
-      width: 200px;
-      height: 3px;
-      background-color: #fff;
-      transition: .2s all linear;
-      border-radius: 1.5px;
-    }
-  }
-
-  .macyContainer {
-    display: flex;
-    margin: 0 16px;
-  }
-
-  .scrollContainer {
-    display: flex;
-    flex-direction: row;
-    align-items: center;
-    margin: 0 16px;
-    overflow-x: auto;
-    padding-bottom: 15px;
-
-    &.pl_100 {
-      padding-left: 100px;
-    }
-
-    .scrollProductList {
-      display: flex;
-      flex-direction: row;
-      align-items: flex-start;
-
-      .productCard {
-        margin-right: 12px;
-      }
-    }
-  }
-
-  .btnSeeAll {
-    display: block;
-    width: fit-content;
-    min-width: 80px;
-    margin: 0 auto;
-    flex: none;
-  }
-}
+}
+.m-recommend-mobile .cylon-tabs-nav-operations {
+  display: none !important;
+}
+.m-recommend-mobile ::-webkit-scrollbar {
+  width: 0;
+  height: 0;
+  display: none;
+}
+.m-recommend-mobile .tab-select-wrap {
+  display: flex;
+  align-items: center;
+  height: 1rem;
+  background: #ffffff;
+  overflow: auto;
+  position: relative;
+  margin-bottom: 0.3rem;
+}
+.m-recommend-mobile .tab-select-wrap .tabTitle {
+  display: flex;
+  align-items: center;
+  text-align: center;
+  padding: 0 0.32rem;
+  width: fit-content;
+  height: 100%;
+  justify-content: center;
+  white-space: nowrap;
+  flex-direction: column;
+}
+.m-recommend-mobile .tab-select-wrap .tabTitle img {
+  height: 0.4rem;
+  width: 0.4rem;
+  margin-bottom: 0.04rem;
+}
+.m-recommend-mobile .tab-select-wrap .active-line {
+  position: absolute;
+  bottom: 0;
+  width: 4rem;
+  height: 0.06rem;
+  background-color: #fff;
+  transition: 0.2s all linear;
+  border-radius: 0.03rem;
+}
+.m-recommend-mobile .macyContainer {
+  display: flex;
+  margin: 0 0.32rem;
+}
+.m-recommend-mobile .scrollContainer {
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  margin: 0 0.32rem;
+  overflow-x: auto;
+  padding-bottom: 0.3rem;
+}
+.m-recommend-mobile .scrollContainer.pl_100 {
+  padding-left: 2rem;
+}
+.m-recommend-mobile .scrollContainer .scrollProductList {
+  display: flex;
+  flex-direction: row;
+  align-items: flex-start;
+}
+.m-recommend-mobile .scrollContainer .scrollProductList .productCard {
+  margin-right: 0.24rem;
+}
+.m-recommend-mobile .btnSeeAll {
+  display: block;
+  width: fit-content;
+  min-width: 1.6rem;
+  margin: 0 auto;
+  flex: none;
+}

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

@@ -3,7 +3,7 @@
   flex-direction: column;
   position: relative;
 
-  .ant-tabs-nav-operations {
+  .cylon-tabs-nav-operations {
     display: none !important;
   }
 

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

@@ -1,55 +1,49 @@
 .m-search-bar {
-  height: 48px;
-  padding: 8px 0;
+  height: 0.96rem;
+  padding: 0.16rem 0;
   display: flex;
   flex-direction: row-reverse;
   align-items: center;
   justify-content: space-between;
   width: 100%;
-
-  .right {
-    display: flex;
-    flex: 1;
-    margin-left: 15px;
-    align-items: center;
-    justify-content: space-between;
-
-    .search-input-wrap {
-      flex: 1;
-      background: #fff;
-      border-radius: 4px;
-      border: 1px solid #D2D9E5;
-      padding: 4px 12px;
-      height: 32px;
-      text-align: right;
-    }
-
-    .message-wrap {
-      position: relative;
-      margin-left: 10px;
-
-      .num {
-        position: absolute;
-        top: -6px;
-        right: -6px;
-        display: inline-block;
-        padding: 1px 2px;
-        min-width: 17px;
-        text-align: center;
-        background-color: #CE1126;
-        border: 1px solid #fff;
-        border-radius: 8px;
-        font-family: 'Montserrat';
-        font-style: normal;
-        font-weight: 600;
-        font-size: 8px;
-        color: #FFFFFF;
-      }
-    }
-  }
-  .logo {
-    img {
-      width: auto;
-    }
-  }
-}
+}
+.m-search-bar .right {
+  display: flex;
+  flex: 1;
+  margin-left: 0.3rem;
+  align-items: center;
+  justify-content: space-between;
+}
+.m-search-bar .right .search-input-wrap {
+  flex: 1;
+  background: #fff;
+  border-radius: 0.08rem;
+  border: 0.02rem solid #D2D9E5;
+  padding: 0.08rem 0.24rem;
+  height: 0.64rem;
+  text-align: right;
+}
+.m-search-bar .right .message-wrap {
+  position: relative;
+  margin-left: 0.2rem;
+}
+.m-search-bar .right .message-wrap .num {
+  position: absolute;
+  top: -0.12rem;
+  right: -0.12rem;
+  display: inline-block;
+  padding: 0.02rem 0.04rem;
+  min-width: 0.34rem;
+  text-align: center;
+  background-color: #CE1126;
+  border: 0.02rem solid #fff;
+  border-radius: 0.16rem;
+  font-family: 'Montserrat';
+  font-style: normal;
+  font-weight: 600;
+  font-size: 0.16rem;
+  color: #FFFFFF;
+}
+.m-search-bar .logo img {
+  width: auto;
+}

package/es/core/Designer/AppointmentModal/index.less

@@ -12,11 +12,11 @@
     margin-bottom: 40px;
   }
 
-  .ant-modal-body {
+  .cylon-modal-body {
     overflow: unset;
   }
 
-  .ant-picker-ok button {
+  .cylon-picker-ok button {
     color: #fff;
   }
 

package/es/decorator/compositeDecorator.js

@@ -13,6 +13,8 @@ var _mobx = require("../mobx");
 
 var _constants = require("../constants");
 
+var _commonUtil = require("../utils/commonUtil");
+
 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); }
 
 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; }
@@ -254,14 +256,14 @@ function compositeDecorator(WrappedComponent) {
         onClick: this.onCompositeCompClick,
         onMouseEnter: this.onMouseEnter,
         onMouseLeave: this.onMouseLeave,
-        style: this.getCompositeStyle()
+        style: (0, _commonUtil.pxToRem)(this.getCompositeStyle())
       }, /*#__PURE__*/_react["default"].createElement("div", {
         className: "composite_mask",
         style: this.getMaskStyle()
       }, clickedFloor !== nodeData.id && /*#__PURE__*/_react["default"].createElement("span", {
         style: floorNameStyle
       }, (_a = _constants.compInfoMap[nodeData.type]) === null || _a === void 0 ? void 0 : _a.name)), /*#__PURE__*/_react["default"].createElement("div", {
-        style: this.getWrapStyle()
+        style: (0, _commonUtil.pxToRem)(this.getWrapStyle())
       }, /*#__PURE__*/_react["default"].createElement(WrappedComponent, this.props)));
     };
 

package/es/meta-comp/components/Button/index.js

@@ -17,6 +17,8 @@ var _coreUtil = require("../../../utils/coreUtil");
 
 var _decorator = require("../../../decorator");
 
+var _commonUtil = require("../../../utils/commonUtil");
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
 
 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); }
@@ -149,7 +151,7 @@ function (_super) {
           hover: false
         });
       },
-      style: __assign({}, style)
+      style: (0, _commonUtil.pxToRem)(__assign({}, style))
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: (0, _classnames["default"])('btnContent', {
         horizontal: iconLayout === 'left' || iconLayout === 'right'

package/es/meta-comp/components/Image/index.js

@@ -17,6 +17,8 @@ var _pcDefImg = _interopRequireDefault(require("./image/pcDefImg.png"));
 
 var _coreUtil = require("../../../utils/coreUtil");
 
+var _commonUtil = require("../../../utils/commonUtil");
+
 var _decorator = require("../../../decorator");
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { "default": obj }; }
@@ -201,7 +203,7 @@ function (_super) {
       onMouseEnter: this.mouseEnterImg,
       onMouseLeave: this.mouseLeaveImg,
       src: srcImg,
-      style: this.getStyle()
+      style: (0, _commonUtil.pxToRem)(this.getStyle())
     }), areas && areas.length > 0 && areas.map(function (v, i) {
       var aStyle = {
         position: 'absolute',
@@ -216,7 +218,7 @@ function (_super) {
           e.stopPropagation();
           (0, _coreUtil.clickUrl)(v.inputVal);
         },
-        style: aStyle
+        style: (0, _commonUtil.pxToRem)(aStyle)
       });
     })));
   };

package/es/meta-comp/components/Text/index.js

@@ -534,7 +534,7 @@ function (_super) {
       onKeyDown: function onKeyDown(e) {
         e.stopPropagation();
       },
-      style: __assign({}, style),
+      style: (0, _commonUtil.pxToRem)(__assign({}, style)),
       suppressContentEditableWarning: true
     });
   };

package/es/meta-comp/config-panels/ImageConfig/index.less

@@ -3,7 +3,7 @@
   background-color: #F5F6F7;
 
   // .hoverSelect {
-  //   .ant-select-selector {
+  //   .cylon-select-selector {
   //     border: 1px solid #D2D9E5;
   //     border-radius: 8px;
   //     padding: 0 16px;

package/es/utils/commonUtil.js

@@ -16,6 +16,7 @@ exports.getColorRgba = void 0;
 exports.getPageDataMap = getPageDataMap;
 exports.nextTick = exports.navigateTo = exports.importAsync = exports.getUrlParams = void 0;
 exports.pushGA = pushGA;
+exports.pxToRem = void 0;
 exports.shareFacebook = shareFacebook;
 exports.shareLinkedin = shareLinkedin;
 exports.shareTwitter = shareTwitter;
@@ -172,6 +173,8 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
     };
   }
 };
+/* eslint-disable no-restricted-syntax */
+
 
 /**
  * 安全获取数据
@@ -708,5 +711,46 @@ var asyncNextTick = function asyncNextTick(asyncFunc, interval, count) {
     });
   });
 };
+/** px to rem */
+
+
+exports.asyncNextTick = asyncNextTick;
+
+var pxToRem = function pxToRem(styleObj) {
+  if (window.magicDesign.device === 'pc' || window.magicDesign.mode === 'designer') {
+    return 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];
+
+      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') {
+        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;
+};
 
-exports.asyncNextTick = asyncNextTick;
+exports.pxToRem = pxToRem;

package/lib/common/ImageModal/CommonSelPicCard/index.js

@@ -30,7 +30,7 @@ function CommonSelPicCard(_a) {
   };
 
   return /*#__PURE__*/_react["default"].createElement("div", {
-    className: "ant-upload-list ant-upload-list-picture-card"
+    className: "cylon-upload-list cylon-upload-list-picture-card"
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "upload-list-item-container"
   }, /*#__PURE__*/_react["default"].createElement("span", null, content.contentType === 'Catg' ? /*#__PURE__*/_react["default"].createElement("div", {
@@ -39,7 +39,7 @@ function CommonSelPicCard(_a) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "item-body"
   }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "ant-upload-list-item-thumbnail",
+    className: "cylon-upload-list-item-thumbnail",
     href: ""
   }))), /*#__PURE__*/_react["default"].createElement("div", {
     className: "item-footer",
@@ -49,15 +49,15 @@ function CommonSelPicCard(_a) {
   }, /*#__PURE__*/_react["default"].createElement("div", {
     className: "item-body"
   }, /*#__PURE__*/_react["default"].createElement("span", null, /*#__PURE__*/_react["default"].createElement("div", {
-    className: "ant-upload-list-item-thumbnail",
+    className: "cylon-upload-list-item-thumbnail",
     href: ""
   }, /*#__PURE__*/_react["default"].createElement("img", {
     alt: "",
+    src: type === _const.contentCatgTypeMap.PICTURE ? content.url : content.imgUrl,
     style: {
       width: '100%',
       height: '100%'
-    },
-    src: type === _const.contentCatgTypeMap.PICTURE ? content.url : content.imgUrl
+    }
   }))), /*#__PURE__*/_react["default"].createElement("span", {
     style: {
       position: 'absolute',
@@ -65,8 +65,8 @@ function CommonSelPicCard(_a) {
       right: 6
     }
   }, /*#__PURE__*/_react["default"].createElement(_antd.Checkbox, {
-    className: "checkbox",
     checked: checked,
+    className: "checkbox",
     onChange: function onChange(e) {
       return _onChange(e, content);
     }

package/lib/common/ImageModal/CommonSelPicCard/index.less

@@ -11,7 +11,7 @@
 }
 
 
-.ant-upload-list-item-thumbnail img {
+.cylon-upload-list-item-thumbnail img {
   border-radius: 4px;
 }
 
@@ -35,6 +35,6 @@
   cursor: pointer;
 }
 
-.checkbox :global .ant-checkbox-input {
+.checkbox :global .cylon-checkbox-input {
   position: absolute;
 }

package/lib/common/ImageModal/index.less

@@ -3,7 +3,7 @@
     margin-bottom: 15px;
   }
 
-  .ant-tree-title {
+  .cylon-tree-title {
     max-width: 200px;
     overflow: hidden;
     text-overflow: ellipsis;
@@ -15,12 +15,12 @@
 }
 
 .catg_img {
-  .ant-spin-container {
+  .cylon-spin-container {
     display: flex;
     flex-wrap: wrap;
   }
 
-  .ant-upload-list-item-thumbnail {
+  .cylon-upload-list-item-thumbnail {
     img {
       object-fit: contain;
     }

package/lib/common/ImageModal/utils.js

@@ -166,7 +166,8 @@ var __generator = void 0 && (void 0).__generator || function (thisArg, body) {
 var fileStatus = {
   0: '文件不存在（没有上传过）',
   1: '文件已存在（曾经上传过）',
-  2: '文件不完整（曾经上传中断过，可继续上传）'
+  2: '文件不完整（曾经上传中断过，可继续上传）',
+  3: '文件已恢复（曾经删除，已恢复）'
 };
 /**
  * 发请求，校验文件是否上传过，分三种情况：见：fileStatus
@@ -372,9 +373,7 @@ var fileUpload = function fileUpload(_a, cb) {
 
         case 4:
           error_1 = _b.sent();
-
-          _antd.message.warning(fileStatus[res.uploadState]);
-
+          console.log(error_1);
           return [3
           /*break*/
           , 5];
@@ -408,12 +407,20 @@ var uploadFileCheck = function uploadFileCheck(_a, chunks, fileName, cb) {
           })];
 
         case 1:
-          res = _b.sent();
-          console.log('res: ', res); // 等于1曾经上传过，不需要再上传了
+          res = _b.sent(); // 等于1曾经上传过，不需要再上传了
 
           if (res.uploadState == 1) {
             _antd.message.warning(fileStatus[res.uploadState]);
 
+            return [2
+            /*return*/
+            ]; // 拦截停下
+          } // 曾经删除过，已恢复 不需要上传
+
+
+          if (res.uploadState == 3) {
+            _antd.message.warning(fileStatus[res.uploadState]);
+
             return [2
             /*return*/
             ]; // 拦截停下
@@ -452,8 +459,7 @@ var uploadFileCheck = function uploadFileCheck(_a, chunks, fileName, cb) {
                 formData: formData
               };
             });
-          } // 说明曾经上传过，需要过滤一下，曾经上传过的就不用再上传了
-          else {
+          } else {
             formDataList = chunks.filter(function (_, index) {
               return !doneFileList.includes(index);
             }).map(function (item, index) {
@@ -523,7 +529,7 @@ var chunksUpload = function chunksUpload(_a, cb) {
 
           return [2
           /*return*/
-          ];
+          , true];
       }
     });
   });

package/lib/common/InputNumber/index.less

@@ -7,7 +7,7 @@
   padding: 0 7px;
   position: relative;
 
-  .ant-input-number-focused {
+  .cylon-input-number-focused {
     box-shadow: none;
   }
 

package/lib/common/LinkModal/FilteredProductModal/index.less

@@ -104,7 +104,7 @@
           }
         }
 
-        .ant-form-item {
+        .cylon-form-item {
           margin-bottom: 4px;
         }
 
@@ -117,7 +117,7 @@
   }
 }
 
-[magic_design] .ant-modal-root {
+[magic_design] .cylon-modal-root {
   display: flex;
   justify-content: center;
   position: absolute;

package/lib/common/LinkModal/index.less

@@ -3,7 +3,7 @@
   right: unset !important;
   left: unset !important;
 
-  .ant-modal .ant-modal-content .ant-modal-body {
+  .cylon-modal .cylon-modal-content .cylon-modal-body {
       padding-bottom: 60px !important;
       padding-top: 0 !important;
   }

package/lib/common/ProductModal/index.less

@@ -4,7 +4,7 @@
   left: unset !important;
 
   .proModalWrap {
-    thead .ant-checkbox {
+    thead .cylon-checkbox {
       visibility: hidden;
     }
 
@@ -136,7 +136,7 @@
   }
 }
 
-[magic_design] .ant-modal-root {
+[magic_design] .cylon-modal-root {
   display: flex;
   justify-content: center;
   position: absolute;