@guodun/antdv 1.5.3 → 1.6.0

package/dist/es/components/pro-dynamic-tags/src/index.vue.mjs

@@ -7,6 +7,7 @@ var T = /* @__PURE__ */ l({
 	__name: "index",
 	props: {
 		modelValue: { default: () => [] },
+		maxCount: { default: 5 },
 		tagMaxWidth: { default: "auto" },
 		showAdd: {
 			type: Boolean,
@@ -28,18 +29,22 @@ var T = /* @__PURE__ */ l({
 		"expand"
 	],
 	setup(l, { emit: T }) {
-		let E = l, D = T, { b: O, e: k, m: A } = e("pro-dynamic-tags"), j = g(), M = g(), N = g(), P = g(E.modelValue.length), F = g(!1);
-		function I() {
-			F.value || (F.value = !0, P.value = E.modelValue.length), u(() => {
-				if (!j.value || !M.value || E.modelValue.length === 0) {
-					P.value = E.modelValue.length, F.value = !1;
+		let E = l, D = T;
+		function O(e) {
+			return Number.isFinite(e) && e >= 0 ? Math.floor(e) : 5;
+		}
+		let { b: k, e: A, m: j } = e("pro-dynamic-tags"), M = g(), N = g(), P = g(), F = g(Math.min(E.modelValue.length, O(E.maxCount))), I = g(!1);
+		function L() {
+			I.value || (I.value = !0, F.value = Math.min(E.modelValue.length, O(E.maxCount))), u(() => {
+				if (!M.value || !N.value || E.modelValue.length === 0) {
+					F.value = Math.min(E.modelValue.length, O(E.maxCount)), I.value = !1;
 					return;
 				}
-				let e = j.value.clientWidth, t = window.getComputedStyle(j.value), n = Number.parseFloat(t.paddingLeft), r = Number.parseFloat(t.paddingRight), i = Number.parseFloat(t.gap) || 8, a = 0;
-				E.showAdd && (a = (N.value?.offsetWidth || 80) + i);
-				let o = M.value.querySelectorAll(`.${k("tag")}`);
+				let e = M.value.clientWidth, t = window.getComputedStyle(M.value), n = Number.parseFloat(t.paddingLeft), r = Number.parseFloat(t.paddingRight), i = Number.parseFloat(t.gap) || 8, a = 0;
+				E.showAdd && (a = (P.value?.offsetWidth || 80) + i);
+				let o = N.value.querySelectorAll(`.${A("tag")}`);
 				if (o.length === 0) {
-					P.value = E.modelValue.length, F.value = !1;
+					F.value = Math.min(E.modelValue.length, O(E.maxCount)), I.value = !1;
 					return;
 				}
 				let s = e - n - r - a, c = 0, l = 0;
@@ -48,7 +53,7 @@ var T = /* @__PURE__ */ l({
 					if (c + t <= s) c += t, l++;
 					else break;
 				}
-				if (l === E.modelValue.length) P.value = E.modelValue.length;
+				if (l === E.modelValue.length) F.value = Math.min(E.modelValue.length, O(E.maxCount));
 				else {
 					let t = e - n - r - a - 44;
 					c = 0, l = 0;
@@ -57,51 +62,67 @@ var T = /* @__PURE__ */ l({
 						if (c + n <= t) c += n, l++;
 						else break;
 					}
-					P.value = Math.max(1, l);
+					F.value = Math.max(1, l);
 				}
-				F.value = !1;
+				F.value = Math.min(F.value, O(E.maxCount)), I.value = !1;
 			});
 		}
-		let L = n(() => E.modelValue.length <= P.value ? E.modelValue : E.modelValue.slice(0, P.value)), R = n(() => E.modelValue.length <= P.value ? 0 : E.modelValue.length - P.value), z = n(() => E.modelValue.length <= P.value ? [] : E.modelValue.slice(P.value));
-		function B(e) {
-			let t = [...E.modelValue], n = E.modelValue.findIndex((t) => t.value === e.value);
+		let R = n(() => E.modelValue.length <= F.value ? E.modelValue : E.modelValue.slice(0, F.value)), z = n(() => E.modelValue.length <= F.value ? 0 : E.modelValue.length - F.value), B = n(() => E.modelValue.length <= F.value ? [] : E.modelValue.slice(F.value)), V = n(() => {
+			if (typeof E.tagMaxWidth == "number") return `${E.tagMaxWidth}px`;
+			if (!(E.tagMaxWidth === "auto" || E.tagMaxWidth === void 0)) return E.tagMaxWidth;
+		});
+		function H(e) {
+			return `${e.type || "unknown"}:${String(e.value)}`;
+		}
+		function U(e) {
+			let t = [...E.modelValue], n = E.modelValue.findIndex((t) => (e.type === void 0 || t.type === e.type) && t.value === e.value);
+			if (n < 0) {
+				D("close", e, -1);
+				return;
+			}
 			t.splice(n, 1), D("update:modelValue", t), D("close", e, n);
 		}
-		function V() {
+		function W() {
 			D("add");
 		}
-		let H = null;
+		let G = null, K = 0, q = 0;
+		function J() {
+			K && cancelAnimationFrame(K), K = requestAnimationFrame(() => {
+				K = 0, L();
+			});
+		}
 		m(() => {
-			I(), j.value && (H = new ResizeObserver(() => {
-				I();
-			}), H.observe(j.value));
+			L(), M.value && (G = new ResizeObserver((e) => {
+				let t = e[0]?.contentRect.width ?? M.value?.clientWidth ?? 0;
+				t !== q && (q = t, J());
+			}), G.observe(M.value));
 		}), b(() => E.modelValue, () => {
-			I();
+			J();
 		}, { deep: !0 });
-		function U() {
-			H && j.value && (H.unobserve(j.value), H.disconnect(), H = null);
+		function Y() {
+			K &&= (cancelAnimationFrame(K), 0), G && M.value && (G.unobserve(M.value), G.disconnect(), G = null), q = 0;
 		}
 		return p(() => {
-			U();
+			Y();
 		}), (e, n) => (h(), a("div", {
 			ref_key: "containerRef",
-			ref: j,
+			ref: M,
 			class: d([
-				y(O)(),
-				y(A)(l.size),
+				y(k)(),
+				y(j)(l.size),
 				l.customClass
 			]),
 			style: f(l.customStyle)
 		}, [o("div", {
 			ref_key: "tagsContainerRef",
-			ref: M,
-			class: d(y(k)("tags"))
-		}, [(h(!0), a(t, null, _(L.value, (e) => (h(), r(y(w), {
-			key: e.value,
+			ref: N,
+			class: d(y(A)("tags"))
+		}, [(h(!0), a(t, null, _(R.value, (e) => (h(), r(y(w), {
+			key: H(e),
 			closable: l.closable && e.closable !== !1,
-			class: d(y(k)("tag")),
-			style: f({ maxWidth: `${l.tagMaxWidth}px` }),
-			onClose: (t) => B(e)
+			class: d(y(A)("tag")),
+			style: f({ maxWidth: V.value }),
+			onClose: (t) => U(e)
 		}, {
 			default: x(() => [s(v(e.label), 1)]),
 			_: 2
@@ -110,19 +131,19 @@ var T = /* @__PURE__ */ l({
 			"class",
 			"style",
 			"onClose"
-		]))), 128)), R.value > 0 ? (h(), r(y(C), {
+		]))), 128)), z.value > 0 ? (h(), r(y(C), {
 			key: 0,
 			placement: "top",
-			trigger: "hover",
-			"overlay-class-name": y(k)("popover"),
+			trigger: "click",
+			"overlay-class-name": y(A)("popover"),
 			"overlay-inner-style": { width: "400px" }
 		}, {
-			content: x(() => [o("div", { class: d(y(k)("popover-content")) }, [(h(!0), a(t, null, _(z.value, (e) => (h(), r(y(w), {
-				key: e.value,
+			content: x(() => [o("div", { class: d(y(A)("popover-content")) }, [(h(!0), a(t, null, _(B.value, (e) => (h(), r(y(w), {
+				key: H(e),
 				closable: l.closable && e.closable !== !1,
-				class: d(y(k)("popover-tag")),
-				style: f({ maxWidth: `${l.tagMaxWidth}px` }),
-				onClose: (t) => B(e)
+				class: d(y(A)("popover-tag")),
+				style: f({ maxWidth: V.value }),
+				onClose: (t) => U(e)
 			}, {
 				default: x(() => [s(v(e.label), 1)]),
 				_: 2
@@ -132,23 +153,28 @@ var T = /* @__PURE__ */ l({
 				"style",
 				"onClose"
 			]))), 128))], 2)]),
-			default: x(() => [c(y(w), { class: d(y(k)("more")) }, {
-				default: x(() => [s(" +" + v(R.value), 1)]),
+			default: x(() => [c(y(w), { class: d(y(A)("more")) }, {
+				default: x(() => [s(" +" + v(z.value), 1)]),
 				_: 1
 			}, 8, ["class"])]),
 			_: 1
 		}, 8, ["overlay-class-name"])) : i("", !0)], 2), l.showAdd ? (h(), r(y(S), {
 			key: 0,
 			ref_key: "addBtnRef",
-			ref: N,
+			ref: P,
 			type: "link",
 			size: l.size,
-			class: d(y(k)("add-btn")),
-			onClick: V
+			class: d(y(A)("add-btn")),
+			"aria-label": l.addText,
+			onClick: W
 		}, {
 			default: x(() => [s(v(l.addText), 1)]),
 			_: 1
-		}, 8, ["size", "class"])) : i("", !0)], 6));
+		}, 8, [
+			"size",
+			"class",
+			"aria-label"
+		])) : i("", !0)], 6));
 	}
 });
 //#endregion

package/dist/es/components/pro-selector/index.mjs

@@ -1,11 +1,12 @@
 import { withInstall as e } from "../utils/install.mjs";
 import "./src/types.mjs";
-import t from "./src/components/user.mjs";
-import n from "./src/pro-user.mjs";
+import t from "./src/ProUserSelector.mjs";
+import n from "./src/ProUserSelectorDrilldown.mjs";
+import r from "./src/components/user.mjs";
 import "./style/index.mjs";
 import "./src/hooks/useUserSelector.mjs";
 //#region src/components/pro-selector/index.ts
-n.GTE_ORGTREE_URL = "/security/dept/user/tree";
-var r = e(n), i = e(t);
+t.GTE_ORGTREE_URL = "/security/dept/user/tree";
+var i = e(t), a = i, o = e(n), s = i, c = e(r);
 //#endregion
-export { r as GdAntUserSelector, i as GdAntUserSelectorCheckbox };
+export { a as GdAntProSelector, i as GdAntUserSelector, c as GdAntUserSelectorCheckbox, s as GdAntUserSelectorDirectory, o as GdAntUserSelectorDrilldown };

package/dist/es/components/pro-selector/src/ProUserSelector.mjs

@@ -0,0 +1,5 @@
+import e from "./ProUserSelector.vue.mjs";
+//#region src/components/pro-selector/src/ProUserSelector.vue
+var t = e;
+//#endregion
+export { t as default };

package/dist/es/components/pro-selector/src/ProUserSelector.vue.mjs

@@ -0,0 +1,95 @@
+import e from "../../pro-dynamic-tags/src/index.mjs";
+import { serializeUsers as t, text as n } from "../../selector-core/model.mjs";
+import r from "../../selector-core/components/SelectorDialog.mjs";
+import { UserSelectorProps as i, userSelectorEmits as a } from "./types.mjs";
+import { computed as o, createBlock as s, createCommentVNode as c, createElementVNode as l, createVNode as u, defineComponent as d, openBlock as f, renderSlot as p, unref as m, useAttrs as h, withCtx as g } from "vue";
+import { FormItemRest as _ } from "ant-design-vue";
+//#region src/components/pro-selector/src/ProUserSelector.vue?vue&type=script&setup=true&lang.ts
+var v = { class: "gd-ant-pro-user-selector" }, y = /* @__PURE__ */ d({
+	name: "ProUserSelector",
+	__name: "ProUserSelector",
+	props: i,
+	emits: a,
+	setup(i, { expose: a, emit: d }) {
+		let y = i, b = d, x = h(), S = o(() => y.modelValue.map((e) => ({
+			type: "user",
+			value: n(e.id),
+			label: e.realName,
+			avatar: e.avatar,
+			raw: {
+				...e,
+				id: e.id,
+				userId: e.id
+			}
+		}))), C = o(() => y.modelValue.map((e) => ({
+			label: e.realName,
+			value: e.id,
+			closable: !0
+		}))), w = o(() => {
+			let { modalProps: e, ...t } = x;
+			return {
+				cancelText: "取消",
+				okText: "确定",
+				...t,
+				...e || {}
+			};
+		});
+		function T(e) {
+			b("update:visible", e === !0);
+		}
+		function E(e) {
+			let n = t(e);
+			b("update:visible", !1), b("update:modelValue", n), b("confirm", n);
+		}
+		function D() {
+			b("update:visible", !1), b("cancel");
+		}
+		function O(e) {
+			b("update:modelValue", y.modelValue.filter((t) => t.id !== e)), b("delete-user", e);
+		}
+		return a({ deleteCheckedUser: O }), (t, n) => (f(), s(m(_), null, {
+			default: g(() => [l("div", v, [y.hideSlot ? c("", !0) : p(t.$slots, "default", { key: 0 }, () => [u(e, {
+				"model-value": C.value,
+				"max-count": y.maxVisibleCount,
+				"show-add": "",
+				"add-text": "选择用户",
+				"custom-class": "selector-tags",
+				closable: "",
+				onAdd: n[0] ||= (e) => b("update:visible", !0),
+				onClose: n[1] ||= (e) => O(String(e.value))
+			}, null, 8, ["model-value", "max-count"])]), u(r, {
+				open: y.visible,
+				mode: "user",
+				selected: S.value,
+				selection: y.type,
+				"max-count": y.maxCount,
+				variant: y.variant,
+				title: y.title || "选择联系人",
+				http: y.http,
+				prefix: y.prefix,
+				"init-data": y.initData,
+				"is-built-in-request": y.isBuiltInRequest,
+				"modal-props": w.value,
+				"onUpdate:open": T,
+				"onUpdate:variant": n[2] ||= (e) => b("update:variant", e),
+				onConfirm: E,
+				onCancel: D
+			}, null, 8, [
+				"open",
+				"selected",
+				"selection",
+				"max-count",
+				"variant",
+				"title",
+				"http",
+				"prefix",
+				"init-data",
+				"is-built-in-request",
+				"modal-props"
+			])])]),
+			_: 3
+		}));
+	}
+});
+//#endregion
+export { y as default };

package/dist/es/components/pro-selector/src/ProUserSelectorDrilldown.mjs

@@ -0,0 +1,5 @@
+import e from "./ProUserSelectorDrilldown.vue.mjs";
+//#region src/components/pro-selector/src/ProUserSelectorDrilldown.vue
+var t = e;
+//#endregion
+export { t as default };

package/dist/es/components/pro-selector/src/ProUserSelectorDrilldown.vue.mjs

@@ -0,0 +1,20 @@
+import e from "./ProUserSelector.mjs";
+import { createBlock as t, defineComponent as n, mergeProps as r, openBlock as i, ref as a, renderSlot as o, unref as s, useAttrs as c, withCtx as l } from "vue";
+//#region src/components/pro-selector/src/ProUserSelectorDrilldown.vue?vue&type=script&setup=true&lang.ts
+var u = /* @__PURE__ */ n({
+	name: "ProUserSelectorDrilldown",
+	inheritAttrs: !1,
+	__name: "ProUserSelectorDrilldown",
+	setup(n, { expose: u }) {
+		let d = c(), f = a(), p = d.variant || "A";
+		return u({ deleteCheckedUser: (e) => f.value?.deleteCheckedUser(e) }), (n, a) => (i(), t(e, r({
+			ref_key: "selectorRef",
+			ref: f
+		}, n.$attrs, { variant: s(p) }), {
+			default: l(() => [o(n.$slots, "default")]),
+			_: 3
+		}, 16, ["variant"]));
+	}
+});
+//#endregion
+export { u as default };

package/dist/es/components/pro-selector/src/components/user.mjs

@@ -3,12 +3,11 @@ import t from "../../../icon/src/icon.mjs";
 import n from "../../../pro-user-avatar/src/index.mjs";
 import { createVNode as r, defineComponent as i, isVNode as a } from "vue";
 import { Checkbox as o, Radio as s } from "ant-design-vue";
-import { CheckOutlined as c } from "@ant-design/icons-vue";
 //#region src/components/pro-selector/src/components/user.tsx
-function l(e) {
+function c(e) {
 	return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !a(e);
 }
-var { b: u } = e("pro-user-selector"), d = /* @__PURE__ */ i({
+var { b: l } = e("pro-user-selector"), u = /* @__PURE__ */ i({
 	name: "User",
 	props: {
 		userInfo: {
@@ -30,76 +29,63 @@ var { b: u } = e("pro-user-selector"), d = /* @__PURE__ */ i({
 	},
 	emits: {
 		"delete-user": (e) => e,
-		"change-checked": (e, t) => e
+		"change-checked": (e, t) => typeof e == "boolean" && !!t
 	},
 	setup(e, { emit: i, slots: a }) {
-		let d = (t) => {
+		let u = (t) => {
 			i("change-checked", t.target.checked, e.userInfo);
-		}, f = () => r("div", { class: u("user-item-content") }, [r("div", { class: u("user-item-main") }, [
-			r(n, {
-				name: e.userInfo.realName ? e.userInfo.realName : "",
-				avatar: e.userInfo.avatar,
-				size: "default"
-			}, null, 8, ["name", "avatar"]),
-			r("div", { style: {
-				flex: 1,
-				minWidth: 0
-			} }, [r("div", { style: "display: flex;align-items: center;" }, [a.name ? a.name() : r("div", { class: u("user-item-name") }, [e.userInfo.realName], 2), e.userInfo.position && r("div", {
-				class: u("user-item-content-tag"),
-				style: {
-					"font-size": "10px",
-					"margin-left": "10px",
-					color: "var(--gdant-primary-600)",
-					"background-color": "color-mix(in srgb, var(--gdant-primary-500) 20%, transparent)",
-					"padding-left": "4px",
-					"padding-right": "4px",
-					"border-radius": "var(--gdant-radius-sm)"
-				}
-			}, [e.userInfo.position], 2)]), r("div", { style: {
-				fontSize: "12px",
-				color: "var(--gdant-neutral-500)",
-				lineHeight: "20px"
-			} }, [e.userInfo.stageName])]),
-			e.userInfo.checked && r(c, { style: {
-				color: "var(--gdant-primary-500)",
-				fontSize: "16px",
-				marginLeft: "8px",
-				flexShrink: 0
-			} }, null)
-		], 2), e.isDelete && r("button", {
+		}, d = () => r("div", { class: l("user-item-content") }, [r("div", { class: l("user-item-main") }, [r(n, {
+			class: l("user-avatar"),
+			name: e.userInfo.realName ? e.userInfo.realName : "",
+			avatar: e.userInfo.avatar,
+			size: "default",
+			preview: !1
+		}, null, 8, [
+			"class",
+			"name",
+			"avatar"
+		]), r("div", { class: l("user-item-info") }, [r("div", { class: l("user-item-heading") }, [a.name ? a.name() : r("div", { class: l("user-item-name") }, [e.userInfo.realName], 2), e.userInfo.position && r("span", { class: l("user-item-content-tag") }, [e.userInfo.position], 2)], 2), e.userInfo.stageName && r("div", { class: l("user-item-stage") }, [e.userInfo.stageName], 2)], 2)], 2), e.isDelete && r("button", {
 			type: "button",
-			class: "select-user-item-icon",
+			class: l("user-item-delete"),
 			"aria-label": `移除${e.userInfo.realName || "用户"}`,
-			onClick: () => i("delete-user", e.userInfo.userId || e.userInfo.id)
+			onClick: (t) => {
+				t.stopPropagation(), i("delete-user", e.userInfo.userId || e.userInfo.id);
+			}
 		}, [r(t, {
 			name: "shanchu",
-			size: 12,
-			color: "var(--gdant-neutral-800)"
-		}, null)], 8, ["aria-label", "onClick"])], 2);
+			size: 14,
+			color: "var(--gdant-neutral-600)",
+			"aria-hidden": "true"
+		}, null)], 10, ["aria-label", "onClick"])], 2);
 		return () => {
 			let t, n;
-			return r("div", { class: [u("user-item"), e.userInfo.checked ? `${u("user-item")}--selected` : ""] }, [e.isChecked ? e.selectionType === "radio" ? r(s, {
-				style: "margin: 0 6px;width: 100%;",
+			return r("div", { class: [l("user-item"), e.userInfo.checked ? `${l("user-item")}--selected` : ""] }, [e.isChecked ? e.selectionType === "radio" ? r(s, {
+				class: l("user-item-control"),
 				checked: e.userInfo.checked,
-				onChange: (e) => d({ target: { checked: e.target.checked } })
-			}, l(t = f()) ? t : {
+				onChange: (e) => u({ target: { checked: e.target.checked } })
+			}, c(t = d()) ? t : {
 				default: () => [t],
 				_: 1
-			}, 8, ["checked", "onChange"]) : r(o, {
-				style: "margin: 0 6px;width: 100%;",
+			}, 8, [
+				"class",
+				"checked",
+				"onChange"
+			]) : r(o, {
+				class: l("user-item-control"),
 				checked: e.userInfo.checked,
 				"onUpdate:checked": (t) => e.userInfo.checked = t,
-				onChange: d
-			}, l(n = f()) ? n : {
+				onChange: u
+			}, c(n = d()) ? n : {
 				default: () => [n],
 				_: 1
 			}, 8, [
+				"class",
 				"checked",
 				"onUpdate:checked",
 				"onChange"
-			]) : r("div", { style: "width: 100%;" }, [f()])], 2);
+			]) : r("div", { class: l("user-item-static") }, [d()], 2)], 2);
 		};
 	}
 });
 //#endregion
-export { d as default };
+export { u as default };

package/dist/es/components/pro-selector/src/types.mjs

@@ -20,6 +20,10 @@ var e = Symbol("selectUserContextKey"), t = {
 		type: String,
 		default: "checkbox"
 	},
+	variant: {
+		type: String,
+		default: "B"
+	},
 	initData: {
 		type: Function,
 		default: () => Promise.resolve([])
@@ -33,6 +37,10 @@ var e = Symbol("selectUserContextKey"), t = {
 		default: !1
 	},
 	prefix: String,
+	maxVisibleCount: {
+		type: Number,
+		default: 5
+	},
 	hideSlot: {
 		type: Boolean,
 		default: !1
@@ -40,6 +48,7 @@ var e = Symbol("selectUserContextKey"), t = {
 }, n = "/security/dept/user/tree", r = {
 	"update:visible": (e) => !0,
 	"update:modelValue": (e) => !0,
+	"update:variant": (e) => !0,
 	"delete-user": (e) => !0,
 	confirm: (e) => !0,
 	cancel: () => !0

package/dist/es/components/pro-selector/style/index.mjs

@@ -1,2 +1,3 @@
 import "../../base/style/index.mjs";
 import "@guodun/antdv/dist/theme/pro-selector.css";
+import "@guodun/antdv/dist/theme/selector-core.css";

package/dist/es/components/pro-selector-group/index.mjs

@@ -1,7 +1,7 @@
 import { withInstall as e } from "../utils/install.mjs";
-import "./src/types.mjs";
 import t from "./src/index.mjs";
 import "./src/style/index.mjs";
+import "./src/types.mjs";
 //#region src/components/pro-selector-group/index.ts
 var n = e(t);
 //#endregion