@next-core/brick-kit 2.122.13 → 2.123.1

package/CHANGELOG.md

@@ -3,6 +3,33 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+## [2.123.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.123.0...@next-core/brick-kit@2.123.1) (2022-07-18)
+
+**Note:** Version bump only for package @next-core/brick-kit
+
+
+
+
+
+# [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
+
+
+
+
+
 ## [2.122.13](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.122.12...@next-core/brick-kit@2.122.13) (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
             }
           };
         }
@@ -6198,6 +6204,9 @@
         case "analytics.event":
           return builtinAnalyticsListenerFactory(handler.args, handler, context);
 
+        case "preview.debug":
+          return builtinFormDebugListenerFactory(handler.args, handler, context);
+
         default:
           return () => {
             // eslint-disable-next-line no-console
@@ -6668,6 +6677,22 @@
     };
   }
 
+  function builtinFormDebugListenerFactory(args, ifContainer, context) {
+    return function (event) {
+      if (!looseCheckIf(ifContainer, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
+        event
+      }))) {
+        return;
+      }
+
+      window.parent.postMessage({
+        sender: "previewer",
+        type: "preview.debug",
+        res: argsFactory(args, context, event)
+      });
+    };
+  }
+
   function argsFactory(args, context, event) {
     var options = arguments.length > 3 && arguments[3] !== undefined ? arguments[3] : {};
     return Array.isArray(args) ? computeRealValue(args, _objectSpread__default["default"](_objectSpread__default["default"]({}, context), {}, {
@@ -6923,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);
   }
@@ -6933,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];
@@ -6943,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);
   }
@@ -8339,7 +8405,8 @@
         bricks: [{
           brick: formRenderer,
           properties: {
-            formData: formData
+            formData: formData,
+            isPreview: true
           }
         }],
         menu: false,
@@ -9053,7 +9120,7 @@
     }
   }
 
-  function ExpandCustomForm(formData, brickConf) {
+  function ExpandCustomForm(formData, brickConf, isPreview) {
     var errorBrick = {
       brick: "presentational-bricks.brick-illustration",
       properties: {
@@ -9067,7 +9134,7 @@
     };
 
     try {
-      var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields);
+      var formStoryboard = getStoryboard([formData.formSchema], [], formData.fields, isPreview);
       formStoryboard[0] = ___default["default"].isEmpty(formStoryboard[0]) ? errorBrick : formStoryboard[0];
       return _objectSpread__default["default"](_objectSpread__default["default"]({}, brickConf), {}, {
         brick: "div",
@@ -9331,12 +9398,29 @@
       return defaultValue;
     } else return {};
   }
-  function getStoryboard(datasource, result, fields) {
+  function getStoryboard(datasource, result, fields, isPreview) {
     var _loop = function (i) {
       var dataItem = datasource[i];
       var resultItem = {}; //数据初始化：根据id,字段类型获取默认属性
 
-      var defaultProperties = getDefaultProperties(dataItem.id, fields); //数据初始化：与默认属性进行合并
+      var defaultProperties = getDefaultProperties(dataItem.id, fields);
+
+      if (dataItem.brick === "forms.general-form" && isPreview) {
+        dataItem.properties = _objectSpread__default["default"](_objectSpread__default["default"]({}, dataItem.properties), {}, {
+          className: "form-preview"
+        });
+        dataItem.events = {
+          "validate.error": [{
+            action: "preview.debug",
+            args: ["validate.error", "<% EVENT.detail %>"]
+          }],
+          "validate.success": [{
+            action: "preview.debug",
+            args: ["validate.success", "<% EVENT.detail %>"]
+          }]
+        };
+      } //数据初始化：与默认属性进行合并
+
 
       Object.keys(defaultProperties).forEach(item => {
         if (!dataItem[item]) {
@@ -9356,7 +9440,7 @@
       if (Array.isArray(dataItem.bricks)) {
         var _Object$keys;
 
-        resultItem["slots"] = ___default["default"].groupBy(getStoryboard(dataItem.bricks, [], fields), "mountPoint");
+        resultItem["slots"] = ___default["default"].groupBy(getStoryboard(dataItem.bricks, [], fields, isPreview), "mountPoint");
         (_Object$keys = Object.keys(resultItem["slots"])) === null || _Object$keys === void 0 ? void 0 : _Object$keys.forEach(item => {
           resultItem.slots[item] = {
             bricks: resultItem.slots[item],
@@ -9873,7 +9957,7 @@
 
         if (brick.type === formRenderer) {
           var formData = brick.properties.formData;
-          expandedBrickConf = ExpandCustomForm(formData, brickConf);
+          expandedBrickConf = ExpandCustomForm(formData, brickConf, brick.properties.isPreview);
           yield _this6.kernel.loadDynamicBricksInBrickConf(expandedBrickConf);
         }