@dazhicheng/ui 1.5.228 → 1.5.229

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

@@ -1,2 +1,2 @@
 export * from './useModalForm';
-export type { TtModalFormProps } from './props';
+export type { ModalFormApi, ModalFormType, TtModalFormProps } from './props';

package/dist/components/tt-modal-form/index.vue.d.ts

@@ -1,5 +1,6 @@
 import { Recordable } from '../../../../utils/src';
-import { TtModalFormProps } from './props';
+import { ModalFormType, TtModalFormProps } from './props';
+import { TtFormProps, UseGroupFormOptions } from '../tt-form';
 declare function __VLS_template(): {
     attrs: Partial<{}>;
     slots: Readonly<{
@@ -17,20 +18,21 @@ declare function __VLS_template(): {
     rootEl: any;
 };
 type __VLS_TemplateResult = ReturnType<typeof __VLS_template>;
-declare const __VLS_component: import('vue').DefineComponent<Partial<TtModalFormProps>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
+declare const __VLS_component: import('vue').DefineComponent<Partial<TtModalFormProps<ModalFormType>>, {}, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {
     submit: (data: Recordable) => any;
     fetch: (data: Recordable) => any;
     getinfo: (data: any) => any;
-}, string, import('vue').PublicProps, Readonly<Partial<TtModalFormProps>> & Readonly<{
+}, string, import('vue').PublicProps, Readonly<Partial<TtModalFormProps<ModalFormType>>> & Readonly<{
     onSubmit?: ((data: Recordable) => any) | undefined;
     onFetch?: ((data: Recordable) => any) | undefined;
     onGetinfo?: ((data: any) => any) | undefined;
 }>, {
+    renderType: ModalFormType;
     dataField: string;
     infoApiIdKey: string;
     infoApiParams: globalThis.Recordable;
     apiParams: globalThis.Recordable;
-    formProps: Partial<import('../tt-form').TtFormProps>;
+    formProps: Partial<TtFormProps<Record<string, any>>> | Partial<UseGroupFormOptions<Record<string, any>>>;
     isContinuousChecked: boolean;
     checkedOptions: Record<string, any>;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {}, any>;

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

@@ -1,7 +1,7 @@
-import { defineComponent as G, useSlots as H, ref as K, computed as F, toValue as J, nextTick as y, watch as Q, createBlock as C, openBlock as M, unref as d, createSlots as B, withCtx as A, renderSlot as h, createVNode as W, renderList as P, normalizeProps as S, guardReactiveProps as b, createCommentVNode as X } from "vue";
+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 "axios";
-import { ElCheckbox as Y, ElMessage as V } from "element-plus";
-import { isFunction as u } from "../../packages/utils/src/is.js";
+import { ElCheckbox as Z, ElMessage as O } from "element-plus";
+import { isFunction as c } from "../../packages/utils/src/is.js";
 import "xe-utils";
 import "dayjs";
 import "dayjs/plugin/utc";
@@ -11,7 +11,7 @@ import "../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/aes.js";
 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 { get as Z } from "lodash-es";
+import { get as ee } from "lodash-es";
 import "../tt-select/index.js";
 import "../tt-checkbox/index.js";
 import "../tt-radio-group/index.js";
@@ -19,30 +19,21 @@ import "../tt-panel-select/index.js";
 import "../tt-upload/index.js";
 import "../tt-api-component/index.js";
 import "vee-validate";
-import { useForm as ee } from "../tt-form/src/useForm.js";
+import { useForm as oe } from "../tt-form/src/useForm.js";
 import "zod";
 import "@vee-validate/zod";
 import "@tanstack/vue-store";
 import "es-toolkit/compat";
 import "../tt-form/src/shared/zod-defaults.js";
-import "../tt-nav-anchor/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 "../tt-icon/index.js";
-import "../tt-form/src/components/Slot.js";
-import "../tt-form-item-error-tooltip/index.js";
-import "@vueuse/core";
-/* empty css                                      */
-import "../tt-form/src/form/RenderContent.vue.js";
-import "../tt-form/src/form-render/FormFieldContact.js";
-/* empty css                                         */
-/* empty css                                      */
+import { useGroupForm as te } from "../tt-form/src/group-form/useGroupForm.js";
 import "../tt-modal/index.js";
-import { useModalFormSlot as oe } from "./hooks/useModalFormSlot.js";
-import { useModalRender as te } from "../tt-modal/src/hooks/useModalRender.js";
-const Ue = /* @__PURE__ */ G({
+import { useModalFormSlot as ie } from "./hooks/useModalFormSlot.js";
+import { useModalRender as ne } from "../tt-modal/src/hooks/useModalRender.js";
+const Ee = /* @__PURE__ */ H({
   name: "TtModalForm",
   __name: "index",
   props: {
+    renderType: { default: "form" },
     model: {},
     addApi: {},
     editApi: {},
@@ -63,12 +54,12 @@ const Ue = /* @__PURE__ */ G({
     checkedOptions: { default: () => ({}) }
   },
   emits: ["submit", "fetch", "getinfo"],
-  setup(I, { emit: O }) {
-    var k, w;
-    const o = I, p = O, D = H(), f = K(), r = K(!1), { getFormSlotKeys: L, getModalSlotKeys: E, replaceFormSlotKey: R, replaceModalSlotKey: _ } = oe(D), x = F(() => E.value.filter(Boolean)), T = F(() => L.value.filter(Boolean)), [$, s] = ee({
+  setup(I, { emit: D }) {
+    var w, F;
+    const o = I, m = 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 = {
       showDefaultActions: !1,
-      ...J(o.formProps)
-    }), [z, a] = te({
+      ...Q(o.formProps)
+    }, [z, s] = o.renderType === "groupForm" ? te(v) : oe(v), [N, a] = ne({
       ...o.modalProps,
       onReceiveSharedData: async (e) => {
         if (!e) {
@@ -77,8 +68,8 @@ const Ue = /* @__PURE__ */ G({
         }
         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]) {
           const i = o.infoApi;
-          if (!u(i)) {
-            v(e);
+          if (!c(i)) {
+            g(e);
             return;
           }
           a.changeLoading(!0);
@@ -86,56 +77,56 @@ const Ue = /* @__PURE__ */ G({
             const t = {
               ...o.infoApiParams,
               [o.infoApiIdKey]: e[o.infoApiIdKey]
-            }, n = u(o.infoApiBefore) ? await o.infoApiBefore(t) : t, l = await i(n), c = o.dataField ? Z(l, o.dataField) : l, m = u(o.infoApiAfter) ? await o.infoApiAfter(c) : c;
-            g(m), p("getinfo", m), await y(), await s.resetForm({ values: m });
+            }, n = c(o.infoApiBefore) ? await o.infoApiBefore(t) : t, l = await i(n), p = o.dataField ? ee(l, o.dataField) : l, u = c(o.infoApiAfter) ? await o.infoApiAfter(p) : p;
+            k(u), m("getinfo", u), await y(), await s.resetForm({ values: u });
           } finally {
             a.changeLoading(!1);
           }
         } else
-          v(e);
+          g(e);
       },
       async onOk() {
         await q();
       }
     });
-    function v(e) {
+    function g(e) {
       const i = e[o.infoDataKey || ""] || {};
-      g(i), y(() => {
+      k(i), y(() => {
         s.resetForm({ values: i });
       });
     }
-    function g(e) {
+    function k(e) {
       const i = Object.keys(o.checkedOptions || {});
       i.length && i.forEach((t) => {
-        var m;
-        const n = (m = o.checkedOptions) == null ? void 0 : m[t];
+        var u;
+        const n = (u = o.checkedOptions) == null ? void 0 : u[t];
         if (!Array.isArray(n) || n.length === 0)
           return;
-        const [l, c] = n.length === 1 ? [n[0], n[0]] : n;
-        !l || !c || (e[t] = {
+        const [l, p] = n.length === 1 ? [n[0], n[0]] : n;
+        !l || !p || (e[t] = {
           label: e[l],
-          value: e[c]
+          value: e[p]
         });
       });
     }
-    async function N() {
+    async function j() {
       const e = await s.getValues(), { apiParams: i } = o;
       let t = {
         ...e,
         ...i
       };
-      return t = u(o.saveApiBefore) ? await o.saveApiBefore(t) : t, { reqParams: t, formValue: e };
+      return t = c(o.saveApiBefore) ? await o.saveApiBefore(t) : t, { reqParams: t, formValue: e };
     }
-    async function j(e, i) {
+    async function G(e, i) {
       const { editApi: t } = o;
-      !t || !u(t) || (e[o.infoApiIdKey] = f.value, await t(e, i.files), V.success("修改成功"), p("submit", {
+      !t || !c(t) || (e[o.infoApiIdKey] = f.value, await t(e, i.files), O.success("修改成功"), m("submit", {
         ...e,
         continuousChecked: r.value
       }), a.closeModal());
     }
     async function U(e, i) {
       const { addApi: t } = o;
-      !t || !u(t) || (await t(e, i.files), V.success("新增成功"), p("submit", {
+      !t || !c(t) || (await t(e, i.files), O.success("新增成功"), m("submit", {
         ...e,
         continuousChecked: r.value
       }), (!r.value || !o.isContinuousChecked) && a.closeModal());
@@ -145,24 +136,24 @@ const Ue = /* @__PURE__ */ G({
       try {
         const { valid: e } = await s.validate();
         if (!e) return;
-        const { reqParams: i, formValue: t } = await N();
+        const { reqParams: i, formValue: t } = await j();
         if (!i)
           return;
         const { addApi: n, editApi: l } = o;
         if (!n && !l) {
-          p("submit", {
+          m("submit", {
             ...i,
             [o.infoApiIdKey]: f.value,
             continuousChecked: r.value
           });
           return;
         }
-        f.value ? await j(i, t) : await U(i, t);
+        f.value ? await G(i, t) : await U(i, t);
       } finally {
         a.changeOkLoading(!1);
       }
     }
-    return (k = o.getFormApi) == null || k.call(o, s), (w = o.getModalApi) == null || w.call(o, a), Q(
+    return (w = o.getFormApi) == null || w.call(o, s), (F = o.getModalApi) == null || F.call(o, a), W(
       () => {
         var e;
         return (e = a.getVisible) == null ? void 0 : e.value;
@@ -171,42 +162,42 @@ const Ue = /* @__PURE__ */ G({
         if (e) {
           await y();
           const i = await s.getValues();
-          p("fetch", i);
+          m("fetch", i);
         } else
           r.value = !1;
       }
-    ), (e, i) => (M(), C(d(z), null, B({
+    ), (e, i) => (B(), M(d(N), null, P({
       insertFooter: A(() => [
-        o.isContinuousChecked && !f.value ? (M(), C(d(Y), {
+        o.isContinuousChecked && !f.value ? (B(), M(d(Z), {
           key: 0,
           modelValue: r.value,
           "onUpdate:modelValue": i[0] || (i[0] = (t) => r.value = t),
           label: "连续添加",
           size: "small"
-        }, null, 8, ["modelValue"])) : X("", !0)
+        }, null, 8, ["modelValue"])) : Y("", !0)
       ]),
       default: A(() => [
         h(e.$slots, "BasicMsgTop"),
-        W(d($), null, B({ _: 2 }, [
-          P(T.value, (t) => ({
+        X(d(z), null, P({ _: 2 }, [
+          S($.value, (t) => ({
             name: d(R)(t),
             fn: A((n) => [
-              h(e.$slots, t, S(b(n)))
+              h(e.$slots, t, b(V(n)))
             ])
           }))
         ]), 1024)
       ]),
       _: 2
     }, [
-      P(x.value, (t) => ({
+      S(x.value, (t) => ({
         name: d(_)(t),
         fn: A((n) => [
-          h(e.$slots, t, S(b(n)))
+          h(e.$slots, t, b(V(n)))
         ])
       }))
     ]), 1024));
   }
 });
 export {
-  Ue as default
+  Ee as default
 };

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

@@ -1,6 +1,14 @@
-import { TtExtendedFormApi, TtFormProps } from '../tt-form';
+import { GroupFormApi, TtExtendedFormApi, TtFormProps, UseGroupFormOptions } from '../tt-form';
 import { ModalApiOptions, TtModalExtendedModalApi } from '../tt-modal';
-export type TtModalFormProps = {
+/** modal-form 使用的表单类型。 */
+export type ModalFormType = "form" | "groupForm";
+/** modal-form 对外暴露的表单 API 类型。 */
+export type ModalFormApi<TType extends ModalFormType = "form"> = TType extends "groupForm" ? GroupFormApi : TtExtendedFormApi;
+/** 根据表单类型收窄的表单配置。 */
+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>> = {
+    /** 表单渲染类型，默认使用普通表单 */
+    renderType?: TType;
     /** model */
     model?: Recordable;
     /** 新增保存接口 */
@@ -24,7 +32,7 @@ export type TtModalFormProps = {
     /** 保存额外参数 */
     apiParams?: Recordable;
     /** formProps */
-    formProps?: Partial<TtFormProps>;
+    formProps?: ModalFormProps<TValues, TType>;
     /** 是否连续添加 */
     isContinuousChecked?: boolean;
     /** 响应结果集字段 */
@@ -32,9 +40,10 @@ export type TtModalFormProps = {
     /** modal props */
     modalProps?: ModalApiOptions;
     /** 获取formApi的回调 */
-    getFormApi?: (api: TtExtendedFormApi) => void;
+    getFormApi?: (api: ModalFormApi<TType>) => void;
     /** 获取modalApi的回调 */
     getModalApi?: (api: TtModalExtendedModalApi) => void;
     /** 处理TtSelect(非多选回显值) */
     checkedOptions?: Record<string, any>;
 };
+export {};

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

@@ -1,6 +1,7 @@
 import { TtModalExtendedModalApi } from '../tt-modal';
-import { TtModalFormProps } from './props';
-export declare function useModalForm(options: TtModalFormProps): readonly [import('vue').DefineSetupFnComponent<Partial<TtModalFormProps>, {}, {}, Partial<TtModalFormProps> & {}, import('vue').PublicProps>, {
-    readonly formApi: import('vue').Ref<import('../tt-form/src/types').ExtendedFormApi | undefined, import('../tt-form/src/types').ExtendedFormApi | undefined>;
+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 modalApi: import('vue').Ref<TtModalExtendedModalApi | undefined, TtModalExtendedModalApi | undefined>;
 }];

package/package.json

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