@fonixtree/magic-design 0.1.16 → 0.1.18

package/es/assets/less/input.less

@@ -16,4 +16,7 @@
       height: 30px;
     }
   }
+  &:focus {
+    box-shadow: none
+  }
 }

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/Video/mobile/Layout1/index.js

@@ -126,7 +126,7 @@ function (_super) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "video-item-wrap",
-        style: pxToRem({
+        style: (0, _commonUtil.pxToRem)({
           height: data.mobileHeight
         })
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {

package/lib/assets/less/input.less

@@ -16,4 +16,7 @@
       height: 30px;
     }
   }
+  &:focus {
+    box-shadow: none
+  }
 }

package/lib/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/lib/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/lib/composite-comp/bol/components/Video/mobile/Layout1/index.js

@@ -126,7 +126,7 @@ function (_super) {
       return /*#__PURE__*/_react["default"].createElement("div", {
         key: group.id,
         className: "video-item-wrap",
-        style: pxToRem({
+        style: (0, _commonUtil.pxToRem)({
           height: data.mobileHeight
         })
       }, /*#__PURE__*/_react["default"].createElement(_common.Video, {

package/package.json

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