@guodun/antdv 1.4.4 → 1.4.5

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

@@ -1,114 +1,116 @@
 import { useNamespace as e } from "../../../hooks/use-namespace/index.mjs";
 import t from "../../pro-modal/index.mjs";
 import n from "../../icon/index.mjs";
-import { UserSelectorProps as r, selectUserContextKey as i, userSelectorEmits as a } from "./types.mjs";
-import o from "./components/user.mjs";
-import s from "./components/org-tree.mjs";
-import c from "../../pro-user-avatar/index.mjs";
-import { createTextVNode as l, createVNode as u, defineComponent as d, nextTick as f, provide as p, reactive as m, ref as h, watch as g } from "vue";
-import { Empty as _, FormItemRest as v, Input as y, message as b } from "ant-design-vue";
+import { UserSelectorProps as r, resolveUserSelectorMaxCount as i, selectUserContextKey as a, userSelectorEmits as o } from "./types.mjs";
+import s from "./components/user.mjs";
+import c from "./components/org-tree.mjs";
+import l from "../../pro-user-avatar/index.mjs";
+import { createTextVNode as u, createVNode as d, defineComponent as f, nextTick as p, provide as m, reactive as h, ref as g, watch as _ } from "vue";
+import { Empty as v, FormItemRest as y, Input as b, message as x } from "ant-design-vue";
 //#region src/components/pro-selector/src/pro-user.tsx
