@dazhicheng/ui 1.6.44 → 1.6.46

package/dist/components/tt-modal/src/hooks/useModalRender.js

@@ -1,37 +1,38 @@
-import { useStore as h } from "@tanstack/vue-store";
-import { reactive as x, ref as _, defineComponent as M, provide as w, nextTick as T, h as i, inject as E, onMounted as S, render as y } from "vue";
-import { RouterView as g } from "vue-router";
-import v from "../RenderModal.vue.js";
+import { useStore as y } from "@tanstack/vue-store";
+import { reactive as w, ref as E, defineComponent as A, provide as O, nextTick as T, h as f, inject as b, getCurrentScope as x, effectScope as g, onScopeDispose as R, render as v, onMounted as k } from "vue";
+import { RouterView as L } from "vue-router";
+import h from "../RenderModal.vue.js";
 /* empty css                  */
-import { ModalApi as O } from "../utils/modal-api.js";
-import { onModalCloseTransitionEnd as k } from "../utils/modal-close-transition.js";
-import { resolveModalTarget as P } from "../utils/resolve-modal-target.js";
-const R = Symbol("Tt_MODAL_INJECT"), L = {};
-function K(n = {}, c = R) {
-  var m;
-  const { connectedComponent: r } = n;
-  if (r) {
-    const e = x({}), d = _(!0);
-    return [M(
-      (u, { attrs: C, slots: A }) => (w(c, {
-        extendApi(b) {
-          Object.setPrototypeOf(e, b);
+import { ModalApi as S } from "../utils/modal-api.js";
+import { onModalCloseTransitionEnd as P } from "../utils/modal-close-transition.js";
+import { resolveModalTarget as V } from "../utils/resolve-modal-target.js";
+import { modalOwnerActive as N, MODAL_OWNER_ACTIVE_KEY as D } from "../utils/modal-scope.js";
+const I = Symbol("Tt_MODAL_INJECT"), j = {};
+function H(t = {}, l = I) {
+  var p;
+  const { connectedComponent: n } = t;
+  if (n) {
+    const e = w({}), s = E(!0);
+    return [A(
+      (m, { attrs: u, slots: M }) => (O(l, {
+        extendApi(_) {
+          Object.setPrototypeOf(e, _);
         },
-        options: n,
+        options: t,
         async reCreateModal() {
-          d.value = !1, await T(), d.value = !0;
+          s.value = !1, await T(), s.value = !0;
         }
-      }), V(e, {
+      }), J(e, {
+        ...m,
         ...u,
-        ...C,
-        ...A
-      }), () => i(
-        d.value ? r : "div",
+        ...M
+      }), () => f(
+        s.value ? n : "div",
         {
-          ...u,
-          ...C
+          ...m,
+          ...u
         },
-        A
+        M
       )),
       {
         name: "TtModal",
@@ -39,93 +40,93 @@ function K(n = {}, c = R) {
       }
     ), e];
   }
-  const o = E(c, {}), t = {
-    ...L,
+  const o = b(l, {}), r = {
+    ...j,
     ...o.options,
-    ...n
+    ...t
   };
-  t.onVisibleChange = (e) => {
-    var d, a, u;
-    (d = n.onVisibleChange) == null || d.call(n, e), (u = (a = o.options) == null ? void 0 : a.onVisibleChange) == null || u.call(a, e);
+  r.onVisibleChange = (e) => {
+    var s, i, m;
+    (s = t.onVisibleChange) == null || s.call(t, e), (m = (i = o.options) == null ? void 0 : i.onVisibleChange) == null || m.call(i, e);
   };
-  const s = t.onClosed;
-  t.onClosed = () => {
+  const c = r.onClosed;
+  r.onClosed = () => {
     var e;
-    s == null || s(), t.destroyOnClose && ((e = o.reCreateDrawer) == null || e.call(o));
+    c == null || c(), r.destroyOnClose && ((e = o.reCreateDrawer) == null || e.call(o));
   };
-  const f = new O(t), l = f;
-  l.useStore = (e) => h(f.store, e);
-  const p = M(
-    (e, { attrs: d, slots: a }) => () => i(
-      v,
+  const d = new S(r), a = d;
+  a.useStore = (e) => y(d.store, e);
+  const C = A(
+    (e, { attrs: s, slots: i }) => () => f(
+      h,
       {
         ...e,
-        ...d,
-        modalApi: l
+        ...s,
+        modalApi: a
       },
-      a
+      i
     ),
     {
       name: "TtModal",
       inheritAttrs: !1
     }
   );
-  return (m = o.extendApi) == null || m.call(o, l), [p, l];
+  return (p = o.extendApi) == null || p.call(o, a), [C, a];
 }
-function q(n, c, r) {
-  const o = new O(r), t = o;
-  t.useStore = (e) => h(o.store, e);
-  const s = document.createElement("div");
-  (r.appendToBody ? document.body : P() ?? document.body).appendChild(s);
-  const l = M(
-    (e, { slots: d }) => {
-      S(() => {
-        r && t.setModalProps(r), t.openModal();
-      });
-      const a = k(t, () => {
-        a(), y(null, s), s.remove();
-      });
-      return () => i(
-        v,
-        {
-          ...e,
-          modalApi: t
-        },
-        d
-      );
-    },
+function Q(t, l, n) {
+  const o = x(), r = o ? N.get(o) : void 0, c = new S(n), d = c;
+  d.useStore = (u) => y(c.store, u);
+  const a = document.createElement("div");
+  (n.appendToBody ? document.body : V() ?? document.body).appendChild(a);
+  const p = g(), e = P(d, () => p.stop());
+  p.run(() => {
+    R(() => {
+      e(), v(null, a), a.remove();
+    });
+  });
+  const s = A(
+    (u, { slots: M }) => (r && O(D, r), k(() => {
+      n && d.setModalProps(n), d.openModal();
+    }), () => f(
+      h,
+      {
+        ...u,
+        modalApi: d
+      },
+      M
+    )),
     {
       name: "TtModal",
       inheritAttrs: !1
     }
-  ), p = i(c, {}), m = i(
-    g,
+  ), i = f(l, {}), m = f(
+    L,
     {},
-    () => i(
-      l,
+    () => f(
+      s,
       {
-        ...r
+        ...n
       },
       {
-        default: () => p
+        default: () => i
       }
     )
   );
-  return m.appContext = n._context, y(m, s), t;
+  return m.appContext = t._context, v(m, a), d;
 }
-async function V(n, c) {
-  var t;
-  if (!c || Object.keys(c).length === 0)
+async function J(t, l) {
+  var r;
+  if (!l || Object.keys(l).length === 0)
     return;
   await T();
-  const r = (t = n == null ? void 0 : n.store) == null ? void 0 : t.state;
-  if (!r)
+  const n = (r = t == null ? void 0 : t.store) == null ? void 0 : r.state;
+  if (!n)
     return;
-  const o = new Set(Object.keys(r));
-  for (const s of Object.keys(c))
-    o.has(s) && ["class"].includes(s);
+  const o = new Set(Object.keys(n));
+  for (const c of Object.keys(l))
+    o.has(c) && ["class"].includes(c);
 }
 export {
-  q as showTtModal,
-  K as useModalRender
+  Q as showTtModal,
+  H as useModalRender
 };

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

@@ -1,19 +1,32 @@
-import { inject as e } from "vue";
+import { inject as n, getCurrentScope as u, shallowRef as c, computed as d, onActivated as i, onDeactivated as f } from "vue";
 import { showTtModal as M } from "./hooks/useModalRender.js";
-import { setModalHostApp as d } from "./utils/modal-host-app.js";
-const t = Symbol("SHOW_MODAL");
-function f(o) {
-  d(o);
-  const r = (n, s) => M(o, n, s);
-  o.provide(t, r);
+import { setModalHostApp as w } from "./utils/modal-host-app.js";
+import { MODAL_OWNER_ACTIVE_KEY as m, modalOwnerActive as v } from "./utils/modal-scope.js";
+const s = Symbol("SHOW_MODAL");
+function A(t) {
+  w(t);
+  const o = (e, r) => M(t, e, r);
+  t.provide(s, o);
 }
-function m() {
-  const o = e(t);
-  if (!o)
+function E() {
+  const t = n(s);
+  if (!t)
     throw new Error("[TtModal]: useShowModal() 需要先调用 setupModal(app) 进行注册");
-  return o;
+  const o = u(), e = c(!0), r = n(m, void 0);
+  return o && v.set(
+    o,
+    d(() => e.value && (r == null ? void 0 : r.value) !== !1)
+  ), i(() => {
+    e.value = !0;
+  }), f(() => {
+    e.value = !1;
+  }), (a, l) => {
+    if (o && !o.active)
+      throw new Error("[TtModal]: 页面已销毁，不能再打开弹窗");
+    return o ? o.run(() => t(a, l)) : t(a, l);
+  };
 }
 export {
-  f as setupModal,
-  m as useShowModal
+  A as setupModal,
+  E as useShowModal
 };

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

@@ -1,7 +1,8 @@
-/**
- * 微前端隔离工具。组件库被抽成共享依赖时多个子应用共用模块级状态，
- * 因此模块级注册表都要按子应用分桶。
- */
+import { EffectScope, InjectionKey, Ref } from 'vue';
+/** 命令式弹窗从调用方作用域继承激活状态，WeakMap 不延长页面寿命。 */
+export declare const modalOwnerActive: WeakMap<EffectScope, Readonly<Ref<boolean, boolean>>>;
+/** 独立挂载的弹窗向内容组件传递所属页面状态，支持嵌套弹窗。 */
+export declare const MODAL_OWNER_ACTIVE_KEY: InjectionKey<Readonly<Ref<boolean>>>;
 /** 当前作用域标识：子应用用 micro-app name，宿主页面用 host */
 export declare function getModalScopeKey(): string;
 /**

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

@@ -1,20 +1,23 @@
-function c() {
+const c = /* @__PURE__ */ new WeakMap(), i = Symbol("TtModalOwnerActive");
+function r() {
   return typeof window > "u" ? "host" : window.__MICRO_APP_NAME__ || "host";
 }
-function u(t) {
+function u(e) {
   var n;
-  const o = t.body ?? t.documentElement, e = (n = o == null ? void 0 : o.getRootNode) == null ? void 0 : n.call(o);
-  return e instanceof Document ? e : t;
+  const o = e.body ?? e.documentElement, t = (n = o == null ? void 0 : o.getRootNode) == null ? void 0 : n.call(o);
+  return t instanceof Document ? t : e;
 }
-function i() {
+function s() {
   return typeof document > "u" ? void 0 : document;
 }
-function r(t, o) {
-  return t.closest("micro-app-body") === o.closest("micro-app-body");
+function d(e, o) {
+  return e.closest("micro-app-body") === o.closest("micro-app-body");
 }
 export {
-  i as getClientDocument,
-  c as getModalScopeKey,
-  r as isSameMicroAppScope,
+  i as MODAL_OWNER_ACTIVE_KEY,
+  s as getClientDocument,
+  r as getModalScopeKey,
+  d as isSameMicroAppScope,
+  c as modalOwnerActive,
   u as resolveScanDocument
 };

package/dist/components/tt-modal-form/index.vue.js

@@ -1,7 +1,7 @@
-import { defineComponent as H, useSlots as J, ref as K, computed as C, toValue as Q, nextTick as y, watch as W, createBlock as M, openBlock as B, unref as d, createSlots as P, withCtx as A, renderSlot as h, createVNode as X, renderList as S, normalizeProps as b, guardReactiveProps as V, createCommentVNode as Y } from "vue";
+import { defineComponent as H, useSlots as J, ref as F, computed as K, toValue as Q, nextTick as y, watch as W, createBlock as C, openBlock as B, unref as d, createSlots as P, withCtx as A, renderSlot as g, createVNode as X, renderList as S, normalizeProps as b, guardReactiveProps as V, createCommentVNode as Y } from "vue";
 import "axios";
 import { ElCheckbox as Z, ElMessage as O } from "element-plus";
-import { isFunction as m } from "../../packages/utils/src/is.js";
+import { isFunction as n } from "../../packages/utils/src/is.js";
 import "dayjs";
 import "numeral";
 import "xe-utils";
@@ -31,7 +31,7 @@ import "../tt-form/src/shared/zod-defaults.js";
 import { useGroupForm as te } from "../tt-form/src/group-form/useGroupForm.js";
 import "../tt-modal/index.js";
 import { useModalFormSlot as ie } from "./hooks/useModalFormSlot.js";
-import { useModalRender as ne } from "../tt-modal/src/hooks/useModalRender.js";
+import { useModalRender as se } from "../tt-modal/src/hooks/useModalRender.js";
 const xe = /* @__PURE__ */ H({
   name: "TtModalForm",
   __name: "index",
@@ -40,6 +40,7 @@ const xe = /* @__PURE__ */ H({
     model: {},
     addApi: {},
     editApi: {},
+    successMessage: {},
     infoApi: {},
     infoApiBefore: {},
     infoApiAfter: {},
@@ -58,21 +59,21 @@ const xe = /* @__PURE__ */ H({
   },
   emits: ["submit", "fetch", "getinfo"],
   setup(I, { emit: D }) {
-    var w, F;
-    const o = I, p = D, L = J(), f = K(), r = K(!1), { getFormSlotKeys: T, getModalSlotKeys: E, replaceFormSlotKey: R, replaceModalSlotKey: _ } = ie(L), x = C(() => E.value.filter(Boolean)), $ = C(() => T.value.filter(Boolean)), v = {
+    var M, w;
+    const o = I, m = D, L = J(), c = F(), r = F(!1), { getFormSlotKeys: T, getModalSlotKeys: E, replaceFormSlotKey: R, replaceModalSlotKey: _ } = ie(L), x = K(() => E.value.filter(Boolean)), $ = K(() => T.value.filter(Boolean)), h = {
       showDefaultActions: !1,
       ...Q(o.formProps)
-    }, [z, s] = o.renderType === "groupForm" ? te(v) : oe(v), [N, a] = ne({
+    }, [z, l] = o.renderType === "groupForm" ? te(h) : oe(h), [N, a] = se({
       ...o.modalProps,
       onReceiveSharedData: async (e) => {
         if (!e) {
-          f.value = void 0;
+          c.value = void 0;
           return;
         }
-        if (e.schemas && s.setState({ schema: e.schemas }), e != null && e.title && a.setModalProps({ title: e.title }), f.value = e[o.infoApiIdKey], e != null && e[o.infoApiIdKey]) {
+        if (e.schemas && l.setState({ schema: e.schemas }), e != null && e.title && a.setModalProps({ title: e.title }), c.value = e[o.infoApiIdKey], e != null && e[o.infoApiIdKey]) {
           const i = o.infoApi;
-          if (!m(i)) {
-            g(e);
+          if (!n(i)) {
+            v(e);
             return;
           }
           a.changeLoading(!0);
@@ -80,83 +81,92 @@ const xe = /* @__PURE__ */ H({
             const t = {
               ...o.infoApiParams,
               [o.infoApiIdKey]: e[o.infoApiIdKey]
-            }, n = m(o.infoApiBefore) ? await o.infoApiBefore(t) : t, l = await i(n), c = o.dataField ? ee(l, o.dataField) : l, u = m(o.infoApiAfter) ? await o.infoApiAfter(c) : c;
-            k(u), p("getinfo", u), await y(), await s.resetForm({ values: u });
+            }, s = n(o.infoApiBefore) ? await o.infoApiBefore(t) : t, u = await i(s), p = o.dataField ? ee(u, o.dataField) : u, f = n(o.infoApiAfter) ? await o.infoApiAfter(p) : p;
+            k(f), m("getinfo", f), await y(), await l.resetForm({ values: f });
           } finally {
             a.changeLoading(!1);
           }
         } else
-          g(e);
+          v(e);
       },
       async onOk() {
         await q();
       }
     });
-    function g(e) {
+    function v(e) {
       const i = e[o.infoDataKey || ""] || {};
       k(i), y(() => {
-        s.resetForm({ values: i });
+        l.resetForm({ values: i });
       });
     }
     function k(e) {
       const i = Object.keys(o.checkedOptions || {});
       i.length && i.forEach((t) => {
-        var u;
-        const n = (u = o.checkedOptions) == null ? void 0 : u[t];
-        if (!Array.isArray(n) || n.length === 0)
+        var f;
+        const s = (f = o.checkedOptions) == null ? void 0 : f[t];
+        if (!Array.isArray(s) || s.length === 0)
           return;
-        const [l, c] = n.length === 1 ? [n[0], n[0]] : n;
-        !l || !c || (e[t] = {
-          label: e[l],
-          value: e[c]
+        const [u, p] = s.length === 1 ? [s[0], s[0]] : s;
+        !u || !p || (e[t] = {
+          label: e[u],
+          value: e[p]
         });
       });
     }
     async function j() {
-      const e = await s.getValues(), { apiParams: i } = o;
+      const e = await l.getValues(), { apiParams: i } = o;
       let t = {
         ...e,
         ...i
       };
-      return t = m(o.saveApiBefore) ? await o.saveApiBefore(t) : t, { reqParams: t, formValue: e };
+      return t = n(o.saveApiBefore) ? await o.saveApiBefore(t) : t, { reqParams: t, formValue: e };
     }
     async function G(e, i) {
       const { editApi: t } = o;
-      !t || !m(t) || (e[o.infoApiIdKey] = f.value, await t(e, i.files), O.success("修改成功"), p("submit", {
+      if (!t || !n(t)) return;
+      e[o.infoApiIdKey] = c.value;
+      const s = await t(e, i.files);
+      O.success(
+        n(o.successMessage) ? o.successMessage(s, "edit") : o.successMessage ?? "修改成功"
+      ), m("submit", {
         ...e,
         continuousChecked: r.value
-      }), a.closeModal());
+      }), a.closeModal();
     }
     async function U(e, i) {
       const { addApi: t } = o;
-      !t || !m(t) || (await t(e, i.files), O.success("新增成功"), p("submit", {
+      if (!t || !n(t)) return;
+      const s = await t(e, i.files);
+      O.success(
+        n(o.successMessage) ? o.successMessage(s, "add") : o.successMessage ?? "新增成功"
+      ), m("submit", {
         ...e,
         continuousChecked: r.value
-      }), (!r.value || !o.isContinuousChecked) && a.closeModal());
+      }), (!r.value || !o.isContinuousChecked) && a.closeModal();
     }
     async function q() {
       a.changeOkLoading(!0);
       try {
-        const { valid: e } = await s.validate();
+        const { valid: e } = await l.validate();
         if (!e) return;
         const { reqParams: i, formValue: t } = await j();
         if (!i)
           return;
-        const { addApi: n, editApi: l } = o;
-        if (!n && !l) {
-          p("submit", {
+        const { addApi: s, editApi: u } = o;
+        if (!s && !u) {
+          m("submit", {
             ...i,
-            [o.infoApiIdKey]: f.value,
+            [o.infoApiIdKey]: c.value,
             continuousChecked: r.value
           });
           return;
         }
-        f.value ? await G(i, t) : await U(i, t);
+        c.value ? await G(i, t) : await U(i, t);
       } finally {
         a.changeOkLoading(!1);
       }
     }
-    return (w = o.getFormApi) == null || w.call(o, s), (F = o.getModalApi) == null || F.call(o, a), W(
+    return (M = o.getFormApi) == null || M.call(o, l), (w = o.getModalApi) == null || w.call(o, a), W(
       () => {
         var e;
         return (e = a.getVisible) == null ? void 0 : e.value;
@@ -164,14 +174,14 @@ const xe = /* @__PURE__ */ H({
       async (e) => {
         if (e) {
           await y();
-          const i = await s.getValues();
-          p("fetch", i);
+          const i = await l.getValues();
+          m("fetch", i);
         } else
           r.value = !1;
       }
-    ), (e, i) => (B(), M(d(N), null, P({
+    ), (e, i) => (B(), C(d(N), null, P({
       insertFooter: A(() => [
-        o.isContinuousChecked && !f.value ? (B(), M(d(Z), {
+        o.isContinuousChecked && !c.value ? (B(), C(d(Z), {
           key: 0,
           modelValue: r.value,
           "onUpdate:modelValue": i[0] || (i[0] = (t) => r.value = t),
@@ -180,12 +190,12 @@ const xe = /* @__PURE__ */ H({
         }, null, 8, ["modelValue"])) : Y("", !0)
       ]),
       default: A(() => [
-        h(e.$slots, "BasicMsgTop"),
+        g(e.$slots, "BasicMsgTop"),
         X(d(z), null, P({ _: 2 }, [
           S($.value, (t) => ({
             name: d(R)(t),
-            fn: A((n) => [
-              h(e.$slots, t, b(V(n)))
+            fn: A((s) => [
+              g(e.$slots, t, b(V(s)))
             ])
           }))
         ]), 1024)
@@ -194,8 +204,8 @@ const xe = /* @__PURE__ */ H({
     }, [
       S(x.value, (t) => ({
         name: d(_)(t),
-        fn: A((n) => [
-          h(e.$slots, t, b(V(n)))
+        fn: A((s) => [
+          g(e.$slots, t, b(V(s)))
         ])
       }))
     ]), 1024));

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

@@ -20,6 +20,8 @@ export type TtModalFormProps<TType extends ModalFormType = "form", TValues exten
     addApi?: (...arg: any[]) => Promise<any>;
     /** 编辑保存接口 */
     editApi?: (...arg: any[]) => Promise<any>;
+    /** 保存成功提示；函数接收保存接口返回值及操作类型，不传时使用新增/修改默认文案。 */
+    successMessage?: string | ((result: unknown, type: "add" | "edit") => string);
     /** 详情接口 */
     infoApi?: (...arg: any[]) => Promise<any>;
     /** 详情接口前置钩子 */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.6.44",
+  "version": "1.6.46",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",