@fonixtree/magic-design 0.1.17 → 0.1.19

package/es/common/Iconfont/index.js

@@ -11,6 +11,8 @@ 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); }
@@ -122,10 +124,10 @@ function (_super) {
 
     return /*#__PURE__*/_react["default"].createElement("span", _extends({
       className: (0, _classnames["default"])('icon_container', className),
-      style: {
+      style: (0, _commonUtil.pxToRem)({
         fontSize: _size,
         color: color
-      }
+      })
     }, rest), svg ? /*#__PURE__*/_react["default"].createElement("svg", {
       "aria-hidden": "true",
       className: "icon"

package/es/common/ImageModal/index.js

@@ -491,7 +491,7 @@ function ImageModal(_a) {
 
   var handleUpload = function handleUpload(file) {
     return __awaiter(_this, void 0, void 0, function () {
-      var result, form, result;
+      var config, result, form, result;
       return __generator(this, function (_a) {
         switch (_a.label) {
           case 0:
@@ -510,9 +510,15 @@ function ImageModal(_a) {
             }
 
             console.log('file: ', file);
-            if (!(file.size > 5 * 1024 * 1024)) return [3
+            return [4
+            /*yield*/
+            , (0, _utils.getUploadParamCodeConfig)()];
+
+          case 1:
+            config = _a.sent();
+            if (!(file.size > config.maxSize)) return [3
             /*break*/
-            , 2];
+            , 3];
             setSpinning(true);
             setProcess(0);
             return [4
@@ -525,7 +531,7 @@ function ImageModal(_a) {
               setProcess(process);
             })];
 
-          case 1:
+          case 2:
             result = _a.sent();
             setProcess(null);
             setSpinning(false);
@@ -533,7 +539,7 @@ function ImageModal(_a) {
             /*return*/
             , result];
 
-          case 2:
+          case 3:
             form = new FormData();
             form.append('file', file); // 文件对象
 
@@ -547,7 +553,7 @@ function ImageModal(_a) {
             /*yield*/
             , onUpload(form)];
 
-          case 3:
+          case 4:
             result = _a.sent();
             return [2
             /*return*/

package/es/common/ImageModal/utils.js

@@ -6,6 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.calFileMd5Fn = calFileMd5Fn;
 exports.checkFileFn = checkFileFn;
 exports.fileUpload = exports.chunksUpload = void 0;
+exports.getUploadParamCodeConfig = getUploadParamCodeConfig;
 exports.sliceFileUploadFn = sliceFileUploadFn;
 exports.sliceFn = sliceFn;
 exports.tellBackendMergeFn = tellBackendMergeFn;
@@ -230,6 +231,71 @@ function sliceFileUploadFn(formData) {
     });
   });
 }
+/** 获取上传分包配置 */
+
+
+function getUploadParamCodeConfig() {
+  return __awaiter(this, void 0, void 0, function () {
+    var paramConfig, res, findMaxSize, findChunkSize, error_1;
+    return __generator(this, function (_a) {
+      switch (_a.label) {
+        case 0:
+          _a.trys.push([0, 2,, 3]);
+
+          if (window._videoParamConfig) {
+            return [2
+            /*return*/
+            , window._videoParamConfig];
+          }
+
+          paramConfig = {};
+          return [4
+          /*yield*/
+          , (0, _commonUtil.commonFetch)('/designer/v1/params', {
+            paramCodes: ['designer.upload.file.maxSize', 'designer.upload.file.chunkSize'].join(',')
+          })];
+
+        case 1:
+          res = _a.sent();
+          findMaxSize = res.find(function (item) {
+            return item.paramCode == 'designer.upload.file.maxSize';
+          });
+
+          if (findMaxSize) {
+            paramConfig.maxSize = Number(findMaxSize.paramValue);
+          }
+
+          findChunkSize = res.find(function (item) {
+            return item.paramCode == 'designer.upload.file.chunkSize';
+          });
+
+          if (findChunkSize) {
+            paramConfig.chunkSize = Number(findChunkSize.paramValue);
+          }
+
+          window._videoParamConfig = paramConfig;
+          return [2
+          /*return*/
+          , window._videoParamConfig];
+
+        case 2:
+          error_1 = _a.sent();
+          console.error('获取上传配置失败: ', error_1);
+          return [2
+          /*return*/
+          , {
+            maxSize: 50 * 1024 * 1024,
+            chunkSize: 20 * 1024 * 1024
+          }];
+
+        case 3:
+          return [2
+          /*return*/
+          ];
+      }
+    });
+  });
+}
 /**
  * 告知后端要去合并前端上传的文件了
  * */
@@ -312,7 +378,7 @@ var fileUpload = function fileUpload(_a, cb) {
       fileMd5 = _a.fileMd5,
       chunks = _a.chunks;
   return __awaiter(void 0, void 0, void 0, function () {
-    var count, requestListFn, res, error_1;
+    var count, requestListFn, res, error_2;
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
@@ -372,8 +438,8 @@ var fileUpload = function fileUpload(_a, cb) {
           , 5];
 
         case 4:
-          error_1 = _b.sent();
-          console.log(error_1);
+          error_2 = _b.sent();
+          console.log(error_2);
           return [3
           /*break*/
           , 5];
@@ -508,13 +574,18 @@ var chunksUpload = function chunksUpload(_a, cb) {
     return __generator(this, function (_b) {
       switch (_b.label) {
         case 0:
-          CHUNK_SIZE = 5 * 1024 * 1024;
+          return [4
+          /*yield*/
+          , getUploadParamCodeConfig()];
+
+        case 1:
+          CHUNK_SIZE = _b.sent().chunkSize;
           chunks = sliceFn(file, CHUNK_SIZE);
           return [4
           /*yield*/
           , calFileMd5Fn(chunks)];
 
-        case 1:
+        case 2:
           fileMd5 = _b.sent();
           return [4
           /*yield*/
@@ -523,7 +594,7 @@ var chunksUpload = function chunksUpload(_a, cb) {
             contentCatgId: contentCatgId
           }, chunks, file.name, cb)];
 
-        case 2:
+        case 3:
           _b.sent(); // 然后执行文件检查操作
 
 

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;
-  // }
-
-  .cylon-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/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/ImageGallery/mobile/index.less

@@ -1,22 +1,15 @@
-.m-image-gallery-mobile {
-  .content {
-    .line {
-      margin-bottom: 12px;
-
-      &.isHorizontal {
-        display: flex;
-        justify-content: flex-start;
-      }
-
-      &:last-child {
-        margin-bottom: 0;
-      }
-
-      .img-wrap {
-        display: flex;
-        align-items: center;
-        justify-content: center;
-      }
-    }
-  }
-}
+.m-image-gallery-mobile .content .line {
+  margin-bottom: 0.24rem;
+}
+.m-image-gallery-mobile .content .line.isHorizontal {
+  display: flex;
+  justify-content: flex-start;
+}
+.m-image-gallery-mobile .content .line:last-child {
+  margin-bottom: 0;
+}
+.m-image-gallery-mobile .content .line .img-wrap {
+  display: flex;
+  align-items: center;
+  justify-content: center;
+}