-var { b: x } = e("pro-user-selector"), S = e("user-selector-extermal"), C = /* @__PURE__ */ d({
+var { b: S } = e("pro-user-selector"), C = e("user-selector-extermal"), w = /* @__PURE__ */ f({
 	name: "ProUserSelector",
 	props: r,
-	emits: a,
-	setup(e, { emit: r, slots: a, expose: d, attrs: C }) {
-		let w = h(""), T = h([]), E = h(), D = h(null);
-		p(i, m({
-			maxCount: e.maxCount,
+	emits: o,
+	setup(e, { emit: r, slots: o, expose: f, attrs: w }) {
+		let T = g(""), E = g([]), D = g(), O = g(null);
+		m(a, h({
+			maxCount: i(e.type, e.maxCount),
 			http: e.http,
 			isBuiltInRequest: e.isBuiltInRequest,
 			prefix: e.prefix,
-			initData: e.initData
+			initData: e.initData,
+			type: e.type
 		}));
-		let O = h(e.modelValue || []), k = h(!1);
-		g(() => e.modelValue, (e) => {
-			console.log("watch 触发了...", k.value), k.value ? k.value = !1 : (O.value = JSON.parse(JSON.stringify(e)), f(() => {
-				A(O.value);
-			}));
+		let k = g(e.modelValue || []);
+		_(() => e.modelValue, (e) => {
+			k.value = Array.isArray(e) ? e.map((e) => ({ ...e })) : [], p(() => A(k.value));
 		}, {
 			deep: !0,
 			immediate: !0
-		}), g(T, (e, t) => {
-			e.length > t.length && f(() => {
-				D.value && (D.value.scrollTop = D.value.scrollHeight);
+		}), _(() => e.visible, (t) => {
+			t && (k.value = e.modelValue.map((e) => ({ ...e })), p(() => A(k.value)));
+		}), _(E, (e, t) => {
+			e.length > t.length && p(() => {
+				O.value && (O.value.scrollTop = O.value.scrollHeight);
 			});
 		}, { deep: !0 });
 		async function A(e) {
-			if (await f(), !E.value) {
-				console.warn("OrgTree 组件还未就绪，跳过初始化");
-				return;
-			}
-			let t = await E.value.dataLoadPromise;
-			E.value.getInitData(e, t);
+			if (await p(), !D.value) return;
+			let t = await D.value.dataLoadPromise;
+			D.value.getInitData(e, t);
 		}
 		let j = (e) => {
-			T.value = T.value.filter((t) => t.userId !== e), console.log("selectUserList.value =>", T.value), E.value?.deleteDeptUser(e);
+			E.value = E.value.filter((t) => (t.userId || t.id) !== e), D.value?.deleteDeptUser(e);
 		};
 		function M() {
-			console.log("ready..."), O.value && A(O.value);
+			A(k.value);
 		}
 		let N = () => {
-			r("update:visible", !1), r("cancel");
+			A(e.modelValue), r("update:visible", !1), r("cancel");
 		}, P = (t) => {
-			r("update:modelValue", e.modelValue.filter((e) => e.id !== t));
+			let n = e.modelValue.filter((e) => e.id !== t);
+			k.value = n.map((e) => ({ ...e })), r("update:modelValue", n);
 		}, F = () => {
-			if (T.value.length === 0) {
-				b.warn("请选择用户");
+			if (E.value.length === 0) {
+				x.warn("请选择用户");
 				return;
 			}
-			let e = T.value.map((e) => ({
-				id: e.userId,
+			let e = E.value.map((e) => ({
+				id: e.userId || e.id,
 				realName: e.realName || "",
 				avatar: e.avatar
 			}));
-			r("update:visible", !1), k.value = !0, r("update:modelValue", e), r("confirm", e);
+			r("update:visible", !1), r("update:modelValue", e), r("confirm", e);
 		};
-		d({ deleteCheckedUser: P });
-		let I = () => u(t, {
+		f({ deleteCheckedUser: P });
+		let I = () => d(t, {
 			modelValue: e.visible,
-			title: "选择联系人",
+			title: e.title || "选择联系人",
 			modalProps: {
 				cancelText: "取消",
 				okText: "确定",
-				...C
+				...w
 			},
-			onOnCancel: () => N(),
-			onOnConfirm: () => F()
-		}, { default: () => [u("div", { class: x() }, [u("div", { class: x("content-left") }, [u("div", { style: "padding: 16px 16px 0 16px" }, [u(y, {
-			value: w.value,
-			"onUpdate:value": (e) => w.value = e,
+			onOnCancel: N,
+			onOnConfirm: () => F(),
+			"onUpdate:modelValue": (t) => {
+				t || A(e.modelValue), r("update:visible", t);
+			}
+		}, { default: () => [d("div", { class: S() }, [d("div", { class: S("content-left") }, [d("div", { style: "padding: 16px 16px 0 16px" }, [d(b, {
+			value: T.value,
+			"onUpdate:value": (e) => T.value = e,
 			size: "small",
 			placeholder: "搜索",
 			allowClear: !0
 		}, {
-			prefix: () => u(n, { name: "search" }, null),
+			prefix: () => d(n, { name: "search" }, null),
 			_: 1
 		}, 8, [
 			"value",
 			"onUpdate:value",
 			"allowClear"
-		])]), u(s, {
-			ref: E,
-			selectUserList: T.value,
-			"onUpdate:selectUserList": (e) => T.value = e,
-			keyword: w.value,
+		])]), d(c, {
+			ref: D,
+			selectUserList: E.value,
+			"onUpdate:selectUserList": (e) => E.value = e,
+			keyword: T.value,
 			onReady: () => M()
 		}, null, 8, [
 			"selectUserList",
 			"onUpdate:selectUserList",
 			"keyword",
 			"onReady"
-		])], 2), u("div", { class: x("content-right") }, [u("div", { class: x("content-right-title") }, [
-			l("已选:"),
-			T.value.length,
-			l("/"),
-			e.maxCount,
-			l("人")
-		], 2), u("div", {
+		])], 2), d("div", { class: S("content-right") }, [d("div", { class: S("content-right-title") }, [
+			u("已选:"),
+			E.value.length,
+			u("/"),
+			i(e.type, e.maxCount),
+			u("人")
+		], 2), d("div", {
 			class: "select-user-list",
-			ref: D
-		}, [u("div", { class: x("user-list") }, [T.value.length > 0 ? T.value.map((e) => u(o, {
+			ref: O
+		}, [d("div", { class: S("user-list") }, [E.value.length > 0 ? E.value.map((e) => d(s, {
 			key: e.id,
 			userInfo: e,
 			isChecked: !1,
@@ -118,36 +120,48 @@ var { b: x } = e("pro-user-selector"), S = e("user-selector-extermal"), C = /* @
 			"userInfo",
 			"isDelete",
 			"onDelete-user"
-		])) : u(_, {
-			image: _.PRESENTED_IMAGE_SIMPLE,
+		])) : d(v, {
+			image: v.PRESENTED_IMAGE_SIMPLE,
 			description: "暂无数据"
 		}, null, 8, ["image"])], 2)], 512)], 2)], 2)] }, 8, [
 			"modelValue",
+			"title",
 			"modalProps",
 			"onOnCancel",
-			"onOnConfirm"
-		]), L = () => u(v, null, { default: () => [u("div", { class: S.b() }, [e.hideSlot ? null : a.default ? a.default() : u("div", { class: S.b("list") }, [u("div", {
-			class: S.b("icon"),
+			"onOnConfirm",
+			"onUpdate:modelValue"
+		]), L = () => d(y, null, { default: () => [d("div", { class: C.b() }, [e.hideSlot ? null : o.default ? o.default() : d("div", { class: C.b("list") }, [d("button", {
+			type: "button",
+			class: C.b("icon"),
+			"aria-label": "选择用户",
 			onClick: () => r("update:visible", !0)
-		}, [u(n, {
+		}, [d(n, {
 			name: "plus",
 			size: 20,
 			color: "var(--gdant-primary-500)"
-		}, null)], 10, ["onClick"]), e.modelValue.map((e) => u("div", { class: S.b("item") }, [
-			u(c, {
+		}, null)], 10, ["onClick"]), e.modelValue.map((e) => d("div", {
+			key: e.id,
+			class: C.b("item")
+		}, [
+			d(l, {
 				name: e.realName,
 				avatar: e.avatar,
 				size: "small"
 			}, null, 8, ["name", "avatar"]),
-			u("span", { class: S.be("item", "name") }, [e.realName], 2),
-			u("div", { onClick: () => P(e.id) }, [u(n, {
+			d("span", { class: C.be("item", "name") }, [e.realName], 2),
+			d("button", {
+				type: "button",
+				class: C.be("item", "remove"),
+				"aria-label": `移除${e.realName}`,
+				onClick: () => P(e.id)
+			}, [d(n, {
 				name: "shanchu",
 				size: 18,
 				color: "var(--gdant-neutral-600)"
-			}, null)], 8, ["onClick"])
+			}, null)], 10, ["aria-label", "onClick"])
 		], 2))], 2), I()], 2)] });
 		return () => L();
 	}
 });
 //#endregion
-export { C as default };
+export { w as default };

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

@@ -44,5 +44,8 @@ var e = Symbol("selectUserContextKey"), t = {
 	confirm: (e) => !0,
 	cancel: () => !0
 };
+function i(e, t) {
+	return e === "radio" ? 1 : !Number.isFinite(t) || t < 1 ? 25 : Math.floor(t);
+}
 //#endregion
-export { n as GTE_ORGTREE_URL, t as UserSelectorProps, e as selectUserContextKey, r as userSelectorEmits };
+export { n as GTE_ORGTREE_URL, t as UserSelectorProps, i as resolveUserSelectorMaxCount, e as selectUserContextKey, r as userSelectorEmits };

package/dist/es/components/pro-selector/src/utils/orgTree.mjs

@@ -9,8 +9,11 @@ function e(e, t) {
 	}, r;
 }
 function t(e) {
-	let t = /* @__PURE__ */ new Map();
-	return e.filter((e) => !e || e.id === void 0 || t.has(e.id) ? !1 : (t.set(e.id, !0), !0));
+	let t = /* @__PURE__ */ new Set();
+	return e.filter((e) => {
+		let n = e?.userId || e?.id;
+		return !n || t.has(n) ? !1 : (t.add(n), !0);
+	});
 }
 function n(e) {
 	if (!(!e || e.length === 0)) for (let t of e) t.deptType === "department" && (t.checkedUserIds = []), t.members && t.members.length > 0 && t.members.forEach((e) => {

package/dist/es/components/pro-selector-group/src/compoents/dept-tree.vue.mjs

@@ -1,13 +1,13 @@
-import e from "../../../icon/index.mjs";
+import e from "../../../icon/src/icon.mjs";
 import { selectContextKey as t } from "../types.mjs";
 import { useApi as n } from "../hooks/useApi.mjs";
-import { createBlock as r, createElementBlock as i, createElementVNode as a, createTextVNode as o, createVNode as s, defineComponent as c, inject as l, mergeModels as u, onMounted as d, openBlock as f, ref as p, toDisplayString as m, unref as h, useModel as g, watch as _, withCtx as v } from "vue";
-import { Empty as y, InputSearch as b, Tree as x } from "ant-design-vue";
+import { createBlock as r, createCommentVNode as i, createElementBlock as a, createElementVNode as o, createTextVNode as s, createVNode as c, defineComponent as l, inject as u, mergeModels as d, onMounted as f, openBlock as p, ref as m, toDisplayString as h, unref as g, useModel as _, watch as v, withCtx as y } from "vue";
+import { Alert as b, Button as x, Empty as S, InputSearch as C, Spin as w, Tree as T } from "ant-design-vue";
 //#region src/components/pro-selector-group/src/compoents/dept-tree.vue?vue&type=script&setup=true&lang.ts
-var S = {
+var E = { class: "dept-tree-panel" }, D = {
 	key: 0,
 	class: "selector-tree"
-}, C = { class: "tree-title" }, w = { class: "tree-title_name" }, T = { key: 0 }, E = { style: { color: "#f50" } }, D = { key: 1 }, O = /* @__PURE__ */ c({
+}, O = { class: "tree-title" }, k = { class: "tree-title_name" }, A = { key: 0 }, j = { class: "selector-highlight" }, M = { key: 1 }, N = /* @__PURE__ */ l({
 	__name: "dept-tree",
 	props: {
 		modelValue: {
@@ -16,85 +16,112 @@ var S = {
 		},
 		modelModifiers: {}
 	},
-	emits: /* @__PURE__ */ u(["select"], ["update:modelValue"]),
-	setup(c, { emit: u }) {
-		let O = u, k = l(t), { getDeptTree: A, getUserListByDeptId: j, deptTree: M } = n(k.http, k.urlPrefix), N = g(c, "modelValue"), P = p(""), F = p([]), I = p([]), L = p(!0), R = p([]);
-		function z(e) {
+	emits: /* @__PURE__ */ d(["select"], ["update:modelValue"]),
+	setup(l, { emit: d }) {
+		let N = d, P = u(t), { getDeptTree: F, getUserListByDeptId: I, deptTree: L, deptLoading: R, deptError: z } = n(P.http, P.urlPrefix), B = _(l, "modelValue"), V = m(""), H = m([]), U = m([]), W = m(!0), G = m([]);
+		function K(e) {
 			let t = [];
 			for (let n = 0; n < e.length; n++) {
 				let r = e[n], i = r.id;
 				t.push({
 					key: i,
 					title: r.deptName
-				}), r.children && t.push(...z(r.children));
+				}), r.children && t.push(...K(r.children));
 			}
 			return t;
 		}
-		function B(e, t) {
+		function q(e, t) {
 			let n;
 			for (let r = 0; r < t.length; r++) {
 				let i = t[r];
-				i.children && (i.children.some((t) => t.id === e) ? n = i.id : B(e, i.children) && (n = B(e, i.children)));
+				i.children && (i.children.some((t) => t.id === e) ? n = i.id : q(e, i.children) && (n = q(e, i.children)));
 			}
 			return n;
 		}
-		_(P, (e) => {
-			I.value = R.value.map((t) => t.title.includes(e) ? B(t.key, M.value) : null).filter((e, t, n) => e && n.indexOf(e) === t), L.value = !!e;
-		}), d(async () => {
-			if (await A(), M.value.length > 0) {
-				R.value = z(M.value);
-				let e = M.value[0];
-				I.value = [e.id], F.value = [e.id], N.value = e.id, await j(e.id);
-			}
+		v(V, (e) => {
+			U.value = G.value.map((t) => t.title.includes(e) ? q(t.key, L.value) : null).filter((e, t, n) => e && n.indexOf(e) === t), W.value = !!e;
+		});
+		async function J() {
+			await F(), G.value = K(L.value);
+			let e = L.value[0];
+			e && (U.value = [e.id], H.value = [e.id], B.value = e.id, await I(e.id));
+		}
+		f(() => {
+			J();
 		});
-		function V(e) {
-			P.value = e;
+		function Y(e) {
+			V.value = e;
 		}
-		function H(e) {
-			I.value = e.map((e) => String(e)), L.value = !1;
+		function X(e) {
+			U.value = e.map((e) => String(e)), W.value = !1;
 		}
-		function U(e, { node: t }) {
-			N.value = t.id, O("select", t);
+		function Z(e, { node: t }) {
+			B.value = t.id, N("select", t);
 		}
-		return (t, n) => (f(), i("div", null, [s(h(b), {
-			value: P.value,
-			"onUpdate:value": n[0] ||= (e) => P.value = e,
-			placeholder: "请输入部门名称",
-			onSearch: V
-		}, null, 8, ["value"]), h(M).length > 0 ? (f(), i("div", S, [s(h(x), {
-			"selected-keys": F.value,
-			"onUpdate:selectedKeys": n[1] ||= (e) => F.value = e,
-			"expanded-keys": I.value,
-			"onUpdate:expandedKeys": n[2] ||= (e) => I.value = e,
-			"tree-data": h(M),
-			"auto-expand-parent": L.value,
-			"field-names": {
-				key: "id",
-				title: "deptName"
-			},
-			virtual: !1,
-			onSelect: U,
-			onExpand: H
-		}, {
-			title: v(({ data: t }) => [a("div", C, [s(h(e), {
-				name: t.parentId === "root" ? "qiye" : "bumen",
-				size: 16
-			}, null, 8, ["name"]), a("span", w, [P.value && t.deptName.includes(P.value) ? (f(), i("span", T, [
-				o(m(t.deptName.substring(0, t.deptName.indexOf(P.value))) + " ", 1),
-				a("span", E, m(P.value), 1),
-				o(" " + m(t.deptName.substring(t.deptName.indexOf(P.value) + P.value.length)), 1)
-			])) : (f(), i("span", D, m(t.deptName), 1))])])]),
-			_: 1
-		}, 8, [
-			"selected-keys",
-			"expanded-keys",
-			"tree-data",
-			"auto-expand-parent"
-		])])) : (f(), r(h(y), {
-			key: 1,
-			image: h(y).PRESENTED_IMAGE_SIMPLE
-		}, null, 8, ["image"]))]));
+		return (t, n) => (p(), a("div", E, [
+			c(g(C), {
+				value: V.value,
+				"onUpdate:value": n[0] ||= (e) => V.value = e,
+				"allow-clear": "",
+				placeholder: "搜索部门",
+				onSearch: Y
+			}, null, 8, ["value"]),
+			g(z) ? (p(), r(g(b), {
+				key: 0,
+				class: "selector-feedback",
+				type: "error",
+				message: g(z),
+				"show-icon": ""
+			}, {
+				action: y(() => [c(g(x), {
+					type: "link",
+					size: "small",
+					onClick: J
+				}, {
+					default: y(() => [...n[3] ||= [s("重试", -1)]]),
+					_: 1
+				})]),
+				_: 1
+			}, 8, ["message"])) : i("", !0),
+			c(g(w), { spinning: g(R) }, {
+				default: y(() => [g(L).length > 0 ? (p(), a("div", D, [c(g(T), {
+					"selected-keys": H.value,
+					"onUpdate:selectedKeys": n[1] ||= (e) => H.value = e,
+					"expanded-keys": U.value,
+					"onUpdate:expandedKeys": n[2] ||= (e) => U.value = e,
+					"tree-data": g(L),
+					"auto-expand-parent": W.value,
+					"field-names": {
+						key: "id",
+						title: "deptName"
+					},
+					virtual: !1,
+					onSelect: Z,
+					onExpand: X
+				}, {
+					title: y(({ data: t }) => [o("div", O, [c(e, {
+						name: t.parentId === "root" ? "qiye" : "bumen",
+						size: 16
+					}, null, 8, ["name"]), o("span", k, [V.value && t.deptName.includes(V.value) ? (p(), a("span", A, [
+						s(h(t.deptName.substring(0, t.deptName.indexOf(V.value))) + " ", 1),
+						o("span", j, h(V.value), 1),
+						s(" " + h(t.deptName.substring(t.deptName.indexOf(V.value) + V.value.length)), 1)
+					])) : (p(), a("span", M, h(t.deptName), 1))])])]),
+					_: 1
+				}, 8, [
+					"selected-keys",
+					"expanded-keys",
+					"tree-data",
+					"auto-expand-parent"
+				])])) : g(z) ? i("", !0) : (p(), r(g(S), {
+					key: 1,
+					image: g(S).PRESENTED_IMAGE_SIMPLE,
+					description: "暂无部门"
+				}, null, 8, ["image"]))]),
+				_: 1
+			}, 8, ["spinning"])
+		]));
 	}
 });
 //#endregion
-export { O as default };
+export { N as default };

package/dist/es/components/pro-selector-group/src/compoents/dept.vue.mjs

@@ -23,13 +23,13 @@ var l = { class: "type-selector-box dept-selector" }, u = /* @__PURE__ */ i({
 			h(e);
 		}
 		function _(e) {
-			p.value = [];
+			p.value = p.value.filter((t) => !e.includes(t.value));
 		}
 		function v() {
 			p.value = [];
 		}
 		function y(e) {
-			console.log("dept =>", e), p.value = e.map((e) => ({
+			p.value = e.map((e) => ({
 				value: e.value,
 				label: e.label || "",
 				type: "dept"
@@ -43,7 +43,7 @@ var l = { class: "type-selector-box dept-selector" }, u = /* @__PURE__ */ i({
 		}), (e, i) => (o(), n("div", l, [r(t, {
 			modelValue: f.value,
 			"onUpdate:modelValue": i[0] ||= (e) => f.value = e,
-			style: { width: "400px !important" },
+			class: "selector-pane",
 			onSelect: m
 		}, null, 8, ["modelValue"])]));
 	}