eoss 0.1.0-alpha.32 → 0.1.0-alpha.34

package/lib/dropdown-menu.js

@@ -2196,7 +2196,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
     //
     var referenceOffsets = getOffsetRectRelativeToCustomParent(
       reference,
-      getOffsetParent(popper),
+      popper,
       isParentFixed
     );
 
@@ -2251,17 +2251,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
   Popper.prototype._setupEventListeners = function () {
     // NOTE: 1 DOM access here
     this.state.updateBound = this.update.bind(this);
-    root.addEventListener('resize', this.state.updateBound);
+    // 无界等微前端场景下沙箱 window 不会触发 resize，需监听真实 window
+    this.state.realWindow = getRealWindow(this._popper);
+    this.state.realWindow.addEventListener('resize', this.state.updateBound);
     // if the boundariesElement is window we don't need to listen for the scroll event
     if (this._options.boundariesElement !== 'window') {
       var target = getScrollParent(this._reference);
-      // here it could be both `body` or `documentElement` thanks to Firefox, we then check both
-      if (
-        target === root.document.body ||
-        target === root.document.documentElement
-      ) {
-        target = root;
-      }
       target.addEventListener('scroll', this.state.updateBound);
       this.state.scrollTarget = target;
     }
@@ -2275,7 +2270,10 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   Popper.prototype._removeEventListeners = function () {
     // NOTE: 1 DOM access here
-    root.removeEventListener('resize', this.state.updateBound);
+    (this.state.realWindow || root).removeEventListener(
+      'resize',
+      this.state.updateBound
+    );
     if (
       this._options.boundariesElement !== 'window' &&
       this.state.scrollTarget
@@ -2329,47 +2327,24 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
         left: 0
       };
     } else if (boundariesElement === 'viewport') {
-      var offsetParent = getOffsetParent(this._popper);
-      var scrollParent = getScrollParent(this._popper);
-      var offsetParentRect = getOffsetRect(offsetParent);
-
-      // Thanks the fucking native API, `document.body.scrollTop` & `document.documentElement.scrollTop`
-      var getScrollTopValue = function (element) {
-        return element == document.body
-          ? Math.max(
-            document.documentElement.scrollTop,
-            document.body.scrollTop
-          )
-          : element.scrollTop;
-      };
-      var getScrollLeftValue = function (element) {
-        return element == document.body
-          ? Math.max(
-            document.documentElement.scrollLeft,
-            document.body.scrollLeft
-          )
-          : element.scrollLeft;
-      };
-
-      // if the popper is fixed we don't have to substract scrolling from the boundaries
-      var scrollTop =
-        data.offsets.popper.position === 'fixed'
-          ? 0
-          : getScrollTopValue(scrollParent);
-      var scrollLeft =
+      // 将真实 window 的视口换算到 popper 所在包含块的坐标系。
+      // 无界等场景下沙箱 window 的尺寸、shadowRoot 内元素的 scrollTop 均不可靠，
+      // 统一从元素自身的 view 与真实包含块获取
+      var realWindow = getRealWindow(this._popper);
+      var containingBlockRect = getContainingBlockRect(
+        this._popper,
         data.offsets.popper.position === 'fixed'
-          ? 0
-          : getScrollLeftValue(scrollParent);
+      );
 
       boundaries = {
-        top: 0 - (offsetParentRect.top - scrollTop),
+        top: 0 - containingBlockRect.top,
         right:
-          root.document.documentElement.clientWidth -
-          (offsetParentRect.left - scrollLeft),
+          realWindow.document.documentElement.clientWidth -
+          containingBlockRect.left,
         bottom:
-          root.document.documentElement.clientHeight -
-          (offsetParentRect.top - scrollTop),
-        left: 0 - (offsetParentRect.left - scrollLeft)
+          realWindow.document.documentElement.clientHeight -
+          containingBlockRect.top,
+        left: 0 - containingBlockRect.left
       };
     } else {
       if (getOffsetParent(this._popper) === boundariesElement) {
@@ -2837,7 +2812,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
     element.style.visibility = 'hidden';
     var calcWidthToForceRepaint = element.offsetWidth;
     // original method
-    var styles = root.getComputedStyle(element);
+    var styles = getRealWindow(element).getComputedStyle(element);
     var x = parseFloat(styles.marginTop) + parseFloat(styles.marginBottom);
     var y = parseFloat(styles.marginLeft) + parseFloat(styles.marginRight);
     var result = {
@@ -2908,9 +2883,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   function getStyleComputedProperty(element, property) {
     // NOTE: 1 DOM access here
-    var css = root.getComputedStyle(element, null);
+    // 无界等微前端场景下沙箱 window 与元素实际渲染所在 window 可能不一致，
+    // 需使用元素自身的 view 读取计算样式，避免跨 document 读取到空值
+    var css = getRealWindow(element).getComputedStyle(element, null);
     return css[property];
   }
+
   /**
    * Returns the offset parent of the given element
    * @function
@@ -2925,6 +2903,68 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
       : offsetParent;
   }
 
+  /**
+   * Returns the window the given element actually renders in.
+   * 无界等微前端场景下组件代码运行在沙箱 window 中，而 DOM 实际渲染在
+   * 主应用的 window（shadowRoot 内），滚动量、视口尺寸等必须取自元素自身的 view
+   * @function
+   * @ignore
+   * @argument {Element} element
+   * @returns {Window} window
+   */
+  function getRealWindow(element) {
+    return (
+      (element &&
+        element.ownerDocument &&
+        element.ownerDocument.defaultView) ||
+      root
+    );
+  }
+
+  /**
+   * Returns the viewport rect of the containing block actually used to position the popper.
+   * 无界微前端等场景下 popper 被挂载进子应用的 shadowRoot，offsetParent 的兜底值
+   * （documentElement）与浏览器真实的包含块不再重合，导致下拉框/提示框整体偏移
+   * （偏移量恰为子应用容器在主应用中的位置），因此需要沿 composed tree 查找：
+   * - fixed 定位：包含块为视口；
+   * - absolute 定位：最近的 positioned 祖先元素（跨 shadowRoot 边界查找）；
+   * - 无 positioned 祖先：初始包含块，其视口原点为真实 window 滚动量的负值。
+   * @function
+   * @ignore
+   * @argument {Element} element - popper element
+   * @argument {Boolean} fixed - whether the popper is fixed positioned
+   * @returns {Object} rect
+   */
+  function getContainingBlockRect(element, fixed) {
+    if (fixed) {
+      return { top: 0, left: 0, right: 0, bottom: 0 };
+    }
+
+    var node = element.parentNode;
+    while (node) {
+      if (node.nodeType === 1) {
+        if (getStyleComputedProperty(node, 'position') !== 'static') {
+          return getBoundingClientRect(node);
+        }
+      } else if (node.nodeType === 11) {
+        // 遇到 shadowRoot，跨边界从宿主元素继续向上查找
+        node = node.host;
+        continue;
+      } else {
+        break;
+      }
+      node = node.parentNode;
+    }
+
+    var win = getRealWindow(element);
+    return {
+      top: -(win.pageYOffset || 0),
+      left: -(win.pageXOffset || 0),
+      right: 0,
+      bottom: 0
+    };
+  }
+
   /**
    * Returns the scrolling parent of the given element
    * @function
@@ -2934,18 +2974,20 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   function getScrollParent(element) {
     var parent = element.parentNode;
-    if (!parent || parent.nodeType !== 1) {
+    if (!parent) {
       return element;
     }
 
-    if (parent === root.document) {
-      // Firefox puts the scrollTOp value on `documentElement` instead of `body`, we then check which of them is
-      // greater than 0 and return the proper element
-      if (root.document.body.scrollTop || root.document.body.scrollLeft) {
-        return root.document.body;
-      } else {
-        return root.document.documentElement;
-      }
+    if (parent.nodeType === 11) {
+      // 无界等微前端场景 DOM 位于 shadowRoot 内，需跨边界从宿主元素继续向上查找，
+      // 否则查找到 shadowRoot 即终止，滚动事件无法被监听
+      return getScrollParent(parent.host);
+    }
+
+    if (parent.nodeType !== 1) {
+      // 到达 document，返回元素实际渲染所在的真实 window，
+      // 保证 window 滚动时能触发位置更新
+      return getRealWindow(element);
     }
 
     // Firefox want us to check `-x` and `-y` variations as well
@@ -2965,7 +3007,7 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
       // fixes issue #65
       return parent;
     }
-    return getScrollParent(element.parentNode);
+    return getScrollParent(parent);
   }
 
   /**
@@ -2983,9 +3025,12 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
     if (getStyleComputedProperty(element, 'position') === 'fixed') {
       return true;
     }
-    return element.parentNode && element.parentNode.nodeType === 1
-      ? isFixed(element.parentNode)
-      : element;
+    var parent = element.parentNode;
+    if (parent && parent.nodeType === 11) {
+      // 跨 shadowRoot 边界，从宿主元素继续向上判断
+      parent = parent.host;
+    }
+    return parent && parent.nodeType === 1 ? isFixed(parent) : false;
   }
 
   /**
@@ -3101,15 +3146,9 @@ var __WEBPACK_AMD_DEFINE_FACTORY__, __WEBPACK_AMD_DEFINE_RESULT__;/**
    */
   function getOffsetRectRelativeToCustomParent(element, parent, fixed) {
     var elementRect = getBoundingClientRect(element);
-    var parentRect = getBoundingClientRect(parent);
-
-    if (fixed) {
-      var scrollParent = getScrollParent(parent);
-      parentRect.top += scrollParent.scrollTop;
-      parentRect.bottom += scrollParent.scrollTop;
-      parentRect.left += scrollParent.scrollLeft;
-      parentRect.right += scrollParent.scrollLeft;
-    }
+    // parent 为 popper 元素：取其真实包含块的视口 rect，
+    // 避免无界 shadowRoot 等场景下包含块假设错误导致的整体偏移
+    var parentRect = getContainingBlockRect(parent, fixed);
 
     var rect = {
       top: elementRect.top - parentRect.top,

package/lib/email-login.js

@@ -4830,7 +4830,7 @@ var publishedLists = '/main2/pageComponentConfig/listPublished';
 // 获取自定义配置详情
 var pageInfo = '/main2/pageComponentConfig/info';
 // 获取自定义配置授权列表
-var pageGroup = 'main2/pageComponentTarget/listByConfigIdAndTypeGroup';
+var pageGroup = '/main2/pageComponentTarget/listByConfigIdAndTypeGroup';
 
 // 保存自定义配置,发布也调这个接口但要加上字段status=1
 var pageSave = '/main2/pageComponentConfig/save';