@ithinkdt/ui 4.0.0-403 → 4.0.0-405

package/dist/{components-CYEw_C_U.js → components--Rlef087.js}

@@ -1,6 +1,6 @@
-import { n as useI18n } from "./use-i18n-Dx7V4KrY.js";
-import { i as vTooltip } from "./directives-qqYcWl1I.js";
-import { g as useStyle, h as useMergedClsPrefix, n as cB, r as cE, t as c } from "./use-style-DcT-1dj4.js";
+import { n as useI18n } from "./use-i18n-D-AJ8KbA.js";
+import { i as vTooltip } from "./directives-Bpfh9AKg.js";
+import { g as useStyle, h as useMergedClsPrefix, n as cB, r as cE, t as c } from "./use-style-mj2B1q0l.js";
 import { Fragment, computed, createTextVNode, createVNode, defineComponent, inject, isVNode, mergeProps, nextTick, reactive, ref, shallowRef, toRaw, toRef, toValue, unref, useTemplateRef, watch, withDirectives } from "vue";
 import { toReactive, unrefElement, until, useCurrentElement, useElementSize, watchDebounced } from "@vueuse/core";
 import { NAvatar, NAvatarGroup, NButton, NCard, NCheckbox, NCheckboxGroup, NDataTable, NDropdown, NEllipsis, NEmpty, NFlex, NForm, NFormItem, NGi, NGrid, NH4, NIcon, NInput, NList, NListItem, NPagination, NPerformantEllipsis, NPopover, NRadio, NRadioButton, NRadioGroup, NSelect, NSpin, NTag, NText, NTooltip, NTransfer, NTree, NTreeSelect, dataTableProps, formProps, useDialog } from "ithinkdt-ui";
