@fonixtree/magic-design 0.1.14 → 0.1.16

package/es/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/es/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/es/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/es/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/es/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/es/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/es/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/es/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;

package/es/common/Slider/index.less

@@ -10,11 +10,11 @@
     flex: 1;
     margin-right: 20px;
 
-    // .ant-slider-rail {
+    // .cylon-slider-rail {
     //   background-color: #E9F0FF;
     // }
 
-    // .ant-slider-track {
+    // .cylon-slider-track {
     //   background-color: #2F54EB;
     // }
   }

package/es/common/SwitchCollapse/index.less

@@ -1,9 +1,9 @@
 .switch_collapse_wrap {
-  .ant-collapse {
-    .ant-collapse-item {
+  .cylon-collapse {
+    .cylon-collapse-item {
       padding-bottom: 1px !important;
       // &:first-child {
-      //   .ant-collapse-header{
+      //   .cylon-collapse-header{
       //     padding-top: 0 !important;
       //   }
       // }

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

@@ -17,6 +17,8 @@ var _mobx = require("../../../../../mobx");
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 var _AlignSelector = require("../../../../../common/AlignSelector");
 
 var _components = require("../../../../../meta-comp/components");
@@ -257,10 +259,10 @@ function (_super) {
 
           return (_a = _this.carouselRef.current) === null || _a === void 0 ? void 0 : _a.goTo(i);
         },
-        style: {
+        style: (0, _commonUtil.pxToRem)({
           backgroundColor: i == carouseIndex ? data.setting.dots.hoverColor.mobile : data.setting.dots.color.mobile,
           fontSize: i == carouseIndex ? data.setting.dots.hoverSize.mobile : data.setting.dots.size.mobile
-        }
+        })
       });
     })));
   };

package/es/composite-comp/bol/components/Banner/mobile/index.less

