@dazhicheng/ui 1.6.39 → 1.6.41

package/dist/components/tt-modal/src/RenderModal.vue.js

@@ -1,13 +1,13 @@
-import { defineComponent as Je, ref as C, useAttrs as Qe, useSlots as Xe, getCurrentInstance as Ge, computed as v, unref as t, watch as j, reactive as We, nextTick as $, provide as eo, onMounted as oo, onDeactivated as to, onActivated as lo, onUnmounted as ro, withDirectives as no, createElementBlock as io, openBlock as so, createVNode as x, mergeProps as de, h as ao, createSlots as Z, withCtx as c, normalizeClass as uo, renderSlot as T, renderList as q, normalizeProps as N, guardReactiveProps as U, createElementVNode as po } from "vue";
-import { TtIcon as co } from "../../tt-icon/index.js";
+import { defineComponent as Ue, ref as T, useAttrs as qe, useSlots as Ke, getCurrentInstance as Ye, computed as f, unref as o, watch as ie, reactive as Je, nextTick as L, provide as Qe, onMounted as Xe, onDeactivated as Ge, onActivated as We, onUnmounted as eo, withDirectives as oo, createElementBlock as to, openBlock as lo, createVNode as I, mergeProps as re, h as so, createSlots as E, withCtx as c, normalizeClass as io, renderSlot as g, renderList as V, normalizeProps as _, guardReactiveProps as z, createElementVNode as ro } from "vue";
+import { TtIcon as no } from "../../tt-icon/index.js";
 import "../../../node_modules/.pnpm/vue-types@5.1.3_vue@3.5.21_typescript@5.9.3_/node_modules/vue-types/shim/index.modern.js";
-import { useDesign as fo } from "../../../packages/hooks/src/useDesign.js";
-import { usePriorityValues as mo, getPriorityValues as vo } from "../../../packages/hooks/src/usePriorityValue.js";
+import { useDesign as ao } from "../../../packages/hooks/src/useDesign.js";
+import { usePriorityValues as uo, getPriorityValues as po } from "../../../packages/hooks/src/usePriorityValue.js";
 import "axios";
-import { dialogProps as ue, useZIndex as go, ElDialog as bo } from "element-plus";
+import { dialogProps as ne, useZIndex as co, ElDialog as fo } from "element-plus";
 import "dayjs";
 import "numeral";
-import { generateTestId as K, toKebabCase as Co } from "../../../packages/utils/src/testid-helper.js";
+import { generateTestId as R, toKebabCase as mo } from "../../../packages/utils/src/testid-helper.js";
 import "xe-utils";
 import "dayjs/plugin/utc";
 import "dayjs/plugin/timezone";
@@ -16,27 +16,27 @@ import "../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.j
 import "../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/enc-utf8.js";
 import "../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-ecb.js";
 import "../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
-import { omit as pe, pick as Y } from "lodash-es";
+import { omit as ae, pick as j } from "lodash-es";
 import "vue-router";
