@dazhicheng/ui 1.6.6 → 1.6.8

package/dist/components/tt-table/src/hooks/useTableData.js

@@ -1,7 +1,7 @@
 import "axios";
 import "element-plus";
 import { isString as L, isFunction as N, isObject as Re } from "../../../../packages/utils/src/is.js";
-import { getCurrentInstance as he, shallowRef as J, watch as Q, unref as d, onBeforeUpdate as ve, getCurrentScope as Ce, onScopeDispose as Me, toValue as S, nextTick as P, isRef as be } from "vue";
+import { getCurrentInstance as he, shallowRef as J, watch as Q, toValue as y, unref as d, onBeforeUpdate as ve, getCurrentScope as Ce, onScopeDispose as Me, nextTick as S, isRef as be } from "vue";
 import "dayjs";
 import "numeral";
 import "xe-utils";
@@ -53,7 +53,7 @@ const De = /* @__PURE__ */ new Set([
   "clearRadioReserve"
 ]), ye = /* @__PURE__ */ new Set(["loadData", "reloadData"]);
 function X(l) {
-  const f = S(l);
+  const f = y(l);
   if (f)
     return be(f) ? f.value ?? [] : f;
 }
@@ -66,7 +66,7 @@ async function ke(l, f, C, g = () => !0) {
 }
 function je(l, f, C, g, i) {
   const R = he(), b = J([]), D = J();
-  let A = !1, s = !1, M = 0, h;
+  let A = !1, u = !1, M = 0, h;
   const q = Symbol("tt-table-emitted-rows-event");
   let Y = 0, m, v = !1, T = 0, U = Promise.resolve();
   function p() {
@@ -85,7 +85,7 @@ function je(l, f, C, g, i) {
     const t = X(i.data);
     return t != null && t.length ? "data" : p() ? "model" : "data";
   }
-  function y(e) {
+  function E(e) {
     const t = U.then(e);
     return U = t.then(
       () => {
@@ -96,39 +96,39 @@ function je(l, f, C, g, i) {
   }
   function ee(e, t) {
     return new Proxy(e, {
-      get(o, a, r) {
-        return a === q ? t : Reflect.get(o, a, r);
+      get(r, a, o) {
+        return a === q ? t : Reflect.get(r, a, o);
       },
-      set(o, a, r) {
-        const u = Reflect.set(o, a, r);
-        return u && t === m && (v = !0), u;
+      set(r, a, o) {
+        const s = Reflect.set(r, a, o);
+        return s && t === m && (v = !0), s;
       },
-      deleteProperty(o, a) {
-        const r = Reflect.deleteProperty(o, a);
-        return r && t === m && (v = !0), r;
+      deleteProperty(r, a) {
+        const o = Reflect.deleteProperty(r, a);
+        return o && t === m && (v = !0), o;
       },
-      defineProperty(o, a, r) {
-        const u = Reflect.defineProperty(o, a, r);
-        return u && t === m && (v = !0), u;
+      defineProperty(r, a, o) {
+        const s = Reflect.defineProperty(r, a, o);
+        return s && t === m && (v = !0), s;
       }
     });
   }
   function te(e) {
     const t = e == null ? void 0 : e[q], n = m;
     if (n === void 0 || t !== n) return !1;
-    const o = v;
-    return m = void 0, v = !1, !o;
+    const r = v;
+    return m = void 0, v = !1, !r;
   }
   function ne(e) {
-    P(() => {
+    S(() => {
       m === e && (m = void 0, v = !1);
     });
   }
   function V(e) {
-    const t = S(i.api), n = p(), o = Z(), a = o && !t;
-    o && (D.value = "model");
-    const r = a ? ++Y : void 0, u = r ? ee(e, r) : e;
-    m = r, v = !1, b.value = u, (o || !n) && (C.value = u, r && ne(r));
+    const t = y(i.api), n = p(), r = Z(), a = r && !t;
+    r && (D.value = "model");
+    const o = a ? ++Y : void 0, s = o ? ee(e, o) : e;
+    m = o, v = !1, b.value = s, (r || !n && !t) && (C.value = s, o && ne(o));
   }
   function k(e) {
     var n;
@@ -136,33 +136,33 @@ function je(l, f, C, g, i) {
     return (e === "visible" ? t == null ? void 0 : t.visibleData : t == null ? void 0 : t.fullData) || [];
   }
   function O(e = "full") {
-    return s || !d(f) ? !1 : (h = void 0, V(k(e)), !0);
+    return u || !d(f) ? !1 : (h = void 0, V(k(e)), !0);
   }
   function j(e = "full") {
-    if (s || M || !d(b).length && !k(e).length) return;
+    if (u || M || !d(b).length && !k(e).length) return;
     if (h) {
       e === "visible" && (h.source = e);
       return;
     }
     const t = { inputVersion: T, source: e };
-    h = t, P().then(() => {
-      h === t && (h = void 0, !(s || M || t.inputVersion !== T) && O(t.source));
+    h = t, S().then(() => {
+      h === t && (h = void 0, !(u || M || t.inputVersion !== T) && O(t.source));
     });
   }
   function z() {
     h = void 0;
   }
-  function oe() {
+  function re() {
     j();
   }
   async function F(e, t = "full") {
     const n = T;
-    return y(async () => {
-      if (!s) {
+    return E(async () => {
+      if (!u) {
         M += 1;
         try {
-          const o = await e();
-          return await P(), !s && n === T && O(t), o;
+          const r = await e();
+          return await S(), !u && n === T && O(t), r;
         } finally {
           M -= 1;
         }
@@ -170,11 +170,11 @@ function je(l, f, C, g, i) {
     });
   }
   const K = /* @__PURE__ */ new WeakMap();
-  function re(e) {
+  function oe(e) {
     const t = Reflect.get(e, "getRefMaps");
     if (!N(t)) return;
     const n = Reflect.apply(t, e, []);
-    return S(n.refTable);
+    return y(n.refTable);
   }
   function ie(e) {
     if (L(e)) return e;
@@ -184,72 +184,72 @@ function je(l, f, C, g, i) {
     return e.updateData();
   }
   function le(e, t) {
-    var n, o;
-    ye.has(e) && t[0] && ((n = i.prepareRows) == null || n.call(i, t[0])), e === "loadTreeChildren" && t[1] && ((o = i.prepareRows) == null || o.call(i, t[1]));
+    var n, r;
+    ye.has(e) && t[0] && ((n = i.prepareRows) == null || n.call(i, t[0])), e === "loadTreeChildren" && t[1] && ((r = i.prepareRows) == null || r.call(i, t[1]));
   }
-  function se(e) {
+  function ue(e) {
     if (!e) return;
     const t = K.get(e);
     if (t) return t;
-    const n = /* @__PURE__ */ new Map(), o = new Proxy(e, {
-      get(a, r, u) {
-        let c = Reflect.get(a, r, u);
-        if (!L(r)) return c;
-        const W = xe.has(r);
-        if (!W && !De.has(r)) return c;
-        let E = a;
+    const n = /* @__PURE__ */ new Map(), r = new Proxy(e, {
+      get(a, o, s) {
+        let c = Reflect.get(a, o, s);
+        if (!L(o)) return c;
+        const W = xe.has(o);
+        if (!W && !De.has(o)) return c;
+        let P = a;
         if (!N(c)) {
-          const w = re(a);
-          w && (E = w, c = Reflect.get(w, r));
+          const w = oe(a);
+          w && (P = w, c = Reflect.get(w, o));
         }
         if (!N(c)) return c;
-        const $ = n.get(r);
+        const $ = n.get(o);
         if ($) return $;
-        const me = r === "undo" || r === "redo" ? "visible" : "full", G = (...w) => {
+        const me = o === "undo" || o === "redo" ? "visible" : "full", G = (...w) => {
           if (W) {
-            const B = Reflect.apply(c, E, w);
+            const B = Reflect.apply(c, P, w);
             return Promise.resolve(B).then((we) => {
               var H;
               return (H = i.onSelectionMutated) == null || H.call(i), we;
             });
           }
-          if (le(r, w), r === "syncData") return F(() => ae(a));
-          if (r === "commitProxy") {
+          if (le(o, w), o === "syncData") return F(() => ae(a));
+          if (o === "commitProxy") {
             const B = ie(w[0]);
             if (!Te.has(B || ""))
-              return Reflect.apply(c, E, w);
+              return Reflect.apply(c, P, w);
           }
-          return F(() => Reflect.apply(c, E, w), me);
+          return F(() => Reflect.apply(c, P, w), me);
         };
-        return n.set(r, G), G;
+        return n.set(o, G), G;
       }
     });
-    return K.set(e, o), o;
+    return K.set(e, r), r;
   }
   async function I(e, t) {
     var c;
-    if (s || !x(t)) return !1;
+    if (u || !x(t)) return !1;
     const n = d(f);
     if (!n) return !1;
-    const { treeConfig: o, clearTreeExpand: a, mergeCells: r } = d(l), u = n.getTreeExpandRecords();
+    const { treeConfig: r, clearTreeExpand: a, mergeCells: o } = d(l), s = n.getTreeExpandRecords();
     M += 1;
     try {
-      return (c = i.prepareRows) == null || c.call(i, e), await n.loadData(e), s || !x(t) || r && (await n.setMergeCells(r), s || !x(t)) || (a ? await n.clearTreeExpand() : u.length && (o != null && o.reserve) && await n.setTreeExpand(u, !0), s || !x(t)) ? !1 : (b.value = e, g("load-data"), !0);
+      return (c = i.prepareRows) == null || c.call(i, e), await n.loadData(e), u || !x(t) || o && (await n.setMergeCells(o), u || !x(t)) || (a ? await n.clearTreeExpand() : s.length && (r != null && r.reserve) && await n.setTreeExpand(s, !0), u || !x(t)) ? !1 : (b.value = e, g("load-data"), !0);
     } finally {
       M -= 1;
     }
   }
-  function ue(e, t) {
-    return y(() => I(e, t));
+  function se(e, t) {
+    return E(() => I(e, t));
   }
   function fe(e, t) {
-    return y(async () => !await I(e, t) || s || !x(t) ? !1 : (V(e), !0));
+    return E(async () => !await I(e, t) || u || !x(t) ? !1 : (V(e), !0));
   }
   function ce(e, t) {
-    return y(async () => {
-      var o;
-      if (await P(), s || !t()) return !1;
-      const n = ((o = d(f)) == null ? void 0 : o.getTableData().fullData) || [];
+    return E(async () => {
+      var r;
+      if (await S(), u || !t()) return !1;
+      const n = ((r = d(f)) == null ? void 0 : r.getTableData().fullData) || [];
       return !e.length && !d(b).length && !n.length ? !1 : I(e, t);
     });
   }
@@ -259,13 +259,16 @@ function je(l, f, C, g, i) {
   }
   function pe() {
     const { api: e, data: t } = i;
-    if (S(e)) return;
+    if (y(e)) return;
     if (D.value === "model" && p()) return d(C) || [];
     const n = X(t);
     return n !== void 0 ? n : p() ? d(C) || [] : void 0;
   }
   return D.value = _(), A = p(), Q(
-    () => p() ? d(C) : void 0,
+    () => {
+      if (!y(i.api))
+        return p() ? d(C) : void 0;
+    },
     () => {
       p() && (D.value = "model");
     },
@@ -273,10 +276,10 @@ function je(l, f, C, g, i) {
   ), Q(
     pe,
     (e, t, n) => {
-      let o = !0;
+      let r = !0;
       n(() => {
-        o = !1;
-      }), !te(e) && (T += 1, z(), e && ce(e, () => o).catch((a) => {
+        r = !1;
+      }), !te(e) && (T += 1, z(), e && ce(e, () => r).catch((a) => {
       }));
     },
     { immediate: !0, deep: 1, flush: "post" }
@@ -284,21 +287,21 @@ function je(l, f, C, g, i) {
     const e = p();
     e !== A && (A = e, D.value = _());
   }), Ce() && Me(() => {
-    s = !0, h = void 0, m = void 0, v = !1;
+    u = !0, h = void 0, m = void 0, v = !1;
   }), {
     rows: b,
-    loadRows: ue,
+    loadRows: se,
     applyRows: fe,
     emitRows: V,
     getDataSource: de,
     runDataOperation: F,
     scheduleRowsCommit: j,
     cancelRowsCommit: z,
-    onDataChange: oe,
+    onDataChange: re,
     commitRows: O,
-    createTableInstanceFacade: se,
+    createTableInstanceFacade: ue,
     /** 判断表格作用域是否仍然有效。 */
-    isActive: () => !s
+    isActive: () => !u
   };
 }
 export {

package/dist/components/tt-table/src/hooks/useTableForm.js

@@ -1,7 +1,7 @@
 import "axios";
 import "element-plus";
 import { isFunction as m } from "../../../../packages/utils/src/is.js";
-import { computed as c, unref as i, toValue as u } from "vue";
+import { computed as s, unref as i, toValue as a } from "vue";
 import "dayjs";
 import "numeral";
 import "xe-utils";
@@ -12,12 +12,12 @@ import "../../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/ae
 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 p } from "lodash-es";
-function j(n, h, l, d) {
-  const f = c(() => {
+import { omit as u } from "lodash-es";
+function k(n, p, h, l) {
+  const f = s(() => {
     const { form: t } = i(n), o = {
       ...t == null ? void 0 : t.submitButtonOptions,
-      loading: i(l)
+      loading: i(h)
     };
     return {
       ...t,
@@ -25,44 +25,43 @@ function j(n, h, l, d) {
     };
   });
   async function b(t) {
-    const o = d(), r = { currentPage: 1, pageSize: o == null ? void 0 : o.pageSize };
-    await h({ tablePage: r, searchInfo: t });
+    const o = l(), r = { currentPage: 1, pageSize: o == null ? void 0 : o.pageSize };
+    await p({ tablePage: r, searchInfo: t });
   }
-  async function w(t) {
-    const { handleSearchInfoFn: o, table: r } = u(n);
+  async function d(t) {
+    const { handleSearchInfoFn: o, table: r } = a(n);
     let e = t;
     return m(o) && (e = await o(e) || e), m(r == null ? void 0 : r.beforeFetch) && (e = await r.beforeFetch(e) || e), e;
   }
-  const a = c(() => {
-    const { columnsKey: t, showSetting: o, showSetColumn: r, showRefresh: e, showExport: s } = i(n).table || {}, { toolConfig: F } = i(n);
+  const c = s(() => {
+    const { columnsKey: t, showSetting: o, showSetColumn: r, showRefresh: e, showExport: F } = i(n).table || {}, { toolConfig: w } = i(n);
     return {
       columnsKey: t,
       showSetting: o,
       showRefresh: e,
       showSetColumn: r,
-      showExport: s,
-      ...F
+      showExport: F,
+      ...w
     };
-  }), g = c(() => {
-    const { table: t = {}, tableRowId: o, useSearchForm: r, testId: e } = u(n), s = p(i(a), ["tableRowId"]);
+  }), g = s(() => {
+    const { table: t = {}, useSearchForm: o, testId: r } = a(n), e = u(i(c), ["tableRowId"]);
     return {
-      useSearchForm: r || !1,
+      useSearchForm: o || !1,
       // 数据由 TableForm 单独绑定，不进入表格配置。
-      ...p(t, ["data"]),
-      ...s,
-      tableRowId: (t == null ? void 0 : t.tableRowId) || o,
+      ...u(t, ["data"]),
+      ...e,
       // 继承外层的 testId，如果 table.testId 未设置则使用外层的 testId
-      testId: (t == null ? void 0 : t.testId) || e,
-      beforeFetch: w
+      testId: (t == null ? void 0 : t.testId) || r,
+      beforeFetch: d
     };
   });
   return {
     getFormProps: f,
     submitSearchQuery: b,
     getTableProps: g,
-    getTableToolProps: a
+    getTableToolProps: c
   };
 }
 export {
-  j as useTableForm
+  k as useTableForm
 };

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

@@ -509,11 +509,6 @@ export declare const tableFormProps: {
         type: PropType<TtTableToolsProps>;
         default: null;
     };
-    /** 表格行id */
-    tableRowId: {
-        type: StringConstructor;
-        default: () => string | undefined;
-    };
     /** 表格 testId，用于生成测试标识 */
     testId: {
         type: StringConstructor;

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

@@ -1,4 +1,4 @@
-import { propTypes as o } from "../../../packages/hooks/src/propTypes.js";
+import { propTypes as t } from "../../../packages/hooks/src/propTypes.js";
 import "axios";
 import "element-plus";
 import "dayjs";
@@ -14,12 +14,11 @@ import "../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/mode-
 import "../../../node_modules/.pnpm/crypto-js@4.2.0/node_modules/crypto-js/pad-pkcs7.js";
 import "lodash-es";
 import "vue-router";
-import { GlobalConfig as a } from "../../../hooks/useSetup.js";
-import { createSharedTableDefaults as l } from "./table-defaults.js";
-function e(t) {
-  return l()[t];
+import { createSharedTableDefaults as o } from "./table-defaults.js";
+function e(l) {
+  return o()[l];
 }
-const r = {
+const a = {
   /** 是否显示分页 */
   showPager: { type: Boolean, default: () => e("showPager") },
   /** 当前页数 field */
@@ -30,7 +29,7 @@ const r = {
   totalField: { type: String, default: () => e("totalField") },
   /** 数据的 field */
   dataField: { type: String, default: () => e("dataField") }
-}, p = {
+}, r = {
   /** 是否显示复选框 */
   showCheckbox: { type: Boolean, default: () => e("showCheckbox") },
   /** 是否跨页保持复选框选中状态 */
@@ -83,7 +82,7 @@ const r = {
     type: Function
     // default: () => GlobalConfig.table?.customizeColumn,
   }
-}, n = {
+}, p = {
   /** api请求方法 */
   api: {
     type: Function,
@@ -116,7 +115,7 @@ const r = {
   },
   /** 是否滚动加载数据 */
   isScrollFetch: { type: Boolean, default: () => e("isScrollFetch") }
-}, i = {
+}, n = {
   /** 是否显示toolbar */
   showToolbar: { type: Boolean, default: () => e("showToolbar") },
   /** 具体某些列排序 field数组 */
@@ -142,14 +141,14 @@ const r = {
   },
   /** 是否显示表格上方 alert */
   showTableAlert: { type: Boolean, default: () => e("showTableAlert") }
-}, j = {
+}, x = {
   /**
    * 是否自适应高度
    *
    * 组件方式默认 `true`，与 `table-api.ts` 的 `getDefaultState()` 里 hook 方式默认 `false` 有意不同，
    * 不要统一：改任一边都会改变现有页面的表格高度。因此它不进 `createSharedTableDefaults()`。
    */
-  autoHeight: o.bool.def(!0),
+  autoHeight: t.bool.def(!0),
   /** 左侧插槽的宽度 */
   leftSlotWidth: { type: Number, default: () => e("leftSlotWidth") },
   /** 右侧插槽的宽度 */
@@ -200,17 +199,17 @@ const r = {
     type: Object
   },
   /** 是否使用搜索form */
-  useSearchForm: o.bool.def(!1),
+  useSearchForm: t.bool.def(!1),
   /** 表格 testId，用于生成测试标识 */
   testId: {
     type: String,
     default: void 0
   },
+  ...a,
   ...r,
   ...p,
-  ...n,
-  ...i
-}, d = {
+  ...n
+}, i = {
   /** 按键配置项 */
   keyboardConfig: {
     type: Object,
@@ -231,7 +230,7 @@ const r = {
     type: Object,
     default: () => e("radioConfig")
   }
-}, I = {
+}, T = {
   /**
    * table参数
    *
@@ -243,10 +242,10 @@ const r = {
    */
   table: {
     type: Object,
-    default: () => ({ ...l(), autoHeight: !0, columnsKey: "", useSearchForm: !1 })
+    default: () => ({ ...o(), autoHeight: !0, columnsKey: "", useSearchForm: !1 })
   },
   /** 是否使用搜索form */
-  useSearchForm: o.bool.def(!0),
+  useSearchForm: t.bool.def(!0),
   /** BasicFormProps 的配置 */
   form: {
     type: Object,
@@ -267,14 +266,6 @@ const r = {
     type: Object,
     default: null
   },
-  /** 表格行id */
-  tableRowId: {
-    type: String,
-    default: () => {
-      var t;
-      return (t = a.table) == null ? void 0 : t.tableRowId;
-    }
-  },
   /** 表格 testId，用于生成测试标识 */
   testId: {
     type: String,
@@ -284,7 +275,7 @@ const r = {
   tableFormApi: {
     type: Object
   }
-}, A = {
+}, j = {
   /** 列配置 */
   columns: {
     type: Array,
@@ -341,10 +332,10 @@ const r = {
     type: String,
     default: "right"
   },
-  ...d
+  ...i
 };
 export {
-  I as tableFormProps,
-  A as tableOtherProps,
-  j as tableProps
+  T as tableFormProps,
+  j as tableOtherProps,
+  x as tableProps
 };

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

@@ -492,9 +492,10 @@ export type TtTableMethods<DT = VxeTablePropTypes.Row> = {
     reload: (data?: FetchParams) => Promise<void>;
     /**
      * @description: 重新计算高度
+     * @param full 是否连列宽一起重算，默认重算
      * @return {*}
      */
-    redoHeight: () => void;
+    redoHeight: (full?: boolean) => void;
     /**
      * @description: 设置表格props
      * @param {Partial<TtTableProps>} props 表格props

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

@@ -23,8 +23,6 @@ export type TtTableFormProps<Row = any> = {
     toolConfig?: TtTableToolsProps;
     /** 刷新前的调用方法 */
     tableRefreshBefore?: (...arg: any[]) => Promise<any>;
-    /** 表格行id */
-    tableRowId?: string;
     /**
      * 表格 testId，用于生成测试标识
      * 如果不指定，将从 table.api 路径自动提取

package/dist/components/tt-table/src/utils/table-api.d.ts

@@ -75,9 +75,10 @@ declare class TableApi<Row = any> {
     setProps(props: Partial<TtTableProps<Row>>): void;
     /**
      * @description: 重新计算高度
+     * @param full 是否连列宽一起重算，默认重算
      * @return {*}
      */
-    redoHeight(): void;
+    redoHeight(full?: boolean): void;
     /**
      * @description: 设置表格columns
      * @param {VxeGridPropTypes.Columns<DT>} columns columns

package/dist/components/tt-table/src/utils/table-api.js

@@ -135,10 +135,11 @@ class F {
   }
   /**
    * @description: 重新计算高度
+   * @param full 是否连列宽一起重算，默认重算
    * @return {*}
    */
-  redoHeight() {
-    this.methods.redoHeight();
+  redoHeight(t) {
+    this.methods.redoHeight(t);
   }
   /**
    * @description: 设置表格columns