@next-core/brick-kit 2.208.5 → 2.208.8

package/dist/index.bundle.js

@@ -1238,22 +1238,72 @@
 
   /**
    * 判断一个内部 URL 路径是否被屏蔽。
+   *
+   * @param pathnameWithQuery - 路径（可包含查询字符串）
+   * @returns 是否被屏蔽
    */
-  function isBlockedPath(pathname) {
-    return [...pathBlackListSet].some(path => brickUtils.matchPath(pathname, {
-      path
-    }));
+  function isBlockedPath(pathnameWithQuery) {
+    return [...pathBlackListSet].some(pattern => {
+      // 分离 pattern 的路径和查询字符串
+      var [patternPath, patternQuery] = pattern.split("?");
+
+      // 分离待检查路径的路径和查询字符串
+      var [pathname, pathQuery] = pathnameWithQuery.split("?");
+
+      // 首先匹配路径部分
+      var pathMatched = brickUtils.matchPath(pathname, {
+        path: patternPath
+      });
+      if (!pathMatched) {
+        return false;
+      }
+
+      // 如果 pattern 不包含查询字符串，只要路径匹配就返回 true
+      if (!patternQuery) {
+        return true;
+      }
+
+      // 如果 pattern 包含查询字符串，但待检查路径没有，返回 false
+      if (!pathQuery) {
+        return false;
+      }
+
+      // 精确匹配查询字符串（所有 pattern 中的参数必须存在且值相同）
+      var patternParams = new URLSearchParams(patternQuery);
+      var pathParams = new URLSearchParams(pathQuery);
+      for (var [key, value] of patternParams.entries()) {
+        if (pathParams.get(key) !== value) {
+          return false;
+        }
+      }
+      return true;
+    });
+  }
+
+  /**
+   * 根据特性开关决定是否拼接查询字符串
+   * @param pathname - 路径名
+   * @param search - 查询字符串（可选）
+   * @returns 拼接后的路径
+   */
+  function getPathnameWithQuery(pathname, search) {
+    var _getRuntime;
+    var flags = (_getRuntime = getRuntime()) === null || _getRuntime === void 0 ? void 0 : _getRuntime.getFeatureFlags();
+    var blackListPreserveQueryFlag = flags === null || flags === void 0 ? void 0 : flags["blacklist-preserve-query-string"];
+    return blackListPreserveQueryFlag && search ? pathname + search : pathname;
   }
 
   /**
    * 判断一个内部 URL 是否被屏蔽。
    */
   function isBlockedUrl(url) {
-    var pathname = (typeof url === "string" ? history$1.createLocation(url) : url).pathname;
+    var location = typeof url === "string" ? history$1.createLocation(url) : url;
+    var pathname = location.pathname;
     if (typeof pathname !== "string") {
       return false;
     }
-    return isBlockedPath(pathname);
+    var pathnameWithQuery = getPathnameWithQuery(pathname, location.search);
+    return isBlockedPath(pathnameWithQuery);
   }
 
   /**
@@ -1267,7 +1317,9 @@
       return false;
     }
     // 转换为内部路径
-    return isBlockedPath(url.pathname.substring(basePath.length - 1));
+    var internalPath = url.pathname.substring(basePath.length - 1);
+    var pathnameWithQuery = getPathnameWithQuery(internalPath, url.search);
+    return isBlockedPath(pathnameWithQuery);
   }
 
   var permissionMap = new Map();
@@ -9302,7 +9354,7 @@
               var _eager$v3Bricks;
               if ((_eager$v3Bricks = eager.v3Bricks) !== null && _eager$v3Bricks !== void 0 && _eager$v3Bricks.length) {
                 yield catchLoad(loader.loadBricksImperatively(V3WidgetMates, brickPackages), "brick", V3WidgetMates[0]);
-                yield loader.loadBricksImperatively(eager.v3Bricks, brickPackages);
+                yield loader.loadBricksImperatively(eager.v3Bricks, brickPackages, loadLazyBricks);
               }
             })(), _asyncToGenerator__default["default"](function* () {
               var _eager$v3Processors;
@@ -9315,7 +9367,7 @@
             // 挂载构件可能包括：Provider 构件实时挂载、路由准备完成后的统一挂载等。
             return {
               pendingTask: loadScriptOfDll(dll).then(() => loadScriptOfBricksOrTemplates(deps)).then( /*#__PURE__*/_asyncToGenerator__default["default"](function* () {
-                yield Promise.all([loadLazyBricks(bricks), (v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loader.loadBricksImperatively(v3Bricks, brickPackages), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loader.loadProcessorsImperatively(v3Processors, brickPackages)]);
+                yield Promise.all([loadLazyBricks(bricks), (v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loader.loadBricksImperatively(v3Bricks, brickPackages, loadLazyBricks), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loader.loadProcessorsImperatively(v3Processors, brickPackages)]);
               }))
             };
           }