-import To from "../../../directives/dialog-resize/index.js";
-import { useStore as ko } from "@tanstack/vue-store";
-import yo from "./components/ModalFooter.vue.js";
-import ho from "./components/ModalHeader.vue.js";
-import Oo from "./components/ModalWrapper.vue.js";
-import { basicProps as Po } from "./props.js";
-import { ModalApi as So } from "./utils/modal-api.js";
-import { resolveModalTarget as ce, MODAL_OVERLAY_CLASS as Bo, MODAL_OVERLAY_CONTAINED_CLASS as J, findTopOpenModalOverlayHost as Mo, ensureContainedOverlayStyle as Io, watchOverlayThenSuspend as fe, suspendOverlayByUid as Ao, readOverlayZIndex as me, applyContainedOverlayInline as $o, ensureOverlayHitTarget as xo, lockModalMountScroll as Do, unlockModalMountScroll as Fo, resumeOverlayByUid as Lo } from "./utils/resolve-modal-target.js";
-import { allocateModalZIndex as wo, syncElementPlusZIndexAbove as ve } from "./utils/modal-z-index.js";
-import { getClientDocument as Eo } from "./utils/modal-scope.js";
-import { pushModal as ge, removeModal as Q } from "./utils/modal-stack.js";
-import { emitModalCloseTransitionEnd as zo } from "./utils/modal-close-transition.js";
-import Vo from "../../../assets/svg/close.svg.js";
-const _o = ["aria-tt-id", "data-testid"], Ro = ["data-testid"], yt = /* @__PURE__ */ Je({
+import vo from "../../../directives/dialog-resize/index.js";
+import { useStore as go } from "@tanstack/vue-store";
+import bo from "./components/ModalFooter.vue.js";
+import Co from "./components/ModalHeader.vue.js";
+import To from "./components/ModalWrapper.vue.js";
+import { basicProps as ho } from "./props.js";
+import { ModalApi as ko } from "./utils/modal-api.js";
+import { resolveModalTarget as de, MODAL_OVERLAY_CLASS as yo, MODAL_OVERLAY_CONTAINED_CLASS as H, findTopOpenModalOverlayHost as Oo, ensureContainedOverlayStyle as Bo, applyContainedOverlayInline as N, watchOverlayThenSuspend as ue, suspendOverlayByUid as Po, resumeOverlayByUid as So } from "./utils/resolve-modal-target.js";
+import { allocateModalZIndex as Io } from "./utils/modal-z-index.js";
+import { getClientDocument as Mo } from "./utils/modal-scope.js";
+import { pushModal as pe, removeModal as Z } from "./utils/modal-stack.js";
+import { emitModalCloseTransitionEnd as Ao } from "./utils/modal-close-transition.js";
+import $o from "../../../assets/svg/close.svg.js";
+const Do = ["aria-tt-id", "data-testid"], Fo = ["data-testid"], ft = /* @__PURE__ */ Ue({
   name: "TtModal",
   __name: "RenderModal",
   props: {
-    ...ue,
-    ...Po,
+    ...ne,
+    ...ho,
     /** modalApi */
     modalApi: {
       type: Object,
@@ -44,291 +44,264 @@ const _o = ["aria-tt-id", "data-testid"], Ro = ["data-testid"], yt = /* @__PURE_
     }
   },
   emits: ["visible-change", "register", "update:visible"],
-  setup(be, { expose: Ce, emit: Te }) {
-    var se;
-    const u = be, D = Te, y = C(), { prefixCls: ke } = fo("modal"), p = Qe(), ye = Xe(), o = Ge(), X = C(!1), f = C(), F = C(), h = C(null), L = go();
-    let s = u.modalApi;
-    if (!s) {
-      const e = u.okButtonProps ? {
-        ...u.okButtonProps,
-        disabledTip: Array.isArray(u.okButtonProps.disabledTip) ? u.okButtonProps.disabledTip : u.okButtonProps.disabledTip ? [u.okButtonProps.disabledTip] : void 0
+  setup(ce, { expose: fe, emit: me }) {
+    var le;
+    const d = ce, M = me, h = T(), { prefixCls: ve } = ao("modal"), p = qe(), ge = Ke(), t = Ye(), U = T(!1), q = T(), A = T(), be = co();
+    let r = d.modalApi;
+    if (!r) {
+      const e = d.okButtonProps ? {
+        ...d.okButtonProps,
+        disabledTip: Array.isArray(d.okButtonProps.disabledTip) ? d.okButtonProps.disabledTip : d.okButtonProps.disabledTip ? [d.okButtonProps.disabledTip] : void 0
       } : void 0, l = {
-        ...u,
+        ...d,
         okButtonProps: e
       };
-      s = new So(l), s.useStore = (n) => {
-        const r = n ?? ((i) => i);
-        return ko(s.store, r);
+      r = new ko(l), r.useStore = (i) => {
+        const s = i ?? ((n) => n);
+        return go(r.store, s);
       };
     }
-    const m = (se = s.useStore) == null ? void 0 : se.call(s), {
-      visible: g,
-      title: G,
-      width: W,
-      size: ee,
-      fullscreen: he,
-      resizer: Oe,
-      top: Pe,
-      isBottom: oe,
-      draggable: Se,
-      showCancelBtn: Be,
-      okText: Me,
-      cancelText: Ie,
+    const m = (le = r.useStore) == null ? void 0 : le.call(r), {
+      visible: b,
+      title: K,
+      width: Y,
+      size: J,
+      fullscreen: Ce,
+      resizer: Te,
+      top: he,
+      isBottom: Q,
+      draggable: ke,
+      showCancelBtn: ye,
+      okText: Oe,
+      cancelText: Be,
       okButtonProps: B,
-      cancelButtonProps: Ae,
-      confirmLoading: $e,
-      cancelLoading: xe,
-      showOkBtn: De,
-      loading: w,
-      height: Fe,
-      showFooter: te,
-      loadingTip: Le,
-      ...we
-    } = mo(u, m), Ee = v(() => {
+      cancelButtonProps: Pe,
+      confirmLoading: Se,
+      cancelLoading: Ie,
+      showOkBtn: Me,
+      loading: X,
+      height: Ae,
+      showFooter: G,
+      loadingTip: $e,
+      ...De
+    } = uo(d, m), Fe = f(() => {
       const e = {
         mini: "448px",
         small: "592px",
         medium: "876px"
       };
-      return t(W) ? t(W) : e[t(ee)] ? e[t(ee)] : "500px";
-    }), E = v(() => {
-      var ae;
-      const e = vo(we), l = pe(p, ["onVisibleChange", "onClose", "onClosed", "onOk", "onReceiveSharedData"]), r = {
-        ...Y(e, Object.keys(ue)),
+      return o(Y) ? o(Y) : e[o(J)] ? e[o(J)] : "500px";
+    }), $ = f(() => {
+      var se;
+      const e = po(De), l = ae(p, ["onVisibleChange", "onClose", "onClosed", "onOk", "onReceiveSharedData"]), s = {
+        ...j(e, Object.keys(ne)),
         ...l
-      }, i = r.appendToBody === !0 || r["append-to-body"] === !0 || r["append-to-body"] === "", d = r.appendTo && r.appendTo !== "body" ? r.appendTo : void 0, S = !i && !d, R = S ? F.value : void 0;
-      let k = null;
-      R ? k = R === ((ae = Eo()) == null ? void 0 : ae.body) ? null : R : S && (k = ce());
-      const H = !!k, Ke = i || !d && !k, Ye = H || t(oe) ? "40px" : "15vh";
+      }, n = s.appendToBody === !0 || s["append-to-body"] === !0 || s["append-to-body"] === "", u = s.appendTo && s.appendTo !== "body" ? s.appendTo : void 0, O = !n && !u, w = O ? A.value : void 0;
+      let C = null;
+      w ? C = w === ((se = Mo()) == null ? void 0 : se.body) ? null : w : O && (C = de());
+      const x = !!C, Ne = n || !u && !C, Ze = x || o(Q) ? "40px" : "15vh";
       return {
-        ...r,
-        modelValue: t(g),
-        width: t(Ee),
+        ...s,
+        modelValue: o(b),
+        width: o(Fe),
         destroyOnClose: !0,
         // 默认 false；可通过 modalProps.closeOnClickModal 开启点击遮罩关闭
         closeOnClickModal: e.closeOnClickModal ?? !1,
         // 禁用 element-plus 原生 ESC 关闭，改由 modal-stack 统一管理：
         // 1. 多弹窗时逐个关闭；2. 表单聚焦时 ESC 不关闭弹窗
         closeOnPressEscape: !1,
-        top: t(Pe) ?? Ye,
+        top: o(he) ?? Ze,
         fullscreen: !1,
         draggable: !1,
         // 外部显式指定优先；否则用打开时申请到的层级，element-plus 自己的 nextZIndex 不参与决策
-        zIndex: r.zIndex ?? f.value,
-        appendToBody: Ke,
-        ...d ? { appendTo: d } : k ? { appendTo: k } : { appendTo: "body" },
+        zIndex: s.zIndex ?? q.value,
+        appendToBody: Ne,
+        ...u ? { appendTo: u } : C ? { appendTo: C } : { appendTo: "body" },
         // 区域遮罩不锁整页滚动，避免侧栏能点却滚不动
-        lockScroll: H ? r.lockScroll ?? !1 : r.lockScroll ?? !0,
+        lockScroll: x ? s.lockScroll ?? !1 : s.lockScroll ?? !0,
         modalClass: [
-          r.modalClass || e.modalClass || "",
-          Bo,
-          `tt-id-${o == null ? void 0 : o.uid}`,
-          H ? J : ""
+          s.modalClass || e.modalClass || "",
+          yo,
+          `tt-id-${t == null ? void 0 : t.uid}`,
+          x ? H : ""
         ].filter(Boolean).join(" ")
       };
-    }), ze = v(() => {
+    }), we = f(() => {
       var l;
-      return String(((l = E.value) == null ? void 0 : l.modalClass) || "").includes(J);
-    }), Ve = v(() => ({
-      showCancelBtn: t(Be),
-      okText: t(Me),
-      cancelText: t(Ie),
-      okButtonProps: t(B),
-      cancelButtonProps: t(Ae),
-      confirmLoading: t($e),
-      cancelLoading: t(xe),
-      showOkBtn: t(De)
-    })), le = v(() => {
-      var i, d;
-      const e = (i = t(B)) == null ? void 0 : i.disabled, l = t(w), n = (d = t(B)) == null ? void 0 : d.disabledTip, r = Array.isArray(n) ? n : n ? [n] : [];
-      return e || l ? [!0, r] : [!1, []];
+      return String(((l = $.value) == null ? void 0 : l.modalClass) || "").includes(H);
+    }), xe = f(() => ({
+      showCancelBtn: o(ye),
+      okText: o(Oe),
+      cancelText: o(Be),
+      okButtonProps: o(B),
+      cancelButtonProps: o(Pe),
+      confirmLoading: o(Se),
+      cancelLoading: o(Ie),
+      showOkBtn: o(Me)
+    })), W = f(() => {
+      var n, u;
+      const e = (n = o(B)) == null ? void 0 : n.disabled, l = o(X), i = (u = o(B)) == null ? void 0 : u.disabledTip, s = Array.isArray(i) ? i : i ? [i] : [];
+      return e || l ? [!0, s] : [!1, []];
     });
-    j(
+    ie(
       () => {
         var e;
         return (e = m.value) == null ? void 0 : e.visible;
       },
       (e) => {
         var l;
-        e && (F.value = Mo(o == null ? void 0 : o.uid, ce()) ?? void 0, f.value = wo(L)), e !== g.value && (D("visible-change", !!e), D("update:visible", !!e)), o && ((l = O.emitVisible) == null || l.call(O, !!e, o == null ? void 0 : o.uid)), o != null && o.uid && (e ? (Ue(), b.value || ge({ uid: o.uid, close: () => s.onClosed() }), Io(), $(() => {
-          (o == null ? void 0 : o.uid) != null && (V(o.uid), b.value && (a == null || a(), a = fe(o.uid)), requestAnimationFrame(() => {
-            (o == null ? void 0 : o.uid) != null && (V(o.uid), b.value && Ao(o.uid));
+        e && (A.value = Oo(t == null ? void 0 : t.uid, de()) ?? void 0, q.value = Io(be)), e !== b.value && (M("visible-change", !!e), M("update:visible", !!e)), t && ((l = k.emitVisible) == null || l.call(k, !!e, t == null ? void 0 : t.uid)), t != null && t.uid && (e ? (He(), v.value || pe({ uid: t.uid, close: () => r.onClosed() }), Bo(), L(() => {
+          (t == null ? void 0 : t.uid) != null && (N(t.uid), v.value && (a == null || a(), a = ue(t.uid)), requestAnimationFrame(() => {
+            (t == null ? void 0 : t.uid) != null && (N(t.uid), v.value && Po(t.uid));
           }));
-        })) : (re(), _(), Q(o.uid))), e || s.changeOkLoading(!1);
+        })) : (ee(), Z(t.uid))), e || r.changeOkLoading(!1);
       },
       {
         immediate: !1
       }
-    ), j(
-      () => t(w),
-      (e, l) => {
-        var n;
-        l && !e && (o == null ? void 0 : o.uid) != null && (t(g) || (n = m.value) != null && n.visible) && $(() => {
-          const r = o == null ? void 0 : o.uid;
-          if (r == null) return;
-          const i = document.querySelector(`.el-overlay.tt-id-${r}`);
-          if (!i) return;
-          const d = me(i);
-          (f.value == null || d > f.value) && (f.value = d), ve(L, d);
-        });
-      }
-    ), j(
-      () => t(g),
+    ), ie(
+      () => o(b),
       (e) => {
         var l;
-        e !== ((l = m.value) == null ? void 0 : l.visible) && s.setState({ visible: e }), e || s.changeOkLoading(!1);
+        e !== ((l = m.value) == null ? void 0 : l.visible) && r.setState({ visible: e }), e || r.changeOkLoading(!1);
       },
       {
         immediate: !1
       }
     );
-    function _e(e) {
-      X.value = e;
+    function Le(e) {
+      U.value = e;
     }
-    function Re() {
-      zo(s);
+    function Ee() {
+      Ao(r);
     }
-    function He() {
+    function Ve() {
       document.querySelectorAll(".el-select__popper").forEach((l) => {
         l.style.display !== "none" && (l.style.display = "none");
       });
     }
-    function z(e) {
+    function D(e) {
       return e.toLowerCase().includes("modal") ? e : `modal-${e}`;
     }
-    function je() {
+    function _e() {
       const e = p["data-testid"] || p.dataTestid || p.testId || p["test-id"];
       return e && typeof e == "string" ? e : void 0;
     }
-    const M = v(() => {
-      var i;
-      const e = (i = m.value) == null ? void 0 : i.testId;
+    const P = f(() => {
+      var n;
+      const e = (n = m.value) == null ? void 0 : n.testId;
       if (e)
-        return z(e);
-      const l = u.testId;
+        return D(e);
+      const l = d.testId;
       if (l)
-        return z(l);
-      const n = je();
-      if (n)
-        return z(n);
-      const r = t(G);
-      return r && typeof r == "string" && r.trim() ? K("modal", Co(r)) : o != null && o.uid ? `modal-${o.uid}` : "modal";
-    }), Ze = v(() => K(M.value, "footer")), qe = v(() => K(M.value, "body"));
-    eo("modalIdContext", M);
-    const O = We({
-      setModalProps: s.setState,
+        return D(l);
+      const i = _e();
+      if (i)
+        return D(i);
+      const s = o(K);
+      return s && typeof s == "string" && s.trim() ? R("modal", mo(s)) : t != null && t.uid ? `modal-${t.uid}` : "modal";
+    }), ze = f(() => R(P.value, "footer")), Re = f(() => R(P.value, "body"));
+    Qe("modalIdContext", P);
+    const k = Je({
+      setModalProps: r.setState,
       emitVisible: void 0,
       redoModalHeight: () => {
-        $(() => {
-          t(y) && t(y).setModalHeight();
+        L(() => {
+          o(h) && o(h).setModalHeight();
         });
       },
       scrollToBottom: () => {
         var e;
-        t(y) && ((e = t(y)) == null || e.onScrollBottom());
+        o(h) && ((e = o(h)) == null || e.onScrollBottom());
       }
     });
-    o && D("register", O, `${o == null ? void 0 : o.uid}`);
-    const b = C(!1), I = C(null);
-    let a, P;
-    function A() {
+    t && M("register", k, `${t == null ? void 0 : t.uid}`);
+    const v = T(!1), S = T(null);
+    let a, y;
+    function F() {
       var l;
-      return String(((l = E.value) == null ? void 0 : l.modalClass) || "").includes(J);
+      return String(((l = $.value) == null ? void 0 : l.modalClass) || "").includes(H);
     }
-    function Ne() {
-      var l, n;
-      const e = o == null ? void 0 : o.appContext.config.globalProperties.$router;
-      return ((n = (l = e == null ? void 0 : e.currentRoute) == null ? void 0 : l.value) == null ? void 0 : n.path) ?? null;
+    function je() {
+      var l, i;
+      const e = t == null ? void 0 : t.appContext.config.globalProperties.$router;
+      return ((i = (l = e == null ? void 0 : e.currentRoute) == null ? void 0 : l.value) == null ? void 0 : i.path) ?? null;
     }
-    function Ue() {
-      if (!A()) {
-        I.value = null;
+    function He() {
+      if (!F()) {
+        S.value = null;
         return;
       }
-      I.value = Ne();
+      S.value = je();
     }
-    function re() {
-      a == null || a(), a = void 0, b.value = !1, I.value = null;
+    function ee() {
+      a == null || a(), a = void 0, v.value = !1, S.value = null;
     }
-    function V(e) {
-      $o(e), xo(e);
-      const l = document.querySelector(`.el-overlay.tt-id-${e}`);
-      if (l) {
-        const r = me(l);
-        (f.value == null || r > f.value) && (f.value = r), ve(L, r);
-      }
-      if (!A()) return;
-      const n = l == null ? void 0 : l.parentElement;
-      !n || n === document.body || h.value || (Do(n), h.value = n);
-    }
-    function _() {
-      h.value && (Fo(h.value), h.value = null);
-    }
-    function ne() {
-      var n;
-      const e = o == null ? void 0 : o.uid;
-      e == null || !(t(g) || (n = m.value) != null && n.visible) || !A() || (b.value = !0, a == null || a(), a = fe(e), Q(e), _());
+    function oe() {
+      var i;
+      const e = t == null ? void 0 : t.uid;
+      e == null || !(o(b) || (i = m.value) != null && i.visible) || !F() || (v.value = !0, a == null || a(), a = ue(e), Z(e));
     }
-    function ie() {
-      var n;
-      const e = o == null ? void 0 : o.uid;
-      e == null || !b.value || (a == null || a(), a = void 0, b.value = !1, !!!(t(g) || (n = m.value) != null && n.visible)) || (Lo(e), ge({ uid: e, close: () => s.onClosed() }), $(() => V(e)));
+    function te() {
+      var i;
+      const e = t == null ? void 0 : t.uid;
+      e == null || !v.value || (a == null || a(), a = void 0, v.value = !1, !!!(o(b) || (i = m.value) != null && i.visible)) || (So(e), pe({ uid: e, close: () => r.onClosed() }), L(() => N(e)));
     }
-    return oo(() => {
-      const e = Y(p, ["onVisibleChange", "onClosed", "onOk"]);
-      s.mount(
+    return Xe(() => {
+      const e = j(p, ["onVisibleChange", "onClosed", "onOk"]);
+      r.mount(
         {
           ...e,
           onClosed: e.onClosed || p.onCancel || p.onClose
         },
-        O
+        k
       );
-      const l = o == null ? void 0 : o.appContext.config.globalProperties.$router;
-      l != null && l.afterEach && (P = l.afterEach((n, r) => {
-        var S;
-        if (!(n != null && n.path) || n.path === (r == null ? void 0 : r.path) || !A() || !!!(t(g) || (S = m.value) != null && S.visible)) return;
-        const d = I.value;
-        d && (n.path !== d ? ne() : ie());
+      const l = t == null ? void 0 : t.appContext.config.globalProperties.$router;
+      l != null && l.afterEach && (y = l.afterEach((i, s) => {
+        var O;
+        if (!(i != null && i.path) || i.path === (s == null ? void 0 : s.path) || !F() || !!!(o(b) || (O = m.value) != null && O.visible)) return;
+        const u = S.value;
+        u && (i.path !== u ? oe() : te());
       }));
-    }), to(() => {
-      ne();
-    }), lo(() => {
-      ie();
-    }), ro(() => {
-      re(), _(), P == null || P(), P = void 0, F.value = void 0, o != null && o.uid && Q(o.uid);
-    }), Ce({
-      modalApi: s
+    }), Ge(() => {
+      oe();
+    }), We(() => {
+      te();
+    }), eo(() => {
+      ee(), y == null || y(), y = void 0, A.value = void 0, t != null && t.uid && Z(t.uid);
+    }), fe({
+      modalApi: r
     }), (e, l) => {
-      var n;
-      return no((so(), io("div", {
-        "aria-tt-id": `tt-id-${(n = t(o)) == null ? void 0 : n.uid}`,
-        "data-testid": M.value
+      var i;
+      return oo((lo(), to("div", {
+        "aria-tt-id": `tt-id-${(i = o(t)) == null ? void 0 : i.uid}`,
+        "data-testid": P.value
       }, [
-        x(t(bo), de(E.value, {
-          class: ["tt-ui-modal", t(ke)],
-          "before-close": t(s).onClosed,
-          onClosed: Re,
-          "close-icon": () => ao(t(co), {
+        I(o(fo), re($.value, {
+          class: ["tt-ui-modal", o(ve)],
+          "before-close": o(r).onClosed,
+          onClosed: Ee,
+          "close-icon": () => so(o(no), {
             size: 16,
-            icon: t(Vo),
+            icon: o($o),
             isCustomSvg: !0
           })
-        }), Z({
+        }), E({
           default: c(() => [
-            x(Oo, {
+            I(To, {
               ref_key: "modalWrapperRef",
-              ref: y,
-              "is-bottom": t(oe),
-              height: t(Fe),
-              loading: t(w),
-              "loading-tip": t(Le),
-              contained: ze.value,
-              class: uo({ "pb-2!": !t(te) }),
-              "data-testid": qe.value,
-              onIsScroll: _e
+              ref: h,
+              "is-bottom": o(Q),
+              height: o(Ae),
+              loading: o(X),
+              "loading-tip": o($e),
+              contained: we.value,
+              class: io({ "pb-2!": !o(G) }),
+              "data-testid": Re.value,
+              onIsScroll: Le
             }, {
               default: c(() => [
-                T(e.$slots, "default")
+                g(e.$slots, "default")
               ]),
               _: 3
             }, 8, ["is-bottom", "height", "loading", "loading-tip", "contained", "class", "data-testid"])
@@ -338,63 +311,63 @@ const _o = ["aria-tt-id", "data-testid"], Ro = ["data-testid"], yt = /* @__PURE_
           e.$slots.header ? {
             name: "header",
             fn: c(() => [
-              T(e.$slots, "header")
+              g(e.$slots, "header")
             ]),
             key: "1"
           } : {
             name: "header",
             fn: c(() => [
-              x(ho, {
-                title: t(G),
-                onMousedown: He
-              }, Z({
+              I(Co, {
+                title: o(K),
+                onMousedown: Ve
+              }, E({
                 titleToolbar: c(() => [
-                  T(e.$slots, "titleToolbar")
+                  g(e.$slots, "titleToolbar")
                 ]),
                 _: 2
               }, [
-                q(Object.keys(e.$slots), (r) => ({
-                  name: r,
-                  fn: c((i) => [
-                    T(e.$slots, r, N(U(i || {})))
+                V(Object.keys(e.$slots), (s) => ({
+                  name: s,
+                  fn: c((n) => [
+                    g(e.$slots, s, _(z(n || {})))
                   ])
                 }))
               ]), 1032, ["title"])
             ]),
             key: "0"
           },
-          t(ye).footer || t(te) ? {
+          o(ge).footer || o(G) ? {
             name: "footer",
             fn: c(() => [
-              T(e.$slots, "footer", {}, () => [
-                po("div", { "data-testid": Ze.value }, [
-                  x(yo, de(Ve.value, {
+              g(e.$slots, "footer", {}, () => [
+                ro("div", { "data-testid": ze.value }, [
+                  I(bo, re(xe.value, {
                     class: "footer",
-                    style: { borderTop: X.value ? "1px solid var(--tt-modal-footer-border-color)" : "none" },
+                    style: { borderTop: U.value ? "1px solid var(--tt-modal-footer-border-color)" : "none" },
                     "ok-button-props": {
-                      ...t(B),
-                      disabledTip: le.value[1],
-                      disabled: le.value[0]
+                      ...o(B),
+                      disabledTip: W.value[1],
+                      disabled: W.value[0]
                     },
-                    onFooterok: t(s).onOk,
-                    onCancel: t(s).onClosed
-                  }), Z({ _: 2 }, [
-                    q(Object.keys(
-                      t(Y)(e.$slots, ["beforeFooter", "insertFooter", "centerFooter", "appendFooter"])
-                    ), (r) => ({
-                      name: r,
-                      fn: c((i) => [
-                        T(e.$slots, r, N(U({ ...i || {} })))
+                    onFooterok: o(r).onOk,
+                    onCancel: o(r).onClosed
+                  }), E({ _: 2 }, [
+                    V(Object.keys(
+                      o(j)(e.$slots, ["beforeFooter", "insertFooter", "centerFooter", "appendFooter"])
+                    ), (s) => ({
+                      name: s,
+                      fn: c((n) => [
+                        g(e.$slots, s, _(z({ ...n || {} })))
                       ])
                     }))
                   ]), 1040, ["style", "ok-button-props", "onFooterok", "onCancel"])
-                ], 8, Ro)
+                ], 8, Fo)
               ])
             ]),
             key: "2"
           } : void 0,
-          q(Object.keys(
-            t(pe)(e.$slots, [
+          V(Object.keys(
+            o(ae)(e.$slots, [
               "default",
               "titleToolbar",
               "header",
@@ -404,24 +377,24 @@ const _o = ["aria-tt-id", "data-testid"], Ro = ["data-testid"], yt = /* @__PURE_
               "centerFooter",
               "appendFooter"
             ])
-          ), (r) => ({
-            name: r,
-            fn: c((i) => [
-              T(e.$slots, r, N(U(i || {})))
+          ), (s) => ({
+            name: s,
+            fn: c((n) => [
+              g(e.$slots, s, _(z(n || {})))
             ])
           }))
         ]), 1040, ["class", "before-close", "close-icon"])
-      ], 8, _o)), [
-        [t(To), {
-          draggable: t(Se),
-          fullscreen: t(he),
-          resizer: t(Oe),
-          resizeChange: t(p).resizeChange
+      ], 8, Do)), [
+        [o(vo), {
+          draggable: o(ke),
+          fullscreen: o(Ce),
+          resizer: o(Te),
+          resizeChange: o(p).resizeChange
         }]
       ]);
     };
   }
 });
 export {
-  yt as default
+  ft as default
 };

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

@@ -3,13 +3,6 @@ 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,26 +1,24 @@
-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);
+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);
 }
-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 I(n, e) {
+  const { currentZIndex: d, nextZIndex: l } = n;
+  let t = 0;
+  for (; d.value <= e && t < c; )
+    l(), t += 1;
 }
 function u(n) {
   const e = Math.max(
     n.nextZIndex(),
-    M() + o,
-    t + o
+    s() + a,
+    o + a
   );
-  return t = e, s(n, e), e;
+  return o = e, I(n, e), e;
 }
 export {
   u as allocateModalZIndex,
-  M as getOpenModalMaxZIndex,
-  s as syncElementPlusZIndexAbove
+  s as getOpenModalMaxZIndex
 };

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

@@ -5,19 +5,6 @@ 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 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) {
+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) {
   var r;
   if (typeof t > "u") return;
   const o = `
-.el-overlay.${c},
-.el-overlay.${c} .el-overlay-dialog {
+.el-overlay.${a},
+.el-overlay.${a} .el-overlay-dialog {
   position: absolute !important;
   inset: 0 !important;
   height: 100% !important;
 }
-.el-overlay.${c} .el-overlay-dialog {
+.el-overlay.${a} .el-overlay-dialog {
   overflow: auto !important;
 }
-.el-overlay.${c} .tt-ui-modal.el-dialog {
+.el-overlay.${a} .tt-ui-modal.el-dialog {
   --tt-modal-contained-top: 40px;
   --tt-modal-contained-bottom: 24px;
   margin-top: var(--tt-modal-contained-top) !important;
@@ -24,197 +24,164 @@ function I(t = document) {
   flex-direction: column !important;
   overflow: hidden !important;
 }
-.el-overlay.${c} .tt-ui-modal.el-dialog .el-dialog__header,
-.el-overlay.${c} .tt-ui-modal.el-dialog .el-dialog__footer {
+.el-overlay.${a} .tt-ui-modal.el-dialog .el-dialog__header,
+.el-overlay.${a} .tt-ui-modal.el-dialog .el-dialog__footer {
   flex-shrink: 0;
 }
-.el-overlay.${c} .tt-ui-modal.el-dialog .el-dialog__body {
+.el-overlay.${a} .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.${c} .tt-ui-modal.el-dialog .tt-modal-wrapper {
+.el-overlay.${a} .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(v);
+  let e = t.getElementById(y);
   if (e) {
     e.textContent = o;
     return;
   }
-  (r = t.getElementById("tt-modal-overlay-contained-style")) == null || r.remove(), e = t.createElement("style"), e.id = v, e.textContent = o;
+  (r = t.getElementById("tt-modal-overlay-contained-style")) == null || r.remove(), e = t.createElement("style"), e.id = y, e.textContent = o;
   const n = t.head || t.documentElement;
   n == null || n.appendChild(e);
 }
-function g(t) {
+function f(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 h(t) {
+function v(t) {
   ["position", "top", "right", "bottom", "left", "height"].forEach((o) => t.style.removeProperty(o));
 }
-function P(t, o = document) {
+function w(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(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);
+  if (!e.classList.contains(a) && !r) {
+    v(e), n && v(n);
     return;
   }
-  t.setAttribute(d, String(o - 1));
+  f(e), n && f(n);
 }
-function S(t, o = document) {
+function g(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 z(t, o = document, e = 3e3) {
-  if (S(t, o)) return () => {
+function B(t, o = document, e = 3e3) {
+  if (g(t, o)) return () => {
   };
   const n = o.body || o.documentElement;
   if (!n) return () => {
   };
   let r = !1;
   const i = () => {
-    r || (r = !0, s.disconnect(), clearTimeout(l));
+    r || (r = !0, s.disconnect(), clearTimeout(c));
   }, s = new MutationObserver(() => {
-    S(t, o) && i();
+    g(t, o) && i();
   });
   s.observe(n, { childList: !0, subtree: !0 });
-  const l = window.setTimeout(i, e);
+  const c = window.setTimeout(i, e);
   return i;
 }
-function V(t, o = document) {
+function D(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"), P(t, o), O(t, o));
+  !e || e.dataset.ttModalSuspended !== "1" || (delete e.dataset.ttModalSuspended, e.style.removeProperty("display"), w(t, o));
 }
-function m(t) {
+function h(t) {
   const o = t.style.zIndex || getComputedStyle(t).zIndex, e = Number.parseInt(o, 10);
   return Number.isNaN(e) ? 0 : e;
 }
-function N(t) {
-  const o = t ?? b();
-  return o ? Array.from(_(o).querySelectorAll(`.${A}`)).filter(
+function I(t) {
+  const o = t ?? S();
+  return o ? Array.from(C(o).querySelectorAll(`.${E}`)).filter(
     (e) => e.isConnected && e.dataset.ttModalSuspended !== "1" && e.style.display !== "none"
   ) : [];
 }
-function Y(t, o, e) {
-  const n = b(), r = o ?? (n == null ? void 0 : n.body);
+function H(t, o, e) {
+  const n = S(), r = o ?? (n == null ? void 0 : n.body);
   if (!n || !r) return null;
-  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);
+  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);
   });
-  return s.length === 0 ? null : s.reduce((a, u) => m(u) >= m(a) ? u : a).parentElement;
+  return s.length === 0 ? null : s.reduce((l, u) => h(u) >= h(l) ? u : l).parentElement;
 }
-function x(t) {
+function P(t) {
   return t.isConnected ? t.getClientRects().length > 0 : !1;
 }
 function T(t) {
-  return t.isConnected ? (t.clientHeight || t.getBoundingClientRect().height) >= w : !1;
+  return t.isConnected ? (t.clientHeight || t.getBoundingClientRect().height) >= A : !1;
 }
-function L(t) {
+function x(t) {
   const o = window.innerHeight || document.documentElement.clientHeight || 0;
   if (o === 0) return !0;
   const e = t.getBoundingClientRect();
-  return e.height > o + y ? !1 : e.top >= -y;
+  return e.height > o + m ? !1 : e.top >= -m;
 }
-function f(t) {
+function p(t) {
   return !!t.closest("micro-app-body");
 }
-function p(t, o = !0) {
-  return !t || !t.isConnected || o && !T(t) || o && !x(t) ? null : t;
+function d(t, o = !0) {
+  return !t || !t.isConnected || o && !T(t) || o && !P(t) ? null : t;
 }
-function R(t) {
+function N(t) {
   getComputedStyle(t).position === "static" && (t.style.position = "relative");
 }
-function $() {
+function R() {
   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`), l = p(s, !1);
-    if (l) return l;
+    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 o = document.querySelector("#app");
   if (o) {
-    const i = p(o, !1);
+    const i = d(o, !1);
     return i || o;
   }
   const e = document.querySelector("micro-app-body #app");
   if (e) {
-    const i = p(e, !1);
+    const i = d(e, !1);
     if (i) return i;
   }
   const n = document.body;
-  return n && (n.tagName === "MICRO-APP-BODY" || f(n)) ? n : document.querySelector("micro-app-body");
+  return n && (n.tagName === "MICRO-APP-BODY" || p(n)) ? n : document.querySelector("micro-app-body");
 }
-function q() {
+function $() {
   const t = document.querySelector("#app-content");
-  if (t && !f(t)) {
-    const e = p(t, !0);
+  if (t && !p(t)) {
+    const e = d(t, !0);
     if (e) return e;
   }
   const o = document.querySelectorAll("#app");
   for (const e of Array.from(o)) {
     const n = e;
-    if (f(n)) continue;
-    const r = p(n, !0);
+    if (p(n)) continue;
+    const r = d(n, !0);
     if (r) return r;
   }
   return null;
 }
-function G() {
+function V() {
   if (typeof document > "u") return null;
-  I();
-  const t = window.__MICRO_APP_ENVIRONMENT__ ? $() : q();
-  return !t || !L(t) ? null : (R(t), t);
+  M();
+  const t = window.__MICRO_APP_ENVIRONMENT__ ? R() : $();
+  return !t || !x(t) ? null : (N(t), t);
 }
 export {
-  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
+  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
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.6.39",
+  "version": "1.6.41",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -69,8 +69,8 @@
     "vue-router": "^5.0.2",
     "vxe-pc-ui": "^4.14.15",
     "vxe-table": "^4.18.13",
-    "@dazhicheng/hooks": "1.4.57",
-    "@dazhicheng/utils": "1.3.54"
+    "@dazhicheng/hooks": "1.4.59",
+    "@dazhicheng/utils": "1.3.56"
   },
   "files": [
     "dist"