@vanstack/solid-ark 0.0.19 → 0.0.22

package/dist/data-table/index.mjs

@@ -2,10 +2,10 @@ import "../solid-ark.css";
 import { t as e } from "../button-Br_upy12.js";
 import { t } from "../badge-Dt0uZnmA.js";
 import { t as n } from "../form-IwL17HZI.js";
-import { t as r } from "../table-D3DgojFM.js";
+import { t as r } from "../table-Dl0ngdNr.js";
 import { className as i, createComponent as a, effect as o, insert as s, memo as c, setAttribute as l, setStyleProperty as u, template as d, use as f } from "solid-js/web";
-import { For as p, Show as m, createEffect as ee, createMemo as h, createSignal as g, mergeProps as te, on as _, onCleanup as v, onMount as y } from "solid-js";
-import { formatDate as ne, formatDateTime as re, formatShortDateTime as b } from "@vanstack/shared";
+import { For as p, Show as m, createEffect as ee, createMemo as h, createSignal as g, mergeProps as _, on as te, onCleanup as v, onMount as y } from "solid-js";
+import { formatDate as b, formatDateTime as ne, formatShortDateTime as re } from "@vanstack/shared";
 import { Pagination as x } from "@ark-ui/solid/pagination";
 //#region src/data-table/EllipsisCell.tsx
 var S = /*#__PURE__*/ d("<span class=van-data-table-ellipsis>");
@@ -109,12 +109,12 @@ function ie(e) {
 }
 //#endregion
 //#region src/data-table/DataTable.tsx
