@guodun/antdv 1.4.4 → 1.4.6

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

@@ -1,95 +1,120 @@
 import { selectContextKey as e } from "../types.mjs";
 import { useApi as t } from "../hooks/useApi.mjs";
-import { Fragment as n, computed as r, createElementBlock as i, createElementVNode as a, createTextVNode as o, createVNode as s, defineComponent as c, inject as l, onMounted as u, openBlock as d, reactive as f, ref as p, renderList as m, toDisplayString as h, unref as g, watch as _, watchEffect as v, withCtx as y } from "vue";
-import { Checkbox as b, CheckboxGroup as x, InputSearch as S } from "ant-design-vue";
+import { Fragment as n, computed as r, createBlock as i, createCommentVNode as a, createElementBlock as o, createElementVNode as s, createTextVNode as c, createVNode as l, defineComponent as u, inject as d, onMounted as f, openBlock as p, reactive as m, ref as h, renderList as g, toDisplayString as _, unref as v, watch as y, withCtx as b } from "vue";
+import { Alert as x, Button as S, Checkbox as C, CheckboxGroup as w, InputSearch as T, Spin as E } from "ant-design-vue";
 //#region src/components/pro-selector-group/src/compoents/role.vue?vue&type=script&setup=true&lang.ts
-var C = { class: "type-selector-box role-selector" }, w = { style: { width: "400px" } }, T = { style: { "margin-top": "12px" } }, E = { style: { "margin-top": "12px" } }, D = /* @__PURE__ */ c({
+var D = { class: "type-selector-box role-selector" }, O = { class: "selector-pane" }, k = { class: "selector-toolbar" }, A = { class: "selector-toolbar__count" }, j = { class: "selector-option-list" }, M = { key: 0 }, N = {
+	key: 0,
+	class: "selector-empty"
+}, P = /* @__PURE__ */ u({
 	__name: "role",
-	setup(c, { expose: D }) {
-		let O = l(e), { getRole: k, roleList: A } = t(O.http, O.urlPrefix), j = p(""), M = r(() => j.value ? A.value.filter((e) => e.roleName && e.roleName.includes(j.value)) : A.value), N = f({
+	setup(u, { expose: P }) {
+		let F = d(e), { getRole: I, roleList: L, roleLoading: R, roleError: z } = t(F.http, F.urlPrefix), B = h(""), V = r(() => B.value ? L.value.filter((e) => e.roleName && e.roleName.includes(B.value)) : L.value), H = m({
 			indeterminate: !1,
 			checkAll: !1,
 			checkedList: []
 		});
-		v(() => {
-			if (A.value.length > 0) {
-				N.checkAll = N.checkedList.length === M.value.length && N.checkedList.length > 0 && M.value.length > 0, N.indeterminate = N.checkedList.length > 0 && N.checkedList.length < M.value.length;
-				let e = [];
-				A.value.forEach((t) => {
-					N.checkedList.forEach((n) => {
-						t.id === n && e.push({
-							label: t.roleName,
-							value: n,
-							type: "role"
-						});
-					});
-				}), O.changeSelectData(e);
-			}
-		}), _(() => j.value, () => {
-			let e = N.checkedList.filter((e) => M.value.some((t) => t.id === e));
-			N.checkAll = e.length === M.value.length && M.value.length > 0, N.indeterminate = e.length > 0 && e.length < M.value.length;
+		function U() {
+			let e = H.checkedList.filter((e) => V.value.some((t) => t.id === e));
+			H.checkAll = e.length === V.value.length && V.value.length > 0, H.indeterminate = e.length > 0 && e.length < V.value.length, F.changeSelectData(L.value.filter((e) => H.checkedList.includes(e.id)).map((e) => ({
+				label: e.roleName,
+				value: e.id,
+				type: "role"
+			})));
+		}
+		y([
+			() => H.checkedList,
+			V,
+			L
+		], U, {
+			deep: !0,
+			immediate: !0
 		});
-		function P(e) {
+		function W(e) {
 			if (e.target.checked) {
-				N.checkAll = !0, N.indeterminate = !1;
-				let e = M.value.map((e) => e.id);
-				N.checkedList = [...N.checkedList.filter((t) => !e.includes(t)), ...e];
+				H.checkAll = !0, H.indeterminate = !1;
+				let e = V.value.map((e) => e.id);
+				H.checkedList = [...H.checkedList.filter((t) => !e.includes(t)), ...e];
 			} else {
-				N.checkAll = !1, N.indeterminate = !1;
-				let e = M.value.map((e) => e.id);
-				N.checkedList = N.checkedList.filter((t) => !e.includes(t));
+				H.checkAll = !1, H.indeterminate = !1;
+				let e = V.value.map((e) => e.id);
+				H.checkedList = H.checkedList.filter((t) => !e.includes(t));
 			}
 		}
-		function F(e) {
-			j.value = e;
+		function G(e) {
+			B.value = e;
 		}
-		function I(e) {
-			N.checkedList = N.checkedList.filter((t) => t !== e);
+		function K(e) {
+			H.checkedList = H.checkedList.filter((t) => t !== e);
 		}
-		function L(e) {
-			N.checkedList = N.checkedList.filter((t) => !e.includes(t));
+		function q(e) {
+			H.checkedList = H.checkedList.filter((t) => !e.includes(t));
 		}
-		function R() {
-			N.checkAll = !1, N.indeterminate = !1, N.checkedList = [];
+		function J() {
+			H.checkAll = !1, H.indeterminate = !1, H.checkedList = [];
 		}
-		u(() => {
-			k();
+		f(() => {
+			I();
 		});
-		function z(e) {
-			N.checkedList = e.map((e) => e.value);
+		function Y(e) {
+			H.checkedList = e.map((e) => e.value);
 		}
-		return D({
-			delFn: I,
-			deleteAll: L,
-			reset: R,
-			echo: z
-		}), (e, t) => (d(), i("div", C, [a("div", w, [s(g(S), {
-			value: j.value,
-			"onUpdate:value": t[0] ||= (e) => j.value = e,
-			placeholder: "请输入角色名称",
-			onOnSearch: F
-		}, null, 8, ["value"]), a("div", T, [s(g(b), {
-			checked: N.checkAll,
-			"onUpdate:checked": t[1] ||= (e) => N.checkAll = e,
-			indeterminate: N.indeterminate,
-			onChange: P
-		}, {
-			default: y(() => [...t[3] ||= [o(" 全选 ", -1)]]),
-			_: 1
-		}, 8, ["checked", "indeterminate"]), a("div", E, [s(g(x), {
-			value: N.checkedList,
-			"onUpdate:value": t[2] ||= (e) => N.checkedList = e
-		}, {
-			default: y(() => [a("div", null, [(d(!0), i(n, null, m(M.value, (e) => (d(), i("div", {
-				key: e.id,
-				style: { "margin-top": "4px" }
-			}, [s(g(b), { value: e.id }, {
-				default: y(() => [o(h(e.roleName), 1)]),
-				_: 2
-			}, 1032, ["value"])]))), 128))])]),
-			_: 1
-		}, 8, ["value"])])])])]));
+		return P({
+			delFn: K,
+			deleteAll: q,
+			reset: J,
+			echo: Y
+		}), (e, t) => (p(), o("div", D, [s("div", O, [
+			l(v(T), {
+				value: B.value,
+				"onUpdate:value": t[0] ||= (e) => B.value = e,
+				"allow-clear": "",
+				placeholder: "搜索角色",
+				onSearch: G
+			}, null, 8, ["value"]),
+			v(z) ? (p(), i(v(x), {
+				key: 0,
+				class: "selector-feedback",
+				type: "error",
+				message: v(z),
+				"show-icon": ""
+			}, {
+				action: b(() => [l(v(S), {
+					type: "link",
+					size: "small",
+					onClick: v(I)
+				}, {
+					default: b(() => [...t[3] ||= [c("重试", -1)]]),
+					_: 1
+				}, 8, ["onClick"])]),
+				_: 1
+			}, 8, ["message"])) : a("", !0),
+			l(v(E), { spinning: v(R) }, {
+				default: b(() => [s("div", k, [l(v(C), {
+					checked: H.checkAll,
+					"onUpdate:checked": t[1] ||= (e) => H.checkAll = e,
+					indeterminate: H.indeterminate,
+					onChange: W
+				}, {
+					default: b(() => [...t[4] ||= [c(" 全选搜索结果 ", -1)]]),
+					_: 1
+				}, 8, ["checked", "indeterminate"]), s("span", A, _(V.value.length) + " 个角色", 1)]), s("div", j, [l(v(w), {
+					value: H.checkedList,
+					"onUpdate:value": t[2] ||= (e) => H.checkedList = e
+				}, {
+					default: b(() => [V.value.length ? (p(), o("div", M, [(p(!0), o(n, null, g(V.value, (e) => (p(), o("div", {
+						key: e.id,
+						class: "selector-option-row"
+					}, [l(v(C), { value: e.id }, {
+						default: b(() => [c(_(e.roleName), 1)]),
+						_: 2
+					}, 1032, ["value"])]))), 128))])) : a("", !0)]),
+					_: 1
+				}, 8, ["value"]), !v(R) && !v(z) && V.value.length === 0 ? (p(), o("div", N, "暂无匹配角色")) : a("", !0)])]),
+				_: 1
+			}, 8, ["spinning"])
+		])]));
 	}
 });
 //#endregion
-export { D as default };
+export { P as default };

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

@@ -1,10 +1,10 @@
 import { defaultNamespace as e } from "../../../../hooks/use-namespace/index.mjs";
-import t from "../../../icon/index.mjs";
+import t from "../../../icon/src/icon.mjs";
 import { selectContextKey as n } from "../types.mjs";
 import { Fragment as r, computed as i, createBlock as a, createCommentVNode as o, createElementBlock as s, createElementVNode as c, createTextVNode as l, createVNode as u, defineComponent as d, inject as f, mergeModels as p, normalizeClass as m, normalizeStyle as h, openBlock as g, renderList as _, toDisplayString as v, unref as y, useModel as b, withCtx as x } from "vue";
 import { Button as S, Empty as C } from "ant-design-vue";
 //#region src/components/pro-selector-group/src/compoents/select-box.vue?vue&type=script&setup=true&lang.ts
-var w = { style: { width: "40px" } }, T = { key: 0 }, E = {
+var w = { key: 0 }, T = ["aria-label", "onClick"], E = {
 	key: 1,
 	style: {
 		display: "flex",
@@ -29,9 +29,9 @@ var w = { style: { width: "40px" } }, T = { key: 0 }, E = {
 			D("delete", e);
 		}
 		function M() {
-			D("deleteAll", k.value.map((e) => e.value));
+			D("deleteAll", k.value);
 		}
-		return (n, i) => (g(), s("div", { class: m(`${y(e)}-select-box`) }, [c("div", { class: m(`${y(e)}-select-box_title`) }, [c("div", { class: m(`${y(e)}-select-box_title_count`) }, "已选: " + v(k.value.length) + "个", 3), c("div", w, [k.value.length > 0 ? (g(), a(y(S), {
+		return (n, i) => (g(), s("div", { class: m(`${y(e)}-select-box`) }, [c("div", { class: m(`${y(e)}-select-box_title`) }, [c("div", { class: m(`${y(e)}-select-box_title_count`) }, "已选: " + v(k.value.length) + "个", 3), c("div", null, [k.value.length > 0 ? (g(), a(y(S), {
 			key: 0,
 			type: "link",
 			size: "small",
@@ -39,17 +39,20 @@ var w = { style: { width: "40px" } }, T = { key: 0 }, E = {
 		}, {
 			default: x(() => [...i[0] ||= [l(" 清空 ", -1)]]),
 			_: 1
-		})) : o("", !0)])], 2), c("div", { class: m(`${y(e)}-select-box_content`) }, [k.value.length > 0 ? (g(), s("div", T, [(g(!0), s(r, null, _(k.value, (n) => (g(), s("div", {
+		})) : o("", !0)])], 2), c("div", { class: m(`${y(e)}-select-box_content`) }, [k.value.length > 0 ? (g(), s("div", w, [(g(!0), s(r, null, _(k.value, (n) => (g(), s("div", {
 			key: n.value,
 			class: m(`${y(e)}-select-box_content-item`)
 		}, [c("div", {
 			class: m(`${y(e)}-select-box_content-item_name`),
 			style: h(A.value)
-		}, v(n.label), 7), c("div", { class: m(`${y(e)}-select-box_content-item_close`) }, [u(y(t), {
+		}, v(n.label), 7), c("div", { class: m(`${y(e)}-select-box_content-item_close`) }, [c("button", {
+			type: "button",
+			"aria-label": `移除${n.label || "已选项"}`,
+			onClick: (e) => j(n)
+		}, [u(t, {
 			name: "close-circle-o",
-			size: 16,
-			onClick: (e) => j(n.value)
-		}, null, 8, ["onClick"])], 2)], 2))), 128))])) : (g(), s("div", E, [u(y(C), { image: y(C).PRESENTED_IMAGE_SIMPLE }, null, 8, ["image"])]))], 2)], 2));
+			size: 16
+		})], 8, T)], 2)], 2))), 128))])) : (g(), s("div", E, [u(y(C), { image: y(C).PRESENTED_IMAGE_SIMPLE }, null, 8, ["image"])]))], 2)], 2));
 	}
 });
 //#endregion

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

@@ -1,120 +1,149 @@
-import { GdAntUserSelectorCheckbox as e } from "../../../pro-selector/index.mjs";
+import e from "../../../pro-selector/src/components/user.mjs";
 import { selectContextKey as t } from "../types.mjs";
 import { useApi as n } from "../hooks/useApi.mjs";
 import r from "./dept-tree.mjs";
 import { Fragment as i, computed as a, createBlock as o, createCommentVNode as s, createElementBlock as c, createElementVNode as l, createTextVNode as u, createVNode as d, defineComponent as f, inject as p, openBlock as m, reactive as h, ref as g, renderList as _, unref as v, watch as y, withCtx as b } from "vue";
-import { Checkbox as x, Empty as S, InputSearch as C, Spin as w } from "ant-design-vue";
+import { Alert as x, Button as S, Checkbox as C, Empty as w, InputSearch as T, Spin as E } from "ant-design-vue";
 //#region src/components/pro-selector-group/src/compoents/user.vue?vue&type=script&setup=true&lang.ts
-var T = { class: "type-selector-box user-selector" }, E = { style: { width: "280px" } }, D = { style: { "margin-top": "12px" } }, O = { key: 0 }, k = /* @__PURE__ */ f({
+var D = { class: "type-selector-box user-selector" }, O = { class: "selector-pane user-list-pane" }, k = { style: { "margin-top": "12px" } }, A = { key: 0 }, j = /* @__PURE__ */ f({
 	__name: "user",
-	setup(f, { expose: k }) {
-		let A = p(t), { getUserListByDeptId: j, userList: M, userLoading: N } = n(A.http, A.urlPrefix), P = a(() => F[I.value] || {
-			indeterminate: !1,
-			checkAll: !1
-		}), F = h({}), I = g(""), L = g(""), R = g([]), z = a(() => L.value ? M.value.filter((e) => e.realName && e.realName.includes(L.value)) : M.value);
-		y(() => I.value, async (e) => {
-			e && (await j(e), F[e] = B());
-		}, { immediate: !0 }), y(() => R.value, (e) => {
-			A.changeSelectData(e);
-		}, { deep: !0 }), y(() => L.value, () => {
-			I.value && (F[I.value] = B());
+	setup(f, { expose: j }) {
+		let M = p(t), { getUserListByDeptId: N, userList: P, userLoading: F, userError: I } = n(M.http, M.urlPrefix);
+		function L(e = B.value) {
+			return R[e] || (R[e] = {
+				indeterminate: !1,
+				checkAll: !1
+			}), R[e];
+		}
+		let R = h({}), z = a(() => L()), B = g(""), V = g(""), H = g([]), U = a(() => V.value ? P.value.filter((e) => e.realName && e.realName.includes(V.value)) : P.value);
+		y(() => B.value, async (e) => {
+			if (e) {
+				if (await N(e), e !== B.value) return;
+				R[e] = W();
+			}
+		}, { immediate: !0 }), y(() => H.value, (e) => {
+			B.value && (R[B.value] = W()), M.changeSelectData(e);
+		}, { deep: !0 }), y(() => V.value, () => {
+			B.value && (R[B.value] = W());
 		});
-		function B() {
-			R.value.forEach((e) => {
-				M.value.forEach((t) => {
-					e.value === t.id && (t.checked = !0);
-				});
+		function W() {
+			let e = new Set(H.value.map((e) => e.value));
+			P.value.forEach((t) => {
+				t.checked = e.has(t.id);
 			});
-			let e = z.value.filter((e) => e.checked);
+			let t = U.value.filter((e) => e.checked);
 			return {
-				indeterminate: e.length > 0 && e.length < z.value.length,
-				checkAll: e.length === z.value.length && z.value.length > 0
+				indeterminate: t.length > 0 && t.length < U.value.length,
+				checkAll: t.length === U.value.length && U.value.length > 0
 			};
 		}
-		function V(e, t) {
+		function G(e, t) {
 			return e.some((e) => e.value === t);
 		}
-		function H(e) {
-			let t = F[I.value];
-			t.checkAll = e.target.checked, t.indeterminate = !1, z.value.forEach((t) => {
-				let n = M.value.find((e) => e.id === t.id);
+		function K(e) {
+			let t = L();
+			t.checkAll = e.target.checked, t.indeterminate = !1, U.value.forEach((t) => {
+				let n = P.value.find((e) => e.id === t.id);
 				n && (n.checked = e.target.checked);
-			}), e.target.checked ? z.value.forEach((e) => {
-				V(R.value, e.id) || R.value.push({
+			}), e.target.checked ? U.value.forEach((e) => {
+				G(H.value, e.id) || H.value.push({
 					value: e.id,
 					label: e.realName || "",
 					type: "user"
 				});
-			}) : z.value.forEach((e) => {
-				V(R.value, e.id) && (R.value = R.value.filter((t) => t.value !== e.id));
+			}) : U.value.forEach((e) => {
+				G(H.value, e.id) && (H.value = H.value.filter((t) => t.value !== e.id));
 			});
 		}
-		function U(e, t) {
-			let n = F[I.value], r = z.value.filter((e) => e.checked);
-			n.checkAll = r.length === z.value.length && z.value.length > 0, n.indeterminate = r.length > 0 && r.length < z.value.length, e ? V(R.value, t.id) || R.value.push({
+		function q(e, t) {
+			let n = L(), r = U.value.filter((e) => e.checked);
+			n.checkAll = r.length === U.value.length && U.value.length > 0, n.indeterminate = r.length > 0 && r.length < U.value.length, e ? G(H.value, t.id) || H.value.push({
 				value: t.id,
 				label: t.realName || "",
 				type: "user"
-			}) : V(R.value, t.id) && (R.value = R.value.filter((e) => e.value !== t.id));
+			}) : G(H.value, t.id) && (H.value = H.value.filter((e) => e.value !== t.id));
 		}
-		function W(e) {
-			L.value = e;
+		function J(e) {
+			V.value = e;
 		}
-		function G(e) {
-			R.value = R.value.filter((t) => t.value !== e), M.value.forEach((t) => {
+		function Y(e) {
+			H.value = H.value.filter((t) => t.value !== e), P.value.forEach((t) => {
 				t.id === e && (t.checked = !1);
-			}), I.value && (F[I.value] = B());
+			}), B.value && (R[B.value] = W());
 		}
-		function K(e) {
-			R.value = R.value.filter((t) => !e.includes(t.value)), M.value.forEach((t) => {
+		function X(e) {
+			H.value = H.value.filter((t) => !e.includes(t.value)), P.value.forEach((t) => {
 				e.includes(t.id) && (t.checked = !1);
-			}), I.value && (F[I.value] = B());
+			}), B.value && (R[B.value] = W());
 		}
-		function q() {
-			P.value.checkAll = !1, P.value.indeterminate = !1, R.value = [], M.value.forEach((e) => {
+		function Z() {
+			let e = L();
+			e.checkAll = !1, e.indeterminate = !1, H.value = [], P.value.forEach((e) => {
 				e.checked = !1;
 			});
 		}
-		function J(e) {
-			R.value = e;
+		function Q(e) {
+			H.value = e.map((e) => ({
+				...e,
+				type: "user"
+			}));
 		}
-		return k({
-			delFn: G,
-			reset: q,
-			deleteAll: K,
-			echo: J
-		}), (t, n) => (m(), c("div", T, [d(r, {
-			modelValue: I.value,
-			"onUpdate:modelValue": n[0] ||= (e) => I.value = e,
+		return j({
+			delFn: Y,
+			reset: Z,
+			deleteAll: X,
+			echo: Q
+		}), (t, n) => (m(), c("div", D, [d(r, {
+			modelValue: B.value,
+			"onUpdate:modelValue": n[0] ||= (e) => B.value = e,
 			style: { width: "280px" }
-		}, null, 8, ["modelValue"]), l("div", E, [d(v(w), { spinning: v(N) }, {
+		}, null, 8, ["modelValue"]), l("div", O, [d(v(E), { spinning: v(F) }, {
 			default: b(() => [
-				d(v(C), {
-					value: L.value,
-					"onUpdate:value": n[1] ||= (e) => L.value = e,
-					placeholder: "请输入用户名称",
-					onSearch: W
+				d(v(T), {
+					value: V.value,
+					"onUpdate:value": n[1] ||= (e) => V.value = e,
+					"allow-clear": "",
+					placeholder: "搜索用户",
+					onSearch: J
 				}, null, 8, ["value"]),
-				z.value.length > 0 ? (m(), o(v(x), {
+				v(I) ? (m(), o(v(x), {
 					key: 0,
-					checked: P.value.checkAll,
-					"onUpdate:checked": n[2] ||= (e) => P.value.checkAll = e,
+					class: "selector-feedback",
+					type: "error",
+					message: v(I),
+					"show-icon": ""
+				}, {
+					action: b(() => [d(v(S), {
+						type: "link",
+						size: "small",
+						onClick: n[2] ||= (e) => v(N)(B.value)
+					}, {
+						default: b(() => [...n[4] ||= [u("重试", -1)]]),
+						_: 1
+					})]),
+					_: 1
+				}, 8, ["message"])) : s("", !0),
+				U.value.length > 0 ? (m(), o(v(C), {
+					key: 1,
+					checked: z.value.checkAll,
+					"onUpdate:checked": n[3] ||= (e) => z.value.checkAll = e,
 					style: {
 						"margin-top": "12px",
 						"margin-left": "6px"
 					},
-					indeterminate: P.value.indeterminate,
-					onChange: H
+					indeterminate: z.value.indeterminate,
+					onChange: K
 				}, {
-					default: b(() => [...n[3] ||= [u(" 全选 ", -1)]]),
+					default: b(() => [...n[5] ||= [u(" 全选 ", -1)]]),
 					_: 1
 				}, 8, ["checked", "indeterminate"])) : s("", !0),
-				l("div", D, [z.value.length > 0 ? (m(), c("div", O, [(m(!0), c(i, null, _(z.value, (t) => (m(), c("div", { key: t.id }, [d(v(e), {
+				l("div", k, [U.value.length > 0 ? (m(), c("div", A, [(m(!0), c(i, null, _(U.value, (t) => (m(), c("div", { key: t.id }, [d(v(e), {
 					"user-info": t,
-					onChangeChecked: U
-				}, null, 8, ["user-info"])]))), 128))])) : (m(), o(v(S), {
+					onChangeChecked: q
+				}, null, 8, ["user-info"])]))), 128))])) : v(I) ? s("", !0) : (m(), o(v(w), {
 					key: 1,
-					image: v(S).PRESENTED_IMAGE_SIMPLE
+					image: v(w).PRESENTED_IMAGE_SIMPLE,
+					description: "暂无用户"
 				}, null, 8, ["image"]))])
 			]),
 			_: 1
@@ -122,4 +151,4 @@ var T = { class: "type-selector-box user-selector" }, E = { style: { width: "280
 	}
 });
 //#endregion
-export { k as default };
+export { j as default };

package/dist/es/components/pro-selector-group/src/hooks/useApi.mjs

@@ -5,54 +5,71 @@ var t = /* @__PURE__ */ function(e) {
 }({});
 function n(n, r = "") {
 	if (!n) throw Error("http is required");
-	let i = e([]), a = e([]), o = e(!1), s = e([]);
+	let i = e([]), a = e([]), o = e(!1), s = e([]), c = e(!1), l = e(!1), u = e(""), d = e(""), f = e(""), p = 0;
 	return {
 		getDeptTree: async () => {
+			c.value = !0, u.value = "";
 			try {
 				let e = await n.get(`${r}${t.GET_DEPT}`);
-				return e.status === 0 ? (i.value = e.data, e.data) : [];
-			} catch (e) {
-				return console.error(e), [];
+				return e.status === 0 ? (i.value = Array.isArray(e.data) ? e.data : [], i.value) : (u.value = "部门数据加载失败，请重试", []);
+			} catch {
+				return u.value = "部门数据加载失败，请重试", [];
+			} finally {
+				c.value = !1;
 			}
 		},
 		getUserListByDeptId: async (e) => {
+			let i = ++p;
+			d.value = "";
 			try {
 				o.value = !0;
-				let i = await n.get(`${r}${t.GET_USER_BY_DEPT_ID}?deptId=${e}&pageSIze=1000&pageNum=1`);
-				return i.status === 0 ? (a.value = i.data.list.map((e) => ({
-					...e,
-					id: e.userId,
-					userId: e.userId,
-					deptId: e.deptId,
-					realName: e.userInfo?.realName || "",
-					phone: e.userInfo?.phone || ""
-				})), i.data) : [];
-			} catch (e) {
-				return console.error(e), [];
+				let s = await n.get(`${r}${t.GET_USER_BY_DEPT_ID}?deptId=${e}&pageSIze=1000&pageNum=1`);
+				if (s.status === 0) {
+					let e = (Array.isArray(s.data?.list) ? s.data.list : []).map((e) => ({
+						...e,
+						id: e.userId,
+						userId: e.userId,
+						deptId: e.deptId,
+						realName: e.userInfo?.realName || "",
+						phone: e.userInfo?.phone || ""
+					}));
+					return i === p && (a.value = e), e;
+				}
+				return i === p && (d.value = "用户数据加载失败，请重试"), [];
+			} catch {
+				return i === p && (d.value = "用户数据加载失败，请重试"), [];
 			} finally {
-				o.value = !1;
+				i === p && (o.value = !1);
 			}
 		},
 		getUser: async () => {
 			try {
 				let e = await n.get(`${r}${t.GET_USER}`);
 				return e.status === 0 ? e.data : [];
-			} catch (e) {
-				return console.error(e), [];
+			} catch {
+				return [];
 			}
 		},
 		getRole: async () => {
+			l.value = !0, f.value = "";
 			try {
 				let e = await n.get(`${r}${t.GET_ROLE}`);
-				return e.status === 0 ? (s.value = e.data.list || [], e.data.list || []) : [];
-			} catch (e) {
-				return console.error(e), [];
+				return e.status === 0 ? (s.value = e.data.list || [], e.data.list || []) : (f.value = "角色数据加载失败，请重试", []);
+			} catch {
+				return f.value = "角色数据加载失败，请重试", [];
+			} finally {
+				l.value = !1;
 			}
 		},
 		deptTree: i,
 		userList: a,
 		roleList: s,
-		userLoading: o
+		userLoading: o,
+		deptLoading: c,
+		roleLoading: l,
+		deptError: u,
+		userError: d,
+		roleError: f
 	};
 }
 //#endregion