@dazhicheng/ui 1.5.226 → 1.5.227

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

@@ -1,4 +1,4 @@
-import { defineComponent as Ae, useSlots as Ee, ref as Oe, computed as g, toValue as E, 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 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 "../../tt-button/index.js";
 import "../../tt-checkbox/index.js";
 import "../../tt-empty/index.js";
@@ -89,35 +89,35 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
   ],
   setup(oe, { expose: re, emit: se }) {
     var W, U, q;
-    const u = oe, T = se, R = Ee(), { prefixCls: _ } = We("table-form"), y = Oe();
+    const u = oe, y = se, R = Ee(), { prefixCls: _ } = We("table-form"), w = Oe();
     let t = u.tableFormApi;
     if (!t) {
       t = new rt(u);
       const e = t;
       e.useStore = (o) => He(t.store, o), t = e;
     }
-    const B = (W = t == null ? void 0 : t.useStore) == null ? void 0 : W.call(t), v = g(() => {
+    const B = (W = t == null ? void 0 : t.useStore) == null ? void 0 : W.call(t), S = h(() => {
       var o;
       if (u.testId) return u.testId;
-      const e = (o = E(B)) == null ? void 0 : o.table;
+      const e = (o = A(B)) == null ? void 0 : o.table;
       return e != null && e.api ? je(e.api) : "table";
-    }), ae = g(() => k(v.value, "tableform")), ie = g(() => k(v.value, "search-form-header")), le = g(() => k(v.value, "search-btn-query")), ne = g(() => k(v.value, "search-btn-reset")), me = g(() => ({
+    }), 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
     }));
     Ge(me);
-    const x = {}, c = $e(), S = g(() => E(B)), { getFormSlotKeysFunc: pe, getTableSlotKeysFunc: ue, replaceTableSlotKey: ce, replaceFormSlotKey: de } = et(), {
+    const x = {}, c = $e(), T = h(() => A(B)), { getFormSlotKeysFunc: pe, getTableSlotKeysFunc: ue, replaceTableSlotKey: ce, replaceFormSlotKey: de } = et(), {
       tableData: fe,
       getFormProps: V,
       getTableProps: d,
       getTableToolProps: be,
       handleSearchInfoChange: z
     } = Ye(
-      S,
+      T,
       t.tableApi.reload,
       t.tableApi.getLoading,
       t.tableApi.getPagination,
-      T
+      y
     ), { run: ge } = j(
       async () => {
         const e = await r.getValues();
@@ -133,8 +133,8 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
       },
       200,
       { leading: !0 }
-    ), [Ce, r] = Ne({
-      ...E(V),
+    ), [ve, r] = Ne({
+      ...A(V),
       handleSubmit: he,
       handleReset: ge,
       submitOnEnter: !0,
@@ -144,16 +144,16 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
       showCollapseButton: !0,
       collapsed: !0,
       collapseTriggerResize: !0
-    }), { initCustomSetting: ve, saveColumns: Se } = Ze({
+    }), { initCustomSetting: Ce, saveColumns: Se } = Ze({
       getTableProps: d,
       tableMethods: t.tableApi,
-      getProps: S
+      getProps: T
     }), D = async () => {
       await Ve(), t.tableApi && t.tableApi.redoHeight();
     };
     te.forEach((e) => {
       const o = xe.camelCase(e);
-      x[o] = (...a) => T(e, ...a);
+      x[o] = (...a) => y(e, ...a);
     });
     const Te = {
       ...x
@@ -172,7 +172,7 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
     }
     const { run: we } = j(
       async (e) => {
-        r.isMounted && s(S).useSearchForm ? r.validate().then(async (o) => {
+        r.isMounted && s(T).useSearchForm ? r.validate().then(async (o) => {
           if (o.valid) {
             const a = await r.getValues();
             await t.tableApi.reload({
@@ -192,62 +192,60 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
       },
       200,
       { leading: !0 }
-    ), A = {
+    ), E = {
       tableMethods: t.tableApi,
       formMethods: r,
       setTableProps: t.tableApi.setState,
       setFormProps: r.setState,
       setProps: ye,
       reload: we,
-      selectedKeys: g(() => E(t.tableApi.selectedKeys))
+      selectedKeys: h(() => A(t.tableApi.selectedKeys))
     };
     async function Fe() {
-      const { tableRefreshBefore: e } = S.value;
-      e && Ke(e) && await e(), A.reload();
+      const { tableRefreshBefore: e } = T.value;
+      e && Ke(e) && await e(), E.reload();
     }
     async function Pe(e) {
-      var f, m;
-      const o = ((m = (f = S.value) == null ? void 0 : f.table) == null ? void 0 : m.columns) || [], a = new Map(o.map((n) => [n.field, n])), l = e.checkedModel.map((n) => a.get(n)).filter(Boolean);
+      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);
       if (e.isExport) {
-        T("export", e.checkedModel, e.modalApi);
+        y("export", e.checkedModel, e.modalApi);
         return;
       }
       e.modalApi.setModalProps({
         confirmLoading: !0
-      }), d.value.useHttpCache && await Se(JSON.stringify(e.checkedModel)), t.tableApi.setTableColumns(l), e.modalApi.setModalProps({
+      }), d.value.useHttpCache && await Se(JSON.stringify(e.checkedModel)), t.tableApi.setTableColumns(i), e.modalApi.setModalProps({
         confirmLoading: !1
-      }), e.modalApi.closeModal(), T("set-columns", l);
+      }), e.modalApi.closeModal(), y("set-columns", i);
     }
     function N(e = !1) {
-      var m, n, h, b, w, F, P, I, M;
-      const { notSetColumnField: o, columns: a } = s(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 = ((F = (w = s(a)) == null ? void 0 : w.filter((i) => i.visible === !0 || i.visible === void 0)) == null ? void 0 : F.map((i) => i.field)) || [];
-      (I = y.value) == null || I.openModal({
-        columns: (((P = t.tableApi) == null ? void 0 : P.getTableColumns()) || []).filter(
-          (i) => i.visible !== !1
-        ),
-        displayFields: e ? f : l,
+      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)) || [];
+      (I = w.value) == null || I.openModal({
+        columns: (A(a) || []).filter((m) => m.visible !== !1),
+        displayFields: e ? f : i,
         disabledColumnField: o || []
-      }), (M = y.value) == null || M.setModalProps({
+      }), (M = w.value) == null || M.setModalProps({
         title: "列设置"
       });
     }
     function H(e = !1) {
-      var m, n, h, b, w, F, P, I, M;
-      const { notSetColumnField: o, columns: a } = s(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 = ((F = (w = s(a)) == null ? void 0 : w.filter((i) => i.visible === !0 || i.visible === void 0)) == null ? void 0 : F.map((i) => i.field)) || [];
-      (I = y.value) == null || I.openModal({
-        columns: (((P = t.tableApi) == null ? void 0 : P.getTableColumns()) || []).filter(
-          (i) => i.visible !== !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 : l,
+        displayFields: e ? f : i,
         disabledColumnField: o || [],
         isExport: !0
-      }), (M = y.value) == null || M.setModalProps({
+      }), (m = w.value) == null || m.setModalProps({
         title: "自定义导出"
       });
     }
     Xe({ formInstance: r }), G(() => {
-      c && T("register", A, c == null ? void 0 : c.uid), setTimeout(() => {
-        ve();
+      c && y("register", E, c == null ? void 0 : c.uid), setTimeout(() => {
+        Ce();
       }, 16);
     }), O(
       () => t.tableApi.getLoading.value,
@@ -271,7 +269,7 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
       },
       { deep: !0 }
     ), window.addEventListener("resize", D), G(() => {
-      t == null || t.mount(A, r), r == null || r.setState(V.value);
+      t == null || t.mount(E, r), r == null || r.setState(V.value);
     });
     function Ie(e) {
       return Object.fromEntries(Object.entries(e).filter(([o]) => !o.startsWith("on")));
@@ -282,34 +280,34 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
     return O(
       () => De(u, ["tableFormApi"]),
       () => {
-        var m;
-        const e = {}, o = ((m = c == null ? void 0 : c.vnode) == null ? void 0 : m.props) || {}, a = new Set(Object.keys(u));
-        for (const [n, h] of Object.entries(o)) {
-          const b = Le(n);
-          a.has(b) && (e[b] = h);
+        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);
         }
-        const l = Ie(e), f = Me(l, u);
+        const i = Ie(e), f = Me(i, u);
         t.setState(f);
       },
       { deep: !0 }
     ), ke(() => {
       t == null || t.unmount(), window.removeEventListener("resize", D);
-    }), re({ ...A, instance: c }), (e, o) => (Q(), J("div", {
+    }), re({ ...E, instance: c }), (e, o) => (Q(), J("div", {
       class: L(s(_)),
       "data-testid": ae.value
     }, [
-      S.value.useSearchForm ? (Q(), J("div", {
+      T.value.useSearchForm ? (Q(), J("div", {
         key: 0,
         class: L(`${s(_)}-header`),
         "data-testid": ie.value
       }, [
-        $(s(Ce), {
-          "test-id": `${v.value}-search-form`
+        $(s(ve), {
+          "test-id": `${S.value}-search-form`
         }, K({ _: 2 }, [
           X(s(pe)(s(R)), (a) => ({
             name: s(de)(a),
-            fn: C((l) => [
-              p(e.$slots, a, Y(Z(l || {})))
+            fn: C((i) => [
+              p(e.$slots, a, Y(Z(i || {})))
             ])
           }))
         ]), 1032, ["test-id"]),
@@ -326,14 +324,14 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
         $(Qe, ee(s(d), {
           data: s(fe),
           "table-row-id": e.tableRowId,
-          "table-id": v.value,
+          "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((l) => [
-              p(e.$slots, a, Y(Z(l || {})))
+            fn: C((i) => [
+              p(e.$slots, a, Y(Z(i || {})))
             ])
           })),
           s(d).showToolbar ? {
@@ -361,7 +359,7 @@ const st = ["data-testid"], at = ["data-testid"], Ao = /* @__PURE__ */ Ae({
       ], 2),
       $(qe, {
         ref_key: "tableColumnModalRef",
-        ref: y,
+        ref: w,
         "open-export": H,
         "open-column": N,
         onOnSubmit: Pe

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dazhicheng/ui",
-  "version": "1.5.226",
+  "version": "1.5.227",
   "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/hooks": "1.4.44",
-    "@dazhicheng/utils": "1.3.41"
+    "@dazhicheng/utils": "1.3.41",
+    "@dazhicheng/hooks": "1.4.44"
   },
   "files": [
     "dist"