@ithinkdt/ui 4.0.19 → 4.1.0

package/esm/{DataTable-2vtI02wP.js → DataTable-BVifHuTW.js}

@@ -1,7 +1,7 @@
 import e, { c as t, cB as n, cE as r, cM as i, useClsPrefix as a } from "./use-style.js";
-import { i as o } from "./directives-Chz4DK1u.js";
-import { C as s } from "./components-DLa9-kdK.js";
-import { t as c } from "./use-table-range-select-Da6t9Vlf.js";
+import { i as o } from "./directives-G7hy3akL.js";
+import { C as s } from "./components-Gbs1QIjp.js";
+import { t as c } from "./use-table-range-select-BTC3NnsD.js";
 import { computed as l, createVNode as u, defineComponent as d, inject as f, isVNode as p, ref as m, shallowRef as h, toValue as g, useTemplateRef as _, watch as v, withDirectives as y } from "vue";
 import { toReactive as b, until as x } from "@vueuse/core";
 import { NButton as S, NDataTable as C, NFlex as w, NIcon as T, NTooltip as E, dataTableProps as D } from "ithinkdt-ui";

package/esm/{components-DLa9-kdK.js → components-Gbs1QIjp.js}

@@ -1,6 +1,6 @@
 import { n as e } from "./use-i18n-BUP_StIp.js";
 import t, { cB as n, cE as r, useClsPrefix as i } from "./use-style.js";
-import { i as a } from "./directives-Chz4DK1u.js";
+import { i as a } from "./directives-G7hy3akL.js";
 import { Fragment as o, computed as s, createTextVNode as c, createVNode as l, defineAsyncComponent as u, defineComponent as d, h as f, inject as p, isVNode as m, markRaw as h, mergeProps as g, nextTick as _, onBeforeUnmount as v, reactive as y, ref as b, renderSlot as x, shallowRef as S, toRaw as C, toRef as w, toValue as T, unref as E, useTemplateRef as D, watch as O, withDirectives as k } from "vue";
 import { onClickOutside as A, until as j, useElementHover as M, useFullscreen as N } from "@vueuse/core";
 import { NAnchor as P, NAnchorLink as F, NAvatar as I, NAvatarGroup as ee, NBadge as te, NButton as L, NCard as ne, NCheckbox as R, NCheckboxGroup as re, NDropdown as ie, NEllipsis as ae, NEmpty as oe, NFlex as z, NForm as se, NFormItem as ce, NGi as le, NGrid as ue, NIcon as B, NInput as V, NList as de, NListItem as fe, NPagination as pe, NPopover as H, NRadio as me, NRadioButton as he, NRadioGroup as ge, NScrollbar as _e, NSelect as ve, NSpin as ye, NTag as be, NText as xe, NTooltip as Se, NTransfer as Ce, NTree as we, NTreeSelect as Te, formProps as U, useDialog as Ee } from "ithinkdt-ui";
