@zl-ui-kit/components 0.19.0 → 0.20.1

package/README.md

@@ -960,6 +960,10 @@ const cardRequest = usePageableRequest(getPageApi, { manual: true, initialData:
 
 内部用 `usePageableRequest` 驱动分页与查询；`columns` 为 `TableColumn[]`，`queryItems` 为 `SearchItem[]`。
 
+> **查询 / 重置回到第 1 页**：点击「查询」「重置」或外部调用 `search()` 时，请求参数与分页器**同步**回到第 1 页；
+> `ref.refresh()` 则是原地重查、保持当前页码。翻页时组件会把 `{ pageNum, pageSize }` 合并进请求参数，
+> 不需要页面自己维护页码；即使接口不回传 `pageNum`，分页器也会跟随本次请求的目标页码。
+
 `queryItems` 与 `ZlForm` 的 `items` 是同一套 schema：基础查询项直接 `component` + `props` 配置（不用写模板），
 选项类控件用 EP 的 `options`，字段不是 `label`/`value` 时用 `props` 别名重映射，联动项用 `slot:true` + `#<model>` 接管：
 
@@ -1024,6 +1028,9 @@ const queryItems: SearchItem[] = [
 内部组合 `usePageableRequest + ZlSearch + ZlPagination + ZlEmpty`。
 搜索栏直接由 `queryItems: SearchItem[]` 驱动，写法与上面的 `ZlSearchTable` 完全一致（`component` + `props` 配置，选项类用 EP 的 `options`）。
 
+> **分页状态与查询动作同步**：与 `ZlSearchTable` 一致，点「查询」「重置」时请求参数与分页器同步回到第 1 页；
+> 即使接口只返回行数组、不回传 `pageNum`，分页器也会跟随本次请求的目标页码。`cardPageRef.value?.refresh()` 是原地重查、保持当前页码。
+
 **条件查询 / 页签切换怎么重查**：把变化源放进 `request.options.refreshDeps`（ref / getter 数组），
 依赖变化会自动重查**并回到第 1 页**——卡片页的请求是 `manual` 的（首屏由 `ZlSearch` 触发），
 组件内部已把 `refreshDeps` 接到自己的 `search()` 上，不需要自己写 `watch`：
@@ -1892,7 +1899,20 @@ const items: MenuOption[] = [
 | `collapseTransition` | `boolean`                    | false      | 折叠动画                                 |
 | `navigate`           | `(item: MenuOption) => void` | —          | 点击后的跳转回调（通常传 `router.push`） |
 
-`MenuOption` 字段：`key`（唯一标识）/ `label`（文案）/ `icon?`（`zl:*` 图标名）/ `disabled?` / `children?`。
+`MenuOption` 字段：`key`（唯一标识）/ `label`（文案）/ `icon?`（字符串 `zl:*` 图标名、组件或 VNode）/ `disabled?` / `children?`。
+
+`icon` 支持三种形态，可在同一个菜单里混用：
+
+```ts
+import { h } from 'vue'
+import MenuIcon from './MenuIcon.vue'
+
+const items: MenuOption[] = [
+  { key: 'home', label: '首页', icon: 'zl:home' },
+  { key: 'custom', label: '自定义', icon: h(MenuIcon, { name: 'a-home' }) },
+]
+```
+
 主题变量：`--zl-menu-text-color` / `--zl-menu-hover-bg`（与 `ZlAppMenu` 同口径）。
 
 ### ZlPermission
@@ -5199,13 +5219,13 @@ import { ZlMenu } from '@zl-ui-kit/components'
 
 **`items` 条目字段（`MenuOption`）**
 
-| 字段       | 类型           | 必填 | 说明                                              |
-| ---------- | -------------- | ---- | ------------------------------------------------- |
-| `key`      | `string`       | 是   | 唯一标识：选中态、select 事件、路由跳转都以它为准 |
-| `label`    | `string`       | 是   | 菜单文案                                          |
-| `icon`     | `string`       | 否   | 图标名（@zl-ui-kit/icons 中的 `zl:*` 图标）       |
-| `disabled` | `boolean`      | 否   | 是否禁用                                          |
-| `children` | `MenuOption[]` | 否   | 子菜单                                            |
+| 字段       | 类型                           | 必填 | 说明                                                                                                                                                                        |
+| ---------- | ------------------------------ | ---- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `key`      | `string`                       | 是   | 唯一标识：选中态、select 事件、路由跳转都以它为准                                                                                                                           |
+| `label`    | `string`                       | 是   | 菜单文案                                                                                                                                                                    |
+| `icon`     | `string \| Component \| VNode` | 否   | 图标： - 字符串：`@zl-ui-kit/icons` 中的 `zl:*` 图标名； - 组件：如 `h(MenuIcon, { name: 'a-home' })` 里的组件本身； - VNode：如 `h(MenuIcon, { name: 'a-home' })` 的结果。 |
+| `disabled` | `boolean`                      | 否   | 是否禁用                                                                                                                                                                    |
+| `children` | `MenuOption[]`                 | 否   | 子菜单                                                                                                                                                                      |
 
 **事件（emits）**
 
@@ -7265,13 +7285,13 @@ ZlGrid 子项 schema
 
 ZlMenu 菜单项配置
 
-| 字段       | 类型           | 必填 | 说明                                              |
-| ---------- | -------------- | ---- | ------------------------------------------------- |
-| `key`      | `string`       | 是   | 唯一标识：选中态、select 事件、路由跳转都以它为准 |
-| `label`    | `string`       | 是   | 菜单文案                                          |
-| `icon`     | `string`       | 否   | 图标名（@zl-ui-kit/icons 中的 `zl:*` 图标）       |
-| `disabled` | `boolean`      | 否   | 是否禁用                                          |
-| `children` | `MenuOption[]` | 否   | 子菜单                                            |
+| 字段       | 类型                           | 必填 | 说明                                                                                                                                                                        |
+| ---------- | ------------------------------ | ---- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
+| `key`      | `string`                       | 是   | 唯一标识：选中态、select 事件、路由跳转都以它为准                                                                                                                           |
+| `label`    | `string`                       | 是   | 菜单文案                                                                                                                                                                    |
+| `icon`     | `string \| Component \| VNode` | 否   | 图标： - 字符串：`@zl-ui-kit/icons` 中的 `zl:*` 图标名； - 组件：如 `h(MenuIcon, { name: 'a-home' })` 里的组件本身； - VNode：如 `h(MenuIcon, { name: 'a-home' })` 的结果。 |
+| `disabled` | `boolean`                      | 否   | 是否禁用                                                                                                                                                                    |
+| `children` | `MenuOption[]`                 | 否   | 子菜单                                                                                                                                                                      |
 
 #### `TableColumn`
 

package/dist/components/ZlCardPage/index.vue.d.ts

@@ -421,8 +421,8 @@ declare const __VLS_component: import('vue').DefineComponent<__VLS_Props, {
 }>, {
     immediate: boolean;
     hideEmptyLabel: boolean;
-    queryItems: SearchItem[];
     pagination: Record<string, any> | boolean;
+    queryItems: SearchItem[];
     itemKey: string;
 }, {}, {}, {}, string, import('vue').ComponentProvideOptions, false, {
     searchRef: ({

package/dist/components/ZlCardPage/index.vue.mjs

@@ -1,12 +1,13 @@
-import { defineComponent as K, useSlots as M, ref as V, computed as u, watch as x, resolveDirective as F, withDirectives as G, openBlock as m, createElementBlock as z, normalizeStyle as H, createBlock as g, createSlots as J, withCtx as P, renderSlot as h, renderList as b, normalizeProps as Q, guardReactiveProps as T, createCommentVNode as k, createElementVNode as q, Fragment as U, mergeProps as $, unref as v } from "vue";
+import { defineComponent as M, useSlots as V, ref as P, computed as o, watch as x, resolveDirective as F, withDirectives as G, openBlock as l, createElementBlock as b, normalizeStyle as H, createBlock as h, createSlots as J, withCtx as k, renderSlot as g, renderList as z, normalizeProps as Q, guardReactiveProps as T, createCommentVNode as q, createElementVNode as $, Fragment as U, mergeProps as D, unref as v } from "vue";
 import { usePageableRequest as X } from "@zl-ui-kit/composables";
-import { isArray as D } from "@zl-ui-kit/utils";
-import Y from "../ZlEmpty/index.vue.mjs";
-import _ from "../ZlPagination/index.vue.mjs";
-import ee from "../ZlSearch/index.vue.mjs";
+import { isArray as Y } from "@zl-ui-kit/utils";
+import _ from "../ZlEmpty/index.vue.mjs";
+import ee from "../ZlPagination/index.vue.mjs";
+import te from "../ZlSearch/index.vue.mjs";
 import '../ZlSearch/index.css';/* empty css                      */
-import { usePagination as te } from "../ZlPagination/usePagination.mjs";
-const ae = { class: "zl-card-page__content" }, se = { class: "zl-card-page__list" }, B = "search-", de = /* @__PURE__ */ K({
+import { usePagination as ae } from "../ZlPagination/usePagination.mjs";
+import { resolveCardPagePagination as se } from "./resolvePagination.mjs";
+const re = { class: "zl-card-page__content" }, ie = { class: "zl-card-page__list" }, B = "search-", he = /* @__PURE__ */ M({
   name: "ZlCardPage",
   __name: "index",
   props: {
@@ -19,9 +20,9 @@ const ae = { class: "zl-card-page__content" }, se = { class: "zl-card-page__list
     cardMinWidth: {}
   },
   emits: ["search-reset"],
-  setup(s, { expose: E, emit: N }) {
-    const n = s, R = N, w = M(), C = V(null), p = u(() => {
-      const e = n.request;
+  setup(s, { expose: C, emit: E }) {
+    const c = s, N = E, R = V(), w = P(null), p = o(() => {
+      const e = c.request;
       if (e && typeof e == "object" && "run" in e && "data" in e && !("service" in e))
         return {
           instance: e,
@@ -31,113 +32,110 @@ const ae = { class: "zl-card-page__content" }, se = { class: "zl-card-page__list
       const t = { manual: !0, initialData: [] };
       if (typeof e == "function")
         return { instance: null, service: e, options: t };
-      const { refreshDeps: r, refreshDepsAction: a, ...c } = e.options ?? {};
+      const { refreshDeps: d, refreshDepsAction: a, ...n } = e.options ?? {};
       return {
         instance: null,
         service: e.service,
         options: {
-          ...c,
+          ...n,
           ...t,
-          ...r ? { refreshDeps: r, refreshDepsAction: a ?? (() => l()) } : {}
+          ...d ? { refreshDeps: d, refreshDepsAction: a ?? (() => i()) } : {}
         }
       };
-    }), o = X(p.value.service, p.value.options), I = p.value.instance ?? {
-      loading: o.loading,
-      data: o.data,
-      run: o.run,
-      params: o.params,
-      refresh: o.refresh
-    }, { loading: O, data: i, run: j, params: A, refresh: L } = I, y = u(() => A.value?.[0]), W = u(() => {
-      if (D(i.value))
-        return n.pagination && { total: i.value.length, ...n.pagination };
-      {
-        const e = i.value ?? {}, t = y.value ?? {}, r = n.pagination;
-        return {
-          ...r,
-          pageNum: e.pageNum ?? t.pageNum ?? 1,
-          pageSize: e.pageSize ?? t.pageSize ?? r?.pageSize ?? 30,
-          total: e.total ?? 0
-        };
-      }
-    }), d = te(() => W.value ?? !1), S = u(
-      () => D(i.value) ? i.value : i.value?.rows ?? []
-    ), Z = u(() => {
+    }), r = X(p.value.service, p.value.options), I = p.value.instance ?? {
+      loading: r.loading,
+      data: r.data,
+      run: r.run,
+      params: r.params,
+      refresh: r.refresh
+    }, { loading: O, data: m, run: j, params: A, refresh: L } = I, W = o(() => A.value?.[0]), y = P({ pageNum: 1 }), Z = o(
+      () => se({
+        data: m.value,
+        pagination: c.pagination,
+        pageState: y.value
+      })
+    ), u = ae(() => Z.value ?? !1), S = o(
+      () => Y(m.value) ? m.value : m.value?.rows ?? []
+    ), K = o(() => {
       const e = [];
-      return Object.keys(w).forEach((t) => {
+      return Object.keys(R).forEach((t) => {
         t.startsWith(B) && t !== "search-actions" && e.push(t.slice(B.length));
       }), e;
     });
     let f;
-    function l(e, t = {
+    function i(e, t = {
       pageNum: 1,
-      pageSize: d.value !== !1 ? d.value.pageSize : 30
+      pageSize: u.value !== !1 ? u.value.pageSize : 30
     }) {
       f = {
         ...f,
         ...e,
         ...t
+      }, y.value = {
+        pageNum: t?.pageNum ?? 1,
+        pageSize: t?.pageSize
       }, j(f);
     }
     return x(
-      () => n.immediate,
+      () => c.immediate,
       (e) => {
-        e && !n.queryItems.length && l();
+        e && !c.queryItems.length && i();
       },
       { immediate: !0, once: !0 }
-    ), E({
+    ), C({
       /** 原地重查：用最近一次入参重新请求，保持当前页码（区别于 `search()` 会回到第 1 页） */
       refresh: L,
       /** 最近一次请求的入参（`{ pageNum, pageSize, ...查询表单 }`），未请求过时为 `undefined` */
-      params: y,
+      params: W,
       /** 重新查询并回到第 1 页；消费方可在 useRequest 的 refreshDepsAction 里调用 */
-      search: l
+      search: i
     }), (e, t) => {
-      const r = F("loading");
-      return G((m(), z("div", {
+      const d = F("loading");
+      return G((l(), b("div", {
         class: "zl-card-page",
         style: H({ "--card-min-width": s.cardMinWidth })
       }, [
-        s.queryItems.length || e.$slots["search-actions"] ? (m(), g(ee, {
+        s.queryItems.length || e.$slots["search-actions"] ? (l(), h(te, {
           key: 0,
           ref_key: "searchRef",
-          ref: C,
+          ref: w,
           items: s.queryItems,
           immediate: s.immediate,
           "hide-empty-label": s.hideEmptyLabel,
-          onSearch: l,
-          onReset: t[0] || (t[0] = (a) => R("search-reset"))
+          onSearch: i,
+          onReset: t[0] || (t[0] = (a) => N("search-reset"))
         }, J({ _: 2 }, [
           e.$slots["search-actions"] ? {
             name: "actions",
-            fn: P(() => [
-              h(e.$slots, "search-actions")
+            fn: k(() => [
+              g(e.$slots, "search-actions")
             ]),
             key: "0"
           } : void 0,
-          b(Z.value, (a) => ({
+          z(K.value, (a) => ({
             name: a,
-            fn: P((c) => [
-              h(e.$slots, `search-${a}`, Q(T(c)))
+            fn: k((n) => [
+              g(e.$slots, `search-${a}`, Q(T(n)))
             ])
           }))
-        ]), 1032, ["items", "immediate", "hide-empty-label"])) : k("", !0),
-        q("div", ae, [
-          q("div", se, [
-            S.value.length ? (m(!0), z(U, { key: 0 }, b(S.value, (a, c) => h(e.$slots, "default", $({
-              key: a[s.itemKey] || c
-            }, { ref_for: !0 }, { data: a }))), 128)) : (m(), g(Y, { key: 1 }))
+        ]), 1032, ["items", "immediate", "hide-empty-label"])) : q("", !0),
+        $("div", re, [
+          $("div", ie, [
+            S.value.length ? (l(!0), b(U, { key: 0 }, z(S.value, (a, n) => g(e.$slots, "default", D({
+              key: a[s.itemKey] || n
+            }, { ref_for: !0 }, { data: a }))), 128)) : (l(), h(_, { key: 1 }))
           ])
         ]),
-        s.pagination && v(d) !== !1 ? (m(), g(_, $({ key: 1 }, v(d), {
-          onChange: t[1] || (t[1] = (a) => l(void 0, a))
-        }), null, 16)) : k("", !0)
+        s.pagination && v(u) !== !1 ? (l(), h(ee, D({ key: 1 }, v(u), {
+          onChange: t[1] || (t[1] = (a) => i(void 0, a))
+        }), null, 16)) : q("", !0)
       ], 4)), [
-        [r, v(O)]
+        [d, v(O)]
       ]);
     };
   }
 });
 export {
-  de as default
+  he as default
 };
 //# sourceMappingURL=index.vue.mjs.map

package/dist/components/ZlCardPage/resolvePagination.d.ts

@@ -0,0 +1,20 @@
+/**
+ * ZlCardPage 的分页数据源解析（纯函数，便于回归测试）。
+ *
+ * 无论接口返回行数组还是分页对象，结果里都必须带上「本次请求的目标页码」：
+ * 下发的 `currentPage` 只有会随查询 / 重置变化，ZlPagination 的监听才会触发。
+ * 否则数组响应（或接口不回传 pageNum）时 currentPage 恒为 1，在第 N 页点重置
+ * 就会出现「数据已回第 1 页、分页器仍停在第 N 页」。
+ */
+export interface CardPageState {
+    /** 本次请求的目标页码，由 `search()` 写入；`refresh()` 不改（原地重查保持页码） */
+    pageNum: number;
+    /** 本次请求的目标页容量 */
+    pageSize?: number;
+}
+export declare function resolveCardPagePagination(options: {
+    data: any;
+    pagination: Record<string, any> | boolean | undefined;
+    pageState: CardPageState;
+}): Record<string, any> | false;
+//# sourceMappingURL=resolvePagination.d.ts.map

package/dist/components/ZlCardPage/resolvePagination.mjs

@@ -0,0 +1,24 @@
+import { isArray as p } from "@zl-ui-kit/utils";
+function f(o) {
+  const { data: a, pagination: t, pageState: g } = o;
+  if (t === !1) return !1;
+  const e = (t === !0 ? {} : t) ?? {}, { pageNum: i, pageSize: r } = g;
+  if (p(a))
+    return {
+      ...e,
+      pageNum: i,
+      pageSize: r ?? e.pageSize ?? 30,
+      total: a.length
+    };
+  const n = a ?? {};
+  return {
+    ...e,
+    pageNum: i,
+    pageSize: r ?? n.pageSize ?? e.pageSize ?? 30,
+    total: n.total ?? 0
+  };
+}
+export {
+  f as resolveCardPagePagination
+};
+//# sourceMappingURL=resolvePagination.mjs.map

package/dist/components/ZlMenu/MenuIcon.d.ts

@@ -0,0 +1,17 @@
+import { Component, PropType, VNode } from 'vue';
+/** 内部渲染器：统一处理字符串图标 / 组件 / VNode 三种形态 */
+declare const _default: import('vue').DefineComponent<import('vue').ExtractPropTypes<{
+    icon: {
+        type: PropType<string | Component | VNode>;
+        required: true;
+    };
+}>, () => VNode<import('vue').RendererNode, import('vue').RendererElement, {
+    [key: string]: any;
+}>, {}, {}, {}, import('vue').ComponentOptionsMixin, import('vue').ComponentOptionsMixin, {}, string, import('vue').PublicProps, Readonly<import('vue').ExtractPropTypes<{
+    icon: {
+        type: PropType<string | Component | VNode>;
+        required: true;
+    };
+}>> & Readonly<{}>, {}, {}, {}, {}, string, import('vue').ComponentProvideOptions, true, {}, any>;
+export default _default;
+//# sourceMappingURL=MenuIcon.d.ts.map

package/dist/components/ZlMenu/MenuIcon.mjs

@@ -0,0 +1,21 @@
+import { defineComponent as t, h as e, isVNode as o } from "vue";
+import i from "../ZlIcon/index.vue.mjs";
+const p = t({
+  name: "ZlMenuIcon",
+  props: {
+    icon: {
+      type: [String, Object, Function],
+      required: !0
+    }
+  },
+  setup(r) {
+    return () => {
+      const { icon: n } = r;
+      return typeof n == "string" ? e(i, { icon: n }) : o(n) ? n : e(n);
+    };
+  }
+});
+export {
+  p as default
+};
+//# sourceMappingURL=MenuIcon.mjs.map

package/dist/components/ZlMenu/ZlMenuItem.vue.mjs

@@ -1,46 +1,46 @@
-import { defineComponent as k, resolveComponent as l, openBlock as t, createBlock as n, withCtx as i, createElementBlock as b, Fragment as s, renderList as y, createCommentVNode as c, createElementVNode as x, toDisplayString as o, createTextVNode as f } from "vue";
-import u from "../ZlIcon/index.vue.mjs";
-const M = /* @__PURE__ */ k({
+import { defineComponent as b, resolveComponent as l, openBlock as t, createBlock as n, withCtx as i, createElementBlock as s, Fragment as y, renderList as f, unref as c, createCommentVNode as o, createElementVNode as x, toDisplayString as u, createTextVNode as I } from "vue";
+import d from "./MenuIcon.mjs";
+const g = /* @__PURE__ */ b({
   name: "ZlMenuItem",
   __name: "ZlMenuItem",
   props: {
     item: {}
   },
   setup(e) {
-    return (I, Z) => {
-      const d = l("ZlMenuItem", !0), a = l("el-sub-menu"), r = l("el-menu-item");
-      return e.item.children?.length ? (t(), n(a, {
+    return (M, h) => {
+      const a = l("ZlMenuItem", !0), r = l("el-sub-menu"), k = l("el-menu-item");
+      return e.item.children?.length ? (t(), n(r, {
         key: 0,
         index: e.item.key,
         disabled: e.item.disabled
       }, {
         title: i(() => [
-          e.item.icon ? (t(), n(u, {
+          e.item.icon ? (t(), n(c(d), {
             key: 0,
             icon: e.item.icon
-          }, null, 8, ["icon"])) : c("", !0),
-          x("span", null, o(e.item.label), 1)
+          }, null, 8, ["icon"])) : o("", !0),
+          x("span", null, u(e.item.label), 1)
         ]),
         default: i(() => [
-          (t(!0), b(s, null, y(e.item.children, (m) => (t(), n(d, {
+          (t(!0), s(y, null, f(e.item.children, (m) => (t(), n(a, {
             key: m.key,
             item: m
           }, null, 8, ["item"]))), 128))
         ]),
         _: 1
-      }, 8, ["index", "disabled"])) : (t(), n(r, {
+      }, 8, ["index", "disabled"])) : (t(), n(k, {
         key: 1,
         index: e.item.key,
         disabled: e.item.disabled
       }, {
         title: i(() => [
-          f(o(e.item.label), 1)
+          I(u(e.item.label), 1)
         ]),
         default: i(() => [
-          e.item.icon ? (t(), n(u, {
+          e.item.icon ? (t(), n(c(d), {
             key: 0,
             icon: e.item.icon
-          }, null, 8, ["icon"])) : c("", !0)
+          }, null, 8, ["icon"])) : o("", !0)
         ]),
         _: 1
       }, 8, ["index", "disabled"]));
@@ -48,6 +48,6 @@ const M = /* @__PURE__ */ k({
   }
 });
 export {
-  M as default
+  g as default
 };
 //# sourceMappingURL=ZlMenuItem.vue.mjs.map

package/dist/components/ZlMenu/types.d.ts

@@ -1,11 +1,17 @@
+import { Component, VNode } from 'vue';
 /** ZlMenu 菜单项配置 */
 export interface MenuOption {
     /** 唯一标识：选中态、select 事件、路由跳转都以它为准 */
     key: string;
     /** 菜单文案 */
     label: string;
-    /** 图标名（@zl-ui-kit/icons 中的 `zl:*` 图标） */
-    icon?: string;
+    /**
+     * 图标：
+     * - 字符串：`@zl-ui-kit/icons` 中的 `zl:*` 图标名；
+     * - 组件：如 `h(MenuIcon, { name: 'a-home' })` 里的组件本身；
+     * - VNode：如 `h(MenuIcon, { name: 'a-home' })` 的结果。
+     */
+    icon?: string | Component | VNode;
     /** 是否禁用 */
     disabled?: boolean;
     /** 子菜单 */

package/dist/components/ZlSearchTable/index.vue.mjs

@@ -1,11 +1,11 @@
-import { defineComponent as D, useSlots as K, useAttrs as T, computed as m, ref as v, toRef as V, watch as _, openBlock as y, createElementBlock as W, createBlock as Z, createSlots as q, withCtx as f, renderSlot as d, renderList as S, normalizeProps as $, guardReactiveProps as P, createCommentVNode as x, createVNode as F, mergeProps as G, unref as h } from "vue";
-import { usePageableRequest as H } from "@zl-ui-kit/composables";
-import J from "../ZlSearch/index.vue.mjs";
+import { defineComponent as K, useSlots as T, useAttrs as V, computed as m, ref as b, toRef as W, watch as Z, openBlock as y, createElementBlock as _, createBlock as x, createSlots as P, withCtx as f, renderSlot as d, renderList as q, normalizeProps as S, guardReactiveProps as $, createCommentVNode as F, createVNode as G, mergeProps as H, unref as h } from "vue";
+import { usePageableRequest as J } from "@zl-ui-kit/composables";
+import M from "../ZlSearch/index.vue.mjs";
 import '../ZlTable/index.css';import '../ZlSearch/index.css';/* empty css                      */
-import M from "../ZlTable/index.vue.mjs";
+import Q from "../ZlTable/index.vue.mjs";
 /* empty css                     */
-import { useTablePagination as Q } from "../ZlTable/useTablePagination.mjs";
-const U = { class: "zl-search-table" }, R = "search-", ne = /* @__PURE__ */ D({
+import { useTablePagination as U } from "../ZlTable/useTablePagination.mjs";
+const X = { class: "zl-search-table" }, R = "search-", oe = /* @__PURE__ */ K({
   name: "ZlSearchTable",
   inheritAttrs: !1,
   __name: "index",
@@ -19,62 +19,64 @@ const U = { class: "zl-search-table" }, R = "search-", ne = /* @__PURE__ */ D({
   },
   emits: ["search-reset"],
   setup(r, { expose: B, emit: w }) {
-    const s = r, z = w, k = K(), p = T(), g = m(() => {
+    const s = r, z = w, C = T(), p = V(), g = m(() => {
       const e = [], t = [];
-      return Object.keys(k).forEach((a) => {
+      return Object.keys(C).forEach((a) => {
         if (a.startsWith(R)) {
           if (a === "search-actions") return;
           t.push({ slot: a, subSlot: a.slice(R.length) });
         } else
           e.push(a);
       }), { table: e, search: t };
-    }), n = v(null), i = v(null), b = m(() => {
+    }), i = b(null), u = b(null), v = m(() => {
       const e = { manual: !0, initialData: [] };
       return typeof s.request == "function" ? { service: s.request, options: e } : {
         ...s.request,
         options: Object.assign({ initialData: [] }, s.request.options, { manual: !0 })
       };
     }), {
-      loading: A,
-      data: C,
-      run: E,
-      params: I,
-      refresh: j
-    } = H(b.value.service, b.value.options), L = m(() => I.value?.[0]), N = p.dataKey ?? p["data-key"] ?? "rows", { data: O, pagination: l } = Q({
-      data: C,
-      pagination: V(s, "pagination"),
-      dataKey: N,
+      loading: N,
+      data: k,
+      run: A,
+      params: E,
+      refresh: I
+    } = J(v.value.service, v.value.options), j = m(() => E.value?.[0]), L = p.dataKey ?? p["data-key"] ?? "rows", { data: O, pagination: n, setCurrentPage: D } = U({
+      data: k,
+      pagination: W(s, "pagination"),
+      dataKey: L,
       // 分页事件由 ZlTable 内部处理，这里无需重复派发
       emit: {}
     });
-    let u;
-    function o(e, t = l.value !== !1 ? { pageNum: 1, pageSize: l.value.pageSize } : void 0) {
-      u = {
-        ...u,
+    let c;
+    function l(e, t = n.value !== !1 ? { pageNum: 1, pageSize: n.value.pageSize } : void 0) {
+      c = {
+        ...c,
         ...e,
         ...t
-      }, E(u);
+      };
+      const a = t?.pageNum, o = n.value === !1 ? void 0 : n.value.currentPage;
+      a != null && a !== o && D(a), A(c);
     }
-    return _(
+    return Z(
       () => s.immediate,
       (e) => {
-        e && !s.queryItems.length && o();
+        e && !s.queryItems.length && l();
       },
       { immediate: !0, once: !0 }
     ), B({
       /** 原地重查：用最近一次入参重新请求，保持当前页码（区别于 `search()` 会回到第 1 页） */
-      refresh: j,
+      refresh: I,
       /** 最近一次请求的入参（`{ pageNum, pageSize, ...查询表单 }`） */
-      params: L,
+      params: j,
       /** 内部 ZlSearch 实例，`params` / `search()` / `reset()` 等可直接调用 */
       search: new Proxy(
         {},
         {
           get(e, t) {
-            return !n.value && t === "search" ? o : n.value?.[t];
+            return !i.value && t === "search" ? l : i.value?.[t];
           },
           has(e, t) {
-            return t in (n.value ?? {});
+            return t in (i.value ?? {});
           }
         }
       ),
@@ -83,24 +85,24 @@ const U = { class: "zl-search-table" }, R = "search-", ne = /* @__PURE__ */ D({
         {},
         {
           get(e, t) {
-            return i.value?.[t];
+            return u.value?.[t];
           },
           has(e, t) {
-            return t in (i.value ?? {});
+            return t in (u.value ?? {});
           }
         }
       )
-    }), (e, t) => (y(), W("div", U, [
-      r.queryItems.length || e.$slots.searchActions || e.$slots["search-actions"] ? (y(), Z(J, {
+    }), (e, t) => (y(), _("div", X, [
+      r.queryItems.length || e.$slots.searchActions || e.$slots["search-actions"] ? (y(), x(M, {
         key: 0,
         ref_key: "searchRef",
-        ref: n,
+        ref: i,
         items: r.queryItems,
         immediate: r.immediate,
         "hide-empty-label": r.hideEmptyLabel,
-        onSearch: o,
+        onSearch: l,
         onReset: t[0] || (t[0] = (a) => z("search-reset"))
-      }, q({ _: 2 }, [
+      }, P({ _: 2 }, [
         e.$slots.searchActions || e.$slots["search-actions"] ? {
           name: "actions",
           fn: f(() => [
@@ -108,28 +110,28 @@ const U = { class: "zl-search-table" }, R = "search-", ne = /* @__PURE__ */ D({
           ]),
           key: "0"
         } : void 0,
-        S(g.value.search, (a) => ({
+        q(g.value.search, (a) => ({
           name: a.subSlot,
-          fn: f((c) => [
-            d(e.$slots, a.slot, $(P(c)))
+          fn: f((o) => [
+            d(e.$slots, a.slot, S($(o)))
           ])
         }))
-      ]), 1032, ["items", "immediate", "hide-empty-label"])) : x("", !0),
-      F(M, G({
+      ]), 1032, ["items", "immediate", "hide-empty-label"])) : F("", !0),
+      G(Q, H({
         ref_key: "tableRef",
-        ref: i,
+        ref: u,
         class: "zl-search-table__table",
         columns: r.columns,
         data: h(O),
-        pagination: h(l),
-        loading: h(A)
+        pagination: h(n),
+        loading: h(N)
       }, e.$attrs, {
-        onPaginationChange: t[1] || (t[1] = (a) => o(void 0, a))
-      }), q({ _: 2 }, [
-        S(g.value.table, (a) => ({
+        onPaginationChange: t[1] || (t[1] = (a) => l(void 0, a))
+      }), P({ _: 2 }, [
+        q(g.value.table, (a) => ({
           name: a,
-          fn: f((c) => [
-            d(e.$slots, a, $(P(c)))
+          fn: f((o) => [
+            d(e.$slots, a, S($(o)))
           ])
         }))
       ]), 1040, ["columns", "data", "pagination", "loading"])
@@ -137,6 +139,6 @@ const U = { class: "zl-search-table" }, R = "search-", ne = /* @__PURE__ */ D({
   }
 });
 export {
-  ne as default
+  oe as default
 };
 //# sourceMappingURL=index.vue.mjs.map

package/dist/components/ZlTable/useTablePagination.d.ts

@@ -25,5 +25,6 @@ export declare function useTablePagination(options: {
     data: Ref<any[], any[]>;
     onPageSizeChange: (pageSize: number) => void;
     onPageChange: (pageNum: number) => void;
+    setCurrentPage: (pageNum: number) => void;
 };
 //# sourceMappingURL=useTablePagination.d.ts.map

package/dist/components/ZlTable/useTablePagination.mjs

@@ -1,35 +1,49 @@
-import { isArray as d, isPlainObject as h } from "@zl-ui-kit/utils";
-import { ref as g, computed as b, watch as j } from "vue";
-import { usePagination as z } from "../ZlPagination/usePagination.mjs";
-function C(c) {
-  const { data: s, pagination: r, dataKey: l, emit: n } = c, u = z(
-    () => r.value === void 0 ? {} : r.value
-  ), t = g([]), a = g({}), i = b(() => u.value ? Object.assign({}, u.value, a.value) : !1);
-  j(
-    s,
+import { isArray as z, isPlainObject as b } from "@zl-ui-kit/utils";
+import { ref as c, computed as S, watch as g } from "vue";
+import { usePagination as j } from "../ZlPagination/usePagination.mjs";
+function _(s) {
+  const { data: f, pagination: l, dataKey: p, emit: t } = s, a = j(
+    () => l.value === void 0 ? {} : l.value
+  ), o = c([]), n = c({}), u = S(() => a.value ? Object.assign({}, a.value, n.value) : !1);
+  g(
+    f,
     (e) => {
-      if (d(e))
-        t.value = e;
-      else if (h(e)) {
-        t.value = e[l] ?? [];
-        const { pageNum: o, pageSize: m, total: v } = e;
-        a.value = Object.fromEntries(
-          Object.entries({ currentPage: o, pageSize: m, total: v }).filter(([, P]) => P != null)
+      if (z(e))
+        o.value = e;
+      else if (b(e)) {
+        o.value = e[p] ?? [];
+        const { pageNum: r, pageSize: P, total: d } = e;
+        n.value = Object.fromEntries(
+          Object.entries({ currentPage: r, pageSize: P, total: d }).filter(([, h]) => h != null)
         );
       }
     },
     { immediate: !0 }
   );
-  function p(e) {
-    const o = (i.value === !1 ? 30 : i.value.pageSize) ?? 30;
-    n("pagination-change", { pageNum: e, pageSize: o }), n("page-change", e), a.value.currentPage = e;
+  function i(e) {
+    n.value.currentPage = e;
   }
-  function f(e) {
-    n("pagination-change", { pageNum: 1, pageSize: e }), n("page-size-change", e), a.value.currentPage = 1, a.value.pageSize = e;
+  g(
+    () => a.value === !1 ? void 0 : a.value.currentPage,
+    (e) => {
+      e != null && i(e);
+    }
+  ), g(
+    () => a.value === !1 ? void 0 : a.value.pageSize,
+    (e) => {
+      e != null && (n.value.pageSize = e);
+    }
+  );
+  function v(e) {
+    const r = (u.value === !1 ? 30 : u.value.pageSize) ?? 30;
+    t("pagination-change", { pageNum: e, pageSize: r }), t("page-change", e), i(e);
+  }
+  function m(e) {
+    t("pagination-change", { pageNum: 1, pageSize: e }), t("page-size-change", e), i(1), n.value.pageSize = e;
   }
-  return { pagination: i, data: t, onPageSizeChange: f, onPageChange: p };
+  return { pagination: u, data: o, onPageSizeChange: m, onPageChange: v, setCurrentPage: i };
 }
 export {
-  C as useTablePagination
+  _ as useTablePagination
 };
 //# sourceMappingURL=useTablePagination.mjs.map

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zl-ui-kit/components",
-  "version": "0.19.0",
+  "version": "0.20.1",
   "type": "module",
   "description": "ZL UI 业务组件库（Element Plus 体系，Zl 前缀）——首批：Icon/AutoTooltip/Tag/CornerTag/Text/Title/Copy/Empty/Pagination/DictTag",
   "license": "MIT",
@@ -39,9 +39,9 @@
     "file-type": "^20.4.1",
     "dt-sql-parser": "^4.3.1",
     "sql-formatter": "^15.4.2",
-    "@zl-ui-kit/icons": "0.19.0",
-    "@zl-ui-kit/composables": "0.19.0",
-    "@zl-ui-kit/utils": "0.19.0"
+    "@zl-ui-kit/composables": "0.20.1",
+    "@zl-ui-kit/icons": "0.20.1",
+    "@zl-ui-kit/utils": "0.20.1"
   },
   "peerDependencies": {
     "@vueuse/core": "^12.3.0 || ^13.0.0 || ^14.0.0 || ^15.0.0",
@@ -87,6 +87,7 @@
     "vite": "^6.0.7",
     "vite-plugin-dts": "^4.5.0",
     "vite-plugin-lib-inject-css": "^2.2.1",
+    "vitest": "^2.1.8",
     "vue": "^3.5.13",
     "vue-tsc": "^2.2.0",
     "monaco-editor": "^0.41.0",
@@ -100,8 +101,8 @@
     "echarts": "^5.6.0",
     "@jichuang/vite-config": "1.0.0",
     "@jichuang/eslint-config": "1.0.0",
-    "@jichuang/tsconfig": "1.0.0",
-    "@zl-ui-kit/theme": "0.19.0"
+    "@zl-ui-kit/theme": "0.20.1",
+    "@jichuang/tsconfig": "1.0.0"
   },
   "repository": {
     "type": "git",
@@ -122,6 +123,7 @@
     "build": "vite build",
     "dev": "vite build --watch",
     "typecheck": "vue-tsc --noEmit",
-    "lint": "cross-env ESLINT_USE_FLAT_CONFIG=false eslint src --ext .ts"
+    "lint": "cross-env ESLINT_USE_FLAT_CONFIG=false eslint src --ext .ts",
+    "test:unit": "vitest run"
   }
 }