@next-core/brick-kit 2.147.1 → 2.148.0

package/CHANGELOG.md

@@ -3,6 +3,28 @@
 All notable changes to this project will be documented in this file.
 See [Conventional Commits](https://conventionalcommits.org) for commit guidelines.
 
+# [2.148.0](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.147.2...@next-core/brick-kit@2.148.0) (2022-10-11)
+
+
+### Features
+
+* support emit render info ([2bac5d0](https://github.com/easyops-cn/next-core/commit/2bac5d018e265025c69440c63178ea9711cce679))
+
+
+
+
+
+## [2.147.2](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.147.1...@next-core/brick-kit@2.147.2) (2022-10-11)
+
+
+### Bug Fixes
+
+* **FlowApi:** fix download api without data must pass data argument ([a2fcfc4](https://github.com/easyops-cn/next-core/commit/a2fcfc430f13f1ec385f53eeedfab843ac5adc6b))
+
+
+
+
+
 ## [2.147.1](https://github.com/easyops-cn/next-core/compare/@next-core/brick-kit@2.147.0...@next-core/brick-kit@2.147.1) (2022-10-09)
 
 **Note:** Version bump only for package @next-core/brick-kit

package/dist/index.bundle.js

@@ -6138,12 +6138,12 @@
   function isCustomApiProvider(provider) {
     return provider.includes("@");
   }
-  function getArgsOfCustomApi(_x, _x2) {
+  function getArgsOfCustomApi(_x, _x2, _x3) {
     return _getArgsOfCustomApi.apply(this, arguments);
   }
 
   function _getArgsOfCustomApi() {
-    _getArgsOfCustomApi = _asyncToGenerator__default["default"](function* (provider, originalArgs) {
+    _getArgsOfCustomApi = _asyncToGenerator__default["default"](function* (provider, originalArgs, method) {
       if (!isCustomApiProvider(provider)) {
         return originalArgs;
       }
@@ -6156,15 +6156,15 @@
       }
 
       var apiProfile = getApiProfileFromApiDefinition(provider, apiDefinition);
-      return getApiArgsFromApiProfile(apiProfile, originalArgs);
+      return getApiArgsFromApiProfile(apiProfile, originalArgs, method);
     });
     return _getArgsOfCustomApi.apply(this, arguments);
   }
 
-  function getApiArgsFromApiProfile(_ref, originalArgs) {
+  function getApiArgsFromApiProfile(_ref, originalArgs, method) {
     var {
       uri,
-      method,
+      method: apiMethod,
       ext_fields,
       name,
       namespace,
@@ -6174,9 +6174,10 @@
       isFileType,
       request
     } = _ref;
+    var isDownload = isFileType && method === "saveAs";
     var fileName;
 
-    if (isFileType) {
+    if (isDownload) {
       fileName = originalArgs.shift();
     }
 
@@ -6184,20 +6185,14 @@
       url,
       args
     } = getTransformedUriAndRestArgs(uri, originalArgs, name, namespace, serviceName, version);
-    return isFileType ? [fileName, {
+    return [...(isDownload ? [fileName] : []), {
       url,
-      method,
-      ext_fields,
-      responseWrapper: false,
-      request
-    }, ...args, {
-      responseType: "blob"
-    }] : [{
-      url,
-      method,
+      originalUri: uri,
+      method: apiMethod,
       ext_fields,
       responseWrapper,
-      request
+      request,
+      isFileType
     }, ...args];
   }
 
@@ -6254,7 +6249,7 @@
     return promise;
   }
 
-  function _fetchFlowApiDefinition(_x3) {
+  function _fetchFlowApiDefinition(_x4) {
     return _fetchFlowApiDefinition2.apply(this, arguments);
   }
 
@@ -6868,7 +6863,7 @@
           var computedArgs = argsFactory(handler.args, context, event, options);
 
           if (isUseProviderHandler(handler)) {
-            computedArgs = yield getArgsOfCustomApi(handler.useProvider, computedArgs);
+            computedArgs = yield getArgsOfCustomApi(handler.useProvider, computedArgs, method);
           }
 
           return target[method](...computedArgs);
@@ -7297,35 +7292,36 @@
   }
 
   var CUSTOM_API_PROVIDER = "brick-kit.provider-custom-api";
-  function processExtFields(ext_fields) {
-    var hasFields = type => {
-      return ext_fields.some(item => item.source === type);
-    };
 
-    var hasQueryParams = hasFields("query");
-    var HasBodyParams = hasFields("body");
+  function hasFields(ext_fields, type) {
+    return ext_fields.some(item => item.source === type);
+  }
+
+  function processExtFields(ext_fields) {
+    var hasQueryParams = hasFields(ext_fields, "query");
+    var hasBodyParams = hasFields(ext_fields, "body");
 
     for (var _len = arguments.length, args = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
       args[_key - 1] = arguments[_key];
     }
 
-    if (hasQueryParams && HasBodyParams) {
-      var [_data, params, _options] = args;
-      return {
-        data: _data,
-        options: _objectSpread__default["default"]({
-          params: params
-        }, _options)
-      };
-    }
-
     if (hasQueryParams) {
-      var [_params, _options2] = args;
+      if (hasBodyParams) {
+        var [_data, _params, _options2] = args;
+        return {
+          data: _data,
+          options: _objectSpread__default["default"]({
+            params: _params
+          }, _options2)
+        };
+      }
+
+      var [params, _options] = args;
       return {
         data: {},
         options: _objectSpread__default["default"]({
-          params: _params
-        }, _options2)
+          params: params
+        }, _options)
       };
     } // only hasBodyParams or default
 
@@ -7394,12 +7390,17 @@
     _CustomApi = _asyncToGenerator__default["default"](function* (_ref2) {
       var {
         url,
+        originalUri,
         method = "GET",
         responseWrapper = true,
         ext_fields = [],
-        request
+        request,
+        isFileType
       } = _ref2;
       var isSimpleRequest = ["get", "delete", "head"].includes(method.toLowerCase());
+      var defaultOptions = isFileType ? {
+        responseType: "blob"
+      } : {};
       var response;
 
       for (var _len2 = arguments.length, args = new Array(_len2 > 1 ? _len2 - 1 : 0), _key2 = 1; _key2 < _len2; _key2++) {
@@ -7407,17 +7408,28 @@
       }
 
       if (isSimpleRequest) {
-        var [data, options] = args;
-        response = yield brickHttp.http.simpleRequest(method, url, _objectSpread__default["default"]({
-          params: data
-        }, options));
+        var _originalUri$match$le, _originalUri$match, _request$fields$lengt, _request$fields;
+
+        var noParams = originalUri && request ? ((_originalUri$match$le = (_originalUri$match = originalUri.match(/:([^/]+)/g)) === null || _originalUri$match === void 0 ? void 0 : _originalUri$match.length) !== null && _originalUri$match$le !== void 0 ? _originalUri$match$le : 0) === ((_request$fields$lengt = (_request$fields = request.fields) === null || _request$fields === void 0 ? void 0 : _request$fields.length) !== null && _request$fields$lengt !== void 0 ? _request$fields$lengt : 0) : false;
+        var params;
+        var options;
+
+        if (noParams) {
+          [options] = args;
+        } else {
+          [params, options] = args;
+        }
+
+        response = yield brickHttp.http.simpleRequest(method, url, _objectSpread__default["default"](_objectSpread__default["default"]({
+          params
+        }, defaultOptions), options));
       } else {
         var isUploadType = hasFileType(request);
         var result = processExtFields(ext_fields, ...args);
-        response = yield brickHttp.http.requestWithBody(method, url, isUploadType ? transformFormData(result.data) : result.data, result.options);
+        response = yield brickHttp.http.requestWithBody(method, url, isUploadType ? transformFormData(result.data) : result.data, _objectSpread__default["default"](_objectSpread__default["default"]({}, defaultOptions), result.options));
       }
 
-      return responseWrapper ? response.data : response;
+      return (isFileType ? false : responseWrapper) ? response.data : response;
     });
     return _CustomApi.apply(this, arguments);
   }
@@ -11643,7 +11655,7 @@
         } else {
           promise = _asyncToGenerator__default["default"](function* () {
             if (useProvider) {
-              actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs);
+              actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs, method);
             }
 
             return providerBrick[method](...actualArgs);
@@ -12143,7 +12155,8 @@
         }
 
         var history = getHistory();
-        history.unblock(); // Create the page tracker before page load.
+        history.unblock();
+        var renderStartTime = performance.now(); // Create the page tracker before page load.
         // And the API Analyzer maybe disabled.
 
         var pageTracker = (_apiAnalyzer$getInsta = easyopsAnalytics.apiAnalyzer.getInstance()) === null || _apiAnalyzer$getInsta === void 0 ? void 0 : _apiAnalyzer$getInsta.pageTracker();
@@ -12381,6 +12394,8 @@
           // we say *page found*, otherwise, *page not found*.
 
           if (route && route.type !== "routes" || failed) {
+            var _this3$kernel$bootstr, _this3$kernel$bootstr2;
+
             main.length > 0 && mountTree(main, mountPoints.main);
             portal.length > 0 && mountTree(portal, mountPoints.portal);
             afterMountTree(mountPoints.main);
@@ -12409,7 +12424,29 @@
               path: locationContext.getCurrentMatch().path,
               username: getAuth().username,
               pageTitle: document.title
-            }); // analytics page_view event
+            });
+            var renderTime = performance.now() - renderStartTime;
+            var {
+              loadTime = 0,
+              loadInfoPage
+            } = (_this3$kernel$bootstr = (_this3$kernel$bootstr2 = _this3.kernel.bootstrapData.settings) === null || _this3$kernel$bootstr2 === void 0 ? void 0 : _this3$kernel$bootstr2.misc) !== null && _this3$kernel$bootstr !== void 0 ? _this3$kernel$bootstr : {};
+
+            if (currentApp.isBuildPush && loadTime > 0 && renderTime > loadTime) {
+              var getSecond = time => Math.floor(time * 100) / 100;
+
+              window.dispatchEvent(new CustomEvent("app.bar.tips", {
+                detail: [_objectSpread__default["default"]({
+                  text: "\u60A8\u7684\u9875\u9762\u5B58\u5728\u6027\u80FD\u95EE\u9898, \u5F53\u524D\u9875\u9762\u6E32\u67D3\u65F6\u95F4\u4E3A: ".concat(getSecond(renderTime / 1000), " \u79D2, \u89C4\u5B9A\u9608\u503C\u4E3A: ").concat(getSecond(loadTime / 1000), " \u79D2; \u60A8\u5DF2\u8D85\u8FC7, \u8BF7\u60A8\u9488\u5BF9\u8BE5\u9875\u9762\u8FDB\u884C\u6027\u80FD\u4F18\u5316!"),
+                  closeable: false
+                }, loadInfoPage ? {
+                  info: {
+                    label: "查看详情",
+                    url: loadInfoPage
+                  }
+                } : {})]
+              }));
+            } // analytics page_view event
+
 
             easyopsAnalytics.userAnalytics.event("page_view", _objectSpread__default["default"]({
               micro_app_id: _this3.kernel.currentApp.id,