@@ -1,80 +1,54 @@
 .m-banner-mobile {
   position: relative;
-  // .turnPage {
-  //   position: absolute;
-  //   top: 50%;
-  //   transform: translateY(-50%);
-  //   z-index: 3;
-  //   cursor: pointer;
-  // }
-  // .leftBtn {
-  //   left: 20px;
-  // }
-  // .rightBtn {
-  //   right: 20px;
-  // }
-
-  .ant-carousel {
-    .slick-track {
-      display: flex;
-      align-items: center;
-    }
-  }
-
-  .carouselItem {
-    // height: 386px;
-    position: relative;
-    display: flex;
-
-    .carouseContent {
-      padding: 80px 28px 0;
-      position: absolute;
-      z-index: 2;
-      display: flex;
-      flex-direction: column;
-      margin-bottom: auto;
-    }
-
-    .title {
-      margin-bottom: 8px;
-    }
-
-    .sub-title {
-      margin-bottom: 20px;
-    }
-
-    .btn-wrap {
-      display: flex;
-      align-items: center;
-      justify-content: flex-start;
-
-      .btn {
-        margin-right: 12px;
-      }
-    }
-  }
-
-  .swiper-ban {
-    position: absolute;
-    width: 100%;
-    bottom: 10px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ban {
-      font-size: 16px;
-      width: 1.5em;
-      height: 0.3em;
-      background: #FFF;
-      cursor: inherit;
-      margin-right: 0.3em;
-      transition: all .5s;
-
-      &.active {
-        width: 1.5em;
-        opacity: 1;
-      }
-    }
-  }
-}
+}
+.m-banner-mobile .cylon-carousel .slick-track {
+  display: flex;
+  align-items: center;
+}
+.m-banner-mobile .carouselItem {
+  position: relative;
+  display: flex;
+}
+.m-banner-mobile .carouselItem .carouseContent {
+  padding: 1.6rem 0.56rem 0;
+  position: absolute;
+  z-index: 2;
+  display: flex;
+  flex-direction: column;
+  margin-bottom: auto;
+}
+.m-banner-mobile .carouselItem .title {
+  margin-bottom: 0.16rem;
+}
+.m-banner-mobile .carouselItem .sub-title {
+  margin-bottom: 0.4rem;
+}
+.m-banner-mobile .carouselItem .btn-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: flex-start;
+}
+.m-banner-mobile .carouselItem .btn-wrap .btn {
+  margin-right: 0.24rem;
+}
+.m-banner-mobile .swiper-ban {
+  position: absolute;
+  width: 100%;
+  bottom: 0.2rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.m-banner-mobile .swiper-ban .ban {
+  font-size: 0.32rem;
+  width: 1.5em;
+  height: 0.3em;
+  background: #FFF;
+  cursor: inherit;
+  margin-right: 0.3em;
+  transition: all 0.5s;
+}
+.m-banner-mobile .swiper-ban .ban.active {
+  width: 1.5em;
+  opacity: 1;
+}

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

@@ -1,7 +1,7 @@
 .m-banner-pc {
   position: relative;
 
-  .ant-carousel {
+  .cylon-carousel {
     .slick-track {
       display: flex;
       align-items: center;

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

@@ -15,6 +15,8 @@ var _classnames = _interopRequireDefault(require("classnames"));
 
 var _coreUtil = require("../../../../../utils/coreUtil");
 
+var _commonUtil = require("../../../../../utils/commonUtil");
+
 var _components = require("../../../../../meta-comp/components");
 
 require("slick-carousel/slick/slick.css");
@@ -230,9 +232,9 @@ function (_super) {
       className: "m-carousel-mobile"
     }, /*#__PURE__*/_react["default"].createElement("div", {
       className: "content",
-      style: {
+      style: (0, _commonUtil.pxToRem)({
         paddingBottom: data.setting.dots.open && data.groupSource.length / floorColNum > 1 ? dotsSpace : '0'
-      }
+      })
     }, /*#__PURE__*/_react["default"].createElement(_reactSlick["default"], _extends({
       ref: function ref(slider) {
         return _this.sliderRef = slider;
@@ -298,10 +300,10 @@ function (_super) {
         onClick: function onClick() {
           return _this.sliderRef.slickGoTo(i);
         },
-        style: {
+        style: (0, _commonUtil.pxToRem)({
           backgroundColor: i == sliderIndex ? data.setting.dots.hoverColor : data.setting.dots.color,
           fontSize: i == sliderIndex ? data.setting.dots.hoverSize : data.setting.dots.size
-        }
+        })
       });
     }))));
   };

package/es/composite-comp/bol/components/Carousel/mobile/index.less

@@ -1,103 +1,84 @@
 .m-carousel-mobile {
   position: relative;
   width: 100%;
-
-  .content {
-    display: flex;
-    margin: 0 auto;
-  }
-
-  .slider-wrap {
-    width: 100%;
-    margin: 0 auto;
-    line-height: 1;
-
-    .slick-list {
-      // margin-left: -11px;
-      // margin-right: -11px;
-      padding: 0;
-
-      &:hover {
-        padding-top: 100px;
-        margin-top: -100px;
-        padding-bottom: 100px;
-        margin-bottom: -100px;
-      }
-
-      .slick-track {
-        display: flex;
-        align-items: center;
-        gap: 12px;
-      }
-    }
-
-    .img-wrap {
-      .img {
-        width: fit-content;
-        height: fit-content;
-        display: block;
-        margin: 0 auto;
-      }
-
-      .title {
-        display: flex;
-        justify-content: center;
-        margin-top: 12px;
-      }
-
-      .text {
-        display: flex;
-        justify-content: center;
-        margin-top: 6px;
-      }
-
-      .tags {
-        margin-top: 8px;
-        margin-bottom: 12px;
-        display: flex;
-        flex-direction: row;
-        align-items: center;
-        justify-content: center;
-
-        >div {
-          margin-right: 8px;
-
-          &:last-child {
-            margin-right: 0;
-          }
-        }
-      }
-    }
-  }
-
-  .swiper-ban {
-    position: absolute;
-    width: 100%;
-    bottom: 6px;
-    display: flex;
-    align-items: center;
-    justify-content: center;
-
-    .ban {
-      font-size: 8px;
-      width: 1em;
-      height: 1em;
-      border-radius: 50%;
-      background: #FFF;
-      cursor: inherit;
-      margin-right: 10px;
-      transition: all .5s;
-
-      &:last-child {
-        margin-right: 0;
-      }
-
-      &.active {
-        width: 2em;
-        height: 1em;
-        border-radius: 100px;
-        opacity: 1;
-      }
-    }
-  }
-}
+}
+.m-carousel-mobile .content {
+  display: flex;
+  margin: 0 auto;
+}
+.m-carousel-mobile .slider-wrap {
+  width: 100%;
+  margin: 0 auto;
+  line-height: 1;
+}
+.m-carousel-mobile .slider-wrap .slick-list {
+  padding: 0;
+}
+.m-carousel-mobile .slider-wrap .slick-list:hover {
+  padding-top: 2rem;
+  margin-top: -2rem;
+  padding-bottom: 2rem;
+  margin-bottom: -2rem;
+}
+.m-carousel-mobile .slider-wrap .slick-list .slick-track {
+  display: flex;
+  align-items: center;
+  gap: 0.24rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .img {
+  width: fit-content;
+  height: fit-content;
+  display: block;
+  margin: 0 auto;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .title {
+  display: flex;
+  justify-content: center;
+  margin-top: 0.24rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .text {
+  display: flex;
+  justify-content: center;
+  margin-top: 0.12rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags {
+  margin-top: 0.16rem;
+  margin-bottom: 0.24rem;
+  display: flex;
+  flex-direction: row;
+  align-items: center;
+  justify-content: center;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags > div {
+  margin-right: 0.16rem;
+}
+.m-carousel-mobile .slider-wrap .img-wrap .tags > div:last-child {
+  margin-right: 0;
+}
+.m-carousel-mobile .swiper-ban {
+  position: absolute;
+  width: 100%;
+  bottom: 0.12rem;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}
+.m-carousel-mobile .swiper-ban .ban {
+  font-size: 0.16rem;
+  width: 1em;
+  height: 1em;
+  border-radius: 50%;
+  background: #FFF;
+  cursor: inherit;
+  margin-right: 0.2rem;
+  transition: all 0.5s;
+}
+.m-carousel-mobile .swiper-ban .ban:last-child {
+  margin-right: 0;
+}
+.m-carousel-mobile .swiper-ban .ban.active {
+  width: 2em;
+  height: 1em;
+  border-radius: 2rem;
+  opacity: 1;
+}

package/es/composite-comp/bol/components/Divider/index.js

@@ -11,6 +11,8 @@ var _defaultJSON = require("./defaultJSON");
 
 var _compositeDecorator = _interopRequireDefault(require("../../../../decorator/compositeDecorator"));
 
+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); }
@@ -84,9 +86,9 @@ function (_super) {
       width: content.width + "%"
     } : {};
     return /*#__PURE__*/_react["default"].createElement("div", {
-      style: style
+      style: (0, _commonUtil.pxToRem)(style)
     }, /*#__PURE__*/_react["default"].createElement("div", {
-      style: lineStyle
+      style: (0, _commonUtil.pxToRem)(lineStyle)
     }));
   };