@next-core/brick-kit 2.204.2 → 2.206.0

package/dist/index.bundle.js

@@ -1175,9 +1175,11 @@
   }();
 
   var auth = {};
+  var pathBlackListSet = new Set();
 
   /** @internal */
   function authenticate(newAuth) {
+    var _newAuth$license;
     Object.assign(auth, {
       org: newAuth.org,
       username: newAuth.username,
@@ -1190,6 +1192,7 @@
       accessToken: newAuth.accessToken,
       userShowValue: newAuth.userShowValue
     });
+    pathBlackListSet = new Set((_newAuth$license = newAuth.license) === null || _newAuth$license === void 0 ? void 0 : _newAuth$license.blackList);
 
     // re-init analytics to set user_id
     if (easyopsAnalytics.userAnalytics.initialized) {
@@ -1226,14 +1229,20 @@
     return auth.username !== undefined;
   }
 
+  /**
+   * 增加路径黑名单
+   */
+  function addPathToBlackList(path) {
+    pathBlackListSet.add(path);
+  }
+
   /**
    * 判断一个内部 URL 路径是否被屏蔽。
    */
   function isBlockedPath(pathname) {
-    var _auth$license, _auth$license$blackLi;
-    return !!((_auth$license = auth.license) !== null && _auth$license !== void 0 && (_auth$license$blackLi = _auth$license.blackList) !== null && _auth$license$blackLi !== void 0 && _auth$license$blackLi.some(path => brickUtils.matchPath(pathname, {
+    return [...pathBlackListSet].some(path => brickUtils.matchPath(pathname, {
       path
-    })));
+    }));
   }
 
   /**
@@ -7382,12 +7391,13 @@
    * @endpoint GET /api/v1/micro_app_standalone/runtime/:appId
    */
   var RuntimeApi_runtimeMicroAppStandalone = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator__default["default"](function* (appId, options) {
-      return (/**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */
-        (yield brickHttp.http.get("api/gateway/micro_app_standalone.runtime.RuntimeMicroAppStandalone/api/v1/micro_app_standalone/runtime/".concat(appId), options)).data
+    var _ref = _asyncToGenerator__default["default"](function* (appId, params, options) {
+      return (/**! @contract easyops.api.micro_app_standalone.runtime.RuntimeMicroAppStandalone@1.0.1 */(yield brickHttp.http.get("api/gateway/logic.micro_app_standalone_service/api/v1/micro_app_standalone/runtime/".concat(appId), _objectSpread__default["default"](_objectSpread__default["default"]({}, options), {}, {
+          params
+        }))).data
       );
     });
-    return function RuntimeApi_runtimeMicroAppStandalone(_x, _x2) {
+    return function RuntimeApi_runtimeMicroAppStandalone(_x, _x2, _x3) {
       return _ref.apply(this, arguments);
     };
   }();
@@ -7398,8 +7408,7 @@
    */
   var RuntimeApi_searchMicroAppStandalone = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator__default["default"](function* (data, options) {
-      return (/**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */
-        (yield brickHttp.http.post("api/gateway/micro_app_standalone.runtime.SearchMicroAppStandalone/api/v1/micro_app_standalone/search", data, options)).data
+      return (/**! @contract easyops.api.micro_app_standalone.runtime.SearchMicroAppStandalone@1.0.1 */(yield brickHttp.http.post("api/gateway/logic.micro_app_standalone_service/api/v1/micro_app_standalone/search", data, options)).data
       );
     });
     return function RuntimeApi_searchMicroAppStandalone(_x, _x2) {
@@ -7523,9 +7532,7 @@
         return appRuntimeDataMap.get(appId);
       }
       var promise = RuntimeApi_runtimeMicroAppStandalone(appId, {
-        params: {
-          version
-        }
+        version
       }).catch(function (error) {
         // make it not crash when the backend service is not updated.
         // eslint-disable-next-line no-console
@@ -9376,7 +9383,8 @@
               initializeAppConfig(storyboard.app);
               // get inject menus (Actually, appRuntimeData contains both main and inject menus)
               storyboard.meta = _objectSpread__default["default"](_objectSpread__default["default"]({}, storyboard.meta), {}, {
-                injectMenus: appRuntimeData.injectMenus
+                injectMenus: appRuntimeData.injectMenus,
+                blackList: appRuntimeData.blackList
               });
             }
           }
@@ -12296,51 +12304,72 @@
         /** Pending task for loading bricks */
         var pendingTask;
         if (storyboard) {
-          var _storyboard$meta, _storyboard$meta2, _storyboard$meta3;
+          var _storyboard$meta, _storyboard$meta$blac, _storyboard$meta$blac2;
           yield _this3.kernel.fulfilStoryboard(storyboard);
-          setAppLocales(storyboard.app);
           _this3.kernel.nextApp = storyboard.app;
-          setWatermark();
-          brickUtils.removeDeadConditions(storyboard, {
-            constantFeatureFlags: true,
-            featureFlags: _this3.kernel.getFeatureFlags()
+          (_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");
+            if (item.to) {
+              try {
+                path = computeRealValue(path, _this3.locationContext.getCurrentContext());
+              } catch (e) /* istanbul ignore next */{
+                // eslint-disable-next-line no-console
+                console.error(e);
+              }
+            } else {
+              path = path.replace(/^\/next\//, "/");
+            }
+            path && addPathToBlackList(path);
           });
+          if (isBlockedPath(location.pathname)) {
+            blocked = true;
+          } else {
+            var _storyboard$meta2, _storyboard$meta3, _storyboard$meta4;
+            setAppLocales(storyboard.app);
+            setWatermark();
+            brickUtils.removeDeadConditions(storyboard, {
+              constantFeatureFlags: true,
+              featureFlags: _this3.kernel.getFeatureFlags()
+            });
 
-          // 将动态解析后的模板还原，以便重新动态解析。
-          brickUtils.restoreDynamicTemplates(storyboard);
-          var parallelRequests = [];
+            // 将动态解析后的模板还原，以便重新动态解析。
+            brickUtils.restoreDynamicTemplates(storyboard);
+            var parallelRequests = [];
 
-          // 预加载权限信息
-          if (isLoggedIn() && !getAuth().isAdmin) {
-            parallelRequests.push(preCheckPermissions(storyboard));
-          }
+            // 预加载权限信息
+            if (isLoggedIn() && !getAuth().isAdmin) {
+              parallelRequests.push(preCheckPermissions(storyboard));
+            }
 
-          // Standalone App 需要额外读取 Installed App 信息
-          if (window.STANDALONE_MICRO_APPS && !window.NO_AUTH_GUARD) {
-            // TODO: get standalone apps when NO_AUTH_GUARD, maybe from conf.yaml
-            parallelRequests.push(preFetchStandaloneInstalledApps(storyboard).then(() => {
-              _this3.kernel.bootstrapData.offSiteStandaloneApps = getStandaloneInstalledApps();
-            }));
-          }
+            // Standalone App 需要额外读取 Installed App 信息
+            if (window.STANDALONE_MICRO_APPS && !window.NO_AUTH_GUARD) {
+              // TODO: get standalone apps when NO_AUTH_GUARD, maybe from conf.yaml
+              parallelRequests.push(preFetchStandaloneInstalledApps(storyboard).then(() => {
+                _this3.kernel.bootstrapData.offSiteStandaloneApps = getStandaloneInstalledApps();
+              }));
+            }
 
-          // `loadDepsOfStoryboard()` may requires these data.
-          yield Promise.all(parallelRequests);
+            // `loadDepsOfStoryboard()` may requires these data.
+            yield Promise.all(parallelRequests);
 
-          // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
-          var subStoryboard = yield _this3.locationContext.getSubStoryboardByRoute(storyboard);
-          ({
-            pendingTask
-          } = yield _this3.kernel.loadDepsOfStoryboard(subStoryboard));
+            // 如果找到匹配的 storyboard，那么根据路由匹配得到的 sub-storyboard 加载它的依赖库。
+            var subStoryboard = yield _this3.locationContext.getSubStoryboardByRoute(storyboard);
+            ({
+              pendingTask
+            } = yield _this3.kernel.loadDepsOfStoryboard(subStoryboard));
 
-          // 注册 Storyboard 中定义的自定义模板和函数。
-          _this3.kernel.registerCustomTemplatesInStoryboard(storyboard);
-          registerStoryboardFunctions((_storyboard$meta = storyboard.meta) === null || _storyboard$meta === void 0 ? void 0 : _storyboard$meta.functions, storyboard.app);
-          registerMock((_storyboard$meta2 = storyboard.meta) === null || _storyboard$meta2 === void 0 ? void 0 : _storyboard$meta2.mocks);
-          registerFormRenderer();
-          collectContract((_storyboard$meta3 = storyboard.meta) === null || _storyboard$meta3 === void 0 ? void 0 : _storyboard$meta3.contracts);
+            // 注册 Storyboard 中定义的自定义模板和函数。
+            _this3.kernel.registerCustomTemplatesInStoryboard(storyboard);
+            registerStoryboardFunctions((_storyboard$meta2 = storyboard.meta) === null || _storyboard$meta2 === void 0 ? void 0 : _storyboard$meta2.functions, storyboard.app);
+            registerMock((_storyboard$meta3 = storyboard.meta) === null || _storyboard$meta3 === void 0 ? void 0 : _storyboard$meta3.mocks);
+            registerFormRenderer();
+            collectContract((_storyboard$meta4 = storyboard.meta) === null || _storyboard$meta4 === void 0 ? void 0 : _storyboard$meta4.contracts);
 
-          // `app` maybe fulfilled
-          currentApp = storyboard.app;
+            // `app` maybe fulfilled
+            currentApp = storyboard.app;
+          }
         }
         var mountPoints = _this3.kernel.mountPoints;
         var legacy = currentApp ? currentApp.legacy : undefined;
@@ -12376,7 +12405,7 @@
             from: location
           });
         };
-        if (storyboard) {
+        if (storyboard && !blocked) {
           var _currentApp$breadcrum, _currentApp$breadcrum2, _currentApp$breadcrum3, _currentApp$breadcrum4;
           var {
             bricks,
@@ -13281,6 +13310,7 @@
           }
         })();
       }, [runtimeBrick, updateBrick]);
+      var previousObserverRef = React.useRef();
       innerRefCallbackRef.current = /*#__PURE__*/function () {
         var _ref6 = _asyncToGenerator__default["default"](function* (element) {
           immediatelyRefCallback === null || immediatelyRefCallback === void 0 ? void 0 : immediatelyRefCallback(element);
@@ -13294,15 +13324,46 @@
           // sub-brick rendering is ignored.
           if (brick) {
             if (element) {
-              var _useBrick$lifeCycle;
+              var _useBrick$lifeCycle, _useBrick$lifeCycle2;
               updateBrick(brick, element);
-              if ((_useBrick$lifeCycle = useBrick.lifeCycle) !== null && _useBrick$lifeCycle !== void 0 && _useBrick$lifeCycle.onMount) {
-                dispatchLifeCycleEvent(new CustomEvent("mount"), useBrick.lifeCycle.onMount, brick);
+              var onMount = (_useBrick$lifeCycle = useBrick.lifeCycle) === null || _useBrick$lifeCycle === void 0 ? void 0 : _useBrick$lifeCycle.onMount;
+              if (onMount) {
+                dispatchLifeCycleEvent(new CustomEvent("mount"), transformEvents(data, {
+                  onMount
+                }).onMount, brick);
+              }
+              var onScrollIntoView = (_useBrick$lifeCycle2 = useBrick.lifeCycle) === null || _useBrick$lifeCycle2 === void 0 ? void 0 : _useBrick$lifeCycle2.onScrollIntoView;
+              if (onScrollIntoView) {
+                var _onScrollIntoView$thr;
+                var threshold = (_onScrollIntoView$thr = onScrollIntoView.threshold) !== null && _onScrollIntoView$thr !== void 0 ? _onScrollIntoView$thr : 0.1;
+                var observer = new IntersectionObserver((entries, observer) => {
+                  entries.forEach(entry => {
+                    if (entry.isIntersecting) {
+                      if (entry.intersectionRatio >= threshold) {
+                        dispatchLifeCycleEvent(new CustomEvent("scroll.into.view"), transformEvents(data, {
+                          onScrollIntoView: onScrollIntoView.handlers
+                        }).onScrollIntoView, brick);
+                        observer.disconnect();
+                      }
+                    }
+                  });
+                }, {
+                  threshold
+                });
+                observer.observe(element);
+                previousObserverRef.current = observer;
               }
             } else {
-              var _useBrick$lifeCycle2;
-              if ((_useBrick$lifeCycle2 = useBrick.lifeCycle) !== null && _useBrick$lifeCycle2 !== void 0 && _useBrick$lifeCycle2.onUnmount) {
-                dispatchLifeCycleEvent(new CustomEvent("unmount"), useBrick.lifeCycle.onUnmount, brick);
+              var _useBrick$lifeCycle3;
+              var onUnmount = (_useBrick$lifeCycle3 = useBrick.lifeCycle) === null || _useBrick$lifeCycle3 === void 0 ? void 0 : _useBrick$lifeCycle3.onUnmount;
+              if (onUnmount) {
+                dispatchLifeCycleEvent(new CustomEvent("unmount"), transformEvents(data, {
+                  onUnmount
+                }).onUnmount, brick);
+              }
+              if (previousObserverRef.current) {
+                previousObserverRef.current.disconnect();
+                previousObserverRef.current = undefined;
               }
             }
           }
@@ -13559,6 +13620,7 @@
           }
         })();
       }, [runtimeBrick, updateBrick]);
+      var previousObserverRef = React.useRef();
       innerRefCallbackRef.current = /*#__PURE__*/function () {
         var _ref14 = _asyncToGenerator__default["default"](function* (element) {
           elementRef.current = element;
@@ -13571,15 +13633,46 @@
           // sub-brick rendering is ignored.
           if (brick) {
             if (element) {
-              var _useBrick$lifeCycle3;
+              var _useBrick$lifeCycle4, _useBrick$lifeCycle5;
               updateBrick(brick, element);
-              if ((_useBrick$lifeCycle3 = useBrick.lifeCycle) !== null && _useBrick$lifeCycle3 !== void 0 && _useBrick$lifeCycle3.onMount) {
-                dispatchLifeCycleEvent(new CustomEvent("mount"), useBrick.lifeCycle.onMount, brick);
+              var onMount = (_useBrick$lifeCycle4 = useBrick.lifeCycle) === null || _useBrick$lifeCycle4 === void 0 ? void 0 : _useBrick$lifeCycle4.onMount;
+              if (onMount) {
+                dispatchLifeCycleEvent(new CustomEvent("mount"), transformEvents(data, {
+                  onMount
+                }).onMount, brick);
+              }
+              var onScrollIntoView = (_useBrick$lifeCycle5 = useBrick.lifeCycle) === null || _useBrick$lifeCycle5 === void 0 ? void 0 : _useBrick$lifeCycle5.onScrollIntoView;
+              if (onScrollIntoView) {
+                var _onScrollIntoView$thr2;
+                var threshold = (_onScrollIntoView$thr2 = onScrollIntoView.threshold) !== null && _onScrollIntoView$thr2 !== void 0 ? _onScrollIntoView$thr2 : 0.1;
+                var observer = new IntersectionObserver((entries, observer) => {
+                  entries.forEach(entry => {
+                    if (entry.isIntersecting) {
+                      if (entry.intersectionRatio >= threshold) {
+                        dispatchLifeCycleEvent(new CustomEvent("scroll.into.view"), transformEvents(data, {
+                          onScrollIntoView: onScrollIntoView.handlers
+                        }).onScrollIntoView, brick);
+                        observer.disconnect();
+                      }
+                    }
+                  });
+                }, {
+                  threshold
+                });
+                observer.observe(element);
+                previousObserverRef.current = observer;
               }
             } else {
-              var _useBrick$lifeCycle4;
-              if ((_useBrick$lifeCycle4 = useBrick.lifeCycle) !== null && _useBrick$lifeCycle4 !== void 0 && _useBrick$lifeCycle4.onUnmount) {
-                dispatchLifeCycleEvent(new CustomEvent("unmount"), useBrick.lifeCycle.onUnmount, brick);
+              var _useBrick$lifeCycle6;
+              var onUnmount = (_useBrick$lifeCycle6 = useBrick.lifeCycle) === null || _useBrick$lifeCycle6 === void 0 ? void 0 : _useBrick$lifeCycle6.onUnmount;
+              if (onUnmount) {
+                dispatchLifeCycleEvent(new CustomEvent("unmount"), transformEvents(data, {
+                  onUnmount
+                }).onUnmount, brick);
+              }
+              if (previousObserverRef.current) {
+                previousObserverRef.current.disconnect();
+                previousObserverRef.current = undefined;
               }
             }
           }
@@ -17039,6 +17132,7 @@
   exports.WebsocketMessageRequest = WebsocketMessageRequest;
   exports.WebsocketMessageResponse = WebsocketMessageResponse;
   exports.abortController = abortController;
+  exports.addPathToBlackList = addPathToBlackList;
   exports.applyTheme = applyTheme;
   exports.authenticate = authenticate;
   exports.batchSetAppsLocalTheme = batchSetAppsLocalTheme;