@otwb/ui 2.0.40 → 2.0.42

package/dist/index.js

@@ -945,7 +945,10 @@ const AppMultiTabs = /* @__PURE__ */ defineComponent({
 				closable: z.closable,
 				dark: d.dark,
 				onClick: () => {
-					G || H.push(z.fullPath);
+					if (!G) {
+						let d = new URL(z.href, window.location.origin);
+						H.push(`${d.pathname}${d.search}${d.hash}`);
+					}
 				},
 				onContextmenu: (d) => W(d, z)
 			}, { default: () => [B.name ? B.name({

package/dist/page.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@otwb/ui",
-  "version": "2.0.40",
+  "version": "2.0.42",
   "type": "module",
   "license": "MIT",
   "description": "otwb UI",