-var P = /*#__PURE__*/ d("<svg fill=none height=16 stroke=currentColor stroke-linecap=round stroke-linejoin=round stroke-width=2 viewBox=\"0 0 24 24\"width=16 xmlns=http://www.w3.org/2000/svg><path d=\"M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8\"></path><path d=\"M3 3v5h5\">"), ae = /*#__PURE__*/ d("<div class=van-data-table-actions>"), F = /*#__PURE__*/ d("<div class=van-data-table-badges>"), I = /*#__PURE__*/ d("<div class=van-data-table-search>"), L = /*#__PURE__*/ d("<div class=van-data-table-toolbar>"), R = /*#__PURE__*/ d("<div>"), z = /*#__PURE__*/ d("<div class=van-data-table-search-actions>"), B = /*#__PURE__*/ d("<div class=van-data-table-tooltip>");
-function V() {
+var P = /*#__PURE__*/ d("<svg fill=none height=16 stroke=currentColor stroke-linecap=round stroke-linejoin=round stroke-width=2 viewBox=\"0 0 24 24\"width=16 xmlns=http://www.w3.org/2000/svg><path d=\"M3 12a9 9 0 1 0 9-9 9.75 9.75 0 0 0-6.74 2.74L3 8\"></path><path d=\"M3 3v5h5\">"), ae = /*#__PURE__*/ d("<div class=van-data-table-actions>"), oe = /*#__PURE__*/ d("<div class=van-data-table-badges>"), F = /*#__PURE__*/ d("<div class=van-data-table-search>"), I = /*#__PURE__*/ d("<div class=van-data-table-toolbar>"), L = /*#__PURE__*/ d("<div>"), R = /*#__PURE__*/ d("<div class=van-data-table-search-actions>"), z = /*#__PURE__*/ d("<div class=van-data-table-tooltip>");
+function B() {
 	return P();
 }
-function H(c) {
-	let l = te({
+function V(c) {
+	let l = _({
 		defaultPage: 1,
 		defaultPageSize: 10,
 		emptyText: "暂无数据",
@@ -122,11 +122,11 @@ function H(c) {
 	}, c), d = h(() => l.searchFields ?? []), x = h(() => d().map((e) => ({
 		...e,
 		label: void 0
-	}))), S = h(() => l.data !== void 0), w = h(() => c.selectable ?? !!c.onSelectionChange), T = (e, t) => typeof e.show == "function" ? e.show(t) : e.show !== !1, [E, D] = g(l.searchValues ?? {}), [O, k] = g(l.searchValues ?? {});
-	ee(_(() => l.searchValues, (e) => {
-		e && D(() => e);
+	}))), S = h(() => l.data !== void 0), w = h(() => c.selectable ?? !!c.onSelectionChange), T = (e, t) => typeof e.show == "function" ? e.show(t) : e.show !== !1, E = (e, t) => typeof e.disabled == "function" ? e.disabled(t) : e.disabled === !0, [D, O] = g(l.searchValues ?? {}), [k, A] = g(l.searchValues ?? {});
+	ee(te(() => l.searchValues, (e) => {
+		e && O(() => e);
 	}));
-	let [A, j] = g(l.defaultPage), [M, N] = g(l.defaultPageSize), [P, H] = g([]), U = h(() => {
+	let [j, M] = g(l.defaultPage), [N, P] = g(l.defaultPageSize), [V, H] = g([]), U = h(() => {
 		let n = 0, r = 0, i = [];
 		for (let o of l.columns) {
 			let c = o.type;
@@ -141,7 +141,7 @@ function H(c) {
 					enableColumnFilter: !1,
 					enableHiding: !1,
 					...o,
-					cell: ({ row: e }) => (A() - 1) * M() + e.index + 1
+					cell: ({ row: e }) => (j() - 1) * N() + e.index + 1
 				};
 				i.push(e);
 				continue;
@@ -149,7 +149,7 @@ function H(c) {
 			if (c === "date" || c === "dateTime" || c === "shortDateTime") {
 				let e = o;
 				if (!e.accessorKey) throw Error("[solid-ark] 时间戳列（type=\"date/dateTime/shortDateTime\"）必须提供 accessorKey");
-				let t = e.accessorKey, n = e.type === "date" ? ne : e.type === "dateTime" ? re : b;
+				let t = e.accessorKey, n = e.type === "date" ? b : e.type === "dateTime" ? ne : re;
 				i.push({
 					id: t,
 					accessorKey: t,
@@ -178,6 +178,9 @@ function H(c) {
 								},
 								get children() {
 									return a(e, {
+										get disabled() {
+											return E(n, t.original);
+										},
 										onClick: () => n.onClick(t.original),
 										get variant() {
 											return n.variant ?? "outline";
@@ -202,7 +205,7 @@ function H(c) {
 					cell: ({ row: e }) => {
 						let r = typeof n == "function" ? n(e.original) : n, i = Array.isArray(r) ? r : r ? [r] : [];
 						return i.length === 0 ? "-" : (() => {
-							var e = F();
+							var e = oe();
 							return s(e, a(p, {
 								each: i,
 								children: (e) => a(t, {
@@ -257,7 +260,7 @@ function H(c) {
 			e.removeEventListener("mouseover", t), e.removeEventListener("mouseout", n);
 		});
 	});
-	let [q, oe] = g([]), [se, ce] = g(0), [le, J] = g(!1), Y = h(() => S() ? l.data : q()), ue = h(() => S() ? l.total ?? Y().length : se()), X = h(() => S() ? l.loading ?? !1 : le()), Z = (e, t, n) => ({
+	let [se, ce] = g([]), [le, ue] = g(0), [de, q] = g(!1), J = h(() => S() ? l.data : se()), Y = h(() => S() ? l.total ?? J().length : le()), X = h(() => S() ? l.loading ?? !1 : de()), Z = (e, t, n) => ({
 		page: e,
 		pageSize: t,
 		sorting: n
@@ -267,68 +270,68 @@ function H(c) {
 			return;
 		}
 		let n = ++Q;
-		J(!0);
+		q(!0);
 		try {
 			let r = await c.onSearch(e, t);
 			if (n !== Q) return;
-			oe(r.data), ce(r.total);
+			ce(r.data), ue(r.total);
 		} catch (e) {
 			if (n !== Q) return;
 			c.onError?.(e);
 		} finally {
-			n === Q && J(!1);
+			n === Q && q(!1);
 		}
 	};
 	y(() => {
-		S() || $(O(), Z(A(), M(), P()));
+		S() || $(k(), Z(j(), N(), V()));
 	});
-	let de = (e) => {
-		k(() => e), j(1), $(e, Z(1, M(), P()));
-	}, fe = () => {
+	let fe = (e) => {
+		A(() => e), M(1), $(e, Z(1, N(), V()));
+	}, pe = () => {
 		let e = Object.fromEntries(d().map((e) => [e.name, void 0]));
-		D(() => e), k(() => e), j(1), $(e, Z(1, M(), P()));
-	}, pe = (e) => {
-		e !== A() && (j(e), l.onPageChange?.(e), $(O(), Z(e, M(), P())));
+		O(() => e), A(() => e), M(1), $(e, Z(1, N(), V()));
 	}, me = (e) => {
-		e !== M() && (N(e), j(1), l.onPageSizeChange?.(e), $(O(), Z(1, e, P())));
+		e !== j() && (M(e), l.onPageChange?.(e), $(k(), Z(e, N(), V())));
 	}, he = (e) => {
-		H(e), l.onSortingChange?.(e), j(1), $(O(), Z(1, M(), e));
+		e !== N() && (P(e), M(1), l.onPageSizeChange?.(e), $(k(), Z(1, e, V())));
+	}, ge = (e) => {
+		H(e), l.onSortingChange?.(e), M(1), $(k(), Z(1, N(), e));
 	};
 	return (() => {
-		var t = R(), p = W;
+		var t = L(), p = W;
 		return typeof p == "function" ? f(p, t) : W = t, s(t, a(m, {
 			get when() {
 				return d().length > 0;
 			},
 			get children() {
-				var t = I();
+				var t = F();
 				return s(t, a(n, {
 					get fields() {
 						return x();
 					},
-					onSubmit: ({ value: e }) => de(e),
+					onSubmit: ({ value: e }) => fe(e),
 					get onValuesChange() {
 						return l.onSearchValuesChange;
 					},
 					get values() {
-						return E();
+						return D();
 					},
 					children: () => a(m, {
 						get when() {
 							return l.showSearchActions;
 						},
 						get children() {
-							var t = z();
+							var t = R();
 							return s(t, a(e, {
 								"aria-label": "重置",
 								class: "van-btn-icon-only",
 								get disabled() {
 									return X();
 								},
-								onClick: fe,
+								onClick: pe,
 								variant: "outline",
 								get children() {
-									return a(V, {});
+									return a(B, {});
 								}
 							}), null), s(t, a(e, {
 								get disabled() {
@@ -346,7 +349,7 @@ function H(c) {
 				return l.children;
 			},
 			get children() {
-				var e = L();
+				var e = I();
 				return s(e, () => l.children), e;
 			}
 		}), null), s(t, a(r, {
@@ -354,7 +357,7 @@ function H(c) {
 				return U();
 			},
 			get data() {
-				return Y();
+				return J();
 			},
 			get emptyText() {
 				return l.emptyText;
@@ -368,7 +371,7 @@ function H(c) {
 			get onSelectionChange() {
 				return l.onSelectionChange;
 			},
-			onSortingChange: he,
+			onSortingChange: ge,
 			get rowId() {
 				return l.rowId;
 			},
@@ -380,22 +383,22 @@ function H(c) {
 			}
 		}), null), s(t, a(ie, {
 			get count() {
-				return ue();
+				return Y();
 			},
-			onPageChange: pe,
-			onPageSizeChange: me,
+			onPageChange: me,
+			onPageSizeChange: he,
 			get page() {
-				return A();
+				return j();
 			},
 			get pageSize() {
-				return M();
+				return N();
 			}
 		}), null), s(t, a(m, {
 			get when() {
 				return G();
 			},
 			children: (e) => (() => {
-				var t = B();
+				var t = z();
 				return s(t, () => e().text), o((n) => {
 					var r = `${e().left}px`, i = `${e().top}px`;
 					return r !== n.e && u(t, "left", n.e = r), i !== n.t && u(t, "top", n.t = i), n;
@@ -408,4 +411,4 @@ function H(c) {
 	})();
 }
 //#endregion
-export { H as DataTable };
+export { V as DataTable };

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

@@ -24,6 +24,8 @@ export interface DataTableAction<TData> {
     variant?: ButtonVariant;
     /** 是否显示该按钮，默认 true；可为函数（按行判断，读取信号时响应式更新） */
     show?: ((row: TData) => boolean) | boolean;
+    /** 是否禁用该按钮，默认 false；可为函数（按行判断，读取信号时响应式更新） */
+    disabled?: ((row: TData) => boolean) | boolean;
 }
 /** type="badge" 列的徽标配置：变种 + 展示值 */
 export interface DataTableBadgeConfig {
@@ -47,7 +49,7 @@ export type DataTableColumnDef<TData> = {
     type?: "action" | "badge" | "date" | "dateTime" | "index" | "shortDateTime";
 } & Partial<UnionToIntersection<ColumnDef<TData>>>;
 /** 取数函数：接收表单值与查询参数，返回当前页数据与总条数 */
-export type DataTableSearchHandler<TData, TSearch> = (values: TSearch, query: DataTableQuery) => DataTableResult<TData> | Promise<DataTableResult<TData>> | Promise<void> | undefined;
+export type DataTableSearchHandler<TData, TSearch> = (values: TSearch, query: DataTableQuery) => DataTableResult<TData> | Promise<DataTableResult<TData>> | Promise<void> | undefined | void;
 export interface DataTableProps<TData, TSearch extends Record<string, unknown> = Record<string, unknown>> {
     /** 搜索表单字段；不传或为空数组时不渲染搜索区 */
     searchFields?: FieldConfig[];

package/dist/table/index.mjs

@@ -1,3 +1,3 @@
 import "../solid-ark.css";
-import { t as e } from "../table-D3DgojFM.js";
+import { t as e } from "../table-Dl0ngdNr.js";
 export { e as Table };

package/dist/{table-D3DgojFM.js → table-Dl0ngdNr.js}

@@ -120,7 +120,8 @@ function P(r) {
 		getCoreRowModel: _(),
 		getSortedRowModel: v(),
 		enableRowSelection: l.selectable,
-		getRowId: (e) => l.rowId(e)
+		getRowId: (e) => l.rowId(e),
+		defaultColumn: { enableSorting: !1 }
 	}), L = (e) => e === "__select__";
 	function R(r) {
 		return (() => {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vanstack/solid-ark",
-  "version": "0.0.19",
+  "version": "0.0.22",
   "private": false,
   "license": "MIT",
   "type": "module",
@@ -71,8 +71,8 @@
     "vite-plugin-solid": "^2.11.0",
     "vitest": "^4.1.10",
     "zod": "^4.4.0",
-    "@vanstack/prettier-config": "0.0.1",
     "@vanstack/eslint-config": "0.0.1",
+    "@vanstack/prettier-config": "0.0.1",
     "@vanstack/tsconfig": "0.0.1",
     "@vanstack/vite-config": "0.0.2"
   },