@next-core/brick-kit 2.147.1 → 2.148.0

package/dist/index.esm.js

@@ -6139,12 +6139,12 @@ var flowApiDefinitionPromiseMap = new Map(); // Legacy Custom API: `${namespace}
 function isCustomApiProvider(provider) {
   return provider.includes("@");
 }
-function getArgsOfCustomApi(_x, _x2) {
+function getArgsOfCustomApi(_x, _x2, _x3) {
   return _getArgsOfCustomApi.apply(this, arguments);
 }
 
 function _getArgsOfCustomApi() {
-  _getArgsOfCustomApi = _asyncToGenerator$3(function* (provider, originalArgs) {
+  _getArgsOfCustomApi = _asyncToGenerator$3(function* (provider, originalArgs, method) {
     if (!isCustomApiProvider(provider)) {
       return originalArgs;
     }
@@ -6157,15 +6157,15 @@ function _getArgsOfCustomApi() {
     }
 
     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,
@@ -6175,9 +6175,10 @@ function getApiArgsFromApiProfile(_ref, originalArgs) {
     isFileType,
     request
   } = _ref;
+  var isDownload = isFileType && method === "saveAs";
   var fileName;
 
-  if (isFileType) {
+  if (isDownload) {
     fileName = originalArgs.shift();
   }
 
@@ -6185,20 +6186,14 @@ function getApiArgsFromApiProfile(_ref, originalArgs) {
     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];
 }
 
@@ -6255,7 +6250,7 @@ function fetchFlowApiDefinition(provider) {
   return promise;
 }
 
-function _fetchFlowApiDefinition(_x3) {
+function _fetchFlowApiDefinition(_x4) {
   return _fetchFlowApiDefinition2.apply(this, arguments);
 }
 
@@ -6869,7 +6864,7 @@ function _brickCallback() {
         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);
@@ -7298,35 +7293,36 @@ function processBootstrapResponse(bootstrapResponse) {
 }
 
 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({
-        params: params
-      }, _options)
-    };
-  }
-
   if (hasQueryParams) {
-    var [_params, _options2] = args;
+    if (hasBodyParams) {
+      var [_data, _params, _options2] = args;
+      return {
+        data: _data,
+        options: _objectSpread({
+          params: _params
+        }, _options2)
+      };
+    }
+
+    var [params, _options] = args;
     return {
       data: {},
       options: _objectSpread({
-        params: _params
-      }, _options2)
+        params: params
+      }, _options)
     };
   } // only hasBodyParams or default
 
@@ -7395,12 +7391,17 @@ function _CustomApi() {
   _CustomApi = _asyncToGenerator$3(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++) {
@@ -7408,17 +7409,28 @@ function _CustomApi() {
     }
 
     if (isSimpleRequest) {
-      var [data, options] = args;
-      response = yield http.simpleRequest(method, url, _objectSpread({
-        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 http.simpleRequest(method, url, _objectSpread(_objectSpread({
+        params
+      }, defaultOptions), options));
     } else {
       var isUploadType = hasFileType(request);
       var result = processExtFields(ext_fields, ...args);
-      response = yield http.requestWithBody(method, url, isUploadType ? transformFormData(result.data) : result.data, result.options);
+      response = yield http.requestWithBody(method, url, isUploadType ? transformFormData(result.data) : result.data, _objectSpread(_objectSpread({}, defaultOptions), result.options));
     }
 
-    return responseWrapper ? response.data : response;
+    return (isFileType ? false : responseWrapper) ? response.data : response;
   });
   return _CustomApi.apply(this, arguments);
 }
@@ -11644,7 +11656,7 @@ class Resolver {
       } else {
         promise = _asyncToGenerator$3(function* () {
           if (useProvider) {
-            actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs);
+            actualArgs = yield getArgsOfCustomApi(useProvider, actualArgs, method);
           }
 
           return providerBrick[method](...actualArgs);
@@ -12144,7 +12156,8 @@ class Router {
       }
 
       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 = apiAnalyzer.getInstance()) === null || _apiAnalyzer$getInsta === void 0 ? void 0 : _apiAnalyzer$getInsta.pageTracker();
@@ -12382,6 +12395,8 @@ class Router {
         // 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);
@@ -12410,7 +12425,29 @@ class Router {
             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({
+                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
+
 
           userAnalytics.event("page_view", _objectSpread({
             micro_app_id: _this3.kernel.currentApp.id,