@dazhicheng/ui 1.6.19 → 1.6.21

package/dist/components/tt-modal/src/utils/modal-stack.js

@@ -1,28 +1,39 @@
+import { getModalScopeKey as i } from "./modal-scope.js";
 const n = [];
+function a() {
+  const e = i();
+  return n.filter((t) => t.scope === e).map((t) => t.uid);
+}
 let r = !1;
-function u(e) {
+function s(e) {
   if (!e || !(e instanceof HTMLElement)) return !1;
   const t = e.tagName;
   return !!(t === "INPUT" || t === "TEXTAREA" || t === "SELECT" || e.isContentEditable || e.closest(
     ".el-select, .el-select-v2, .el-cascader, .el-date-editor, .el-time-picker, .el-color-picker, .el-input, .el-textarea, .el-autocomplete, .el-input-number, .el-mention"
   ));
 }
-function i(e) {
+function c(e) {
   if (e.key !== "Escape" && e.key !== "Esc" || n.length === 0) return;
   const t = e.target ?? document.activeElement;
-  if (u(t))
+  if (s(t))
     return;
   const o = n[n.length - 1];
   o && (e.stopPropagation(), o.close());
 }
-function l(e) {
-  c(e.uid), n.push(e), !r && typeof document < "u" && (document.addEventListener("keydown", i), r = !0);
+function d(e) {
+  l(e.uid), n.push({ ...e, scope: i() }), !r && typeof document < "u" && (document.addEventListener("keydown", c), r = !0);
 }
-function c(e) {
+function f() {
+  const e = i();
+  n.filter((t) => t.scope === e).reverse().forEach((t) => t.close());
+}
+function l(e) {
   const t = n.findIndex((o) => o.uid === e);
-  t !== -1 && n.splice(t, 1), n.length === 0 && r && typeof document < "u" && (document.removeEventListener("keydown", i), r = !1);
+  t !== -1 && n.splice(t, 1), n.length === 0 && r && typeof document < "u" && (document.removeEventListener("keydown", c), r = !1);
 }
 export {
-  l as pushModal,
-  c as removeModal
+  f as closeAllModals,
+  a as getOpenModalUids,
+  d as pushModal,
+  l as removeModal
 };

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

@@ -0,0 +1,15 @@
+import { useZIndex } from 'element-plus';
+/** element-plus 层级计数器句柄，必须由组件在 setup 里取才能继承 ElConfigProvider 的基准 */
+export type ElementPlusZIndex = ReturnType<typeof useZIndex>;
+/** 当前已打开弹窗里的最高层级 */
+export declare function getOpenModalMaxZIndex(): number;
+/**
+ * 申请一个高于当前所有已打开弹窗的层级。
+ *
+ * 起点取 element-plus 的 nextZIndex，保证 ElConfigProvider 配的基准仍生效；
+ * 但它是模块级计数器，微前端下多份 element-plus 各自起算会让后开的拿到更小的值，
+ * 所以再用页面上已打开遮罩的实际层级兜一层。
+ * @param elementPlusZIndex 计数器句柄
+ * @returns 本次弹窗应使用的 z-index
+ */
+export declare function allocateModalZIndex(elementPlusZIndex: ElementPlusZIndex): number;

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

@@ -0,0 +1,24 @@
+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 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(),
+    s() + a,
+    o + a
+  );
+  return o = e, I(n, e), e;
+}
+export {
+  u as allocateModalZIndex,
+  s as getOpenModalMaxZIndex
+};

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

@@ -1,4 +1,6 @@
 export declare const MODAL_OVERLAY_CONTAINED_CLASS = "tt-modal-overlay--contained";
+/** 遮罩的稳定标记类。modal 为 false 时 element-plus 不输出 el-overlay，故不能用它定位 */
+export declare const MODAL_OVERLAY_CLASS = "tt-modal-overlay";
 /** 注入全局样式，避免仅依赖 Vue SFC / scopecss 导致 absolute 未生效 */
 export declare function ensureContainedOverlayStyle(doc?: Document): void;
 /** 用内联样式强制区域遮罩，压过 EP 的 position:fixed（含内部 overlay-dialog） */
@@ -12,6 +14,18 @@ export declare function suspendOverlayByUid(uid: string | number, doc?: Document
 export declare function watchOverlayThenSuspend(uid: string | number, doc?: Document, timeoutMs?: number): () => void;
 /** KeepAlive / 切回：恢复未关闭的弹窗遮罩 */
 export declare function resumeOverlayByUid(uid: string | number, doc?: Document): void;
+/** 读取遮罩的层级数值，auto / 空值按 0 计 */
+export declare function readOverlayZIndex(el: HTMLElement): number;
+/** 页面上仍显示着的弹窗遮罩，切页挂起的不算；扫真实 document 以覆盖其它子应用 */
+export declare function getOpenModalOverlays(doc?: Document): HTMLElement[];
+/**
+ * 已打开弹窗中层级最高的那个遮罩所在的容器。
+ * 后开的弹窗挂到同一容器层级才可比——不同容器可能分属不同 stacking context。
+ * @param excludeUid 排除自身的组件 uid
+ * @param ownTarget 自身挂载目标，用于限制在同一子应用内
+ * @param doc 起点 document
+ */
+export declare function findTopOpenModalOverlayHost(excludeUid?: number, ownTarget?: HTMLElement | null, doc?: Document): HTMLElement | null;
 /**
  * 解析弹窗 Teleport 目标。无可用节点时返回 null，由调用方回退 body。
  * 子应用只要处在 micro 环境，尽量返回内容区节点（含 micro-app-body），以便加 contained class。

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

@@ -1,5 +1,7 @@
-const a = "tt-modal-overlay--contained", u = "tt-modal-overlay-contained-style-v2";
-function y(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 = `
@@ -40,112 +42,146 @@ function y(t = document) {
   overflow: auto !important;
 }
 `.trim();
-  let e = t.getElementById(u);
+  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 = u, 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 p(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 f(t, o = document) {
+function v(t) {
+  ["position", "top", "right", "bottom", "left", "height"].forEach((o) => t.style.removeProperty(o));
+}
+function w(t, o = document) {
   const e = o.querySelector(`.el-overlay.tt-id-${t}`);
   if (!e) return;
-  const n = !!e.closest("micro-app-body");
-  if (!e.classList.contains(a) && !n) return;
-  p(e);
-  const r = e.querySelector(".el-overlay-dialog");
-  r && p(r);
+  const n = e.querySelector(".el-overlay-dialog"), r = !!e.closest("micro-app-body");
+  if (!e.classList.contains(a) && !r) {
+    v(e), n && v(n);
+    return;
+  }
+  f(e), n && f(n);
 }
-function m(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 b(t, o = document, e = 3e3) {
-  if (m(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(d));
+    r || (r = !0, s.disconnect(), clearTimeout(c));
   }, s = new MutationObserver(() => {
-    m(t, o) && i();
+    g(t, o) && i();
   });
   s.observe(n, { childList: !0, subtree: !0 });
-  const d = window.setTimeout(i, e);
+  const c = window.setTimeout(i, e);
   return i;
 }
-function C(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"), f(t, o));
+  !e || e.dataset.ttModalSuspended !== "1" || (delete e.dataset.ttModalSuspended, e.style.removeProperty("display"), w(t, o));
 }
-function v(t) {
+function h(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(
+    (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);
+  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);
+  });
+  return s.length === 0 ? null : s.reduce((l, u) => h(u) >= h(l) ? u : l).parentElement;
+}
+function P(t) {
   return t.isConnected ? t.getClientRects().length > 0 : !1;
 }
-function g(t) {
-  return t.isConnected ? (t.clientHeight || t.getBoundingClientRect().height) >= 48 : !1;
+function T(t) {
+  return t.isConnected ? (t.clientHeight || t.getBoundingClientRect().height) >= A : !1;
 }
-function c(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 + m ? !1 : e.top >= -m;
+}
+function p(t) {
   return !!t.closest("micro-app-body");
 }
-function l(t, o = !0) {
-  return !t || !t.isConnected || o && !g(t) || o && !v(t) ? null : t;
+function d(t, o = !0) {
+  return !t || !t.isConnected || o && !T(t) || o && !P(t) ? null : t;
 }
-function h(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`), d = l(s, !1);
-    if (d) return d;
+    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 = l(o, !1);
+    const i = d(o, !1);
     return i || o;
   }
   const e = document.querySelector("micro-app-body #app");
   if (e) {
-    const i = l(e, !1);
+    const i = d(e, !1);
     if (i) return i;
   }
   const n = document.body;
-  return n && (n.tagName === "MICRO-APP-BODY" || c(n)) ? n : document.querySelector("micro-app-body");
+  return n && (n.tagName === "MICRO-APP-BODY" || p(n)) ? n : document.querySelector("micro-app-body");
 }
-function S() {
+function $() {
   const t = document.querySelector("#app-content");
-  if (t && !c(t)) {
-    const e = l(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 (c(n)) continue;
-    const r = l(n, !0);
+    if (p(n)) continue;
+    const r = d(n, !0);
     if (r) return r;
   }
   return null;
 }
-function A() {
+function V() {
   if (typeof document > "u") return null;
-  y();
-  const t = window.__MICRO_APP_ENVIRONMENT__ ? _() : S();
-  return t && h(t), t;
+  M();
+  const t = window.__MICRO_APP_ENVIRONMENT__ ? R() : $();
+  return !t || !x(t) ? null : (N(t), t);
 }
 export {
+  E as MODAL_OVERLAY_CLASS,
   a as MODAL_OVERLAY_CONTAINED_CLASS,
-  f as applyContainedOverlayInline,
-  y as ensureContainedOverlayStyle,
-  A as resolveModalTarget,
-  C as resumeOverlayByUid,
-  m as suspendOverlayByUid,
-  b as watchOverlayThenSuspend
+  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/dist/components/tt-modal-form/props.d.ts

@@ -1,9 +1,14 @@
-import { GroupFormApi, TtExtendedFormApi, TtFormProps, UseGroupFormOptions } from '../tt-form';
+import { ExtendedGroupFormApi, TtExtendedFormApi, TtFormProps, UseGroupFormOptions } from '../tt-form';
 import { ModalApiOptions, TtModalExtendedModalApi } from '../tt-modal';
 /** modal-form 使用的表单类型。 */
 export type ModalFormType = "form" | "groupForm";
-/** modal-form 对外暴露的表单 API 类型。 */
-export type ModalFormApi<TType extends ModalFormType = "form"> = TType extends "groupForm" ? GroupFormApi : TtExtendedFormApi;
+/**
+ * modal-form 对外暴露的表单 API 类型。
+ *
+ * `TValues` 跟着 `formProps` 走，`getFormApi` 拿到的 api 上 `getValues` / `setState({ schema })`
+ * 等方法也按业务的值类型收窄。
+ */
+export type ModalFormApi<TType extends ModalFormType = "form", TValues extends Record<string, any> = Record<string, any>> = TType extends "groupForm" ? ExtendedGroupFormApi<TValues> : TtExtendedFormApi<TValues>;
 /** 根据表单类型收窄的表单配置。 */
 type ModalFormProps<TValues extends Record<string, any>, TType extends ModalFormType> = TType extends "groupForm" ? Partial<UseGroupFormOptions<TValues>> : Partial<TtFormProps<TValues>>;
 export type TtModalFormProps<TType extends ModalFormType = "form", TValues extends Record<string, any> = Record<string, any>> = {
@@ -40,7 +45,7 @@ export type TtModalFormProps<TType extends ModalFormType = "form", TValues exten
     /** modal props */
     modalProps?: ModalApiOptions;
     /** 获取formApi的回调 */
-    getFormApi?: (api: ModalFormApi<TType>) => void;
+    getFormApi?: (api: ModalFormApi<TType, TValues>) => void;
     /** 获取modalApi的回调 */
     getModalApi?: (api: TtModalExtendedModalApi) => void;
     /** 处理TtSelect(非多选回显值) */

package/dist/components/tt-modal-form/useModalForm.d.ts

@@ -2,6 +2,6 @@ import { TtModalExtendedModalApi } from '../tt-modal';
 import { ModalFormApi, ModalFormType, TtModalFormProps } from './props';
 /** 创建普通表单或分组表单的弹窗表单。 */
 export declare function useModalForm<TType extends ModalFormType = "form", TValues extends Record<string, any> = Record<string, any>>(options: TtModalFormProps<TType, TValues>): readonly [import('vue').DefineSetupFnComponent<Partial<TtModalFormProps<ModalFormType>>, {}, {}, Partial<TtModalFormProps<ModalFormType>> & {}, import('vue').PublicProps>, {
-    readonly formApi: import('vue').Ref<ModalFormApi<TType> | undefined, ModalFormApi<TType> | undefined>;
+    readonly formApi: import('vue').Ref<ModalFormApi<TType, TValues> | undefined, ModalFormApi<TType, TValues> | undefined>;
     readonly modalApi: import('vue').Ref<TtModalExtendedModalApi | undefined, TtModalExtendedModalApi | undefined>;
 }];

package/dist/components/tt-table/index.d.ts

@@ -207,6 +207,10 @@ export declare const TtTable: import('../../../../utils/src').SFCWithInstall<{
             type: import('vue').PropType<import('.').TtTableProps["beforeFetch"]>;
             default: null;
         };
+        beforePageChange: {
+            type: import('vue').PropType<import('.').TtTableProps["beforePageChange"]>;
+            default: null;
+        };
         data: {
             type: import('vue').PropType<import('.').TtTableProps["data"]>;
             default: () => import('.').TtTableProps["data"];
@@ -523,6 +527,7 @@ export declare const TtTable: import('../../../../utils/src').SFCWithInstall<{
         api: (...arg: any[]) => Promise<any>;
         afterFetch: ((data: any[], res: Recordable | Recordable[]) => Promise<any[]>) | undefined;
         beforeFetch: ((params: Recordable) => Promise<Recordable>) | undefined;
+        beforePageChange: ((page: import("vxe-table").VxeGridPropTypes.PagerConfig) => boolean | Promise<boolean>) | undefined;
     }, true, {}, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, {
         wrapRef: HTMLDivElement;
         xGrid: (import('vxe-table').VxeGridMethods<any> & {
@@ -894,6 +899,10 @@ export declare const TtTable: import('../../../../utils/src').SFCWithInstall<{
             type: import('vue').PropType<import('.').TtTableProps["beforeFetch"]>;
             default: null;
         };
+        beforePageChange: {
+            type: import('vue').PropType<import('.').TtTableProps["beforePageChange"]>;
+            default: null;
+        };
         data: {
             type: import('vue').PropType<import('.').TtTableProps["data"]>;
             default: () => import('.').TtTableProps["data"];
@@ -1208,6 +1217,7 @@ export declare const TtTable: import('../../../../utils/src').SFCWithInstall<{
         api: (...arg: any[]) => Promise<any>;
         afterFetch: ((data: any[], res: Recordable | Recordable[]) => Promise<any[]>) | undefined;
         beforeFetch: ((params: Recordable) => Promise<Recordable>) | undefined;
+        beforePageChange: ((page: import("vxe-table").VxeGridPropTypes.PagerConfig) => boolean | Promise<boolean>) | undefined;
     }>;
     __isFragment?: never;
     __isTeleport?: never;
@@ -1312,6 +1322,10 @@ export declare const TtTable: import('../../../../utils/src').SFCWithInstall<{
         type: import('vue').PropType<import('.').TtTableProps["beforeFetch"]>;
         default: null;
     };
+    beforePageChange: {
+        type: import('vue').PropType<import('.').TtTableProps["beforePageChange"]>;
+        default: null;
+    };
     data: {
         type: import('vue').PropType<import('.').TtTableProps["data"]>;
         default: () => import('.').TtTableProps["data"];
@@ -1628,6 +1642,7 @@ export declare const TtTable: import('../../../../utils/src').SFCWithInstall<{
     api: (...arg: any[]) => Promise<any>;
     afterFetch: ((data: any[], res: Recordable | Recordable[]) => Promise<any[]>) | undefined;
     beforeFetch: ((params: Recordable) => Promise<Recordable>) | undefined;
+    beforePageChange: ((page: import("vxe-table").VxeGridPropTypes.PagerConfig) => boolean | Promise<boolean>) | undefined;
 }, {}, string, {}, import('vue').GlobalComponents, import('vue').GlobalDirectives, string, import('vue').ComponentProvideOptions> & import('vue').VNodeProps & import('vue').AllowedComponentProps & import('vue').ComponentCustomProps & (new () => {
     $slots: Readonly<{
         [key: string]: (props: import('../../../../utils/src').Recordable) => void;

package/dist/components/tt-table/src/Table.vue.d.ts

@@ -393,6 +393,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: import('vue').PropType<TtTableProps["beforeFetch"]>;
         default: null;
     };
+    beforePageChange: {
+        type: import('vue').PropType<TtTableProps["beforePageChange"]>;
+        default: null;
+    };
     data: {
         type: import('vue').PropType<TtTableProps["data"]>;
         default: () => TtTableProps["data"];
@@ -744,6 +748,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: import('vue').PropType<TtTableProps["beforeFetch"]>;
         default: null;
     };
+    beforePageChange: {
+        type: import('vue').PropType<TtTableProps["beforePageChange"]>;
+        default: null;
+    };
     data: {
         type: import('vue').PropType<TtTableProps["data"]>;
         default: () => TtTableProps["data"];
@@ -967,6 +975,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     api: (...arg: any[]) => Promise<any>;
     afterFetch: ((data: any[], res: globalThis.Recordable | globalThis.Recordable[]) => Promise<any[]>) | undefined;
     beforeFetch: ((params: globalThis.Recordable) => Promise<globalThis.Recordable>) | undefined;
+    beforePageChange: ((page: import("vxe-table").VxeGridPropTypes.PagerConfig) => boolean | Promise<boolean>) | undefined;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {
     wrapRef: HTMLDivElement;
     xGrid: (import('vxe-table').VxeGridMethods<any> & {