@@ -1737,6 +1737,10 @@ const DtDeptRender = /* @__PURE__ */ defineComponent({
 		type: Boolean,
 		default: void 0
 	},
+	type: {
+		type: String,
+		default: void 0
+	},
 	succeeded: {
 		type: [Boolean, Object],
 		default: void 0
@@ -1762,13 +1766,13 @@ const DtDeptRender = /* @__PURE__ */ defineComponent({
 	props: StateButtonProps,
 	setup(e, { slots: v }) {
 		return () => {
-			let { disabled: y, succeeded: b, successText: x, failureText: S } = e;
+			let { type: y, disabled: b, succeeded: x, successText: S, failureText: C } = e;
 			return createVNode(NButton, {
-				type: b ? "success" : b === !1 ? "error" : void 0,
-				disabled: typeof b == "boolean" ? !0 : y
+				type: x ? "success" : x === !1 ? "error" : y,
+				disabled: typeof x == "boolean" ? !0 : b
 			}, {
-				default: () => (b ? v.success ? v.success() : x : b === !1 ? v.failure ? v.failure() : S : v.default?.()) ?? v.default(),
-				icon: () => b ? v.successIcon ? v.successIcon() : createVNode(NIcon, null, { default: () => [createVNode(ICheck, null, null)] }) : b === !1 ? v.failureIcon ? v.failureIcon() : createVNode(NIcon, null, { default: () => [createVNode(IClose, null, null)] }) : v.icon?.()
+				default: () => (x ? v.success ? v.success() : S : x === !1 ? v.failure ? v.failure() : C : v.default?.()) ?? v.default(),
+				icon: () => x ? v.successIcon ? v.successIcon() : createVNode(NIcon, null, { default: () => [createVNode(ICheck, null, null)] }) : x === !1 ? v.failureIcon ? v.failureIcon() : createVNode(NIcon, null, { default: () => [createVNode(IClose, null, null)] }) : v.icon?.()
 			});
 		};
 	}

package/dist/components.js

@@ -1,5 +1,5 @@
-import "./use-i18n-Dx7V4KrY.js";
-import "./directives-qqYcWl1I.js";
-import "./use-style-DcT-1dj4.js";
-import { _ as dataFormActionsProps, a as DtUserRender, b as NCheckboxes, c as DataTable, d as DataPagination, f as DataLocaleInput, g as DataFormActions, h as DataForm, i as DtUserDept, l as useDataTableDrag, m as DataFilter, n as StateButtonProps, o as renderUsers, p as useLocaleEdit, r as DtDeptRender, s as NRadios, t as NStateButton, u as DataSelection, v as DataCustom, y as DataActions } from "./components-CYEw_C_U.js";
+import "./use-i18n-D-AJ8KbA.js";
+import "./directives-Bpfh9AKg.js";
+import "./use-style-mj2B1q0l.js";
+import { _ as dataFormActionsProps, a as DtUserRender, b as NCheckboxes, c as DataTable, d as DataPagination, f as DataLocaleInput, g as DataFormActions, h as DataForm, i as DtUserDept, l as useDataTableDrag, m as DataFilter, n as StateButtonProps, o as renderUsers, p as useLocaleEdit, r as DtDeptRender, s as NRadios, t as NStateButton, u as DataSelection, v as DataCustom, y as DataActions } from "./components--Rlef087.js";
 export { DataActions, DataCustom, DataFilter, DataForm, DataFormActions, DataLocaleInput, DataPagination, DataSelection, DataTable, DtDeptRender, DtUserDept, DtUserRender, NCheckboxes, NRadios, NStateButton, StateButtonProps, dataFormActionsProps, renderUsers, useDataTableDrag, useLocaleEdit };

package/dist/{directives-qqYcWl1I.js → directives-Bpfh9AKg.js}

@@ -1,4 +1,4 @@
-import { g as useStyle, i as cM, n as cB, r as cE, t as c } from "./use-style-DcT-1dj4.js";
+import { g as useStyle, i as cM, n as cB, r as cE, t as c } from "./use-style-mj2B1q0l.js";
 import { Fragment, createVNode, defineComponent, h, nextTick, reactive, ref, shallowRef, toRef, watch } from "vue";
 import { promiseTimeout, useEventListener } from "@vueuse/core";
 import { NTooltip } from "ithinkdt-ui";

package/dist/directives.js

@@ -1,3 +1,3 @@
-import { i as vTooltip, n as vSpin, r as TooltipDirectiveProvider, t as SpinDirectiveProvider } from "./directives-qqYcWl1I.js";
-import "./use-style-DcT-1dj4.js";
+import { i as vTooltip, n as vSpin, r as TooltipDirectiveProvider, t as SpinDirectiveProvider } from "./directives-Bpfh9AKg.js";
+import "./use-style-mj2B1q0l.js";
 export { SpinDirectiveProvider, TooltipDirectiveProvider, vSpin, vTooltip };

package/dist/index.js

@@ -1,6 +1,6 @@
-import { n as useI18n, t as UI_I18N_INJECTION } from "./use-i18n-Dx7V4KrY.js";
-import { i as vTooltip, n as vSpin, r as TooltipDirectiveProvider, t as SpinDirectiveProvider } from "./directives-qqYcWl1I.js";
-import { g as useStyle, i as cM, n as cB, r as cE, t as c } from "./use-style-DcT-1dj4.js";
+import { n as useI18n, t as UI_I18N_INJECTION } from "./use-i18n-D-AJ8KbA.js";
+import { i as vTooltip, n as vSpin, r as TooltipDirectiveProvider, t as SpinDirectiveProvider } from "./directives-Bpfh9AKg.js";
+import { g as useStyle, i as cM, n as cB, r as cE, t as c } from "./use-style-mj2B1q0l.js";
 import { Fragment, computed, createVNode, defineComponent, inject, isVNode, mergeProps, provide, reactive, ref, renderSlot, shallowRef, toRef, toValue, unref, useTemplateRef, watch, withDirectives } from "vue";
 import { computedAsync, promiseTimeout, useElementHover, useElementSize, useEventListener, useFullscreen, watchDebounced } from "@vueuse/core";
 import { NAvatar, NBadge, NBreadcrumb, NBreadcrumbItem, NButton, NDrawer, NDrawerContent, NDropdown, NEmpty, NIcon, NList, NListItem, NMenu, NPagination, NPopover, NScrollbar, NText, NThing, useThemeVars } from "ithinkdt-ui";

package/dist/page.js

@@ -1,17 +1,18 @@
-import { n as useI18n } from "./use-i18n-Dx7V4KrY.js";
-import "./directives-qqYcWl1I.js";
-import "./use-style-DcT-1dj4.js";
-import { a as DtUserRender, b as NCheckboxes, h as DataForm, i as DtUserDept, r as DtDeptRender, s as NRadios } from "./components-CYEw_C_U.js";
+import { n as useI18n } from "./use-i18n-D-AJ8KbA.js";
+import "./directives-Bpfh9AKg.js";
+import "./use-style-mj2B1q0l.js";
+import { a as DtUserRender, b as NCheckboxes, h as DataForm, i as DtUserDept, r as DtDeptRender, s as NRadios } from "./components--Rlef087.js";
 import { computed, createVNode, defineComponent, h, isVNode, mergeProps, ref, shallowRef, unref } from "vue";
 import { until } from "@vueuse/core";
 import { NButton, NCheckbox, NColorPicker, NDatePicker, NDrawer, NDrawerContent, NFlex, NInput, NInputNumber, NModal, NScrollbar, NSelect, NText, NUpload, useMessage } from "ithinkdt-ui";
 import { format } from "date-fns";
 import { useFormItem } from "ithinkdt-ui/es/_mixins";
+import { isNullish } from "@ithinkdt/common";
 import { useDict, useDictMap } from "@ithinkdt/common/dict";
-function _isSlot(n) {
-	return typeof n == "function" || Object.prototype.toString.call(n) === "[object Object]" && !isVNode(n);
+function _isSlot(r) {
+	return typeof r == "function" || Object.prototype.toString.call(r) === "[object Object]" && !isVNode(r);
 }
-var mapProps = (n) => Object.fromEntries(Object.entries(n || {}).map(([n, c]) => [n, unref(c)])), SimpleUpload = /* @__PURE__ */ defineComponent({
+var mapProps = (r) => Object.fromEntries(Object.entries(r || {}).map(([r, a]) => [r, unref(a)])), SimpleUpload = /* @__PURE__ */ defineComponent({
 	name: "SimpleUpload",
 	props: {
 		type: {
@@ -49,405 +50,420 @@ var mapProps = (n) => Object.fromEntries(Object.entries(n || {}).map(([n, c]) =>
 		onUpdateFileList: { type: [Array, Function] },
 		uploadFile: { type: Function }
 	},
-	setup(c, { slots: l, expose: u }) {
-		let { t: d } = useI18n();
-		SimpleUpload.t = d;
-		let f = useFormItem(c), p = useMessage(), g = computed(() => c.customRequest || (({ file: n, onProgress: l, onFinish: u, onError: d }) => {
-			c.uploadFile(n.file, (n) => l({ percent: n })).then((c) => {
-				n.file.fileId = c, u();
-			}).catch((n) => {
-				p.error(n.message), d(n);
+	setup(a, { slots: o, expose: s }) {
+		let { t: c } = useI18n();
+		SimpleUpload.t = c;
+		let l = useFormItem(a), u = useMessage(), f = computed(() => a.customRequest || (({ file: r, onProgress: o, onFinish: s, onError: c }) => {
+			a.uploadFile(r.file, (r) => o({ percent: r })).then((a) => {
+				r.file.fileId = a, s();
+			}).catch((r) => {
+				u.error(r.message), c(r);
 			});
-		})), _ = ref();
-		u({ submit() {
-			return until(_).toBeTruthy().then((n) => n.submit());
+		})), p = ref();
+		s({ submit() {
+			return until(p).toBeTruthy().then((r) => r.submit());
 		} });
-		let v = (n) => {
-			c.onUpdateFileList?.(n), nextTick(() => f.nTriggerFormChange());
+		let m = (r) => {
+			a.onUpdateFileList?.(r), nextTick(() => l.nTriggerFormChange());
 		};
 		return () => {
-			let { type: n, onUpdateFileList: u, ...p } = c;
-			return createVNode(NUpload, mergeProps(p, {
-				ref: _,
-				customRequest: g.value,
-				listType: n === "image" ? "image-card" : "text",
-				accept: p.accept ?? n === "image" ? "image/*" : void 0,
-				"onUpdate:fileList": v
+			let { type: r, onUpdateFileList: s, ...u } = a;
+			return createVNode(NUpload, mergeProps(u, {
+				ref: p,
+				customRequest: f.value,
+				listType: r === "image" ? "image-card" : "text",
+				accept: u.accept ?? r === "image" ? "image/*" : void 0,
+				"onUpdate:fileList": m
 			}), {
-				default: n === "image" ? void 0 : () => {
-					let n;
+				default: r === "image" ? void 0 : () => {
+					let r;
 					return createVNode(NButton, {
-						disabled: f.mergedDisabledRef.value,
-						size: f.mergedSizeRef.value
-					}, _isSlot(n = d("common.page.form.selectFileText")) ? n : { default: () => [n] });
+						disabled: l.mergedDisabledRef.value,
+						size: l.mergedSizeRef.value
+					}, _isSlot(r = c("common.page.form.selectFileText")) ? r : { default: () => [r] });
 				},
-				...l
+				...o
 			});
 		};
 	}
 });
-function createPageFormHelper({ getUserGroups: n, getUsersByGroup: u, getDeptsByCode: f, getUsersByDept: m, getUsersByUsername: g, uploadFile: v, getFileInfos: y }) {
+function createPageFormHelper({ getUserGroups: r, getUsersByGroup: s, getDeptsByCode: l, getUsersByDept: d, getUsersByUsername: f, uploadFile: m, getFileInfos: g }) {
+	let _ = (r) => isNullish(r) ? r : String(r), x = (r) => r, C = (r) => isNullish(r) ? r : Number(r);
 	return {
-		input: () => ({ slots: n, props: c }, { modelValue: l, "onUpdate:modelValue": u, required: d, readonly: f, ...p }) => f ? createVNode(NText, {
+		input: () => ({ slots: r, props: a }, { modelValue: o, "onUpdate:modelValue": s, required: c, readonly: l, ...u }) => l ? createVNode(NText, {
 			depth: 2,
 			style: "line-height: 1.25"
-		}, { default: () => [l ?? ""] }) : (c = mapProps(c), h(NInput, {
+		}, { default: () => [o ?? ""] }) : (a = mapProps(a), h(NInput, {
 			clearable: !0,
-			...c,
-			...p,
-			value: l,
-			"onUpdate:value": u
-		}, n)),
-		number: () => ({ slots: n, props: c }, { modelValue: l, "onUpdate:modelValue": u, required: d, readonly: f, ...p }) => f ? createVNode(NText, {
+			...a,
+			...u,
+			value: o,
+			"onUpdate:value": s
+		}, r)),
+		number: () => ({ slots: r, props: a }, { modelValue: o, "onUpdate:modelValue": s, required: c, readonly: l, ...u }) => l ? createVNode(NText, {
 			depth: 2,
 			style: "line-height: 1.25"
-		}, { default: () => [l ?? ""] }) : (c = mapProps(c), h(NInputNumber, {
+		}, { default: () => [o ?? ""] }) : (a = mapProps(a), h(NInputNumber, {
 			clearable: !0,
-			...c,
-			...p,
-			value: l,
-			"onUpdate:value": u
-		}, n)),
+			...a,
+			...u,
+			value: o,
+			"onUpdate:value": s
+		}, r)),
 		select: () => {
-			let n, c;
-			return ({ slots: l, props: u }, { modelValue: d, "onUpdate:modelValue": f, required: p, readonly: m, ...g }) => {
-				let { dictType: v, options: y, ...b } = mapProps(u);
-				if (y ? c = y : n !== v && (n = v, !c && n && (c = useDict(n))), m) if (b.multiple) {
-					let n;
+			let r, a, o, s, c;
+			return ({ slots: l, props: u }, { modelValue: d, "onUpdate:modelValue": f, required: m, readonly: g, ...v }) => {
+				let { dictType: b, options: S, valueType: w = "string", ...T } = mapProps(u), E = w === "number" ? _ : x;
+				S ? a = S : r !== b && (r = b, !a && r && (a = useDict(r)));
+				let D = T.multiple ? d?.map(E) : E(d);
+				if (g) if (T.multiple) {
+					let r;
 					return createVNode(NText, {
 						depth: 2,
 						style: "line-height: 1.25"
-					}, _isSlot(n = (d?.map((n) => c?.find((c) => c[b.valueField || "value"] === n)) ?? []).map((n, c, l) => {
-						let u = n ? b.renderLabel ? b.renderLabel(n) ?? "" : n[b.labelField || "label"] ?? "" : d[c] ?? "";
-						return createVNode("span", { key: n ? n[b.valueField || "value"] : d[c] ?? "" }, [u, c < l.length - 1 ? ", " : ""]);
-					})) ? n : { default: () => [n] });
+					}, _isSlot(r = (D?.map((r) => a?.find((a) => a[T.valueField || "value"] === r)) ?? []).map((r, a, o) => {
+						let s = r ? T.renderLabel ? T.renderLabel(r) ?? "" : r[T.labelField || "label"] ?? "" : D[a] ?? "";
+						return createVNode("span", { key: r ? r[T.valueField || "value"] : D[a] ?? "" }, [s, a < o.length - 1 ? ", " : ""]);
+					})) ? r : { default: () => [r] });
 				} else {
-					let n = c?.find((n) => n[b.valueField || "value"] === d);
+					let r = a?.find((r) => r[T.valueField || "value"] === D);
 					return createVNode(NText, {
 						depth: 2,
 						style: "line-height: 1.25"
-					}, { default: () => [n ? b.renderLabel ? b.renderLabel(n) ?? "" : n[b.labelField || "label"] ?? "" : d ?? ""] });
+					}, { default: () => [r ? T.renderLabel ? T.renderLabel(r) ?? "" : r[T.labelField || "label"] ?? "" : D ?? ""] });
 				}
-				return h(NSelect, {
+				return s = T.multiple, o = f, w === "number" && !c && (c = (r, ...a) => {
+					o(s ? r?.map(C) : C(r), ...a);
+				}), h(NSelect, {
 					clearable: !0,
-					loading: c?.loading,
-					...b,
-					options: unref(c),
-					...g,
-					value: d,
-					"onUpdate:value": f
+					loading: a?.loading,
+					...T,
+					options: unref(a),
+					...v,
+					value: D,
+					"onUpdate:value": w === "number" ? c : o
 				}, l);
 			};
 		},
-		checkbox: () => ({ slots: n, props: c }, { modelValue: l, "onUpdate:modelValue": u, required: d, readonly: f, ...p }) => {
-			if (c = mapProps(c), f) {
-				let u;
-				return u = l === (c.checkedValue ?? !0) ? n?.checked ? n.checked() : createVNode(NCheckbox, { checked: !0 }, null) : n?.unchecked ? n.unchecked() : createVNode(NCheckbox, { disabled: !0 }, null), createVNode(NText, {
+		checkbox: () => ({ slots: r, props: a }, { modelValue: o, "onUpdate:modelValue": s, required: c, readonly: l, ...u }) => {
+			if (a = mapProps(a), l) {
+				let s;
+				return s = o === (a.checkedValue ?? !0) ? r?.checked ? r.checked() : createVNode(NCheckbox, { checked: !0 }, null) : r?.unchecked ? r.unchecked() : createVNode(NCheckbox, { disabled: !0 }, null), createVNode(NText, {
 					depth: 2,
 					style: "line-height: 1.25"
-				}, _isSlot(u) ? u : { default: () => [u] });
+				}, _isSlot(s) ? s : { default: () => [s] });
 			}
 			return h(NCheckbox, {
-				...c,
-				...p,
-				checked: l,
-				"onUpdate:checked": u
-			}, n);
+				...a,
+				...u,
+				checked: o,
+				"onUpdate:checked": s
+			}, r);
 		},
 		checkboxes: () => {
-			let n, c;
-			return ({ props: u }, { modelValue: d, required: f, readonly: p, ...m }) => {
-				let { dictType: g, options: v, ...y } = mapProps(u);
-				if (v ? c = v : n !== g && (n = g, !c && n && (c = useDict(n))), p) {
-					let n;
+			let r, a, s, c;
+			return ({ props: l }, { modelValue: u, "onUpdate:modelValue": d, required: f, readonly: m, ...g }) => {
+				let { dictType: v, options: y, valueType: b = "string", ...S } = mapProps(l), w = b === "number" ? _ : x;
+				y ? a = y : r !== v && (r = v, !a && r && (a = useDict(r)));
+				let T = u?.map(w) ?? [];
+				if (m) {
+					let r;
 					return createVNode(NText, {
 						depth: 2,
 						style: "line-height: 2.4"
-					}, _isSlot(n = (d?.map((n) => c?.find((c) => c[y.valueField || "value"] === n)) ?? []).map((n, c, l) => {
-						let u = n ? n[y.labelField ?? "label"] ?? "" : d[c] ?? "";
-						return createVNode("span", { key: n ? n[y.valueField ?? "value"] : d[c] ?? "" }, [u, c < l.length - 1 ? ", " : ""]);
-					})) ? n : { default: () => [n] });
+					}, _isSlot(r = (T?.map((r) => a?.find((a) => a[S.valueField || "value"] === r)) ?? []).map((r, a, o) => {
+						let s = r ? r[S.labelField ?? "label"] ?? "" : T[a] ?? "";
+						return createVNode("span", { key: r ? r[S.valueField ?? "value"] : T[a] ?? "" }, [s, a < o.length - 1 ? ", " : ""]);
+					})) ? r : { default: () => [r] });
 				}
-				return h(NCheckboxes, {
-					...y,
-					...m,
-					options: c,
-					modelValue: d
+				return s = d, b === "number" && !c && (c = (r, ...a) => {
+					s(multiple0 ? r?.map(C) : C(r), ...a);
+				}), h(NCheckboxes, {
+					...S,
+					...g,
+					options: a,
+					modelValue: T,
+					"onUpdate:modelValue": b === "number" ? c : s
 				});
 			};
 		},
 		radios: () => {
-			let n, c;
-			return ({ props: l }, { modelValue: u, required: d, readonly: f, ...m }) => {
-				let { dictType: g, options: v, ...y } = mapProps(l);
-				if (v ? c = v : n !== g && (n = g, !c && n && (c = useDict(n))), f) {
-					let n = c?.find((n) => n[y.valueField ?? "value"] === u);
+			let r, a, o, s;
+			return ({ props: c }, { modelValue: l, "onUpdate:modelValue": d, required: f, readonly: m, ...g }) => {
+				let { dictType: v, options: y, valueType: b = "string", ...S } = mapProps(c), w = b === "number" ? _ : x;
+				y ? a = y : r !== v && (r = v, !a && r && (a = useDict(r)));
+				let T = w(l);
+				if (m) {
+					let r = a?.find((r) => r[S.valueField ?? "value"] === T);
 					return createVNode(NText, {
 						depth: 2,
 						style: "line-height: 1.25"
-					}, { default: () => [n ? n[y.labelField ?? "label"] ?? "" : u ?? ""] });
+					}, { default: () => [r ? r[S.labelField ?? "label"] ?? "" : T ?? ""] });
 				}
-				return h(NRadios, {
-					...y,
-					...m,
-					options: c,
-					modelValue: u
+				return o = d, b === "number" && !s && (s = (r, ...a) => {
+					o(C(r), ...a);
+				}), h(NRadios, {
+					...S,
+					...g,
+					options: a,
+					modelValue: T,
+					"onUpdate:modelValue": b === "number" ? s : o
 				});
 			};
 		},
-		datepicker: () => ({ slots: n, props: c }, { modelValue: l, "onUpdate:modelValue": u, required: d, readonly: f, ...p }) => {
-			let { type: m = "date", format: g = m.startsWith("datetime") ? "yyyy-MM-dd HH:mm:ss" : "yyyy-MM-dd", ...v } = mapProps(c);
-			return f ? m.endsWith("range") ? createVNode(NText, {
+		datepicker: () => ({ slots: r, props: a }, { modelValue: o, "onUpdate:modelValue": s, required: c, readonly: l, ...u }) => {
+			let { type: d = "date", format: f = d.startsWith("datetime") ? "yyyy-MM-dd HH:mm:ss" : "yyyy-MM-dd", ...m } = mapProps(a);
+			return l ? d.endsWith("range") ? createVNode(NText, {
 				depth: 2,
 				style: "line-height: 1.25"
-			}, { default: () => [l ? `${l[0] ? format(l[0], g) : ""} ~ ${l[1] ? format(l[1], g) : ""}` : ""] }) : createVNode(NText, {
+			}, { default: () => [o ? `${o[0] ? format(o[0], f) : ""} ~ ${o[1] ? format(o[1], f) : ""}` : ""] }) : createVNode(NText, {
 				depth: 2,
 				style: "line-height: 1.25"
-			}, { default: () => [l ? format(l, g) : ""] }) : h(NDatePicker, {
+			}, { default: () => [o ? format(o, f) : ""] }) : h(NDatePicker, {
 				actions: null,
 				updateValueOnClose: !0,
 				clearable: !0,
-				...v,
-				...p,
-				type: m,
-				format: g,
-				value: l,
-				"onUpdate:value": u
-			}, n);
+				...m,
+				...u,
+				type: d,
+				format: f,
+				value: o,
+				"onUpdate:value": s
+			}, r);
 		},
-		file: () => ({ slots: n, props: c }, { modelValue: l, "onUpdate:modelValue": u, required: d, readonly: f, ...p }) => {
-			if (c = mapProps(c), f) {
-				let n;
+		file: () => ({ slots: r, props: a }, { modelValue: o, "onUpdate:modelValue": s, required: c, readonly: l, ...u }) => {
+			if (a = mapProps(a), l) {
+				let r;
 				return console.warn("[file] 原则上此组建不应该显示在详情中"), fileList.value.length === 0 ? void 0 : createVNode(NFlex, {
 					gap: "8",
 					vertical: !0
-				}, _isSlot(n = l.map((n) => createVNode("a", {
-					key: n.id,
-					href: n.url,
+				}, _isSlot(r = o.map((r) => createVNode("a", {
+					key: r.id,
+					href: r.url,
 					target: "_blank",
 					rel: "noreferrer",
 					style: "max-width: 100px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; display: inline-block"
-				}, [n.name]))) ? n : { default: () => [n] });
+				}, [r.name]))) ? r : { default: () => [r] });
 			}
 			return h(SimpleUpload, {
-				...c,
-				...p,
+				...a,
+				...u,
 				defaultUpload: !1,
-				uploadFile: v,
-				fileList: l,
-				onUpdateFileList: u
-			}, n);
+				uploadFile: m,
+				fileList: o,
+				onUpdateFileList: s
+			}, r);
 		},
 		upload: () => {
-			let n = null, c = /* @__PURE__ */ new Map(), l = /* @__PURE__ */ new Map(), u = shallowRef([]), d = 0, f = (n) => {
-				let c = ++d;
-				u.value = n.map((n) => l.get(n)).filter(Boolean);
-				let f = n.filter((n) => !l.has(n));
-				Promise.resolve(f.length > 0 ? y(f) : []).then((f) => {
-					if (c === d) {
-						u.value = n.map((n) => l.get(n) || f.find((c) => c.id === n)), l.clear();
-						for (let n of u.value) l.set(n.id, n);
+			let r = null, a = /* @__PURE__ */ new Map(), o = /* @__PURE__ */ new Map(), s = shallowRef([]), c = 0, l = (r) => {
+				let a = ++c;
+				s.value = r.map((r) => o.get(r)).filter(Boolean);
+				let l = r.filter((r) => !o.has(r));
+				Promise.resolve(l.length > 0 ? g(l) : []).then((l) => {
+					if (a === c) {
+						s.value = r.map((r) => o.get(r) || l.find((a) => a.id === r)), o.clear();
+						for (let r of s.value) o.set(r.id, r);
 					}
 				});
-			}, p;
+			}, u;
 			return {
-				renderer: ({ slots: d, props: m }, { modelValue: g, "onUpdate:modelValue": y, required: b, readonly: S, ...C }) => {
-					let w = mapProps(m);
-					if (p = w.ref ??= shallowRef(), n !== g && (n = g, f(g?.split(",") ?? [])), S) {
-						let n;
-						return u.value.length === 0 ? void 0 : createVNode(NFlex, {
+				renderer: ({ slots: c, props: d }, { modelValue: f, "onUpdate:modelValue": g, required: _, readonly: y, ...b }) => {
+					let x = mapProps(d);
+					if (u = x.ref ??= shallowRef(), r !== f && (r = f, l(f?.split(",") ?? [])), y) {
+						let r;
+						return s.value.length === 0 ? void 0 : createVNode(NFlex, {
 							gap: "8",
 							vertical: !0,
 							style: "padding: 6px 0"
-						}, _isSlot(n = u.value.map((n) => createVNode("a", {
-							key: n.id,
-							href: n.url,
+						}, _isSlot(r = s.value.map((r) => createVNode("a", {
+							key: r.id,
+							href: r.url,
 							target: "_blank",
 							rel: "noreferrer",
-							title: n.name,
-							download: n.name,
+							title: r.name,
+							download: r.name,
 							style: "max-width: 100%; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; display: inline-block"
-						}, [n.name]))) ? n : { default: () => [n] });
+						}, [r.name]))) ? r : { default: () => [r] });
 					}
 					return h(SimpleUpload, {
-						...w,
-						...C,
-						uploadFile: v,
-						fileList: u.value,
-						onUpdateFileList: (n = []) => {
-							l.clear();
-							for (let u of n) u.file?.fileId && c.set(u.id, u.file.fileId), u.file?.fileId ? l.set(u.file.fileId, u) : l.set(u.id, u);
-							u.value = n, y(u.value.map((n) => c.get(n.id) || n.id).join(",") || null);
+						...x,
+						...b,
+						uploadFile: m,
+						fileList: s.value,
+						onUpdateFileList: (r = []) => {
+							o.clear();
+							for (let s of r) s.file?.fileId && a.set(s.id, s.file.fileId), s.file?.fileId ? o.set(s.file.fileId, s) : o.set(s.id, s);
+							s.value = r, g(s.value.map((r) => a.get(r.id) || r.id).join(",") || null);
 						}
-					}, d);
+					}, c);
 				},
 				beforeSubmit: async () => {
-					if (await p?.value?.submit(), await until(u).toMatch((n) => n.every((n) => !["pending", "uploading"].includes(n.status))), u.value.some((n) => n.status === "error")) return SimpleUpload.t("common.page.form.validate.fileErrorMessage");
+					if (await u?.value?.submit(), await until(s).toMatch((r) => r.every((r) => !["pending", "uploading"].includes(r.status))), s.value.some((r) => r.status === "error")) return SimpleUpload.t("common.page.form.validate.fileErrorMessage");
 				}
 			};
 		},
 		user: () => {
-			let l, p, v;
-			return ({ slots: y, props: b }, { modelValue: S, "onUpdate:modelValue": C, required: w, readonly: T, ...E }) => {
-				let D = mapProps(b);
-				return l || (l = shallowRef([]), p = shallowRef([]), v = shallowRef([]), g().then((n) => {
-					l.value = n;
-				}), n().then((n) => {
-					p.value = n;
-				}), f().then((n) => {
-					v.value = n;
-				})), T ? createVNode(DtUserRender, {
-					value: S,
-					multiple: D.multiple,
-					getUsersByUsername: g
+			let o, u, m;
+			return ({ slots: g, props: _ }, { modelValue: y, "onUpdate:modelValue": b, required: x, readonly: S, ...C }) => {
+				let w = mapProps(_);
+				return o || (o = shallowRef([]), u = shallowRef([]), m = shallowRef([]), f().then((r) => {
+					o.value = r;
+				}), r().then((r) => {
+					u.value = r;
+				}), l().then((r) => {
+					m.value = r;
+				})), S ? createVNode(DtUserRender, {
+					value: y,
+					multiple: w.multiple,
+					getUsersByUsername: f
 				}, null) : h(DtUserDept, {
 					type: "user",
-					users: l.value,
-					depts: v.value,
-					groups: p.value,
-					getUsersByDept: m,
-					getUsersByGroup: u,
-					...D,
-					...E,
-					modelValue: S,
-					"onUpdate:modelValue": C
-				}, y);
+					users: o.value,
+					depts: m.value,
+					groups: u.value,
+					getUsersByDept: d,
+					getUsersByGroup: s,
+					...w,
+					...C,
+					modelValue: y,
+					"onUpdate:modelValue": b
+				}, g);
 			};
 		}
 	};
 }
-function createPageTableHelper({ getDeptsByCode: n, getUsersByUsername: l, getFileInfos: u, previewFileUrl: d }) {
-	let p = (n) => () => (c, l, u, d) => {
-		if (c != null) return format(c, d.formatter ?? n);
-	}, m = (n = {}) => createVNode("svg", mergeProps({
+function createPageTableHelper({ getDeptsByCode: r, getUsersByUsername: o, getFileInfos: s, previewFileUrl: c }) {
+	let u = (r) => () => (a, o, s, c) => {
+		if (a != null) return format(a, c.formatter ?? r);
+	}, d = (r = {}) => createVNode("svg", mergeProps({
 		xmlns: "http://www.w3.org/2000/svg",
 		width: "1em",
 		height: "1em",
 		viewBox: "0 0 32 32"
-	}, n), [createVNode("circle", {
+	}, r), [createVNode("circle", {
 		cx: "16",
 		cy: "16",
 		r: "8",
 		fill: "currentColor"
 	}, null)]);
 	return {
-		date: p("yyyy-MM-dd"),
-		datetime: p("yyyy-MM-dd HH:mm:ss"),
+		date: u("yyyy-MM-dd"),
+		datetime: u("yyyy-MM-dd HH:mm:ss"),
 		dict: () => {
-			let n, c, l;
-			return (u, d, f, p) => {
-				if (u == null) return;
-				let { dictType: g, options: _, multiple: v, statusMap: y } = mapProps(p);
-				if (_ ? c !== _ && (c = _, l = new Map(_.map((n) => [n[p.valueField || "value"], n]))) : n !== g && (n = g, !l && n && (l = useDictMap(n))), !v) {
-					if (u = u.toString(), y && u in y) {
-						let n = y[u] ?? "default";
+			let r, a, o;
+			return (s, c, l, u) => {
+				if (s == null) return;
+				let { dictType: f, options: p, multiple: m, statusMap: g } = mapProps(u);
+				if (p ? a !== p && (a = p, o = new Map(p.map((r) => [r[u.valueField || "value"], r]))) : r !== f && (r = f, !o && r && (o = useDictMap(r))), !m) {
+					if (s = s.toString(), g && s in g) {
+						let r = g[s] ?? "default";
 						return [
 							"primary",
 							"success",
 							"warning",
 							"danger"
-						].includes(n) && (n = `var(--color-${n})`), createVNode("span", { style: "position: relative; padding-left: 1.25em" }, [createVNode(m, { style: `color: ${n}; position: absolute;left: 0; top: 1.5px` }, null), createVNode("span", null, [l.get(u)?.[p.labelField || "label"] ?? u ?? ""])]);
+						].includes(r) && (r = `var(--color-${r})`), createVNode("span", { style: "position: relative; padding-left: 1.25em" }, [createVNode(d, { style: `color: ${r}; position: absolute;left: 0; top: 1.5px` }, null), createVNode("span", null, [o.get(s)?.[u.labelField || "label"] ?? s ?? ""])]);
 					}
-					return l.get(u)?.[p.labelField || "label"] ?? u ?? "";
+					return o.get(s)?.[u.labelField || "label"] ?? s ?? "";
 				}
-				return u?.map((n) => l.get(n?.toString())?.[p.labelField || "label"] ?? n?.toString() ?? "") ?? "";
+				return s?.map((r) => o.get(r?.toString())?.[u.labelField || "label"] ?? r?.toString() ?? "") ?? "";
 			};
 		},
-		number: () => (n, c, l, u) => {
-			if (n != null) {
-				switch (u.percent && (n = Number(n) * 100), "number") {
-					case typeof u.fixed:
-						n = n.toFixed(u.fixed);
+		number: () => (r, a, o, s) => {
+			if (r != null) {
+				switch (s.percent && (r = Number(r) * 100), "number") {
+					case typeof s.fixed:
+						r = r.toFixed(s.fixed);
 						break;
-					case typeof u.round:
-						n = n.toFixed(u.round).replace(/0+$/, "");
+					case typeof s.round:
+						r = r.toFixed(s.round).replace(/0+$/, "");
 						break;
-					case typeof u.precision:
-						n = n.toPrecision(u.precision);
+					case typeof s.precision:
+						r = r.toPrecision(s.precision);
 						break;
 				}
-				return u?.separator ? Number(n).toLocaleString() : n;
+				return s?.separator ? Number(r).toLocaleString() : r;
 			}
 		},
-		email: () => (n) => createVNode("a", { href: `mailto:${n}` }, [n]),
-		url: () => (n) => createVNode("a", { href: n }, [n]),
-		color: () => (n) => createVNode(NColorPicker, {
-			value: n,
+		email: () => (r) => createVNode("a", { href: `mailto:${r}` }, [r]),
+		url: () => (r) => createVNode("a", { href: r }, [r]),
+		color: () => (r) => createVNode(NColorPicker, {
+			value: r,
 			disabled: !0,
 			size: "small"
 		}, null),
-		image: () => (n, c, l, u) => {
-			let f;
-			return n ? createVNode(NFlex, {
+		image: () => (r, a, o, s) => {
+			let l;
+			return r ? createVNode(NFlex, {
 				gap: "8",
 				wrap: !0
-			}, _isSlot(f = (Array.isArray(n) ? n : u?.multiple ? n.split(",") : [n]).map((n) => d(n)).map((n) => createVNode("img", {
-				key: n,
-				src: n,
+			}, _isSlot(l = (Array.isArray(r) ? r : s?.multiple ? r.split(",") : [r]).map((r) => c(r)).map((r) => createVNode("img", {
+				key: r,
+				src: r,
 				style: "max-height: 32px; max-width: 100px; object-fit: contain"
-			}, null))) ? f : { default: () => [f] }) : void 0;
+			}, null))) ? l : { default: () => [l] }) : void 0;
 		},
 		file: () => {
-			let n = nanoid();
-			return (c, l, d, f) => {
-				let p;
-				return c ? (l.__file_urls ??= {}, l.__file_urls[n] || u(Array.isArray(c) ? c : f?.multiple ? c.split(",") : [c]).then((c) => {
-					l.__file_urls[n] = c;
+			let r = nanoid();
+			return (a, o, c, l) => {
+				let u;
+				return a ? (o.__file_urls ??= {}, o.__file_urls[r] || s(Array.isArray(a) ? a : l?.multiple ? a.split(",") : [a]).then((a) => {
+					o.__file_urls[r] = a;
 				}), createVNode(NFlex, {
 					gap: "8",
 					wrap: !0
-				}, _isSlot(p = (l.__file_urls[n] || []).map((n) => createVNode("a", {
-					key: n.id,
-					href: n.url,
+				}, _isSlot(u = (o.__file_urls[r] || []).map((r) => createVNode("a", {
+					key: r.id,
+					href: r.url,
 					target: "_blank",
 					rel: "noreferrer",
 					style: "max-width: 100px; text-overflow: ellipsis; overflow: hidden; white-space: nowrap; display: inline-block"
-				}, [n.name]))) ? p : { default: () => [p] })) : void 0;
+				}, [r.name]))) ? u : { default: () => [u] })) : void 0;
 			};
 		},
-		dept: () => (c, l, u, d) => {
-			if (c) return createVNode(DtDeptRender, {
-				value: c,
-				multiple: d?.multiple,
-				getDeptsByCode: n
+		dept: () => (a, o, s, c) => {
+			if (a) return createVNode(DtDeptRender, {
+				value: a,
+				multiple: c?.multiple,
+				getDeptsByCode: r
 			}, null);
 		},
-		user: () => (n, u, d, f) => {
-			if (n) return createVNode(DtUserRender, {
-				value: n,
-				multiple: f?.multiple,
-				getUsersByUsername: l
+		user: () => (r, s, c, l) => {
+			if (r) return createVNode(DtUserRender, {
+				value: r,
+				multiple: l?.multiple,
+				getUsersByUsername: o
 			}, null);
 		}
 	};
 }
 function createFormHelper() {
-	return () => ({ items: n, model: c, handleSubmit: l, reset: d, validation: f, readonly: p, inModal: m, showFeedback: g, showColon: _, labelWidth: v, labelAlign: y, labelPlacement: b, showRequireMark: x, requireMarkPlacement: C }) => createVNode(DataForm, {
-		readonly: p,
-		model: c,
-		items: n,
-		validation: f,
-		showColon: unref(_) ?? !0,
-		labelWidth: unref(v),
-		labelAlign: unref(y),
-		labelPlacement: unref(b),
-		showRequireMark: unref(x),
-		requireMarkPlacement: unref(C),
-		showFeedback: unref(g) ?? !0,
+	return () => ({ items: r, model: a, handleSubmit: o, reset: c, validation: l, readonly: u, inModal: d, showFeedback: f, showColon: p, labelWidth: m, labelAlign: g, labelPlacement: _, showRequireMark: v, requireMarkPlacement: b }) => createVNode(DataForm, {
+		readonly: u,
+		model: a,
+		items: r,
+		validation: l,
+		showColon: unref(p) ?? !0,
+		labelWidth: unref(m),
+		labelAlign: unref(g),
+		labelPlacement: unref(_),
+		showRequireMark: unref(v),
+		requireMarkPlacement: unref(b),
+		showFeedback: unref(f) ?? !0,
 		showAction: !1,
-		onSubmit: l,
-		onRest: d,
-		style: m ? "padding-right: 2rem; padding-top: 1rem" : void 0
+		onSubmit: o,
+		onRest: c,
+		style: d ? "padding-right: 2rem; padding-top: 1rem" : void 0
 	}, null);
 }
 function createModalHelper() {
-	let n = (n) => typeof n == "number" ? `${n}px` : n, c = {
+	let r = (r) => typeof r == "number" ? `${r}px` : r, a = {
 		maxHeight: "calc(100vh - 130px)",
 		display: "flex",
 		flexDirection: "column"
-	}, l = { content: !0 };
-	return () => ({ type: u = "dialog", visible: d, title: f, content: p, footer: m, placement: g, resizable: _, draggable: v, closeOnEsc: b, closable: x, showMask: S, maskClosable: C, width: T, height: E, style: D, onClose: O, onCancel: k, onConfirm: A, onAfterClose: j, onAfterOpen: M, confirmText: N, confirmDisabled: P, confirmLoading: F, cancelText: I, cancelDisabled: L, cancelLoading: R, nativeScrollbar: z, ...B }) => {
-		let V = m ? () => m : m === null ? null : () => createVNode(NFlex, {
+	}, o = { content: !0 };
+	return () => ({ type: s = "dialog", visible: c, title: l, content: u, footer: d, placement: f, resizable: p, draggable: m, closeOnEsc: _, closable: v, showMask: y, maskClosable: b, width: S, height: C, style: w, onClose: O, onCancel: k, onConfirm: A, onAfterClose: j, onAfterOpen: M, confirmText: N, confirmDisabled: P, confirmLoading: F, cancelText: I, cancelDisabled: L, cancelLoading: R, nativeScrollbar: z, ...B }) => {
+		let V = d ? () => d : d === null ? null : () => createVNode(NFlex, {
 			justify: "end",
 			gap: "16"
 		}, { default: () => [I === null ? void 0 : createVNode(NButton, {
@@ -462,58 +478,58 @@ function createModalHelper() {
 			loading: F,
 			style: "min-width: 60px"
 		}, _isSlot(N) ? N : { default: () => [N] })] });
-		if (u === "dialog") {
-			let { style: u } = mergeProps({ style: {
-				width: n(T ?? 520),
-				height: n(E)
-			} }, { style: D });
+		if (s === "dialog") {
+			let { style: s } = mergeProps({ style: {
+				width: r(S ?? 520),
+				height: r(C)
+			} }, { style: w });
 			return createVNode(NModal, mergeProps({
-				show: d,
+				show: c,
 				preset: "card",
-				title: () => f,
-				maskClosable: C ?? !1,
-				closeOnEsc: b,
-				closable: x,
+				title: () => l,
+				maskClosable: b ?? !1,
+				closeOnEsc: _,
+				closable: v,
 				onClose: O,
-				segmented: l,
+				segmented: o,
 				size: "small",
 				onAfterEnter: M,
 				onAfterLeave: j,
 				onUpdateShow: O,
-				draggable: v ?? !0,
-				style: u,
-				contentStyle: c
+				draggable: m ?? !0,
+				style: s,
+				contentStyle: a
 			}, B), {
 				default: () => createVNode(NScrollbar, {
 					abstract: !0,
 					style: "display: flex; flex-direction: column"
-				}, _isSlot(p) ? p : { default: () => [p] }),
+				}, _isSlot(u) ? u : { default: () => [u] }),
 				action: V
 			});
 		}
 		let { bodyContentClass: H, bodyContentStyle: U, ...W } = B;
 		return createVNode(NDrawer, mergeProps({
-			show: d,
+			show: c,
 			trapFocus: !1,
-			closeOnEsc: b,
-			showMask: S,
-			maskClosable: C,
-			resizable: _,
-			placement: g,
-			width: T ?? 440,
-			height: E,
+			closeOnEsc: _,
+			showMask: y,
+			maskClosable: b,
+			resizable: p,
+			placement: f,
+			width: S ?? 440,
+			height: C,
 			onUpdateShow: O,
 			onAfterEnter: M,
 			onAfterLeave: j,
-			style: D
+			style: w
 		}, W), { default: () => [createVNode(NDrawerContent, {
-			closable: x,
+			closable: v,
 			nativeScrollbar: z ?? !1,
 			bodyContentClass: H,
 			bodyContentStyle: U
 		}, {
-			default: () => p,
-			header: () => f,
+			default: () => u,
+			header: () => l,
 			footer: V
 		})] });
 	};

package/dist/use-style.js

@@ -1,2 +1,2 @@
-import { a as flex, c as flexDirCol, d as flexJustifySB, f as fullHeight, g as useStyle, h as useMergedClsPrefix, i as cM, l as flexGap, m as fullWidth, n as cB, o as flexAlignCenter, p as fullWH, r as cE, s as flexCenter, t as c, u as flexJustifyCenter } from "./use-style-DcT-1dj4.js";
+import { a as flex, c as flexDirCol, d as flexJustifySB, f as fullHeight, g as useStyle, h as useMergedClsPrefix, i as cM, l as flexGap, m as fullWidth, n as cB, o as flexAlignCenter, p as fullWH, r as cE, s as flexCenter, t as c, u as flexJustifyCenter } from "./use-style-mj2B1q0l.js";
 export { c, cB, cE, cM, useStyle as default, flex, flexAlignCenter, flexCenter, flexDirCol, flexGap, flexJustifyCenter, flexJustifySB, fullHeight, fullWH, fullWidth, useMergedClsPrefix as useClsPrefix };

package/esm/page.d.ts

@@ -34,6 +34,7 @@ declare module '@ithinkdt/page' {
             & {
                 dictType?: DictTypeKey | undefined
                 options?: DictItem[] | (SelectOption | SelectGroupOption)[] | undefined
+                valueType?: 'string' | 'number' | undefined
             }>
             selectSlots?: SelectSlots
         }
@@ -52,6 +53,7 @@ declare module '@ithinkdt/page' {
             & {
                 dictType?: DictTypeKey | undefined
                 options?: DictItem[] | undefined
+                valueType?: 'string' | 'number' | undefined
             }>
             checkboxesSlots?: { }
         }
@@ -61,6 +63,7 @@ declare module '@ithinkdt/page' {
             & {
                 dictType?: DictTypeKey | undefined
                 options?: DictItem[] | undefined
+                valueType?: 'string' | 'number' | undefined
             }>
             radiosSlots?: { }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/ui",
-  "version": "4.0.0-403",
+  "version": "4.0.0-405",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT UI",
@@ -82,14 +82,14 @@
     }
   },
   "devDependencies": {
-    "@vitejs/plugin-vue-jsx": "^5.1.1",
+    "@vitejs/plugin-vue-jsx": "^5.1.2",
     "ithinkdt-ui": "^1.8.1",
     "typescript": "~5.9.3",
-    "unocss": ">=66.5.6",
-    "vite": "npm:rolldown-vite@^7.2.5",
-    "vue": "^3.5.24",
+    "unocss": ">=66.5.9",
+    "vite": "npm:rolldown-vite@^7.2.7",
+    "vue": "^3.5.25",
     "vue-router": "^4.6.3",
-    "@ithinkdt/page": "^4.0.0-400"
+    "@ithinkdt/page": "^4.0.0-401"
   },
   "scripts": {
     "dev": "vite build --watch",