@@ -1175,7 +1175,7 @@ var bt = /* @__PURE__ */ d({
 			size: "20",
 			depth: "3"
 		}, { default: () => [o.value ? l(Qe, null, null) : l(Ze, null, null)] })] }), u = (t) => {
-			let n = t.split("-")[0];
+			let n = t.split("-", 1)[0];
 			return e.supports.some((e) => e.value !== t && e.value.startsWith(n)) ? t : n;
 		}, d = `__slots${De(6)}`;
 		O(() => e.supports, (e) => {
@@ -1947,12 +1947,8 @@ var jt = /* @__PURE__ */ d({
 			disabled: t.disabled || void 0,
 			value: r,
 			filter: (e, t) => t.label.includes(e) || t.value.includes(e),
-			"onUpdate:value": (e) => {
-				i?.(e);
-			},
-			onUpdateValue: (e) => {
-				a?.(e);
-			}
+			"onUpdate:value": i,
+			onUpdateValue: a
 		}), null), k = ({ option: e, handleClose: n }) => l(be, {
 			type: t.type === "user" ? "primary" : "info",
 			closable: !0,
@@ -1970,7 +1966,7 @@ var jt = /* @__PURE__ */ d({
 				showIcon: !1,
 				title: t.placeholder,
 				style: { width: "700px" },
-				content: () => l("div", { style: { height: "550px" } }, [D({ style: { height: "100%" } }, t.type === "user" ? f.value : p.value, e.value, (t) => e.value = t)]),
+				content: () => l("div", { style: { height: "550px" } }, [D({ style: { height: "100%" } }, t.type === "user" ? f.value : p.value, e.value, (t) => e.value = t, void 0)]),
 				positiveText: a.value.positiveText,
 				negativeText: a.value.negativeText,
 				onPositiveClick() {
@@ -2027,7 +2023,7 @@ var jt = /* @__PURE__ */ d({
 });
 function Q(e, t, { placement: n = "left", size: r = 24, tooltip: i = !0, username: a = !1, renderInfo: o }) {
 	let s = e.nickname.split(" ").at(-1), c = s;
-	if (/^[\u4E00-\u9FA5]+$/.test(s)) {
+	if (/^[\u{4E00}-\u{9FA5}]+$/u.test(s)) {
 		let e = s.length;
 		c = e === 3 || e === 4 ? s.slice(-2) : e > 4 ? s.slice(0, 1) : s;
 	} else s.length > 4 && (c = l(B, null, { default: () => [l(nt, null, null)] }));
@@ -2162,6 +2158,6 @@ var Mt = /* @__PURE__ */ d({
 			});
 		};
 	}
-}), It = u(() => import("./DataTable-2vtI02wP.js").then((e) => e.DataTable));
+}), It = u(() => import("./DataTable-BVifHuTW.js").then((e) => e.DataTable));
 //#endregion
 export { Re as C, ot as S, gt as _, jt as a, pt as b, At as c, Tt as d, Ct as f, _t as g, yt as h, Mt as i, Ot as l, bt as m, Ft as n, Nt as o, X as p, Pt as r, $ as s, It as t, Et as u, Y as v, Le as w, ct as x, J as y };

package/esm/components.js

@@ -1,2 +1,2 @@
-import { S as e, _ as t, a as n, b as r, c as i, d as a, f as o, g as s, h as c, i as l, l as u, m as d, n as f, o as p, p as m, r as h, s as g, t as _, u as v, v as y, w as b, x, y as S } from "./components-DLa9-kdK.js";
+import { S as e, _ as t, a as n, b as r, c as i, d as a, f as o, g as s, h as c, i as l, l as u, m as d, n as f, o as p, p as m, r as h, s as g, t as _, u as v, v as y, w as b, x, y as S } from "./components-Gbs1QIjp.js";
 export { e as DataActions, x as DataCustom, r as DataDescriptions, s as DataFilter, t as DataForm, y as DataFormActions, d as DataLocaleInput, m as DataPagination, a as DataSelection, _ as DataTable, l as DtDeptRender, n as DtUserDept, p as DtUserRender, v as FullscreenButton, u as FullscreenWrapper, b as NCheckboxes, i as NRadios, f as NStateButton, h as StateButtonProps, o as ViewProfile, S as dataFormActionsProps, g as renderUsers, c as useLocaleEdit };

package/esm/composables.d.ts

@@ -4,10 +4,10 @@ import { InjectionKey, MaybeRef, ShallowRef, TemplateRef } from 'vue'
 
 export declare function useDataTableDrag<T>(
     tableRef: TemplateRef<HTMLElement>,
-    options: {
+    options: Omit<Sortable.Options, 'onSort'> & {
         data: MaybeRef<T[]>
         onSort: (info: { from: number, to: number }) => void
-    } & Omit<Sortable.Options, 'onSort'>,
+    },
 ): void
 
 /**

package/esm/composables.js

@@ -1,4 +1,4 @@
-import { t as e } from "./use-table-range-select-Da6t9Vlf.js";
+import { t as e } from "./use-table-range-select-BTC3NnsD.js";
 import { nextTick as t, ref as n, watch as r } from "vue";
 import { unrefElement as i } from "@vueuse/core";
 import { Sortable as a } from "sortablejs";
@@ -7,7 +7,7 @@ function o(e, { data: o, onSort: s, ...c }) {
 	r([n(o), e], async ([e, n]) => {
 		if (e.length === 0) return;
 		await t();
-		let r = i(n)?.querySelector(".n-data-table-base-table-body .n-data-table-tbody");
+		let r = i(n)?.querySelector(":scope .n-data-table-base-table-body .n-data-table-tbody");
 		if (!r) return;
 		let o = a.create(r, {
 			animation: 150,

package/esm/{directives-Chz4DK1u.js → directives-G7hy3akL.js}

@@ -83,7 +83,7 @@ var O, k, A, j = /* @__PURE__ */ s({
 					"right",
 					"left",
 					"bottom"
-				].find((t) => e.startsWith(t))) ?? "top", r.placement.split("-")[0]) {
+				].find((t) => e.startsWith(t))) ?? "top", r.placement.split("-", 1)[0]) {
 					case "top":
 						r.x = t.left + t.width / 2, r.y = t.top;
 						break;

package/esm/directives.js

@@ -1,2 +1,2 @@
-import { i as e, n as t, r as n, t as r } from "./directives-Chz4DK1u.js";
+import { i as e, n as t, r as n, t as r } from "./directives-G7hy3akL.js";
 export { r as SpinDirectiveProvider, n as TooltipDirectiveProvider, t as vSpin, e as vTooltip };

package/esm/index.d.ts

@@ -4,11 +4,11 @@ import { I18nComposable, ParseMessage } from '@ithinkdt/common/i18n'
 
 import { UILocale } from '../locale.js'
 
+export { UILocale } from '../locale.js'
+
 export * from './directives.js'
 export * from './design.js'
 
-export { UILocale }
-
 /** Props for {@link UIProvider} */
 export interface UIProviderProps {
     i18n?: I18nComposable<ParseMessage<UILocale, 'common'>>

package/esm/index.js

@@ -1,6 +1,6 @@
 import { n as e, t } from "./use-i18n-BUP_StIp.js";
 import n, { c as r, cB as i, cE as a, cM as o } from "./use-style.js";
-import { i as s, n as c, r as l, t as u } from "./directives-Chz4DK1u.js";
+import { i as s, n as c, r as l, t as u } from "./directives-G7hy3akL.js";
 import { Fragment as d, computed as f, createVNode as p, defineComponent as m, inject as h, isVNode as g, mergeProps as _, provide as v, reactive as y, ref as b, renderSlot as x, shallowRef as S, toRef as C, toValue as w, unref as T, useTemplateRef as E, watch as D, withDirectives as O } from "vue";
 import { computedAsync as ee, promiseTimeout as k, useElementHover as A, useElementSize as te, useEventListener as ne, watchDebounced as re } from "@vueuse/core";
 import { NAvatar as j, NBadge as ie, NBreadcrumb as ae, NBreadcrumbItem as oe, NButton as M, NDrawer as se, NDrawerContent as ce, NDropdown as N, NEmpty as le, NIcon as P, NInput as F, NList as I, NListItem as L, NMenu as R, NPagination as z, NPopover as B, NScrollbar as V, NText as H, NThing as U, useThemeVars as W } from "ithinkdt-ui";
@@ -32,7 +32,7 @@ var _e = /* @__PURE__ */ m({
 	},
 	emit: ["logout", "change-pwd"],
 	setup(t, { emit: n, slots: r }) {
-		let i = f(() => /^[\u4E00-\u9FA5]+$/.test(t.nickname) ? t.nickname?.slice(t.nickname?.length > 3 ? 2 : 1) : t.nickname?.split(" ")[0]), { t: a } = e(), o = p(P, { size: "28" }, { default: () => [p("svg", {
+		let i = f(() => /^[\u{4E00}-\u{9FA5}]+$/u.test(t.nickname) ? t.nickname?.slice(t.nickname?.length > 3 ? 2 : 1) : t.nickname?.split(" ", 1)[0]), { t: a } = e(), o = p(P, { size: "28" }, { default: () => [p("svg", {
 			xmlns: "http://www.w3.org/2000/svg",
 			width: "1em",
 			height: "1em",

package/esm/page.d.ts

@@ -71,7 +71,7 @@ declare module '@ithinkdt/page' {
         }
 
         file: {
-            fileProps?: ShallowMaybeRef<{
+            fileProps?: ShallowMaybeRef<PublicProps & {
                 type?: 'file' | 'image' | undefined
                 multiple?: boolean | undefined
                 max?: number | undefined
@@ -79,13 +79,13 @@ declare module '@ithinkdt/page' {
                 /** 最大文件大小（单位：KB） */
                 maxSize?: number | undefined
                 onBeforeUpload?: UploadProps['onBeforeUpload']
-            } & PublicProps>
+            }>
             fileSlots?: {
                 default?: (() => VNode[]) | undefined
             }
         }
         upload: {
-            uploadProps?: ShallowMaybeRef<{
+            uploadProps?: ShallowMaybeRef<PublicProps & {
                 type?: 'file' | 'image' | undefined
                 multiple?: boolean | undefined
                 max?: number | undefined
@@ -94,7 +94,7 @@ declare module '@ithinkdt/page' {
                 maxSize?: number | undefined
                 onBeforeUpload?: UploadProps['onBeforeUpload']
                 defaultUpload?: boolean | undefined
-            } & PublicProps>
+            }>
             uploadSlots?: {
                 default?: (() => VNode[]) | undefined
             }

package/esm/page.js

@@ -1,5 +1,5 @@
 import { n as e } from "./use-i18n-BUP_StIp.js";
-import { _ as t, a as n, c as r, i, o as a, w as o } from "./components-DLa9-kdK.js";
+import { _ as t, a as n, c as r, i, o as a, w as o } from "./components-Gbs1QIjp.js";
 import { computed as s, createVNode as c, defineAsyncComponent as l, defineComponent as u, h as d, isVNode as f, mergeProps as p, nextTick as m, ref as h, renderSlot as g, shallowRef as _, toValue as v, unref as y } from "vue";
 import { until as b, useClipboard as x } from "@vueuse/core";
 import { NButton as S, NCheckbox as C, NColorPicker as w, NDrawer as T, NDrawerContent as E, NFlex as D, NIcon as O, NInput as k, NInputNumber as A, NModal as j, NScrollbar as M, NSelect as N, NText as P, NUpload as F, useMessage as I } from "ithinkdt-ui";
@@ -112,7 +112,7 @@ function K({ getDeptsByCode: e, getUsersByUsername: t, getFileInfos: n, previewF
 				if (r == null) return;
 				let { dictType: o, options: l, multiple: u, statusMap: d } = W(a);
 				if (l ? t !== l && (t = l, n = new Map(l.map((e) => [e[a.valueField || "value"], e]))) : e !== o && (e = o, !n && e && (n = U(e))), !u) {
-					if (r = r.toString(), d && r in d) {
+					if (r = r.toString(), d && Object.hasOwn(d, r)) {
 						let e = d[r] ?? "default";
 						return [
 							"primary",
@@ -339,8 +339,15 @@ function X({ getUserGroups: e, getUsersByGroup: t, getDeptsByCode: i, getUsersBy
 					O("");
 				}, k()) : (n = void 0, t = C) : (n = void 0, e !== b && (e = b, !t && e && (t = H(e))));
 				let A = T.multiple ? l?.map(E) : E(l);
-				if (g) if (T.multiple) {
+				if (g) {
 					let e;
+					if (!T.multiple) {
+						let e = y(t)?.find((e) => e[T.valueField || "value"] === A);
+						return c(P, {
+							depth: 2,
+							style: "line-height: 1.25"
+						}, { default: () => [e ? T.renderLabel ? T.renderLabel(e) ?? "" : e[T.labelField || "label"] ?? "" : A ?? ""] });
+					}
 					return c(P, {
 						depth: 2,
 						style: "line-height: 1.25"
@@ -348,12 +355,6 @@ function X({ getUserGroups: e, getUsersByGroup: t, getDeptsByCode: i, getUsersBy
 						let r = e ? T.renderLabel ? T.renderLabel(e) ?? "" : e[T.labelField || "label"] ?? "" : A[t] ?? "";
 						return c("span", { key: e ? e[T.valueField || "value"] : A[t] ?? "" }, [r, t < n.length - 1 ? ", " : ""]);
 					})) ? e : { default: () => [e] });
-				} else {
-					let e = y(t)?.find((e) => e[T.valueField || "value"] === A);
-					return c(P, {
-						depth: 2,
-						style: "line-height: 1.25"
-					}, { default: () => [e ? T.renderLabel ? T.renderLabel(e) ?? "" : e[T.labelField || "label"] ?? "" : A ?? ""] });
 				}
 				return r = T.multiple, i = u, w === "number" && !a && (a = (e, ...t) => {
 					i(r ? e?.map(S) : S(e), ...t);

package/esm/use-style.js

@@ -1,31 +1,31 @@
-import { useMergedClsPrefix as e } from "ithinkdt-ui/es/_mixins/use-config";
-import t from "ithinkdt-ui/es/_mixins/use-style";
-import { c as n, cB as r, cE as i, cM as a } from "ithinkdt-ui/es/_utils/cssr/index";
+import { useMergedClsPrefix as e, useMergedClsPrefix as t } from "ithinkdt-ui/es/_mixins/use-config";
+import n from "ithinkdt-ui/es/_mixins/use-style";
+import { c as r, cB as i, cE as a, cM as o } from "ithinkdt-ui/es/_utils/cssr/index";
 //#region src/use-style.js
-function o(n, r, i, a) {
-	return i ??= e(), t(n, r, i, a), i;
+function s(t, r, i, a) {
+	return i ??= e(), n(t, r, i, a), i;
 }
-var s = { width: "100%" }, c = { height: "100%" }, l = {
-	...s,
-	...c
-}, u = { display: "flex" }, d = {
-	...u,
+var c = { width: "100%" }, l = { height: "100%" }, u = {
+	...c,
+	...l
+}, d = { display: "flex" }, f = {
+	...d,
 	flexDirection: "column"
-}, f = {
-	...u,
-	alignItems: "center"
 }, p = {
-	...u,
-	justifyContent: "center"
+	...d,
+	alignItems: "center"
 }, m = {
-	...u,
-	justifyContent: "space-between"
+	...d,
+	justifyContent: "center"
 }, h = {
-	...f,
-	...p
-}, g = (e) => ({
-	...u,
+	...d,
+	justifyContent: "space-between"
+}, g = {
+	...p,
+	...m
+}, _ = (e) => ({
+	...d,
 	gap: e
 });
 //#endregion
-export { n as c, r as cB, i as cE, a as cM, o as default, u as flex, f as flexAlignCenter, h as flexCenter, d as flexDirCol, g as flexGap, p as flexJustifyCenter, m as flexJustifySB, c as fullHeight, l as fullWH, s as fullWidth, e as useClsPrefix };
+export { r as c, i as cB, a as cE, o as cM, s as default, d as flex, p as flexAlignCenter, g as flexCenter, f as flexDirCol, _ as flexGap, m as flexJustifyCenter, h as flexJustifySB, l as fullHeight, u as fullWH, c as fullWidth, t as useClsPrefix };

package/esm/{use-table-range-select-Da6t9Vlf.js → use-table-range-select-BTC3NnsD.js}

@@ -29,7 +29,7 @@ function p(p, m = {}) {
 			ing: !0,
 			x1: t.cellIndex,
 			y1: n.rowIndex
-		}, globalThis.getSelection ? globalThis.getSelection().removeAllRanges() : document.selection && document.selection.empty());
+		}, "getSelection" in globalThis ? getSelection().removeAllRanges() : document.selection && document.selection.empty());
 	}, {
 		passive: !0,
 		capture: !0
@@ -42,7 +42,7 @@ function p(p, m = {}) {
 			ing: !1,
 			mousedown: !1
 		};
-		let e = g.value?.querySelector("tbody"), { x0: t, x1: n, y0: r, y1: i } = h.value ?? {};
+		let e = g.value?.querySelector(":scope tbody"), { x0: t, x1: n, y0: r, y1: i } = h.value ?? {};
 		if (!m?.onSelect && y.value !== "auto" || !e || d(n)) return;
 		let [a, o] = [t, n].toSorted((e, t) => e - t), [s, c] = [r, i].toSorted((e, t) => e - t);
 		m?.onSelect?.({
@@ -62,7 +62,7 @@ function p(p, m = {}) {
 		h.value &&= void 0;
 	});
 	let C = () => {
-		let e = g.value?.querySelector("tbody"), { x0: t, x1: n, y0: r, y1: i } = h.value ?? {};
+		let e = g.value?.querySelector(":scope tbody"), { x0: t, x1: n, y0: r, y1: i } = h.value ?? {};
 		if (!x.value || !e || d(n)) return [];
 		let [a, o] = [t, n].toSorted((e, t) => e - t), [s, c] = [r, i].toSorted((e, t) => e - t), l = [];
 		for (let t = s; t <= c; t++) {
@@ -81,7 +81,7 @@ function p(p, m = {}) {
 		return l;
 	};
 	return o([g, h], ([e, { x0: t, x1: n, y0: r, y1: i } = {}]) => {
-		let a = e?.querySelector("tbody");
+		let a = e?.querySelector(":scope tbody");
 		if (!a) return;
 		let [o, s] = [t, n].toSorted((e, t) => e - t), [c, l] = [r, i].toSorted((e, t) => e - t);
 		for (let e = 0; e < a.rows.length; e++) {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ithinkdt/ui",
-  "version": "4.0.19",
+  "version": "4.1.0",
   "type": "module",
   "license": "MIT",
   "description": "iThinkDT UI",
@@ -67,13 +67,13 @@
     "sortablejs": "^1.15.7",
     "@types/sortablejs": "^1.15.9",
     "nanoid": "^5.1.11",
-    "@ithinkdt/common": "^4.0.12"
+    "@ithinkdt/common": "^4.1.0"
   },
   "peerDependencies": {
-    "@ithinkdt/page": ">=4.0",
+    "@ithinkdt/page": ">=4.1",
     "vue": ">=3.5",
-    "vue-router": ">=4.5",
-    "ithinkdt-ui": ">=1.5",
+    "vue-router": ">=5.1",
+    "ithinkdt-ui": ">=1.9",
     "unocss": ">=66"
   },
   "peerDependenciesMeta": {
@@ -88,12 +88,12 @@
     "@vitejs/plugin-vue-jsx": "^5.1.5",
     "ithinkdt-ui": "^1.9.4",
     "typescript": "~6.0.3",
-    "unocss": "^66.7.0",
+    "unocss": "^66.7.2",
     "vite": "^8.0.16",
-    "vue": "^3.5.35",
+    "vue": "^3.5.38",
     "vue-router": "^5.1.0",
     "@vue/test-utils": "^2.4.11",
-    "@ithinkdt/page": "^4.0.22"
+    "@ithinkdt/page": "^4.1.0"
   },
   "scripts": {
     "dev": "vite build --watch",