@dazhicheng/ui 1.6.43 → 1.6.45

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.43",
+  "version": "1.6.45",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",