@vanstack/solid-ark 0.0.11 → 0.0.12

package/dist/data-table/index.d.ts

@@ -1,4 +1,4 @@
 export type { FieldConfig } from '../form/type';
 export { DataTable } from './DataTable';
-export type { DataTableProps, DataTableQuery, DataTableResult, DataTableSearchHandler, } from './type';
+export type { DataTableColumnDef, DataTableProps, DataTableQuery, DataTableResult, DataTableSearchHandler, } from './type';
 export type { ColumnDef, SortingState } from '@tanstack/solid-table';

package/dist/data-table/index.mjs

@@ -112,42 +112,60 @@ function I(s) {
 	f(g(() => c.searchValues, (e) => {
 		e && x(() => e);
 	}));
-	let [w, T] = m(c.defaultPage), [E, D] = m(c.defaultPageSize), [O, A] = m([]), [I, L] = m([]), [R, z] = m(0), [B, V] = m(!1), H = p(() => v() ? c.data : I()), U = p(() => v() ? c.total ?? H().length : R()), W = p(() => v() ? c.loading ?? !1 : B()), G = (e, t, n) => ({
+	let [w, T] = m(c.defaultPage), [E, D] = m(c.defaultPageSize), [O, A] = m([]), I = p(() => {
+		let e = 0, t = [];
+		for (let n of c.columns) {
+			if (n.type === "index") {
+				if (e += 1, e > 1) throw Error("[solid-ark] DataTable columns 只允许一个 type=\"index\" 列");
+				t.push({
+					id: "__index__",
+					header: "#",
+					enableSorting: !1,
+					enableColumnFilter: !1,
+					enableHiding: !1,
+					cell: ({ row: e }) => (w() - 1) * E() + e.index + 1
+				});
+				continue;
+			}
+			t.push(n);
+		}
+		return t;
+	}), [L, R] = m([]), [z, B] = m(0), [V, H] = m(!1), U = p(() => v() ? c.data : L()), W = p(() => v() ? c.total ?? U().length : z()), G = p(() => v() ? c.loading ?? !1 : V()), K = (e, t, n) => ({
 		page: e,
 		pageSize: t,
 		sorting: n
-	}), K = 0, q = async (e, t) => {
+	}), q = 0, J = async (e, t) => {
 		if (v()) {
 			s.onSearch(e, t);
 			return;
 		}
-		let n = ++K;
-		V(!0);
+		let n = ++q;
+		H(!0);
 		try {
 			let r = await s.onSearch(e, t);
-			if (n !== K) return;
-			L(r.data), z(r.total);
+			if (n !== q) return;
+			R(r.data), B(r.total);
 		} catch (e) {
-			if (n !== K) return;
+			if (n !== q) return;
 			s.onError?.(e);
 		} finally {
-			n === K && V(!1);
+			n === q && H(!1);
 		}
 	};
 	_(() => {
-		v() || q(S(), G(w(), E(), O()));
+		v() || J(S(), K(w(), E(), O()));
 	});
-	let J = (e) => {
-		C(() => e), T(1), q(e, G(1, E(), O()));
-	}, Y = () => {
+	let Y = (e) => {
+		C(() => e), T(1), J(e, K(1, E(), O()));
+	}, X = () => {
 		let e = Object.fromEntries(l().map((e) => [e.name, void 0]));
-		x(() => e), C(() => e), T(1), q(e, G(1, E(), O()));
-	}, X = (e) => {
-		e !== w() && (T(e), c.onPageChange?.(e), q(S(), G(e, E(), O())));
+		x(() => e), C(() => e), T(1), J(e, K(1, E(), O()));
 	}, Z = (e) => {
-		e !== E() && (D(e), T(1), c.onPageSizeChange?.(e), q(S(), G(1, e, O())));
+		e !== w() && (T(e), c.onPageChange?.(e), J(S(), K(e, E(), O())));
 	}, Q = (e) => {
-		A(e), c.onSortingChange?.(e), T(1), q(S(), G(1, E(), e));
+		e !== E() && (D(e), T(1), c.onPageSizeChange?.(e), J(S(), K(1, e, O())));
+	}, $ = (e) => {
+		A(e), c.onSortingChange?.(e), T(1), J(S(), K(1, E(), e));
 	};
 	return (() => {
 		var f = N();
@@ -161,7 +179,7 @@ function I(s) {
 					get fields() {
 						return u();
 					},
-					onSubmit: ({ value: e }) => J(e),
+					onSubmit: ({ value: e }) => Y(e),
 					get onValuesChange() {
 						return c.onSearchValuesChange;
 					},
@@ -178,16 +196,16 @@ function I(s) {
 								"aria-label": "重置",
 								class: "van-btn-icon-only",
 								get disabled() {
-									return W();
+									return G();
 								},
-								onClick: Y,
+								onClick: X,
 								variant: "outline",
 								get children() {
 									return i(F, {});
 								}
 							}), null), o(t, i(e, {
 								get disabled() {
-									return W();
+									return G();
 								},
 								type: "submit",
 								children: "查询"
@@ -206,16 +224,16 @@ function I(s) {
 			}
 		}), null), o(f, i(n, {
 			get columns() {
-				return c.columns;
+				return I();
 			},
 			get data() {
-				return H();
+				return U();
 			},
 			get emptyText() {
 				return c.emptyText;
 			},
 			get loading() {
-				return W();
+				return G();
 			},
 			get onRowClick() {
 				return c.onRowClick;
@@ -223,7 +241,7 @@ function I(s) {
 			get onSelectionChange() {
 				return c.onSelectionChange;
 			},
-			onSortingChange: Q,
+			onSortingChange: $,
 			get rowId() {
 				return c.rowId;
 			},
@@ -235,10 +253,10 @@ function I(s) {
 			}
 		}), null), o(f, i(k, {
 			get count() {
-				return U();
+				return W();
 			},
-			onPageChange: X,
-			onPageSizeChange: Z,
+			onPageChange: Z,
+			onPageSizeChange: Q,
 			get page() {
 				return w();
 			},

package/dist/data-table/type.d.ts

@@ -12,8 +12,12 @@ export interface DataTableQuery {
     pageSize: number;
     sorting: SortingState;
 }
+/** DataTable 扩展的列类型：type = "index" 时渲染为序号列（表头 #，页码感知递增），只允许一个 */
+export type DataTableColumnDef<TData> = ColumnDef<TData> | {
+    type: "index";
+};
 /** 取数函数：接收表单值与查询参数，返回当前页数据与总条数 */
-export type DataTableSearchHandler<TData, TSearch> = (values: TSearch, query: DataTableQuery) => DataTableResult<TData> | Promise<DataTableResult<TData>>;
+export type DataTableSearchHandler<TData, TSearch> = (values: TSearch, query: DataTableQuery) => DataTableResult<TData> | Promise<DataTableResult<TData>> | undefined;
 export interface DataTableProps<TData, TSearch extends Record<string, unknown> = Record<string, unknown>> {
     /** 搜索表单字段；不传或为空数组时不渲染搜索区 */
     searchFields?: FieldConfig[];
@@ -29,7 +33,7 @@ export interface DataTableProps<TData, TSearch extends Record<string, unknown> =
     data?: TData[];
     /** 总条数：受控模式配合 data 使用，不传回退为 data.length */
     total?: number;
-    columns: ColumnDef<TData>[];
+    columns: DataTableColumnDef<TData>[];
     /** 行 ID 提取函数，默认取 row.id */
     rowId?: (row: TData) => string;
     /** 是否显示选择列，默认取 !!onSelectionChange */

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanstack/solid-ark",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "private": false,
   "license": "MIT",
   "type": "module",