@next-core/brick-kit 2.118.7 → 2.120.0

package/dist/index.esm.js

@@ -5792,11 +5792,14 @@ function registerMock(useMocks) {
   var _useMocks$mockList;
 
   if (useMocks) mocks = _objectSpread(_objectSpread({}, useMocks), {}, {
-    mockList: (_useMocks$mockList = useMocks.mockList) === null || _useMocks$mockList === void 0 ? void 0 : _useMocks$mockList.map(item => _objectSpread(_objectSpread({}, item), {}, {
-      uri: item.uri.replace(/(easyops\.api\.)(.+?)\/(.+)/, (_match, p1, p2, p3) => {
-        return "(".concat(p1, ")?").concat(p2, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p3, "$");
-      }).replace(/:\w+/g, "([^/]+)")
-    }))
+    mockList: (_useMocks$mockList = useMocks.mockList) === null || _useMocks$mockList === void 0 ? void 0 : _useMocks$mockList.map(item => {
+      var isFlowAPi = isCustomApiProvider(item.provider);
+      return _objectSpread(_objectSpread({}, item), {}, {
+        uri: "".concat(isFlowAPi ? item.uri.replace(/(.+?)\/(.+)/, (_match, p1, p2) => {
+          return "/".concat(p1, "(@\\d+\\.\\d+\\.\\d+)?/").concat(p2, "$");
+        }) : "/".concat(item.uri.split(".").slice(2).join("."), "$")).replace(/:\w+/g, "([^/]+)")
+      });
+    })
   });
 }
 function getMockList() {
@@ -5816,6 +5819,7 @@ var getMockInfo = (requestUrl, method) => {
   if (item) {
     return {
       url: requestUrl.replace(/(api\/gateway\/.+?)(@\d+\.\d+\.\d+)?\/(.+)/, (_match, p1, _p2, p3) => {
+        // 忽略版本
         return "".concat(p1, "/").concat(p3);
       }).replace(/(api\/gateway)/, "api/gateway/mock_server.proxy.".concat(mocks.mockId)),
       mockId: mocks.mockId
@@ -9073,12 +9077,16 @@ class LocationContext {
 
     _defineProperty$1(this, "messageHandlers", []);
 
+    _defineProperty$1(this, "scrollIntoViewHandlersMap", new Map());
+
     _defineProperty$1(this, "segues", {});
 
     _defineProperty$1(this, "currentMatch", void 0);
 
     _defineProperty$1(this, "storyboardContextWrapper", new StoryboardContextWrapper());
 
+    _defineProperty$1(this, "observersList", []);
+
     this.kernel = kernel;
     this.location = location;
     this.resolver = new Resolver(kernel);
@@ -9445,7 +9453,7 @@ class LocationContext {
         _this6 = this;
 
     return _asyncToGenerator$4(function* () {
-      var _this6$kernel$nextApp;
+      var _this6$kernel$nextApp, _brickConf$lifeCycle, _brick$lifeCycle;
 
       var tplStack = _arguments.length > 4 && _arguments[4] !== undefined ? _arguments[4] : [];
       var tplContextId = brickConf[symbolForTplContextId];
@@ -9486,7 +9494,7 @@ class LocationContext {
       yield _this6.storyboardContextWrapper.define(brickConf.context, context, brick);
       yield _this6.preCheckPermissions(brickConf, context);
       var trackingContextList = [];
-      Object.assign(brick, {
+      Object.assign(brick, _objectSpread({
         type: tplTagName || brickConf.brick,
         properties: computeRealProperties(brickConf.properties, context, brickConf.injectDeep !== false, trackingContextList),
         events: isObject(brickConf.events) ? brickConf.events : {},
@@ -9496,7 +9504,11 @@ class LocationContext {
         refForProxy: brickConf[symbolForRefForProxy],
         tplContextId,
         iid: brickConf.iid
-      });
+      }, (_brickConf$lifeCycle = brickConf.lifeCycle) !== null && _brickConf$lifeCycle !== void 0 && _brickConf$lifeCycle.onScrollIntoView ? {
+        lifeCycle: {
+          onScrollIntoView: brickConf.lifeCycle.onScrollIntoView
+        }
+      } : {}));
 
       if (brickConf[symbolForComputedPropsFromProxy]) {
         Object.entries(brickConf[symbolForComputedPropsFromProxy]).forEach(_ref2 => {
@@ -9511,7 +9523,11 @@ class LocationContext {
         brick.refForProxy.brick = brick;
       }
 
-      _this6.registerHandlersFromLifeCycle(brickConf.lifeCycle, brick, match, tplContextId); // Then, resolve the brick.
+      _this6.registerHandlersFromLifeCycle(brickConf.lifeCycle, brick, match, tplContextId);
+
+      if ((_brick$lifeCycle = brick.lifeCycle) !== null && _brick$lifeCycle !== void 0 && _brick$lifeCycle.onScrollIntoView) {
+        _this6.brickBindObserver(brick);
+      } // Then, resolve the brick.
 
 
       yield _this6.resolver.resolve(brickConf, brick, context);
@@ -9586,7 +9602,8 @@ class LocationContext {
       onAnchorUnload,
       onMediaChange,
       onMessage,
-      onMessageClose
+      onMessageClose,
+      onScrollIntoView
     } = lifeCycle !== null && lifeCycle !== void 0 ? lifeCycle : {};
 
     if (onBeforePageLoad) {
@@ -9669,6 +9686,15 @@ class LocationContext {
         handler: onMessageClose
       });
     }
+
+    if (onScrollIntoView) {
+      this.scrollIntoViewHandlersMap.set(brick.iid, {
+        brick,
+        match,
+        tplContextId,
+        handler: onScrollIntoView.handlers
+      });
+    }
   }
 
   handleBeforePageLoad() {
@@ -9723,6 +9749,17 @@ class LocationContext {
     }), this.messageCloseHandlers);
   }
 
+  handleScrollIntoView(id) {
+    var currentHandlers = this.scrollIntoViewHandlersMap.get(id);
+    this.dispatchLifeCycleEvent(new CustomEvent("scroll.into.view"), [currentHandlers]);
+  }
+
+  handleBrickBindObserver() {
+    this.observersList.forEach(value => {
+      value.$$observe();
+    });
+  }
+
   getCurrentMatch() {
     return this.currentMatch;
   }
@@ -9755,6 +9792,27 @@ class LocationContext {
     })();
   }
 
+  brickBindObserver(brick) {
+    var _brick$lifeCycle$onSc;
+
+    var threshold = (_brick$lifeCycle$onSc = brick.lifeCycle.onScrollIntoView.threshold) !== null && _brick$lifeCycle$onSc !== void 0 ? _brick$lifeCycle$onSc : 0.1;
+    var observer = new IntersectionObserver((entries, observer) => {
+      entries.forEach(entry => {
+        if (entry.isIntersecting) {
+          if (entry.intersectionRatio >= threshold) {
+            this.handleScrollIntoView(brick.iid);
+            observer.disconnect();
+          }
+        }
+      });
+    }, {
+      threshold
+    });
+    this.observersList.push({
+      $$observe: () => observer.observe(brick.element)
+    });
+  }
+
 }
 
 function unmountTree(mountPoint) {
@@ -10634,6 +10692,8 @@ class Router {
           window.scrollTo(0, 0);
 
           if (!failed) {
+            _this3.locationContext.handleBrickBindObserver();
+
             _this3.locationContext.handlePageLoad();
 
             _this3.locationContext.handleAnchorLoad();