@dazhicheng/ui 1.5.227 → 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/dist/components/tt-table/src/TableForm.vue.js

@@ -1,39 +1,39 @@
-import { defineComponent as Ae, useSlots as Ee, ref as Oe, computed as h, toValue as A, getCurrentInstance as $e, onMounted as G, watch as O, onUnmounted as ke, createElementBlock as J, openBlock as Q, normalizeClass as L, unref as s, createCommentVNode as Re, createElementVNode as _e, createVNode as $, renderSlot as p, createSlots as K, renderList as X, withCtx as C, normalizeProps as Y, guardReactiveProps as Z, mergeProps as ee, toHandlers as Be, nextTick as Ve } from "vue";
+import { defineComponent as Me, useSlots as Ee, ref as Oe, computed as g, toValue as T, getCurrentInstance as $e, onMounted as q, watch as O, onUnmounted as ke, createElementBlock as G, openBlock as J, normalizeClass as V, unref as a, createCommentVNode as Ae, createElementVNode as Re, createVNode as $, renderSlot as p, createSlots as L, renderList as Q, withCtx as v, normalizeProps as X, guardReactiveProps as Y, mergeProps as Z, toHandlers as _e, nextTick as Be } from "vue";
 import "../../tt-button/index.js";
 import "../../tt-checkbox/index.js";
 import "../../tt-empty/index.js";
-import { kebabToCamelCase as Le } from "../../../packages/utils/src/string.js";
+import { kebabToCamelCase as Ve } from "../../../packages/utils/src/string.js";
 import "axios";
 import "element-plus";
-import { isFunction as Ke } from "../../../packages/utils/src/is.js";
-import { extractResourceFromApi as je, generateTestId as k } from "../../../packages/utils/src/testid-helper.js";
-import xe from "xe-utils";
+import { isFunction as Le } from "../../../packages/utils/src/is.js";
+import { extractResourceFromApi as Ke, generateTestId as k } from "../../../packages/utils/src/testid-helper.js";
+import je from "xe-utils";
 import "dayjs";
 import "dayjs/plugin/utc";
 import "dayjs/plugin/timezone";
-import { mergeWithArrayOverride as ze } from "../../../packages/utils/src/merge.js";
+import { mergeWithArrayOverride as xe } from "../../../packages/utils/src/merge.js";
 import "../../../node_modules/.pnpm/decimal.js@10.6.0/node_modules/decimal.js/decimal.js";
 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 { omit as De } from "lodash-es";
+import { omit as ze } from "lodash-es";
 import "../../tt-select/index.js";
 import "../../tt-radio-group/index.js";
 import "../../tt-panel-select/index.js";
 import "../../tt-upload/index.js";
 import "../../tt-api-component/index.js";
 import "vee-validate";
-import { useForm as Ne } from "../../tt-form/src/useForm.js";
+import { useForm as De } from "../../tt-form/src/useForm.js";
 import "zod";
 import "@vee-validate/zod";
-import { useStore as He } from "@tanstack/vue-store";
+import { useStore as Ne } from "@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 { useDesign as We } from "../../../packages/hooks/src/useDesign.js";
-import { useDebounceFn as j } from "../../../packages/hooks/src/useDebounce.js";
+import { useDesign as He } from "../../../packages/hooks/src/useDesign.js";
+import { useDebounceFn as K } from "../../../packages/hooks/src/useDebounce.js";
 import "../../tt-icon/index.js";
 import "../../tt-form/src/components/Slot.js";
 import "../../tt-form-item-error-tooltip/index.js";
@@ -48,7 +48,7 @@ import "../../tt-drawer/index.js";
 import "../../tt-modal/index.js";
 import "../../tt-text/index.js";
 import "../../../directives/disabled-tip/index.js";
-import { GlobalConfig as Ue } from "../../../hooks/useSetup.js";
+import { GlobalConfig as We } from "../../../hooks/useSetup.js";
 import "../../tt-log/index.js";
 /* empty css                            */
 /* empty css                                    */
@@ -59,24 +59,24 @@ import "../../tt-loading/index.js";
 import "../index.js";
 import "vue-router";
 import "numeral";
