@dazhicheng/ui 1.6.18 → 1.6.19

package/dist/components/tt-form/src/group-form/groupFormApi.js

@@ -1,10 +1,10 @@
-var C = Object.defineProperty;
-var V = (f, h, e) => h in f ? C(f, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[h] = e;
-var l = (f, h, e) => V(f, typeof h != "symbol" ? h + "" : h, e);
+var V = Object.defineProperty;
+var b = (f, h, e) => h in f ? V(f, h, { enumerable: !0, configurable: !0, writable: !0, value: e }) : f[h] = e;
+var l = (f, h, e) => b(f, typeof h != "symbol" ? h + "" : h, e);
 import "axios";
 import "element-plus";
 import { isString as F, isFunction as v, isBoolean as R } from "../../../../packages/utils/src/is.js";
-import { ref as b, reactive as A, computed as T, nextTick as E, toRaw as K } from "vue";
+import { ref as T, reactive as A, computed as K, nextTick as E, toRaw as C } from "vue";
 import "dayjs";
 import "numeral";
 import "xe-utils";
@@ -26,7 +26,7 @@ import { extractFlatSchemas as g, collectDefaultCollapseStates as M, getGroupVal
 function J(f) {
   if (!f)
     return;
-  const h = K(f);
+  const h = C(f);
   if (F(h))
     return h;
   if (v(h.safeParse))
@@ -95,7 +95,7 @@ class ye extends j {
     /** 本轮回环告警是否已输出，避免刷屏 */
     l(this, "_navSyncLoopWarned", !1);
     /** VirtualGroupForm 组件实例引用，由 useGroupForm 的 h() 渲染时赋值 */
-    l(this, "groupFormRef", b(null));
+    l(this, "groupFormRef", T(null));
     /**
      * @description 响应式读取 store 状态，由 useGroupForm 在运行时注入实现
      * @param {Function} [selector] - 可选的状态选择器
@@ -113,7 +113,7 @@ class ye extends j {
       estimateFieldHeight: c = 52,
       scrollOffset: p = 0
     } = t;
-    this.progressive = i, this.virtual = i ? !1 : r, this._defaultNavAnchorProps = { show: !0, ...o }, this._scrollToFirstError = a, this._containerHeight = n, this._rootMargin = u, this._estimateFieldHeight = c, this._scrollOffset = p, this._initialGroupSchema = s, this._initialFlatSchema = g(s), this.collapseStates = A({}), M(s, this.collapseStates), this.hiddenGroupKeys = A(/* @__PURE__ */ new Set()), this.hiddenFieldNames = A(/* @__PURE__ */ new Set()), this._navErrorCountsRef = T(() => this._computeNavErrorCounts()), this.navErrorCounts = new Proxy({}, {
+    this.progressive = i, this.virtual = i ? !1 : r, this._defaultNavAnchorProps = { show: !0, ...o }, this._scrollToFirstError = a, this._containerHeight = n, this._rootMargin = u, this._estimateFieldHeight = c, this._scrollOffset = p, this._initialGroupSchema = s, this._initialFlatSchema = g(s), this.collapseStates = A({}), M(s, this.collapseStates), this.hiddenGroupKeys = A(/* @__PURE__ */ new Set()), this.hiddenFieldNames = A(/* @__PURE__ */ new Set()), this._navErrorCountsRef = K(() => this._computeNavErrorCounts()), this.navErrorCounts = new Proxy({}, {
       get: (m, d) => {
         if (F(d))
           return this._navErrorCountsRef.value[d] ?? 0;
@@ -564,7 +564,7 @@ class ye extends j {
       void 0,
       `${e.fieldName}.dependencies.rules`
     ));
-    const i = r || e.rules;
+    const i = C(r || e.rules);
     let o = !1;
     return s && v(s.required) && (o = !!await this._safeInvoke(
       () => s.required(t, this),

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

@@ -352,6 +352,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: import('vue').PropType<Fn>;
         default: null;
     };
+    tableSearchBefore: {
+        type: import('vue').PropType<NonNullable<TtTableFormProps["tableSearchBefore"]>>;
+        default: null;
+    };
     toolConfig: {
         type: import('vue').PropType<import('../../../index').TtTableToolsProps>;
         default: null;
@@ -575,6 +579,10 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
         type: import('vue').PropType<Fn>;
         default: null;
     };
+    tableSearchBefore: {
+        type: import('vue').PropType<NonNullable<TtTableFormProps["tableSearchBefore"]>>;
+        default: null;
+    };
     toolConfig: {
         type: import('vue').PropType<import('../../../index').TtTableToolsProps>;
         default: null;
@@ -594,6 +602,7 @@ declare const __VLS_component: import('vue').DefineComponent<import('vue').Extra
     handleSearchInfoFn: Fn<any, any>;
     toolConfig: import('../../../index').TtTableToolsProps;
     tableRefreshBefore: Fn<any, any>;
+    tableSearchBefore: (values: Recordable) => import('../../../index').TtTableSearchBeforeResult | Promise<import('../../../index').TtTableSearchBeforeResult>;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {
     columnModalRef: ({
         $: import('vue').ComponentInternalInstance;

package/dist/components/tt-table/src/TableForm.vue.js

@@ -1,17 +1,17 @@
-import { defineComponent as _e, useSlots as Ie, getCurrentInstance as De, ref as Ve, shallowReactive as Ke, onScopeDispose as Y, computed as u, unref as r, shallowRef as ke, toRaw as P, watch as w, toValue as S, onMounted as Be, nextTick as Z, createElementBlock as ee, openBlock as te, normalizeClass as V, createCommentVNode as He, createElementVNode as Le, createVNode as M, renderSlot as l, createSlots as K, renderList as oe, withCtx as g, normalizeProps as re, guardReactiveProps as ie, mergeProps as se, toHandlers as ze, isRef as xe } from "vue";
+import { defineComponent as Ve, useSlots as Be, getCurrentInstance as Ke, ref as ke, shallowReactive as He, onScopeDispose as Y, computed as d, unref as r, shallowRef as Le, toRaw as P, watch as w, toValue as S, onMounted as ze, nextTick as Z, createElementBlock as ee, openBlock as te, normalizeClass as V, createCommentVNode as je, createElementVNode as xe, createVNode as M, renderSlot as l, createSlots as B, renderList as oe, withCtx as h, normalizeProps as re, guardReactiveProps as ae, mergeProps as ie, toHandlers as Ne, isRef as We } from "vue";
 import "../../tt-button/index.js";
 import "../../tt-checkbox/index.js";
 import "../../tt-empty/index.js";
 import "axios";
 import "element-plus";
-import { isFunction as je } from "../../../packages/utils/src/is.js";
+import { isFunction as se, isObject as Je } from "../../../packages/utils/src/is.js";
 import "dayjs";
 import "numeral";
-import { extractResourceFromApi as Ne, generateTestId as O } from "../../../packages/utils/src/testid-helper.js";
+import { extractResourceFromApi as qe, generateTestId as O } from "../../../packages/utils/src/testid-helper.js";
 import "xe-utils";
 import "dayjs/plugin/utc";
 import "dayjs/plugin/timezone";
-import { mergeWithArrayOverride as We } from "../../../packages/utils/src/merge.js";
+import { mergeWithArrayOverride as Ge } 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";
@@ -25,15 +25,15 @@ import "../../tt-upload/index.js";
 import "../../tt-api-component/index.js";
 import "vee-validate";
 import "../../../utils/uppercaseInput.js";
-import { useForm as Je } from "../../tt-form/src/useForm.js";
+import { useForm as Qe } from "../../tt-form/src/useForm.js";
 import "zod";
 import "@vee-validate/zod";
-import { useStore as qe } from "@tanstack/vue-store";
+import { useStore as Ue } 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 Ge } from "../../../packages/hooks/src/useDesign.js";
+import { useDesign as Xe } from "../../../packages/hooks/src/useDesign.js";
 import { useDebounceFn as v } from "../../../packages/hooks/src/useDebounce.js";
 import "vue-router";
 import "../../tt-icon/index.js";
@@ -50,7 +50,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 Qe } from "../../../hooks/useSetup.js";
+import { GlobalConfig as Ye } from "../../../hooks/useSetup.js";
 import "../../tt-log/index.js";
 /* empty css                            */
 /* empty css                                    */
@@ -61,25 +61,25 @@ import "../../tt-log/index.js";
 import "../../tt-loading/index.js";
 import "../index.js";
 import "../../../hooks/basicDataCodes.js";
-import { useTemplateSlot as ae } from "../../../hooks/useTemplateSlot.js";
-import Ue from "./components/TableColumnModal.vue2.js";
+import { useTemplateSlot as ne } from "../../../hooks/useTemplateSlot.js";
+import Ze from "./components/TableColumnModal.vue2.js";
 /* empty css                                */
-import Xe from "./components/TableToolbarTools.vue.js";
-import { basicTableEmits as Ye } from "./emits.js";
-import { useColumnPersistence as Ze } from "./hooks/useColumnPersistence.js";
-import { createTableFormContext as et } from "./hooks/useTableContext.js";
-import { useTableForm as tt } from "./hooks/useTableForm.js";
-import { useSyncProps as ot } from "./hooks/useSyncProps.js";
-import { tableFormProps as rt } from "./props.js";
-import it from "./Table.vue.js";
+import et from "./components/TableToolbarTools.vue.js";
+import { basicTableEmits as tt } from "./emits.js";
+import { useColumnPersistence as ot } from "./hooks/useColumnPersistence.js";
+import { createTableFormContext as rt } from "./hooks/useTableContext.js";
+import { useTableForm as at } from "./hooks/useTableForm.js";
+import { useSyncProps as it } from "./hooks/useSyncProps.js";
+import { tableFormProps as st } from "./props.js";
+import nt from "./Table.vue.js";
 /* empty css           */
-import { forwardedEventEntries as st } from "./table-mutation-events.js";
-import { TableFormApi as at } from "./utils/table-form-api.js";
-import { provideFormActionTestIds as nt } from "./utils/context.js";
-const lt = ["data-testid"], mt = ["data-testid"], Vo = /* @__PURE__ */ _e({
+import { forwardedEventEntries as lt } from "./table-mutation-events.js";
+import { TableFormApi as mt } from "./utils/table-form-api.js";
+import { provideFormActionTestIds as pt } from "./utils/context.js";
+const ct = ["data-testid"], ut = ["data-testid"], ko = /* @__PURE__ */ Ve({
   name: "TtTableForm",
   __name: "TableForm",
-  props: rt,
+  props: st,
   emits: [
     "register",
     "columns-setting",
@@ -87,169 +87,180 @@ const lt = ["data-testid"], mt = ["data-testid"], Vo = /* @__PURE__ */ _e({
     "export",
     "import",
     "set-columns",
-    ...Ye
+    ...tt
   ],
-  setup(ne, { expose: le, emit: me }) {
+  setup(le, { expose: me, emit: pe }) {
     var q, G, Q;
-    const a = ne, C = me, $ = Ie(), h = De(), { prefixCls: E } = Ge("table-form");
-    function k() {
+    const n = le, C = pe, D = Be(), g = Ke(), { prefixCls: $ } = Xe("table-form");
+    function K() {
       var e;
-      return Object.hasOwn(((e = h == null ? void 0 : h.vnode) == null ? void 0 : e.props) || {}, "table");
+      return Object.hasOwn(((e = g == null ? void 0 : g.vnode) == null ? void 0 : e.props) || {}, "table");
     }
-    const R = Ve();
-    let t = a.tableFormApi;
-    t || (t = new at(a), t.useStore = (e) => qe(t.store, e));
-    const B = Ke({});
+    const E = ke();
+    let o = n.tableFormApi;
+    o || (o = new mt(n), o.useStore = (e) => Ue(o.store, e));
+    const k = He({});
     function H() {
-      Object.assign(B, P(t.store.state) || {});
+      Object.assign(k, P(o.store.state) || {});
     }
-    H(), Y(t.store.subscribe(H));
-    const c = u(() => B), T = u(() => {
-      var o;
-      if (a.testId) return a.testId;
-      const e = (o = r(c).table) == null ? void 0 : o.api;
-      return e ? Ne(e) : "table";
-    }), pe = u(() => O(r(T), "tableform")), ue = u(() => O(r(T), "search-form-header"));
-    nt(
-      u(() => ({
+    H(), Y(o.store.subscribe(H));
+    const c = d(() => k), T = d(() => {
+      var t;
+      if (n.testId) return n.testId;
+      const e = (t = r(c).table) == null ? void 0 : t.api;
+      return e ? qe(e) : "table";
+    }), ce = d(() => O(r(T), "tableform")), ue = d(() => O(r(T), "search-form-header"));
+    pt(
+      d(() => ({
         submit: O(r(T), "search-btn-query"),
         reset: O(r(T), "search-btn-reset")
       }))
     );
-    const { getSlotKeys: ce, replaceSlotKey: de } = ae("form-"), { getSlotKeys: fe, replaceSlotKey: be } = ae("t-"), { getFormProps: _, getTableProps: m, getTableToolProps: ge, submitSearchQuery: L } = tt(
+    const { getSlotKeys: de, replaceSlotKey: fe } = ne("form-"), { getSlotKeys: be, replaceSlotKey: he } = ne("t-"), { getFormProps: R, getTableProps: m, getTableToolProps: ge, submitSearchQuery: L } = at(
       c,
-      t.tableApi.reload,
-      t.tableApi.getLoading,
-      t.tableApi.getPagination
-    ), z = ke([]), he = u(() => (a.table, !k() || !a.table ? !1 : (a.table.data, Object.hasOwn(P(a.table), "data"))));
-    let I = () => {
+      o.tableApi.reload,
+      o.tableApi.getLoading,
+      o.tableApi.getPagination
+    ), z = Le([]), we = d(() => (n.table, !K() || !n.table ? !1 : (n.table.data, Object.hasOwn(P(n.table), "data"))));
+    let _ = () => {
     };
-    function we(e) {
-      I(), I = w(
+    function Se(e) {
+      _(), _ = w(
         () => S(e),
-        (o) => {
-          z.value = o || [];
+        (t) => {
+          z.value = t || [];
         },
-        { immediate: !0, deep: xe(e) ? !1 : 1 }
+        { immediate: !0, deep: We(e) ? !1 : 1 }
       );
     }
-    function Se() {
-      if (a.table)
-        return a.table.data, P(a.table).data;
+    function Te() {
+      if (n.table)
+        return n.table.data, P(n.table).data;
     }
-    w(Se, (e) => we(e), { immediate: !0 });
-    const { run: Te } = v(
+    w(Te, (e) => Se(e), { immediate: !0 });
+    const { run: ye } = v(
       async () => {
-        const e = await i.getValues();
-        await i.resetForm(e, { force: !0 });
-        const o = await i.getValues();
-        i.setLatestSubmissionValues(o), (await i.validate()).valid && L(o);
+        const e = await a.getValues();
+        await a.resetForm(e, { force: !0 });
+        const t = await a.getValues();
+        a.setLatestSubmissionValues(t), (await a.validate()).valid && L(t);
       },
       200,
       { leading: !0 }
-    ), { run: ye } = v(
+    );
+    async function ve() {
+      await o.tableApi.reloadData([]), o.tableApi.setPagination({ currentPage: 1, total: 0 });
+    }
+    async function Ce(e) {
+      const { tableSearchBefore: t } = r(c);
+      if (!se(t)) return !0;
+      const i = await t(e), { canSearch: s, clearData: p } = Je(i) ? i : { canSearch: i, clearData: !1 };
+      return p && await ve(), s !== !1;
+    }
+    const { run: Fe } = v(
       async (e) => {
-        await t.grid.clearFilter(), await L(e);
+        const t = e;
+        await Ce(t) && (await o.grid.clearFilter(), await L(t));
       },
       200,
       { leading: !0 }
-    ), [ve, i] = Je({
-      ...S(_),
-      handleSubmit: ye,
-      handleReset: Te,
+    ), [Ae, a] = Qe({
+      ...S(R),
+      handleSubmit: Fe,
+      handleReset: ye,
       submitOnEnter: !0,
       submitButtonOptions: {
-        content: (q = Qe.form) == null ? void 0 : q.submitTitle
+        content: (q = Ye.form) == null ? void 0 : q.submitTitle
       },
       showCollapseButton: !0,
       collapsed: !0,
       collapseTriggerResize: !0,
       collapsedRows: 3
-    }), { restoreColumns: Ce, saveColumns: x } = Ze({
+    }), { restoreColumns: Pe, saveColumns: j } = ot({
       getTableProps: m,
       getProps: c,
-      tableMethods: t.tableApi
+      tableMethods: o.tableApi
     });
-    let d = !1;
+    let f = !1;
     const y = {};
-    st.forEach(([e, o]) => {
-      y[o] = (...s) => C(e, ...s);
+    lt.forEach(([e, t]) => {
+      y[t] = (...i) => C(e, ...i);
     });
-    const { run: Fe } = v(async () => {
-      if (d || !r(m).useHttpCache) return;
-      const e = (t.tableApi.getTableColumns() || []).map((o) => o.field).filter(Boolean);
-      e.length && await x(JSON.stringify(e));
+    const { run: Me } = v(async () => {
+      if (f || !r(m).useHttpCache) return;
+      const e = (o.tableApi.getTableColumns() || []).map((t) => t.field).filter(Boolean);
+      e.length && await j(JSON.stringify(e));
     }, 300);
-    function Ae(e) {
-      var o;
-      (o = y.columnDragend) == null || o.call(y, e), Fe();
+    function Oe(e) {
+      var t;
+      (t = y.columnDragend) == null || t.call(y, e), Me();
     }
-    const Pe = u(() => ({ ...y, columnDragend: Ae }));
-    function Me(e) {
-      t.setState((o) => o.table ? We(e, o) : {}), e.table && t.tableApi.setState(e.table), e.form && (i == null || i.setState(e.form));
+    const De = d(() => ({ ...y, columnDragend: Oe }));
+    function $e(e) {
+      o.setState((t) => t.table ? Ge(e, t) : {}), e.table && o.tableApi.setState(e.table), e.form && (a == null || a.setState(e.form));
     }
-    const { run: Oe } = v(
+    const { run: Ee } = v(
       async (e) => {
-        if (i.isMounted && r(c).useSearchForm) {
-          if (!(await i.validate()).valid) return;
-          const s = await i.getValues();
-          await t.tableApi.reload({ ...e, searchInfo: { ...e == null ? void 0 : e.searchInfo, ...s } });
+        if (a.isMounted && r(c).useSearchForm) {
+          if (!(await a.validate()).valid) return;
+          const i = await a.getValues();
+          await o.tableApi.reload({ ...e, searchInfo: { ...e == null ? void 0 : e.searchInfo, ...i } });
           return;
         }
-        await t.tableApi.reload({ ...e, searchInfo: { ...e == null ? void 0 : e.searchInfo } });
+        await o.tableApi.reload({ ...e, searchInfo: { ...e == null ? void 0 : e.searchInfo } });
       },
       200,
       { leading: !0 }
     ), F = {
-      tableMethods: t.tableApi,
-      formMethods: i,
-      setTableProps: t.tableApi.setState,
-      setFormProps: i.setState,
-      setProps: Me,
-      reload: Oe,
-      selectedKeys: u(() => S(t.tableApi.selectedKeys))
+      tableMethods: o.tableApi,
+      formMethods: a,
+      setTableProps: o.tableApi.setState,
+      setFormProps: a.setState,
+      setProps: $e,
+      reload: Ee,
+      selectedKeys: d(() => S(o.tableApi.selectedKeys))
     };
-    async function $e() {
+    async function Re() {
       const { tableRefreshBefore: e } = r(c);
-      je(e) && await e(), F.reload();
+      se(e) && await e(), F.reload();
     }
-    let D = { width: window.innerWidth, height: window.innerHeight };
-    const { run: j } = v(async () => {
-      var n, f;
-      if (await Z(), d) return;
-      const { innerWidth: e, innerHeight: o } = window, s = e !== D.width || o !== D.height;
-      if (D = { width: e, height: o }, !s) {
+    let I = { width: window.innerWidth, height: window.innerHeight };
+    const { run: x } = v(async () => {
+      var s, p;
+      if (await Z(), f) return;
+      const { innerWidth: e, innerHeight: t } = window, i = e !== I.width || t !== I.height;
+      if (I = { width: e, height: t }, !i) {
         if (!r(m).autoHeight) return;
-        (n = t.tableApi) == null || n.redoHeight(!1);
+        (s = o.tableApi) == null || s.redoHeight(!1);
         return;
       }
-      (f = t.tableApi) == null || f.redoHeight();
+      (p = o.tableApi) == null || p.redoHeight();
     }, 100);
-    async function Ee(e) {
-      var f, A;
-      if (d) return;
-      const o = S((A = (f = r(c)) == null ? void 0 : f.table) == null ? void 0 : A.columns) || [], s = new Map(o.map((b) => [b.field, b])), n = e.checkedModel.map((b) => s.get(b)).filter(Boolean);
+    async function _e(e) {
+      var p, A;
+      if (f) return;
+      const t = S((A = (p = r(c)) == null ? void 0 : p.table) == null ? void 0 : A.columns) || [], i = new Map(t.map((b) => [b.field, b])), s = e.checkedModel.map((b) => i.get(b)).filter(Boolean);
       if (e.isExport) {
         C("export", e.checkedModel, e.modalApi);
         return;
       }
       e.modalApi.setModalProps({ confirmLoading: !0 });
       try {
-        if (r(m).useHttpCache && await x(JSON.stringify(e.checkedModel)), d) return;
-        t.tableApi.setTableColumns(n), e.modalApi.closeModal(), C("set-columns", n);
+        if (r(m).useHttpCache && await j(JSON.stringify(e.checkedModel)), f) return;
+        o.tableApi.setTableColumns(s), e.modalApi.closeModal(), C("set-columns", s);
       } finally {
-        d || e.modalApi.setModalProps({ confirmLoading: !1 });
+        f || e.modalApi.setModalProps({ confirmLoading: !1 });
       }
     }
-    function N(e, o = !1) {
+    function N(e, t = !1) {
       var b, U, X;
-      const { notSetColumnField: s, columns: n } = r(m), f = ((((b = t.tableApi.getTableInstance()) == null ? void 0 : b.getTableColumn()) || {}).visibleColumn || []).map((p) => p.field).filter(Boolean), A = (S(n) || []).filter((p) => p.visible === !0 || p.visible === void 0).map((p) => p.field);
-      (U = R.value) == null || U.openModal({
-        columns: (S(n) || []).filter((p) => p.visible !== !1),
-        displayFields: o ? A : f,
-        disabledColumnField: s || [],
+      const { notSetColumnField: i, columns: s } = r(m), p = ((((b = o.tableApi.getTableInstance()) == null ? void 0 : b.getTableColumn()) || {}).visibleColumn || []).map((u) => u.field).filter(Boolean), A = (S(s) || []).filter((u) => u.visible === !0 || u.visible === void 0).map((u) => u.field);
+      (U = E.value) == null || U.openModal({
+        columns: (S(s) || []).filter((u) => u.visible !== !1),
+        displayFields: t ? A : p,
+        disabledColumnField: i || [],
         isExport: e
-      }), (X = R.value) == null || X.setModalProps({ title: e ? "自定义导出" : "列设置" });
+      }), (X = E.value) == null || X.setModalProps({ title: e ? "自定义导出" : "列设置" });
     }
     function W(e = !1) {
       N(!1, e);
@@ -257,89 +268,89 @@ const lt = ["data-testid"], mt = ["data-testid"], Vo = /* @__PURE__ */ _e({
     function J(e = !1) {
       N(!0, e);
     }
-    function Re() {
-      const e = a.table;
-      if (!k() || !e) return;
-      const o = {};
-      return Object.keys(P(e)).forEach((s) => {
-        s !== "data" && Object.assign(o, { [s]: e[s] });
-      }), o;
+    function Ie() {
+      const e = n.table;
+      if (!K() || !e) return;
+      const t = {};
+      return Object.keys(P(e)).forEach((i) => {
+        i !== "data" && Object.assign(t, { [i]: e[i] });
+      }), t;
     }
-    return ot(a, t.setState, ["tableFormApi", "table"]), w(
-      Re,
+    return it(n, o.setState, ["tableFormApi", "table"]), w(
+      Ie,
       (e) => {
-        e && t.setState({ table: e });
+        e && o.setState({ table: e });
       },
       { deep: !0, immediate: !0 }
-    ), et({ formInstance: i }), w(
-      () => t.tableApi.getLoading.value,
+    ), rt({ formInstance: a }), w(
+      () => o.tableApi.getLoading.value,
       (e) => {
-        i == null || i.setState({ submitButtonOptions: { loading: e } });
+        a == null || a.setState({ submitButtonOptions: { loading: e } });
       },
-      { immediate: (Q = (G = t.store.state) == null ? void 0 : G.table) == null ? void 0 : Q.immediate }
-    ), w(_, (e) => i == null ? void 0 : i.setState(e)), w(m, (e) => {
-      var o;
-      return (o = t.tableApi) == null ? void 0 : o.setState(e);
-    }), Be(() => {
-      h && C("register", F, h.uid), t.mount(F, i), i == null || i.setState(r(_)), Z(() => {
-        d || Ce();
-      }), window.addEventListener("resize", j);
+      { immediate: (Q = (G = o.store.state) == null ? void 0 : G.table) == null ? void 0 : Q.immediate }
+    ), w(R, (e) => a == null ? void 0 : a.setState(e)), w(m, (e) => {
+      var t;
+      return (t = o.tableApi) == null ? void 0 : t.setState(e);
+    }), ze(() => {
+      g && C("register", F, g.uid), o.mount(F, a), a == null || a.setState(r(R)), Z(() => {
+        f || Pe();
+      }), window.addEventListener("resize", x);
     }), Y(() => {
-      d = !0, I(), t == null || t.unmount(), window.removeEventListener("resize", j);
-    }), le({ ...F, instance: h }), (e, o) => (te(), ee("div", {
-      class: V(r(E)),
-      "data-testid": pe.value
+      f = !0, _(), o == null || o.unmount(), window.removeEventListener("resize", x);
+    }), me({ ...F, instance: g }), (e, t) => (te(), ee("div", {
+      class: V(r($)),
+      "data-testid": ce.value
     }, [
       c.value.useSearchForm ? (te(), ee("div", {
         key: 0,
-        class: V(`${r(E)}-header`),
+        class: V(`${r($)}-header`),
         "data-testid": ue.value
       }, [
-        M(r(ve), {
+        M(r(Ae), {
           "test-id": `${T.value}-search-form`
-        }, K({ _: 2 }, [
-          oe(r(ce)(r($)), (s) => ({
-            name: r(de)(s),
-            fn: g((n) => [
-              l(e.$slots, s, re(ie(n || {})))
+        }, B({ _: 2 }, [
+          oe(r(de)(r(D)), (i) => ({
+            name: r(fe)(i),
+            fn: h((s) => [
+              l(e.$slots, i, re(ae(s || {})))
             ])
           }))
         ]), 1032, ["test-id"]),
         l(e.$slots, "header-down")
-      ], 10, mt)) : He("", !0),
-      Le("div", {
+      ], 10, ut)) : je("", !0),
+      xe("div", {
         class: V({
-          [`${r(E)}-wrapper`]: !0,
+          [`${r($)}-wrapper`]: !0,
           "pt-(--tt-base-padding)!": !0,
           "pb-(--tt-base-padding)!": !r(m).showPager
         })
       }, [
         l(e.$slots, "table-top"),
-        M(it, se({
+        M(nt, ie({
           ...r(m),
-          ...he.value ? { data: z.value } : {}
+          ...we.value ? { data: z.value } : {}
         }, {
-          "form-api": r(i),
-          "table-api": r(t).tableApi
-        }, ze(Pe.value)), K({ _: 2 }, [
-          oe(r(fe)(r($)), (s) => ({
-            name: r(be)(s),
-            fn: g((n) => [
-              l(e.$slots, s, re(ie(n || {})))
+          "form-api": r(a),
+          "table-api": r(o).tableApi
+        }, Ne(De.value)), B({ _: 2 }, [
+          oe(r(be)(r(D)), (i) => ({
+            name: r(he)(i),
+            fn: h((s) => [
+              l(e.$slots, i, re(ae(s || {})))
             ])
           })),
           r(m).showToolbar ? {
             name: "toolbar_tools",
-            fn: g(() => [
-              M(Xe, se(r(ge), {
-                onOnRefresh: $e,
+            fn: h(() => [
+              M(et, ie(r(ge), {
+                onOnRefresh: Re,
                 onOnExport: J,
                 onOnColumnsSetting: W
               }), {
-                "toolbar-left": g(() => [
+                "toolbar-left": h(() => [
                   l(e.$slots, "t-toolbar_tools-left")
                 ]),
-                "toolbar-right": g(() => [
+                "toolbar-right": h(() => [
                   l(e.$slots, "t-toolbar_tools-right")
                 ]),
                 _: 3
@@ -351,29 +362,29 @@ const lt = ["data-testid"], mt = ["data-testid"], Vo = /* @__PURE__ */ _e({
         ]), 1040, ["form-api", "table-api"]),
         l(e.$slots, "table-bottom")
       ], 2),
-      M(Ue, {
+      M(Ze, {
         ref_key: "columnModalRef",
-        ref: R,
+        ref: E,
         "open-export": J,
         "open-column": W,
-        onOnSubmit: Ee
-      }, K({
-        beforeFooter: g(() => [
+        onOnSubmit: _e
+      }, B({
+        beforeFooter: h(() => [
           l(e.$slots, "t-column-modal-before-footer")
         ]),
         _: 2
       }, [
-        r($)["t-column-modal-title"] ? {
+        r(D)["t-column-modal-title"] ? {
           name: "title",
-          fn: g(() => [
+          fn: h(() => [
             l(e.$slots, "t-column-modal-title")
           ]),
           key: "0"
         } : void 0
       ]), 1536)
-    ], 10, lt));
+    ], 10, ct));
   }
 });
 export {
-  Vo as default
+  ko as default
 };

package/dist/components/tt-table/src/props.d.ts

@@ -2,7 +2,7 @@ import { PropType } from 'vue';
 import { TtExtendedFormApi, TtFormProps } from '../../tt-form';
 import { VxeTableDefines, VxeTablePropTypes } from 'vxe-table';
 import { TtTableExtendedTableApi, TtTableProps } from './types/table';
-import { TtTableExtendedTableFormApi } from './types/tableForm';
+import { TtTableExtendedTableFormApi, TtTableFormProps } from './types/tableForm';
 import { TtTableToolsProps } from './types/tableTools';
 /** 表格参数 */
 export declare const tableProps: {
@@ -504,6 +504,11 @@ export declare const tableFormProps: {
         type: PropType<Fn>;
         default: null;
     };
+    /** 查询发起请求前的调用方法，返回 false 拦截本次查询 */
+    tableSearchBefore: {
+        type: PropType<NonNullable<TtTableFormProps["tableSearchBefore"]>>;
+        default: null;
+    };
     /** TtTableTools的props */
     toolConfig: {
         type: PropType<TtTableToolsProps>;

package/dist/components/tt-table/src/props.js

@@ -82,7 +82,7 @@ const a = {
     type: Function
     // default: () => GlobalConfig.table?.customizeColumn,
   }
-}, p = {
+}, n = {
   /** api请求方法 */
   api: {
     type: Function,
@@ -115,7 +115,7 @@ const a = {
   },
   /** 是否滚动加载数据 */
   isScrollFetch: { type: Boolean, default: () => e("isScrollFetch") }
-}, n = {
+}, p = {
   /** 是否显示toolbar */
   showToolbar: { type: Boolean, default: () => e("showToolbar") },
   /** 具体某些列排序 field数组 */
@@ -207,8 +207,8 @@ const a = {
   },
   ...a,
   ...r,
-  ...p,
-  ...n
+  ...n,
+  ...p
 }, i = {
   /** 按键配置项 */
   keyboardConfig: {
@@ -261,6 +261,11 @@ const a = {
     type: Function,
     default: null
   },
+  /** 查询发起请求前的调用方法，返回 false 拦截本次查询 */
+  tableSearchBefore: {
+    type: Function,
+    default: null
+  },
   /** TtTableTools的props */
   toolConfig: {
     type: Object,

package/dist/components/tt-table/src/types/tableForm.d.ts

@@ -1,10 +1,22 @@
 import { MaybeRef, Ref } from 'vue';
+import { Recordable } from '../../../../../../utils/src';
 import { TtSelectRowKeysType, TtTableMethods, TtTableProps } from '../types/table';
 import { TableFormApi } from '../utils/table-form-api';
 import { TtTableToolsProps } from './tableTools';
 import { TtExtendedFormApi, TtFormProps } from '../../../tt-form';
 export type TtTableFormRenderFormProps = Partial<TtFormProps>;
 export type TtTableRenderFormInstance = TtExtendedFormApi;
+/**
+ * 查询前拦截的返回结果。
+ *
+ * 直接返回布尔值表示是否发起查询；需要在拦截的同时清掉列表时返回对象形式。
+ */
+export type TtTableSearchBeforeResult = boolean | {
+    /** 是否继续发起查询请求 */
+    canSearch: boolean;
+    /** 是否清空表格数据与分页总数，默认 false */
+    clearData?: boolean;
+};
 /**
  * 表单 + 表格的组合配置。
  *
@@ -23,6 +35,13 @@ export type TtTableFormProps<Row = any> = {
     toolConfig?: TtTableToolsProps;
     /** 刷新前的调用方法 */
     tableRefreshBefore?: (...arg: any[]) => Promise<any>;
+    /**
+     * 点击查询（含回车提交）发起请求前的调用方法。
+     *
+     * 返回 `false` 拦截本次查询；返回 `{ canSearch, clearData }` 可以在拦截的同时清空表格数据。
+     * @param values 通过校验后的当前表单值
+     */
+    tableSearchBefore?: (values: Recordable) => TtTableSearchBeforeResult | Promise<TtTableSearchBeforeResult>;
     /**
      * 表格 testId，用于生成测试标识
      * 如果不指定，将从 table.api 路径自动提取

package/package.json

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