@@ -9345,7 +9397,7 @@
               if (v3Bricks !== null && v3Bricks !== void 0 && v3Bricks.some(brick => brick.includes(".tpl-"))) {
                 yield catchLoad(loader.loadBricksImperatively(V3WidgetMates, brickPackages), "brick", V3WidgetMates[0]);
               }
-              yield Promise.all([(v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loader.loadBricksImperatively(v3Bricks, brickPackages), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loader.loadProcessorsImperatively(v3Processors, brickPackages)]);
+              yield Promise.all([(v3Bricks === null || v3Bricks === void 0 ? void 0 : v3Bricks.length) && loader.loadBricksImperatively(v3Bricks, brickPackages, loadLazyBricks), (v3Processors === null || v3Processors === void 0 ? void 0 : v3Processors.length) && loader.loadProcessorsImperatively(v3Processors, brickPackages)]);
             });
             return function loadV3Bricks() {
               return _ref6.apply(this, arguments);
@@ -12441,10 +12493,14 @@
     render(location) {
       var _this3 = this;
       return _asyncToGenerator__default["default"](function* () {
-        var _apiAnalyzer$getInsta, _storyboard$app, _this3$kernel$previou, _currentApp, _currentApp2, _currentApp2$config, _currentApp2$config$_, _this3$kernel$bootstr, _this3$kernel$bootstr2, _getLocalAppsTheme, _currentApp3, _currentApp4, _storyboard$app$homep, _storyboard$app2;
+        var _getRuntime$getFeatur, _apiAnalyzer$getInsta, _storyboard$app, _this3$kernel$previou, _currentApp, _currentApp2, _currentApp2$config, _currentApp2$config$_, _this3$kernel$bootstr, _this3$kernel$bootstr2, _getLocalAppsTheme, _currentApp3, _currentApp4, _storyboard$app$homep, _storyboard$app2;
         _this3.state = "initial";
         var renderId = _this3.renderId = _.uniqueId("render-id-");
-        var blocked = isBlockedPath(location.pathname);
+        var blackListPreserveQueryFlag = (_getRuntime$getFeatur = getRuntime().getFeatureFlags()) === null || _getRuntime$getFeatur === void 0 ? void 0 : _getRuntime$getFeatur["blacklist-preserve-query-string"];
+
+        // 第一次检查：全局黑名单
+        var pathToCheck = "".concat(location.pathname).concat(blackListPreserveQueryFlag ? location.search : "");
+        var blocked = isBlockedPath(pathToCheck);
         resetAllInjected();
         clearPollTimeout();
         clearCollectWidgetContract();
@@ -12492,7 +12548,12 @@
           (_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : (_storyboard$meta$blac = _storyboard$meta.blackList) === null || _storyboard$meta$blac === void 0 ? void 0 : (_storyboard$meta$blac2 = _storyboard$meta$blac.forEach) === null || _storyboard$meta$blac2 === void 0 ? void 0 : _storyboard$meta$blac2.call(_storyboard$meta$blac, item => {
             var path = item && (item.to || item.url);
             if (!path || typeof path !== "string") return;
-            path = path.split("?")[0].replace(/\${\s*(?:(?:PATH|CTX)\.)?(\w+)\s*}/g, ":$1");
+
+            // 保留查询字符串（如果特性开关启用）
+            var pathParts = path.split("?");
+            var pathWithoutQuery = pathParts[0];
+            var queryString = blackListPreserveQueryFlag && pathParts[1] ? "?".concat(pathParts[1]) : "";
+            path = pathWithoutQuery.replace(/\${\s*(?:(?:PATH|CTX)\.)?(\w+)\s*}/g, ":$1") + queryString;
             if (item.to) {
               try {
                 path = computeRealValue(path, _this3.locationContext.getCurrentContext());
@@ -12505,7 +12566,7 @@
             }
             path && path.startsWith("/") && addPathToBlackList(path);
           });
-          if (isBlockedPath(location.pathname)) {
+          if (isBlockedPath(pathToCheck)) {
             blocked = true;
           } else {
             var _storyboard$meta2, _storyboard$meta3, _storyboard$meta4;