-import qe from "./components/TableColumnModal.vue2.js";
+import Ue from "./components/TableColumnModal.vue2.js";
 /* empty css                                */
-import { provideFormActionTestIds as Ge } from "./utils/context.js";
-import Je from "./components/TableToobalTools.vue.js";
-import { basicTableEmits as te } from "./emits.js";
-import Qe from "./Table.vue.js";
+import { provideFormActionTestIds as qe } from "./utils/context.js";
+import Ge from "./components/TableToobalTools.vue.js";
+import { basicTableEmits as ee } from "./emits.js";
+import Je from "./Table.vue.js";
 /* empty css           */
-import { createTableFormContext as Xe } from "./hooks/useTableContext.js";
-import { useTableForm as Ye } from "./hooks/useTableForm.js";
-import { useCustomColumns as Ze } from "./hooks/useCustomColumns.js";
-import { useTableSlot as et } from "./hooks/useTableSlot.js";
-import { tableFormProps as tt } from "./props.js";
-import { getDefaultState as ot } from "./utils/table-api.js";
-import { TableFormApi as rt } from "./utils/table-form-api.js";
-const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
+import { createTableFormContext as Qe } from "./hooks/useTableContext.js";
+import { useTableForm as Xe } from "./hooks/useTableForm.js";
+import { useCustomColumns as Ye } from "./hooks/useCustomColumns.js";
+import { useTableSlot as Ze } from "./hooks/useTableSlot.js";
+import { tableFormProps as et } from "./props.js";
+import { getDefaultState as tt } from "./utils/table-api.js";
+import { TableFormApi as ot } from "./utils/table-form-api.js";
+const rt = ["data-testid"], st = ["data-testid"], Mo = /* @__PURE__ */ Me({
   name: "TtTableForm",
   __name: "TableForm",
-  props: tt,
+  props: et,
   emits: [
     "register",
     "update:table-data",
@@ -85,101 +85,101 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
     "export",
     "import",
     "set-columns",
-    ...te
+    ...ee
   ],
-  setup(oe, { expose: re, emit: se }) {
-    var W, U, q;
-    const u = oe, y = se, R = Ee(), { prefixCls: _ } = We("table-form"), w = Oe();
+  setup(te, { expose: oe, emit: re }) {
+    var H, W, U;
+    const u = te, y = re, A = Ee(), { prefixCls: R } = He("table-form"), w = Oe();
     let t = u.tableFormApi;
     if (!t) {
-      t = new rt(u);
+      t = new ot(u);
       const e = t;
-      e.useStore = (o) => He(t.store, o), t = e;
+      e.useStore = (o) => Ne(t.store, o), t = e;
     }
-    const B = (W = t == null ? void 0 : t.useStore) == null ? void 0 : W.call(t), S = h(() => {
+    const _ = (H = t == null ? void 0 : t.useStore) == null ? void 0 : H.call(t), C = g(() => {
       var o;
       if (u.testId) return u.testId;
-      const e = (o = A(B)) == null ? void 0 : o.table;
-      return e != null && e.api ? je(e.api) : "table";
-    }), ae = h(() => k(S.value, "tableform")), ie = h(() => k(S.value, "search-form-header")), le = h(() => k(S.value, "search-btn-query")), ne = h(() => k(S.value, "search-btn-reset")), me = h(() => ({
-      submit: le.value,
-      reset: ne.value
+      const e = (o = T(_)) == null ? void 0 : o.table;
+      return e != null && e.api ? Ke(e.api) : "table";
+    }), se = g(() => k(C.value, "tableform")), ae = g(() => k(C.value, "search-form-header")), ie = g(() => k(C.value, "search-btn-query")), le = g(() => k(C.value, "search-btn-reset")), ne = g(() => ({
+      submit: ie.value,
+      reset: le.value
     }));
-    Ge(me);
-    const x = {}, c = $e(), T = h(() => A(B)), { getFormSlotKeysFunc: pe, getTableSlotKeysFunc: ue, replaceTableSlotKey: ce, replaceFormSlotKey: de } = et(), {
-      tableData: fe,
-      getFormProps: V,
+    qe(ne);
+    const j = {}, c = $e(), S = g(() => T(_)), { getFormSlotKeysFunc: me, getTableSlotKeysFunc: pe, replaceTableSlotKey: ue, replaceFormSlotKey: ce } = Ze(), {
+      tableData: de,
+      getFormProps: B,
       getTableProps: d,
-      getTableToolProps: be,
-      handleSearchInfoChange: z
-    } = Ye(
-      T,
+      getTableToolProps: fe,
+      handleSearchInfoChange: x
+    } = Xe(
+      S,
       t.tableApi.reload,
       t.tableApi.getLoading,
       t.tableApi.getPagination,
       y
-    ), { run: ge } = j(
+    ), { run: be } = K(
       async () => {
         const e = await r.getValues();
         await r.resetForm(e, { force: !0 });
         const o = await r.getValues();
-        r.setLatestSubmissionValues(o), (await (r == null ? void 0 : r.validate())).valid && z(o);
+        r.setLatestSubmissionValues(o), (await (r == null ? void 0 : r.validate())).valid && x(o);
       },
       200,
       { leading: !0 }
-    ), { run: he } = j(
+    ), { run: ge } = K(
       async (e) => {
-        await t.grid.clearFilter(), await z(e);
+        await t.grid.clearFilter(), await x(e);
       },
       200,
       { leading: !0 }
-    ), [ve, r] = Ne({
-      ...A(V),
-      handleSubmit: he,
-      handleReset: ge,
+    ), [he, r] = De({
+      ...T(B),
+      handleSubmit: ge,
+      handleReset: be,
       submitOnEnter: !0,
       submitButtonOptions: {
-        content: (U = Ue.form) == null ? void 0 : U.submitTitle
+        content: (W = We.form) == null ? void 0 : W.submitTitle
       },
       showCollapseButton: !0,
       collapsed: !0,
       collapseTriggerResize: !0
-    }), { initCustomSetting: Ce, saveColumns: Se } = Ze({
+    }), { initCustomSetting: ve, saveColumns: Ce } = Ye({
       getTableProps: d,
       tableMethods: t.tableApi,
-      getProps: T
-    }), D = async () => {
-      await Ve(), t.tableApi && t.tableApi.redoHeight();
+      getProps: S
+    }), z = async () => {
+      await Be(), t.tableApi && t.tableApi.redoHeight();
     };
-    te.forEach((e) => {
-      const o = xe.camelCase(e);
-      x[o] = (...a) => y(e, ...a);
+    ee.forEach((e) => {
+      const o = je.camelCase(e);
+      j[o] = (...s) => y(e, ...s);
     });
-    const Te = {
-      ...x
+    const Se = {
+      ...j
     };
-    function ye(e) {
-      t.setState((o) => o.table ? (o.table.getSyncSlotComponent = u.table.getSyncSlotComponent, ze(
+    function Te(e) {
+      t.setState((o) => o.table ? (o.table.getSyncSlotComponent = u.table.getSyncSlotComponent, xe(
         {
           ...e,
           table: {
-            ...ot(),
+            ...tt(),
             ...e.table
           }
         },
         o
       )) : {}), e.table && t.tableApi.setState(e.table), e.form && (r == null || r.setState(e.form));
     }
-    const { run: we } = j(
+    const { run: ye } = K(
       async (e) => {
-        r.isMounted && s(T).useSearchForm ? r.validate().then(async (o) => {
+        r.isMounted && a(S).useSearchForm ? r.validate().then(async (o) => {
           if (o.valid) {
-            const a = await r.getValues();
+            const s = await r.getValues();
             await t.tableApi.reload({
               ...e,
               searchInfo: {
                 ...e == null ? void 0 : e.searchInfo,
-                ...a
+                ...s
               }
             });
           }
@@ -197,55 +197,53 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
       formMethods: r,
       setTableProps: t.tableApi.setState,
       setFormProps: r.setState,
-      setProps: ye,
-      reload: we,
-      selectedKeys: h(() => A(t.tableApi.selectedKeys))
+      setProps: Te,
+      reload: ye,
+      selectedKeys: g(() => T(t.tableApi.selectedKeys))
     };
-    async function Fe() {
-      const { tableRefreshBefore: e } = T.value;
-      e && Ke(e) && await e(), E.reload();
+    async function we() {
+      const { tableRefreshBefore: e } = S.value;
+      e && Le(e) && await e(), E.reload();
     }
-    async function Pe(e) {
-      var f, n;
-      const o = ((n = (f = T.value) == null ? void 0 : f.table) == null ? void 0 : n.columns) || [], a = new Map(o.map((l) => [l.field, l])), i = e.checkedModel.map((l) => a.get(l)).filter(Boolean);
+    async function Fe(e) {
+      var f, m;
+      const o = ((m = (f = S.value) == null ? void 0 : f.table) == null ? void 0 : m.columns) || [], s = new Map(o.map((n) => [n.field, n])), l = e.checkedModel.map((n) => s.get(n)).filter(Boolean);
       if (e.isExport) {
         y("export", e.checkedModel, e.modalApi);
         return;
       }
       e.modalApi.setModalProps({
         confirmLoading: !0
-      }), d.value.useHttpCache && await Se(JSON.stringify(e.checkedModel)), t.tableApi.setTableColumns(i), e.modalApi.setModalProps({
+      }), d.value.useHttpCache && await Ce(JSON.stringify(e.checkedModel)), t.tableApi.setTableColumns(l), e.modalApi.setModalProps({
         confirmLoading: !1
-      }), e.modalApi.closeModal(), y("set-columns", i);
+      }), e.modalApi.closeModal(), y("set-columns", l);
     }
-    function N(e = !1) {
-      var n, l, v, b, F, P, I, M;
-      const { notSetColumnField: o, columns: a } = s(d), i = (b = (v = (l = ((n = t.tableApi.getTableInstance()) == null ? void 0 : n.getTableColumn()) || []) == null ? void 0 : l.visibleColumn) == null ? void 0 : v.map((m) => m.field)) == null ? void 0 : b.filter(Boolean), f = ((P = (F = s(a)) == null ? void 0 : F.filter((m) => m.visible === !0 || m.visible === void 0)) == null ? void 0 : P.map((m) => m.field)) || [];
+    function D(e = !1) {
+      var m, n, h, b, F, P, I, M;
+      const { notSetColumnField: o, columns: s } = a(d), l = (b = (h = (n = ((m = t.tableApi.getTableInstance()) == null ? void 0 : m.getTableColumn()) || []) == null ? void 0 : n.visibleColumn) == null ? void 0 : h.map((i) => i.field)) == null ? void 0 : b.filter(Boolean), f = ((P = (F = a(s)) == null ? void 0 : F.filter((i) => i.visible === !0 || i.visible === void 0)) == null ? void 0 : P.map((i) => i.field)) || [];
       (I = w.value) == null || I.openModal({
-        columns: (A(a) || []).filter((m) => m.visible !== !1),
-        displayFields: e ? f : i,
+        columns: (T(s) || []).filter((i) => i.visible !== !1),
+        displayFields: e ? f : l,
         disabledColumnField: o || []
       }), (M = w.value) == null || M.setModalProps({
         title: "列设置"
       });
     }
-    function H(e = !1) {
-      var n, l, v, b, F, P, I, M, m;
-      const { notSetColumnField: o, columns: a } = s(d), i = (b = (v = (l = ((n = t.tableApi.getTableInstance()) == null ? void 0 : n.getTableColumn()) || []) == null ? void 0 : l.visibleColumn) == null ? void 0 : v.map((g) => g.field)) == null ? void 0 : b.filter(Boolean), f = ((P = (F = s(a)) == null ? void 0 : F.filter((g) => g.visible === !0 || g.visible === void 0)) == null ? void 0 : P.map((g) => g.field)) || [];
-      (M = w.value) == null || M.openModal({
-        columns: (((I = t.tableApi) == null ? void 0 : I.getTableColumns()) || []).filter(
-          (g) => g.visible !== !1
-        ),
-        displayFields: e ? f : i,
+    function N(e = !1) {
+      var m, n, h, b, F, P, I, M;
+      const { notSetColumnField: o, columns: s } = a(d), l = (b = (h = (n = ((m = t.tableApi.getTableInstance()) == null ? void 0 : m.getTableColumn()) || []) == null ? void 0 : n.visibleColumn) == null ? void 0 : h.map((i) => i.field)) == null ? void 0 : b.filter(Boolean), f = ((P = (F = a(s)) == null ? void 0 : F.filter((i) => i.visible === !0 || i.visible === void 0)) == null ? void 0 : P.map((i) => i.field)) || [];
+      (I = w.value) == null || I.openModal({
+        columns: (T(s) || []).filter((i) => i.visible !== !1),
+        displayFields: e ? f : l,
         disabledColumnField: o || [],
         isExport: !0
-      }), (m = w.value) == null || m.setModalProps({
+      }), (M = w.value) == null || M.setModalProps({
         title: "自定义导出"
       });
     }
-    Xe({ formInstance: r }), G(() => {
+    Qe({ formInstance: r }), q(() => {
       c && y("register", E, c == null ? void 0 : c.uid), setTimeout(() => {
-        Ce();
+        ve();
       }, 16);
     }), O(
       () => t.tableApi.getLoading.value,
@@ -254,9 +252,9 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
           submitButtonOptions: { loading: t.tableApi.getLoading.value }
         });
       },
-      { immediate: (q = B.value.table) == null ? void 0 : q.immediate }
+      { immediate: (U = _.value.table) == null ? void 0 : U.immediate }
     ), O(
-      () => V.value,
+      () => B.value,
       (e) => {
         r && (r == null || r.setState(e));
       },
@@ -268,84 +266,84 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
         t != null && t.tableApi && ((o = t == null ? void 0 : t.tableApi) == null || o.setState(e));
       },
       { deep: !0 }
-    ), window.addEventListener("resize", D), G(() => {
-      t == null || t.mount(E, r), r == null || r.setState(V.value);
+    ), window.addEventListener("resize", z), q(() => {
+      t == null || t.mount(E, r), r == null || r.setState(B.value);
     });
-    function Ie(e) {
+    function Pe(e) {
       return Object.fromEntries(Object.entries(e).filter(([o]) => !o.startsWith("on")));
     }
-    function Me(e, o) {
-      return Object.fromEntries(Object.keys(e).map((a) => [a, o[a]]));
+    function Ie(e, o) {
+      return Object.fromEntries(Object.keys(e).map((s) => [s, o[s]]));
     }
     return O(
-      () => De(u, ["tableFormApi"]),
+      () => ze(u, ["tableFormApi"]),
       () => {
-        var n;
-        const e = {}, o = ((n = c == null ? void 0 : c.vnode) == null ? void 0 : n.props) || {}, a = new Set(Object.keys(u));
-        for (const [l, v] of Object.entries(o)) {
-          const b = Le(l);
-          a.has(b) && (e[b] = v);
+        var m;
+        const e = {}, o = ((m = c == null ? void 0 : c.vnode) == null ? void 0 : m.props) || {}, s = new Set(Object.keys(u));
+        for (const [n, h] of Object.entries(o)) {
+          const b = Ve(n);
+          s.has(b) && (e[b] = h);
         }
-        const i = Ie(e), f = Me(i, u);
+        const l = Pe(e), f = Ie(l, u);
         t.setState(f);
       },
       { deep: !0 }
     ), ke(() => {
-      t == null || t.unmount(), window.removeEventListener("resize", D);
-    }), re({ ...E, instance: c }), (e, o) => (Q(), J("div", {
-      class: L(s(_)),
-      "data-testid": ae.value
+      t == null || t.unmount(), window.removeEventListener("resize", z);
+    }), oe({ ...E, instance: c }), (e, o) => (J(), G("div", {
+      class: V(a(R)),
+      "data-testid": se.value
     }, [
-      T.value.useSearchForm ? (Q(), J("div", {
+      S.value.useSearchForm ? (J(), G("div", {
         key: 0,
-        class: L(`${s(_)}-header`),
-        "data-testid": ie.value
+        class: V(`${a(R)}-header`),
+        "data-testid": ae.value
       }, [
-        $(s(ve), {
-          "test-id": `${S.value}-search-form`
-        }, K({ _: 2 }, [
-          X(s(pe)(s(R)), (a) => ({
-            name: s(de)(a),
-            fn: C((i) => [
-              p(e.$slots, a, Y(Z(i || {})))
+        $(a(he), {
+          "test-id": `${C.value}-search-form`
+        }, L({ _: 2 }, [
+          Q(a(me)(a(A)), (s) => ({
+            name: a(ce)(s),
+            fn: v((l) => [
+              p(e.$slots, s, X(Y(l || {})))
             ])
           }))
         ]), 1032, ["test-id"]),
         p(e.$slots, "header-down")
-      ], 10, at)) : Re("", !0),
-      _e("div", {
-        class: L({
-          [`${s(_)}-wrapper`]: !0,
+      ], 10, st)) : Ae("", !0),
+      Re("div", {
+        class: V({
+          [`${a(R)}-wrapper`]: !0,
           "pt-(--tt-base-padding)!": !0,
-          "pb-(--tt-base-padding)!": !s(d).showPager
+          "pb-(--tt-base-padding)!": !a(d).showPager
         })
       }, [
         p(e.$slots, "table-top"),
-        $(Qe, ee(s(d), {
-          data: s(fe),
+        $(Je, Z(a(d), {
+          data: a(de),
           "table-row-id": e.tableRowId,
-          "table-id": S.value,
-          "form-api": s(r),
-          "table-api": s(t).tableApi
-        }, Be(Te)), K({ _: 2 }, [
-          X(s(ue)(s(R)), (a) => ({
-            name: s(ce)(a),
-            fn: C((i) => [
-              p(e.$slots, a, Y(Z(i || {})))
+          "table-id": C.value,
+          "form-api": a(r),
+          "table-api": a(t).tableApi
+        }, _e(Se)), L({ _: 2 }, [
+          Q(a(pe)(a(A)), (s) => ({
+            name: a(ue)(s),
+            fn: v((l) => [
+              p(e.$slots, s, X(Y(l || {})))
             ])
           })),
-          s(d).showToolbar ? {
+          a(d).showToolbar ? {
             name: "toolbar_tools",
-            fn: C(() => [
-              $(Je, ee(s(be), {
-                onOnRefresh: Fe,
-                onOnExport: H,
-                onOnColumnsSetting: N
+            fn: v(() => [
+              $(Ge, Z(a(fe), {
+                onOnRefresh: we,
+                onOnExport: N,
+                onOnColumnsSetting: D
               }), {
-                "toolbar-left": C(() => [
+                "toolbar-left": v(() => [
                   p(e.$slots, "t-toolbar_tools-left")
                 ]),
-                "toolbar-right": C(() => [
+                "toolbar-right": v(() => [
                   p(e.$slots, "t-toolbar_tools-right")
                 ]),
                 _: 3
@@ -357,29 +355,29 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
         ]), 1040, ["data", "table-row-id", "table-id", "form-api", "table-api"]),
         p(e.$slots, "table-bottom")
       ], 2),
-      $(qe, {
+      $(Ue, {
         ref_key: "tableColumnModalRef",
         ref: w,
-        "open-export": H,
-        "open-column": N,
-        onOnSubmit: Pe
-      }, K({
-        beforeFooter: C(() => [
+        "open-export": N,
+        "open-column": D,
+        onOnSubmit: Fe
+      }, L({
+        beforeFooter: v(() => [
           p(e.$slots, "t-column-modal-before-footer")
         ]),
         _: 2
       }, [
-        s(R)["t-column-modal-title"] ? {
+        a(A)["t-column-modal-title"] ? {
           name: "title",
-          fn: C(() => [
+          fn: v(() => [
             p(e.$slots, "t-column-modal-title")
           ]),
           key: "0"
         } : void 0
       ]), 1536)
-    ], 10, st));
+    ], 10, rt));
   }
 });
 export {
-  Ao as default
+  Mo as default
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.5.227",
+  "version": "1.5.229",
   "description": "",
   "main": "./dist/index.js",
   "module": "./dist/index.js",
@@ -67,8 +67,8 @@
     "vue-router": "^5.0.2",
     "vxe-pc-ui": "^4.12.36",
     "vxe-table": "^4.17.48",
-    "@dazhicheng/utils": "1.3.41",
-    "@dazhicheng/hooks": "1.4.44"
+    "@dazhicheng/hooks": "1.4.44",
+    "@dazhicheng/utils": "1.3.41"
   },
   "files": [
     "dist"