@guodun/antdv 1.4.3 → 1.4.5

package/dist/es/components/pro-selector/src/components/org-tree.mjs

@@ -4,13 +4,13 @@ import { GTE_ORGTREE_URL as n, selectUserContextKey as r } from "../types.mjs";
 import { debounce as i, formatOrgTree as a, uniqueById as o } from "../utils/orgTree.mjs";
 import s from "./user.mjs";
 import { Fragment as c, createTextVNode as l, createVNode as u, defineComponent as d, inject as f, isVNode as p, onMounted as m, ref as h, watch as g } from "vue";
-import { Breadcrumb as _, BreadcrumbItem as v, Empty as y, Modal as b, Skeleton as x } from "ant-design-vue";
-import { uid as S } from "@guodun/utils";
+import { Breadcrumb as _, BreadcrumbItem as v, Button as y, Empty as b, Modal as x, Skeleton as S } from "ant-design-vue";
+import { uid as C } from "@guodun/utils";
 //#region src/components/pro-selector/src/components/org-tree.tsx
-function C(e) {
+function w(e) {
 	return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !p(e);
 }
-var { b: w } = e("pro-user-selector"), T = /* @__PURE__ */ d({
+var { b: T } = e("pro-user-selector"), E = /* @__PURE__ */ d({
 	name: "OrgTree",
 	props: {
 		selectUserList: {
@@ -31,73 +31,81 @@ var { b: w } = e("pro-user-selector"), T = /* @__PURE__ */ d({
 		ready: () => !0
 	},
 	setup(e, { emit: d, expose: p }) {
-		let T = f(r), E = h([]), D = h({}), O = h([]), k = h({}), A = h([]), j = h(!1), M = i((e) => {
+		let E = f(r), D = h([]), O = h({}), k = h([]), A = h({}), j = h([]), M = h(!1), N = i((e) => {
 			let t = [], n = (r) => {
 				for (let i of r) {
 					if (i.members && i.members.length > 0) for (let n of i.members) n.realName && n.realName.includes(e) && t.push(n);
 					i.children && i.children.length > 0 && n(i.children);
 				}
 			};
-			n(E.value), A.value = o(t), j.value = e !== "";
+			n(D.value), j.value = o(t), M.value = e !== "";
 		}, 300);
 		g(() => e.keyword, (e, t) => {
 			if (e === "") {
-				M.cancel(), j.value = !1, A.value = [];
+				N.cancel(), M.value = !1, j.value = [];
 				return;
 			}
-			e !== t && M(e);
+			e !== t && N(e);
 		});
-		let N = (e) => {
-			D.value.members?.forEach((t) => {
-				t.userId === e && (t.checked = !1);
-			}), A.value = A.value.map((t) => (t.id === e && (t.checked = !1), t));
-		}, P = (t, n) => {
-			if (e.selectUserList.length === T?.maxCount) {
-				n.checked = !1, b.warning({
+		let P = (e) => {
+			let t = (n) => {
+				n.forEach((n) => {
+					n.members?.forEach((t) => {
+						(t.userId || t.id) === e && (t.checked = !1);
+					}), n.children?.length && t(n.children);
+				});
+			};
+			t(D.value), j.value = j.value.map((t) => ((t.userId || t.id) === e && (t.checked = !1), t));
+		}, F = (t, n) => {
+			let r = n.userId || n.id, i = E?.type === "radio" ? 1 : E?.maxCount;
+			if (t && E?.type === "radio") {
+				P(r), n.checked = !0, d("update:selectUserList", [n]);
+				return;
+			}
+			if (t && i !== void 0 && e.selectUserList.length >= i && !e.selectUserList.some((e) => (e.userId || e.id) === r)) {
+				n.checked = !1, x.warning({
 					title: "温馨提示",
-					content: `最多只能选择${T.maxCount}个用户`
+					content: `最多只能选择${i}个用户`
 				});
 				return;
 			}
-			d("update:selectUserList", t ? [...e.selectUserList, n] : e.selectUserList.filter((e) => e.id !== n.id));
-		}, F = (t) => {
-			t.parentId === "root" ? O.value.push({
-				id: S(32),
+			d("update:selectUserList", t ? e.selectUserList.some((e) => (e.userId || e.id) === r) ? e.selectUserList : [...e.selectUserList, n] : e.selectUserList.filter((e) => (e.userId || e.id) !== r));
+		}, I = (t) => {
+			t.parentId === "root" ? k.value.push({
+				id: C(32),
 				deptName: "组织内联系人",
-				children: E.value[0].children,
-				members: E.value[0].members
-			}) : O.value.push(t), t.members?.forEach((t) => {
-				t.checked = e.selectUserList.some((e) => e.userId === t.userId);
-			}), D.value = t, k.value = t;
-		}, I = (t, n) => {
+				children: D.value[0].children,
+				members: D.value[0].members
+			}) : k.value.push(t), t.members?.forEach((t) => {
+				t.checked = e.selectUserList.some((e) => (e.userId || e.id) === (t.userId || t.id));
+			}), O.value = t, A.value = t;
+		}, L = (t, n) => {
 			let r = {};
-			if (k.value.id === t.id) {
-				console.log(`当前组织架构树展示的视图已经是《${t.deptName}》部门下面的数据`);
-				return;
-			}
-			if (n === 0) r = { children: E.value }, O.value = [{
-				id: S(32),
-				deptName: "联系人",
-				children: E.value
-			}];
-			else if (n === 1) r = E.value[0], O.value = O.value.slice(0, 2);
-			else {
-				r = t;
-				let e = O.value.findIndex((e) => e.id === t.id);
-				e !== -1 && (O.value = O.value.slice(0, e + 1));
+			if (A.value.id !== t.id) {
+				if (n === 0) r = { children: D.value }, k.value = [{
+					id: C(32),
+					deptName: "联系人",
+					children: D.value
+				}];
+				else if (n === 1) r = D.value[0], k.value = k.value.slice(0, 2);
+				else {
+					r = t;
+					let e = k.value.findIndex((e) => e.id === t.id);
+					e !== -1 && (k.value = k.value.slice(0, e + 1));
+				}
+				r.members?.forEach((t) => {
+					t.checked = e.selectUserList.some((e) => (e.userId || e.id) === (t.userId || t.id));
+				}), O.value = r;
 			}
-			r.members?.forEach((t) => {
-				t.checked = e.selectUserList.some((e) => e.id === t.userId);
-			}), D.value = r;
-		}, L = (e) => u(c, null, [u("div", { class: w("org-tree-item-title") }, [e.parentId === "root" ? u(t, {
+		}, R = (e) => u(c, null, [u("div", { class: T("org-tree-item-title") }, [e.parentId === "root" ? u(t, {
 			name: "zuzhijiagou",
 			size: 18,
 			color: "var(--gdant-success-500)"
-		}, null) : u("div", { class: w("org-tree-dept-icon") }, [u(t, {
+		}, null) : u("div", { class: T("org-tree-dept-icon") }, [u(t, {
 			name: "zuzhijiagou",
 			size: 18,
 			color: "var(--gdant-neutral-0)"
-		}, null)], 2), u("div", { class: w("org-tree-item-title-text") }, [e.deptName, e.parentId !== "root" && u(c, null, [
+		}, null)], 2), u("div", { class: T("org-tree-item-title-text") }, [e.deptName, e.parentId !== "root" && u(c, null, [
 			l("("),
 			e.members && e.members.length > 0 ? e.members.length : 0,
 			l(")")
@@ -105,78 +113,111 @@ var { b: w } = e("pro-user-selector"), T = /* @__PURE__ */ d({
 			name: "right",
 			size: 14,
 			color: "var(--gdant-neutral-400)"
-		}, null) : u("a", {
-			style: "width: 50px",
-			href: "javascript:void(0)"
-		}, [l("下级")])]), R = (e) => u("div", { class: w("user-list") }, [e.members?.map((e) => u(s, {
+		}, null) : u("button", {
+			type: "button",
+			class: T("org-tree-next")
+		}, [l("下级")], 2)]), z = (e) => u("div", { class: T("user-list") }, [e.members?.map((e) => u(s, {
+			key: e.userId || e.id,
 			userInfo: e,
-			"onChange-checked": P
-		}, null, 8, ["userInfo", "onChange-checked"]))], 2), z = (e) => e.parentId === "root" && O.value.length === 1 ? u("div", {
-			class: w("org-tree-item"),
-			onClick: () => F(e)
-		}, [L(e)], 10, ["onClick"]) : u(c, null, [e.children && e.children.length > 0 ? e.children.map((e) => u("div", {
-			class: w("org-tree-item"),
-			onClick: () => F(e)
-		}, [L(e)], 10, ["onClick"])) : null, R(e)]), B = () => u("div", { class: w("user-list") }, [A.value.length > 0 ? A.value.map((t) => u(s, {
+			selectionType: E?.type,
+			"onChange-checked": F
+		}, null, 8, [
+			"userInfo",
+			"selectionType",
+			"onChange-checked"
+		]))], 2), B = (e) => e.parentId === "root" && k.value.length === 1 ? u("div", {
+			class: T("org-tree-item"),
+			onClick: () => I(e)
+		}, [R(e)], 10, ["onClick"]) : u(c, null, [e.children && e.children.length > 0 ? e.children.map((e) => u("div", {
+			class: T("org-tree-item"),
+			onClick: () => I(e)
+		}, [R(e)], 10, ["onClick"])) : null, z(e)]), V = () => u("div", { class: T("user-list") }, [j.value.length > 0 ? j.value.map((t) => u(s, {
+			key: t.userId || t.id,
 			userInfo: t,
-			"onChange-checked": P
+			selectionType: E?.type,
+			"onChange-checked": F
 		}, {
 			name: () => u("div", { style: "font-size: 14px;color: var(--gdant-neutral-900);" }, [t?.realName.includes(e.keyword) ? t?.realName.split(e.keyword).map((n, r) => u(c, null, [n, r < t?.realName.split(e.keyword).length - 1 && u("span", { style: "color: var(--gdant-error-500);" }, [e.keyword])])) : t?.realName]),
 			_: 1
-		}, 8, ["userInfo", "onChange-checked"])) : u(y, { description: "暂无数据" }, null)], 2), V = h(!1), H, U = new Promise((e) => {
-			H = e;
-		}), W = () => new Promise((e, t) => {
-			if (T?.isBuiltInRequest) {
-				if (!T.http) throw Error("请传入http实例");
-				T.http.get(`${T.prefix}${n}`).then((t) => {
-					t.status === 0 && e(t.data);
-				}).catch((e) => {
-					console.log(e);
-				});
+		}, 8, [
+			"userInfo",
+			"selectionType",
+			"onChange-checked"
+		])) : u(b, { description: "暂无数据" }, null)], 2), H = h(!1), U = h(""), W, G = !1, K = new Promise((e) => {
+			W = e;
+		}), q = async () => {
+			if (!E?.http) return U.value = "缺少用户数据请求实例", [];
+			try {
+				let e = await E.http.get(`${E.prefix}${n}`);
+				return e?.status === 0 && Array.isArray(e.data) ? e.data : (U.value = "用户组织数据加载失败，请重试", []);
+			} catch {
+				return U.value = "用户组织数据加载失败，请重试", [];
 			}
-		});
-		return m(async () => {
+		}, J = async () => {
 			try {
-				V.value = !0, T?.isBuiltInRequest ? E.value = await W() : T?.initData && (E.value = await T.initData()), a(E.value), V.value = !1, H(E.value), d("ready"), D.value = { children: E.value }, O.value = [{
-					id: S(32),
+				H.value = !0, U.value = "", E?.isBuiltInRequest ? D.value = await q() : E?.initData && (D.value = await E.initData()), a(D.value), O.value = { children: D.value }, k.value = [{
+					id: C(32),
 					deptName: "联系人",
-					children: E.value
-				}], F(E.value[0]);
+					children: D.value
+				}], D.value[0] && I(D.value[0]);
+			} catch {
+				D.value = [], O.value = { children: [] }, U.value = "用户组织数据加载失败，请重试";
 			} finally {
-				V.value = !1;
+				H.value = !1, G || (G = !0, W(D.value)), d("ready");
 			}
+		};
+		return m(() => {
+			J();
 		}), p({
-			deleteDeptUser: N,
+			deleteDeptUser: P,
 			getInitData: (e, t) => {
 				let n = [], r = (t) => {
 					for (let i of t) {
-						if (i.members && i.members.length > 0) for (let t of i.members) e.some((e) => e.id === t.userId) ? (t.checked = !0, n.push(t)) : t.checked = !1;
+						if (i.members && i.members.length > 0) for (let t of i.members) e.some((e) => e.id === (t.userId || t.id)) ? (t.checked = !0, n.push(t)) : t.checked = !1;
 						i.children && i.children.length > 0 && r(i.children);
 					}
 				};
-				r(t), d("update:selectUserList", o(n));
+				r(t);
+				let i = new Set(n.map((e) => e.userId || e.id)), a = e.filter((e) => !i.has(e.id)).map((e) => ({
+					id: e.id,
+					username: null,
+					userId: e.id,
+					realName: e.realName,
+					avatar: e.avatar,
+					checked: !0
+				})), s = o([...n, ...a]);
+				d("update:selectUserList", E?.type === "radio" ? s.slice(0, 1) : s);
 			},
-			dataLoadPromise: U
+			dataLoadPromise: K
 		}), () => {
 			let e;
-			return u(c, null, [u("div", { style: "padding:0 16px" }, [O.value.length > 1 && !j.value ? u(_, {
+			return u(c, null, [u("div", { style: "padding:0 16px" }, [k.value.length > 1 && !M.value ? u(_, {
 				separator: ">",
-				class: w("breadcrumb")
-			}, C(e = O.value.map((e, t) => u(v, { onClick: () => I(e, t) }, { default: () => [t === O.value.length - 1 ? e.deptName : u("a", { href: "javascript:void(0)" }, [e.deptName])] }, 8, ["onClick"]))) ? e : {
+				class: T("breadcrumb")
+			}, w(e = k.value.map((e, t) => u(v, { onClick: () => L(e, t) }, { default: () => [t === k.value.length - 1 ? e.deptName : u("button", {
+				type: "button",
+				class: T("breadcrumb-link")
+			}, [e.deptName], 2)] }, 8, ["onClick"]))) ? e : {
 				default: () => [e],
 				_: 1
-			}, 8, ["class"]) : null]), j.value ? u(c, null, [B()]) : u("div", { class: w("org-tree") }, [V.value ? u("div", {
-				class: w("org-tree-item"),
+			}, 8, ["class"]) : null]), M.value ? u(c, null, [V()]) : u("div", { class: T("org-tree") }, [H.value ? u("div", {
+				class: T("org-tree-item"),
 				style: "height: 200px;display: block;"
-			}, [u(x, {
+			}, [u(S, {
 				active: !0,
 				avatar: !0
-			}, null, 8, ["active", "avatar"]), u(x, {
+			}, null, 8, ["active", "avatar"]), u(S, {
 				active: !0,
 				avatar: !0
-			}, null, 8, ["active", "avatar"])], 2) : z(D.value)], 2)]);
+			}, null, 8, ["active", "avatar"])], 2) : U.value ? u(b, { description: U.value }, {
+				default: () => u(y, {
+					type: "link",
+					onClick: () => void J()
+				}, { default: () => [l("重试")] }, 8, ["onClick"]),
+				_: 1
+			}, 8, ["description"]) : B(O.value)], 2)]);
 		};
 	}
 });
 //#endregion
-export { T as default };
+export { E as default };

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

@@ -1,14 +1,14 @@
 import { useNamespace as e } from "../../../../hooks/use-namespace/index.mjs";
-import t from "../../../icon/index.mjs";
-import n from "../../../pro-user-avatar/index.mjs";
+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 } from "ant-design-vue";
-import { CheckOutlined as s } from "@ant-design/icons-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 c(e) {
+function l(e) {
 	return typeof e == "function" || Object.prototype.toString.call(e) === "[object Object]" && !a(e);
 }
-var { b: l } = e("pro-user-selector"), u = /* @__PURE__ */ i({
+var { b: u } = e("pro-user-selector"), d = /* @__PURE__ */ i({
 	name: "User",
 	props: {
 		userInfo: {
@@ -22,6 +22,10 @@ var { b: l } = e("pro-user-selector"), u = /* @__PURE__ */ i({
 		isDelete: {
 			type: Boolean,
 			default: !1
+		},
+		selectionType: {
+			type: String,
+			default: "checkbox"
 		}
 	},
 	emits: {
@@ -29,14 +33,9 @@ var { b: l } = e("pro-user-selector"), u = /* @__PURE__ */ i({
 		"change-checked": (e, t) => e
 	},
 	setup(e, { emit: i, slots: a }) {
-		let u = (t) => {
+		let d = (t) => {
 			i("change-checked", t.target.checked, e.userInfo);
-		}, d = () => r("div", { class: l("user-item-content") }, [r("div", { style: {
-			width: "100%",
-			display: "flex",
-			alignItems: "center",
-			"margin-top": "4px"
-		} }, [
+		}, 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,
@@ -45,8 +44,8 @@ var { b: l } = e("pro-user-selector"), u = /* @__PURE__ */ i({
 			r("div", { style: {
 				flex: 1,
 				minWidth: 0
-			} }, [r("div", { style: "display: flex;align-items: center;" }, [a.name ? a.name() : r("div", { style: "font-size: 14px;color: var(--gdant-neutral-900);" }, [e.userInfo.realName]), e.userInfo.position && r("div", {
-				class: l("user-item-content-tag"),
+			} }, [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",
@@ -61,37 +60,46 @@ var { b: l } = e("pro-user-selector"), u = /* @__PURE__ */ i({
 				color: "var(--gdant-neutral-500)",
 				lineHeight: "20px"
 			} }, [e.userInfo.stageName])]),
-			e.userInfo.checked && r(s, { style: {
+			e.userInfo.checked && r(c, { style: {
 				color: "var(--gdant-primary-500)",
 				fontSize: "16px",
 				marginLeft: "8px",
 				flexShrink: 0
 			} }, null)
-		]), e.isDelete && r("div", {
+		], 2), e.isDelete && r("button", {
+			type: "button",
 			class: "select-user-item-icon",
-			onClick: () => i("delete-user", e.userInfo.userId)
+			"aria-label": `移除${e.userInfo.realName || "用户"}`,
+			onClick: () => i("delete-user", e.userInfo.userId || e.userInfo.id)
 		}, [r(t, {
 			name: "shanchu",
 			size: 12,
 			color: "var(--gdant-neutral-800)"
-		}, null)], 8, ["onClick"])], 2);
+		}, null)], 8, ["aria-label", "onClick"])], 2);
 		return () => {
-			let t;
-			return r("div", { class: [l("user-item"), e.userInfo.checked ? `${l("user-item")}--selected` : ""] }, [e.isChecked ? r(o, {
+			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%;",
 				checked: e.userInfo.checked,
-				"onUpdate:checked": (t) => e.userInfo.checked = t,
-				onChange: u
-			}, c(t = d()) ? t : {
+				onChange: (e) => d({ target: { checked: e.target.checked } })
+			}, l(t = f()) ? t : {
 				default: () => [t],
 				_: 1
+			}, 8, ["checked", "onChange"]) : r(o, {
+				style: "margin: 0 6px;width: 100%;",
+				checked: e.userInfo.checked,
+				"onUpdate:checked": (t) => e.userInfo.checked = t,
+				onChange: d
+			}, l(n = f()) ? n : {
+				default: () => [n],
+				_: 1
 			}, 8, [
 				"checked",
 				"onUpdate:checked",
 				"onChange"
-			]) : r("div", { style: "width: 100%;" }, [d()])], 2);
+			]) : r("div", { style: "width: 100%;" }, [f()])], 2);
 		};
 	}
 });
 //#endregion
-export { u as default };
+export { d as default };