@next-core/brick-kit 2.122.14 → 2.123.0

package/CHANGELOG.md

@@ -3,6 +3,17 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.123.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.122.14...@next-core/brick-kit@2.123.0) (2022-07-18)
+
+
+### Features
+
+* contract support upload type ([c4614f8](https://github.com/easyops-cn/next-core/commit/c4614f8d588bf60c243444e95780b62eb3612371))
+
+
+
+
+
 ## [2.122.14](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.122.13...@next-core/brick-kit@2.122.14) (2022-07-15)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -5881,7 +5881,8 @@
       serviceName,
       responseWrapper,
       version,
-      isFileType
+      isFileType,
+      request
     } = _ref;
     var fileName;
 
@@ -5897,14 +5898,16 @@
       url,
       method,
       ext_fields,
-      responseWrapper: false
+      responseWrapper: false,
+      request
     }, ...args, {
       responseType: "blob"
     }] : [{
       url,
       method,
       ext_fields,
-      responseWrapper
+      responseWrapper,
+      request
     }, ...args];
   }
 
@@ -5945,7 +5948,8 @@
       serviceName: api.serviceName,
       version: api.version,
       isFileType: (contract === null || contract === void 0 ? void 0 : (_contract$response = contract.response) === null || _contract$response === void 0 ? void 0 : _contract$response.type) === "file",
-      responseWrapper
+      responseWrapper,
+      request: contract.request
     };
   }
 
@@ -5978,7 +5982,8 @@
           version: contract.version,
           contract: {
             endpoint: contract.endpoint,
-            response: contract.response
+            response: contract.response,
+            request: contract.request
           }
         };
       } else {
@@ -5999,7 +6004,8 @@
             version: contractData.version,
             contract: {
               endpoint: contractData.endpoint,
-              response: contractData.response
+              response: contractData.response,
+              request: contractData.request
             }
           };
         }
@@ -6942,6 +6948,46 @@
       options
     };
   }
+  function hasFileType(request) {
+    var flag = false;
+    if (!request) return flag;
+
+    var processFields = fields => {
+      return fields.some(field => {
+        if (["file", "file[]"].includes(field.type)) {
+          return true;
+        }
+
+        if (!_.isEmpty(field.fields)) {
+          return processFields(field.fields);
+        }
+      });
+    };
+
+    if (request.type === "object" && !_.isEmpty(request.fields)) {
+      flag = processFields(request.fields);
+    }
+
+    return flag;
+  }
+  function transformFormData(data) {
+    var formData = new FormData();
+
+    for (var [key, value] of Object.entries(data)) {
+      if (Array.isArray(value)) {
+        (function () {
+          var k = "".concat(key, "[]");
+          value.forEach(v => {
+            formData.append(k, v);
+          });
+        })();
+      } else {
+        formData.append(key, value);
+      }
+    }
+
+    return formData;
+  }
   function CustomApi(_x) {
     return _CustomApi.apply(this, arguments);
   }
@@ -6952,9 +6998,11 @@
         url,
         method = "GET",
         responseWrapper = true,
-        ext_fields = []
+        ext_fields = [],
+        request
       } = _ref;
       var isSimpleRequest = ["get", "delete", "head"].includes(method.toLowerCase());
+      var response;
 
       for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
         args[_key2 - 1] = arguments[_key2];
@@ -6962,17 +7010,16 @@
 
       if (isSimpleRequest) {
         var [data, options] = args;
-        var response = yield brickHttp.http.simpleRequest(method, url, _objectSpread__default["default"]({
+        response = yield brickHttp.http.simpleRequest(method, url, _objectSpread__default["default"]({
           params: data
         }, options));
-        return responseWrapper ? response.data : response;
       } else {
+        var isUploadType = hasFileType(request);
         var result = processExtFields(ext_fields, ...args);
-
-        var _response = yield brickHttp.http.requestWithBody(method, url, result.data, result.options);
-
-        return responseWrapper ? _response.data : _response;
+        response = yield brickHttp.http.requestWithBody(method, url, isUploadType ? transformFormData(result.data) : result.data, result.options);
       }
+
+      return responseWrapper ? response.data : response;
     });
     return _CustomApi.apply(this, arguments);
   }