@dazhicheng/ui 1.6.38 → 1.6.40

package/dist/components/tt-modal/src/utils/modal-z-index.d.ts

@@ -3,6 +3,13 @@ import { useZIndex } from 'element-plus';
 export type ElementPlusZIndex = ReturnType<typeof useZIndex>;
 /** 当前已打开弹窗里的最高层级 */
 export declare function getOpenModalMaxZIndex(): number;
+/**
+ * 把 element-plus 计数器抬到 target 之上。弹窗内的下拉、气泡仍由它发号，
+ * 且默认 Teleport 到 body 与遮罩同级，不同步就会落到弹窗下面。
+ * @param elementPlusZIndex 计数器句柄
+ * @param target 需要被压住的层级
+ */
+export declare function syncElementPlusZIndexAbove(elementPlusZIndex: ElementPlusZIndex, target: number): void;
 /**
  * 申请一个高于当前所有已打开弹窗的层级。
  *

package/dist/components/tt-modal/src/utils/modal-z-index.js

@@ -1,24 +1,26 @@
-import { getOpenModalOverlays as r, readOverlayZIndex as x } from "./resolve-modal-target.js";
-const a = 1, c = 2e3;
-let o = 0;
-function s() {
-  return r().reduce((n, e) => Math.max(n, x(e)), 0);
+import { getOpenModalOverlays as l, readOverlayZIndex as c } from "./resolve-modal-target.js";
+const o = 1, r = 2e3;
+let t = 0;
+function M() {
+  return l().reduce((n, e) => Math.max(n, c(e)), 0);
 }
-function I(n, e) {
-  const { currentZIndex: d, nextZIndex: l } = n;
-  let t = 0;
-  for (; d.value <= e && t < c; )
-    l(), t += 1;
+function s(n, e) {
+  t = Math.max(t, e);
+  const { currentZIndex: x, nextZIndex: d } = n;
+  let a = 0;
+  for (; x.value <= e && a < r; )
+    d(), a += 1;
 }
 function u(n) {
   const e = Math.max(
     n.nextZIndex(),
-    s() + a,
-    o + a
+    M() + o,
+    t + o
   );
-  return o = e, I(n, e), e;
+  return t = e, s(n, e), e;
 }
 export {
   u as allocateModalZIndex,
-  s as getOpenModalMaxZIndex
+  M as getOpenModalMaxZIndex,
+  s as syncElementPlusZIndexAbove
 };

package/dist/components/tt-modal/src/utils/resolve-modal-target.d.ts

@@ -5,6 +5,19 @@ export declare const MODAL_OVERLAY_CLASS = "tt-modal-overlay";
 export declare function ensureContainedOverlayStyle(doc?: Document): void;
 /** 用内联样式强制区域遮罩，压过 EP 的 position:fixed（含内部 overlay-dialog） */
 export declare function applyContainedOverlayInline(uid: string | number, doc?: Document): void;
+/**
+ * 打开/resume：保证区域遮罩能吃到点击。
+ * 同容器内页面兄弟 z-index 更高时会点穿；仅调 DOM 顺序不够，需抬遮罩层级。
+ *
+ * 不把 axios / v-loading 的 `.el-loading-mask` 算进兄弟层级：
+ * 编辑弹窗拉详情时 loading 会挂到同一 `#app`，若据此抬遮罩却未同步 EP，
+ * 弹窗内 PanelSelect / Select 下拉会掉到遮罩下面。
+ */
+export declare function ensureOverlayHitTarget(uid: string | number, doc?: Document): void;
+/** 区域弹窗锁挂载容器滚动（不锁 body，侧栏/顶栏仍可操作） */
+export declare function lockModalMountScroll(target: HTMLElement | null): void;
+/** 关闭/切走时恢复挂载容器滚动 */
+export declare function unlockModalMountScroll(target: HTMLElement | null): void;
 /** KeepAlive / 切页：隐藏已 Teleport 出去的遮罩，避免挡其它页。找到并隐藏则 true */
 export declare function suspendOverlayByUid(uid: string | number, doc?: Document): boolean;
 /**

package/dist/components/tt-modal/src/utils/resolve-modal-target.js

@@ -1,20 +1,20 @@
-import { getClientDocument as S, isSameMicroAppScope as _, resolveScanDocument as C } from "./modal-scope.js";
-import { getOpenModalUids as O } from "./modal-stack.js";
-const A = 48, m = 8, a = "tt-modal-overlay--contained", E = "tt-modal-overlay", y = "tt-modal-overlay-contained-style-v2";
-function M(t = document) {
+import { getClientDocument as b, isSameMicroAppScope as M, resolveScanDocument as _ } from "./modal-scope.js";
+import { getOpenModalUids as E } from "./modal-stack.js";
+const w = 48, y = 8, c = "tt-modal-overlay--contained", A = "tt-modal-overlay", v = "tt-modal-overlay-contained-style-v2";
+function I(t = document) {
   var r;
   if (typeof t > "u") return;
   const o = `
-.el-overlay.${a},
-.el-overlay.${a} .el-overlay-dialog {
+.el-overlay.${c},
+.el-overlay.${c} .el-overlay-dialog {
   position: absolute !important;
   inset: 0 !important;
   height: 100% !important;
 }
-.el-overlay.${a} .el-overlay-dialog {
+.el-overlay.${c} .el-overlay-dialog {
   overflow: auto !important;
 }
-.el-overlay.${a} .tt-ui-modal.el-dialog {
+.el-overlay.${c} .tt-ui-modal.el-dialog {
   --tt-modal-contained-top: 40px;
   --tt-modal-contained-bottom: 24px;
   margin-top: var(--tt-modal-contained-top) !important;
@@ -24,164 +24,197 @@ function M(t = document) {
   flex-direction: column !important;
   overflow: hidden !important;
 }
-.el-overlay.${a} .tt-ui-modal.el-dialog .el-dialog__header,
-.el-overlay.${a} .tt-ui-modal.el-dialog .el-dialog__footer {
+.el-overlay.${c} .tt-ui-modal.el-dialog .el-dialog__header,
+.el-overlay.${c} .tt-ui-modal.el-dialog .el-dialog__footer {
   flex-shrink: 0;
 }
-.el-overlay.${a} .tt-ui-modal.el-dialog .el-dialog__body {
+.el-overlay.${c} .tt-ui-modal.el-dialog .el-dialog__body {
   display: flex !important;
   flex: 1 1 auto !important;
   flex-direction: column !important;
   min-height: 0 !important;
   overflow: hidden !important;
 }
-.el-overlay.${a} .tt-ui-modal.el-dialog .tt-modal-wrapper {
+.el-overlay.${c} .tt-ui-modal.el-dialog .tt-modal-wrapper {
   flex: 1 1 auto !important;
   min-height: 0 !important;
   max-height: none !important;
   overflow: auto !important;
 }
 `.trim();
-  let e = t.getElementById(y);
+  let e = t.getElementById(v);
   if (e) {
     e.textContent = o;
     return;
   }
-  (r = t.getElementById("tt-modal-overlay-contained-style")) == null || r.remove(), e = t.createElement("style"), e.id = y, e.textContent = o;
+  (r = t.getElementById("tt-modal-overlay-contained-style")) == null || r.remove(), e = t.createElement("style"), e.id = v, e.textContent = o;
   const n = t.head || t.documentElement;
   n == null || n.appendChild(e);
 }
-function f(t) {
+function g(t) {
   t.style.setProperty("position", "absolute", "important"), t.style.setProperty("top", "0", "important"), t.style.setProperty("right", "0", "important"), t.style.setProperty("bottom", "0", "important"), t.style.setProperty("left", "0", "important"), t.style.setProperty("height", "100%", "important");
 }
-function v(t) {
+function h(t) {
   ["position", "top", "right", "bottom", "left", "height"].forEach((o) => t.style.removeProperty(o));
 }
-function w(t, o = document) {
+function P(t, o = document) {
   const e = o.querySelector(`.el-overlay.tt-id-${t}`);
   if (!e) return;
   const n = e.querySelector(".el-overlay-dialog"), r = !!e.closest("micro-app-body");
-  if (!e.classList.contains(a) && !r) {
-    v(e), n && v(n);
+  if (!e.classList.contains(c) && !r) {
+    h(e), n && h(n);
+    return;
+  }
+  g(e), n && g(n), O(t, o);
+}
+const d = "data-tt-modal-scroll-lock";
+function O(t, o = document) {
+  var s;
+  const e = o.querySelector(`.el-overlay.tt-id-${t}`);
+  if (!(e != null && e.parentElement)) return;
+  e.style.setProperty("pointer-events", "auto"), (s = e.querySelector(".el-overlay-dialog")) == null || s.style.setProperty("pointer-events", "auto");
+  const n = e.parentElement;
+  let r = 0;
+  for (const l of Array.from(n.children)) {
+    if (l === e || !(l instanceof HTMLElement) || l.classList.contains(A) || l.classList.contains("el-loading-mask")) continue;
+    const a = Number.parseInt(l.style.zIndex || getComputedStyle(l).zIndex || "0", 10);
+    Number.isNaN(a) || (r = Math.max(r, a));
+  }
+  const i = m(e);
+  r >= i && (e.style.zIndex = String(r + 1)), n.lastElementChild !== e && n.appendChild(e);
+}
+function D(t) {
+  if (!t) return;
+  const o = Number(t.getAttribute(d) || "0");
+  o === 0 && (t.dataset.ttModalPrevOverflow = t.style.overflow || "", t.style.overflow = "hidden"), t.setAttribute(d, String(o + 1));
+}
+function k(t) {
+  if (!t) return;
+  const o = Number(t.getAttribute(d) || "0");
+  if (o <= 1) {
+    t.style.overflow = t.dataset.ttModalPrevOverflow || "", delete t.dataset.ttModalPrevOverflow, t.removeAttribute(d);
     return;
   }
-  f(e), n && f(n);
+  t.setAttribute(d, String(o - 1));
 }
-function g(t, o = document) {
+function S(t, o = document) {
   const e = o.querySelector(`.el-overlay.tt-id-${t}`);
   return e ? (e.dataset.ttModalSuspended = "1", e.style.setProperty("display", "none", "important"), !0) : !1;
 }
-function B(t, o = document, e = 3e3) {
-  if (g(t, o)) return () => {
+function z(t, o = document, e = 3e3) {
+  if (S(t, o)) return () => {
   };
   const n = o.body || o.documentElement;
   if (!n) return () => {
   };
   let r = !1;
   const i = () => {
-    r || (r = !0, s.disconnect(), clearTimeout(c));
+    r || (r = !0, s.disconnect(), clearTimeout(l));
   }, s = new MutationObserver(() => {
-    g(t, o) && i();
+    S(t, o) && i();
   });
   s.observe(n, { childList: !0, subtree: !0 });
-  const c = window.setTimeout(i, e);
+  const l = window.setTimeout(i, e);
   return i;
 }
-function D(t, o = document) {
+function V(t, o = document) {
   const e = o.querySelector(`.el-overlay.tt-id-${t}`);
-  !e || e.dataset.ttModalSuspended !== "1" || (delete e.dataset.ttModalSuspended, e.style.removeProperty("display"), w(t, o));
+  !e || e.dataset.ttModalSuspended !== "1" || (delete e.dataset.ttModalSuspended, e.style.removeProperty("display"), P(t, o), O(t, o));
 }
-function h(t) {
+function m(t) {
   const o = t.style.zIndex || getComputedStyle(t).zIndex, e = Number.parseInt(o, 10);
   return Number.isNaN(e) ? 0 : e;
 }
-function I(t) {
-  const o = t ?? S();
-  return o ? Array.from(C(o).querySelectorAll(`.${E}`)).filter(
+function N(t) {
+  const o = t ?? b();
+  return o ? Array.from(_(o).querySelectorAll(`.${A}`)).filter(
     (e) => e.isConnected && e.dataset.ttModalSuspended !== "1" && e.style.display !== "none"
   ) : [];
 }
-function H(t, o, e) {
-  const n = S(), r = o ?? (n == null ? void 0 : n.body);
+function Y(t, o, e) {
+  const n = b(), r = o ?? (n == null ? void 0 : n.body);
   if (!n || !r) return null;
-  const i = O().map((l) => `tt-id-${l}`), s = I(n).filter((l) => {
-    if (t != null && l.classList.contains(`tt-id-${t}`) || !i.some((b) => l.classList.contains(b))) return !1;
-    const u = l.parentElement;
-    return !!u && _(u, r);
+  const i = E().map((a) => `tt-id-${a}`), s = N(n).filter((a) => {
+    if (t != null && a.classList.contains(`tt-id-${t}`) || !i.some((C) => a.classList.contains(C))) return !1;
+    const u = a.parentElement;
+    return !!u && M(u, r);
   });
-  return s.length === 0 ? null : s.reduce((l, u) => h(u) >= h(l) ? u : l).parentElement;
+  return s.length === 0 ? null : s.reduce((a, u) => m(u) >= m(a) ? u : a).parentElement;
 }
-function P(t) {
+function x(t) {
   return t.isConnected ? t.getClientRects().length > 0 : !1;
 }
 function T(t) {
-  return t.isConnected ? (t.clientHeight || t.getBoundingClientRect().height) >= A : !1;
+  return t.isConnected ? (t.clientHeight || t.getBoundingClientRect().height) >= w : !1;
 }
-function x(t) {
+function L(t) {
   const o = window.innerHeight || document.documentElement.clientHeight || 0;
   if (o === 0) return !0;
   const e = t.getBoundingClientRect();
-  return e.height > o + m ? !1 : e.top >= -m;
+  return e.height > o + y ? !1 : e.top >= -y;
 }
-function p(t) {
+function f(t) {
   return !!t.closest("micro-app-body");
 }
-function d(t, o = !0) {
-  return !t || !t.isConnected || o && !T(t) || o && !P(t) ? null : t;
+function p(t, o = !0) {
+  return !t || !t.isConnected || o && !T(t) || o && !x(t) ? null : t;
 }
-function N(t) {
+function R(t) {
   getComputedStyle(t).position === "static" && (t.style.position = "relative");
 }
-function R() {
+function $() {
   const t = window.__MICRO_APP_NAME__;
   if (t) {
-    const i = typeof CSS < "u" && CSS.escape ? CSS.escape(t) : t, s = document.querySelector(`micro-app[name="${i}"] micro-app-body #app`), c = d(s, !1);
-    if (c) return c;
+    const i = typeof CSS < "u" && CSS.escape ? CSS.escape(t) : t, s = document.querySelector(`micro-app[name="${i}"] micro-app-body #app`), l = p(s, !1);
+    if (l) return l;
   }
   const o = document.querySelector("#app");
   if (o) {
-    const i = d(o, !1);
+    const i = p(o, !1);
     return i || o;
   }
   const e = document.querySelector("micro-app-body #app");
   if (e) {
-    const i = d(e, !1);
+    const i = p(e, !1);
     if (i) return i;
   }
   const n = document.body;
-  return n && (n.tagName === "MICRO-APP-BODY" || p(n)) ? n : document.querySelector("micro-app-body");
+  return n && (n.tagName === "MICRO-APP-BODY" || f(n)) ? n : document.querySelector("micro-app-body");
 }
-function $() {
+function q() {
   const t = document.querySelector("#app-content");
-  if (t && !p(t)) {
-    const e = d(t, !0);
+  if (t && !f(t)) {
+    const e = p(t, !0);
     if (e) return e;
   }
   const o = document.querySelectorAll("#app");
   for (const e of Array.from(o)) {
     const n = e;
-    if (p(n)) continue;
-    const r = d(n, !0);
+    if (f(n)) continue;
+    const r = p(n, !0);
     if (r) return r;
   }
   return null;
 }
-function V() {
+function G() {
   if (typeof document > "u") return null;
-  M();
-  const t = window.__MICRO_APP_ENVIRONMENT__ ? R() : $();
-  return !t || !x(t) ? null : (N(t), t);
+  I();
+  const t = window.__MICRO_APP_ENVIRONMENT__ ? $() : q();
+  return !t || !L(t) ? null : (R(t), t);
 }
 export {
-  E as MODAL_OVERLAY_CLASS,
-  a as MODAL_OVERLAY_CONTAINED_CLASS,
-  w as applyContainedOverlayInline,
-  M as ensureContainedOverlayStyle,
-  H as findTopOpenModalOverlayHost,
-  I as getOpenModalOverlays,
-  h as readOverlayZIndex,
-  V as resolveModalTarget,
-  D as resumeOverlayByUid,
-  g as suspendOverlayByUid,
-  B as watchOverlayThenSuspend
+  A as MODAL_OVERLAY_CLASS,
+  c as MODAL_OVERLAY_CONTAINED_CLASS,
+  P as applyContainedOverlayInline,
+  I as ensureContainedOverlayStyle,
+  O as ensureOverlayHitTarget,
+  Y as findTopOpenModalOverlayHost,
+  N as getOpenModalOverlays,
+  D as lockModalMountScroll,
+  m as readOverlayZIndex,
+  G as resolveModalTarget,
+  V as resumeOverlayByUid,
+  S as suspendOverlayByUid,
+  k as unlockModalMountScroll,
+  z as watchOverlayThenSuspend
 };