@baishuyun/ui-business 6.1.1 → 6.2.0

package/dist/DeptsMemberSelector/{useTreeExpandedKeys-BlOuNYZ2.js → useTreeExpandedKeys-oLUTUYkP.js}

@@ -1,45 +1,45 @@
 import { n as e } from "../vendors/lodash-es.js";
 import { useEffect as t, useRef as n, useState as r } from "react";
-//#region src/components/DeptsMemberSelector/utils/treeExpandedKeys.ts
-var i = (e, t) => {
+//#region src/components/DeptsMemberSelector/utils/deptUsersDockCacheKeys.ts
+var i = "deptUsersCorps", a = "deptUsersCorpLabelTree", o = "deptUsersCorpDeptTree", s = "deptUsersRelations", c = "deptUsersRoleLeaves", l = "deptUsersOrgInternal", u = "deptUsersOrgExternal", d = (e, t, n = !0) => `${e}:${t?.appId ?? ""}:${t?.entryId ?? ""}:${!!n}`, f = (e, t) => {
 	if (t === "none" || e.length === 0) return [];
 	if (t === "single-root-only") {
 		let t = e[0]._id;
 		return e.length === 1 && t != null ? [t] : [];
 	}
 	return e.map((e) => e._id).filter((e) => e != null);
-}, a = (e, t, n = []) => {
+}, p = (e, t, n = []) => {
 	for (let r of e) {
 		if (r._id === void 0 || r._id === null) continue;
 		let e = [...n, r._id];
 		if (r._id === t) return e;
 		if (r.children?.length) {
-			let n = a(r.children, t, e);
+			let n = p(r.children, t, e);
 			if (n) return n;
 		}
 	}
 	return null;
-}, o = (t, n = []) => {
+}, m = (t, n = []) => {
 	let r = [];
 	return n.forEach((e) => {
-		let n = a(t, e);
+		let n = p(t, e);
 		n && r.push(...n.slice(0, -1));
 	}), e(r);
-}, s = (t, n) => {
-	let r = i(t, n.baselineMode), a = n.selectionExpandKeys ?? [];
-	return e([...r, ...a]);
-}, c = (e, t) => {
+}, h = (t, n) => {
+	let r = f(t, n.baselineMode), i = n.selectionExpandKeys ?? [];
+	return e([...r, ...i]);
+}, g = (e, t) => {
 	if (e.length !== t.length) return !1;
 	let n = new Set(t.map(String));
 	return e.every((e) => n.has(String(e)));
-}, l = (e) => {
+}, _ = (e) => {
 	let [i, a] = r(null), o = n(e);
 	return t(() => {
-		c(e, o.current) || (o.current = e, a(null));
+		g(e, o.current) || (o.current = e, a(null));
 	}, [e]), {
 		expandedKeys: i ?? e,
 		onExpand: a
 	};
 };
 //#endregion
-export { s as i, a as n, o as r, l as t };
+export { i as a, u as c, c as d, d as f, h as i, l, p as n, o, m as r, a as s, _ as t, s as u };

package/dist/components/DeptsMemberSelector/context/DeptsMemberContext.d.ts

@@ -1,4 +1,3 @@
-import { SetStateAction } from 'react';
 import { Action } from '../types/context';
 import { CurrentContext, DepartmentSelectableRange, DepartmentPanelRequestGuard, DeptUsersPanelConfig, FlowCreator, MemberPanelRequestGuard, MemberPanelVisibility, RequestContext, SelectorLimits, SelectorType } from '../types/selector';
 declare const DeptsMemberContext: import('react').Context<{
@@ -8,7 +7,6 @@ declare const DeptsMemberContext: import('react').Context<{
      * @description 无论单选还是多选，value 都统一按数组存储，避免面板层再分叉处理状态结构
      */
     value?: any[];
-    setValue: (v: SetStateAction<any[]>, ...args: any[]) => void;
     dispatch: (action: Action) => void;
     containerHeight: number;
     currentUsers?: Record<string, unknown>[];
@@ -40,9 +38,9 @@ declare const DeptsMemberContext: import('react').Context<{
      */
     isSingleSelect?: boolean;
     /**
-     * 为 true 时在所有成员列表出口过滤当前登录用户，并隐藏「当前用户」Tab。
-     * 不影响部门实体与流程发起人。由主组件从 props.noUserMe 派生注入。
+     * 成员黑名单 id Set。仅 type === 'deptusers' 时由主组件从 props.excludedMemberIds 派生；
+     * 其它 type 或未传时为空 Set。命中 `_id` / `id` / `dock_userid` 的成员不展示。
      */
-    noUserMe?: boolean;
+    excludedMemberIdSet?: ReadonlySet<string>;
 }>;
 export default DeptsMemberContext;

package/dist/components/DeptsMemberSelector/hooks/useDeptsMemberSelector.d.ts

@@ -3,7 +3,6 @@ export declare const useDeptsMemberSelector: () => {
     departmentPanelRequestGuard: import('../types/selector').DepartmentPanelRequestGuard;
     type: import('..').SelectorType;
     value?: any[];
-    setValue: (v: import('react').SetStateAction<any[]>, ...args: any[]) => void;
     dispatch: (action: import('../types/context').Action) => void;
     containerHeight: number;
     currentUsers?: Record<string, unknown>[];
@@ -21,5 +20,5 @@ export declare const useDeptsMemberSelector: () => {
     hasDock?: boolean;
     hasDeptDock?: boolean;
     isSingleSelect?: boolean;
-    noUserMe?: boolean;
+    excludedMemberIdSet?: ReadonlySet<string>;
 };

package/dist/components/DeptsMemberSelector/hooks/useFilteredMemberList.d.ts

@@ -1,6 +1,6 @@
 /**
- * 成员列表出口统一过滤当前登录用户：transfer 或 noUserMe 为 true 时剔除身份重合成员。
- * 从 Context 读取 type / currentUsers / noUserMe 并 memo 化结果。仅用于渲染期调用点；
+ * 成员列表出口统一过滤：transfer 剔除当前登录用户；excludedMemberIdSet 非空时剔除黑名单成员。
+ * 从 Context 读取 type / currentUsers / excludedMemberIdSet 并 memo 化结果。仅用于渲染期调用点；
  * useRequest 异步回调内请直接使用 filterMemberListCandidates。
  */
 export declare const useFilteredMemberList: <T extends Record<string, unknown>>(list: T[]) => T[];

package/dist/components/DeptsMemberSelector/subcomponents/Entity/DeptsUser/DeptUsersSearch/DeptUsersSearch.d.ts

@@ -0,0 +1,5 @@
+/** deptusers 全局搜索唯一宿主：按维度注册表并集展示结果。 */
+declare const DeptUsersSearch: React.FC<{
+    wd?: string;
+}>;
+export default DeptUsersSearch;

package/dist/components/DeptsMemberSelector/subcomponents/Entity/DeptsUser/DeptUsersSearch/useDeptUsersSearchData.d.ts

@@ -0,0 +1,19 @@
+import { TreeNodeDefine } from '@baishuyun/ui-base/components/Tree';
+/** deptusers 全局搜索唯一宿主数据层：按维度注册表并集挂载 remote/local 搜索。 */
+declare const useDeptUsersSearchData: ({ wd }: {
+    wd?: string;
+}) => {
+    containerHeight: number;
+    treeData: {
+        title: string;
+        value: string;
+        children: any[];
+    }[];
+    defaultExpandedKeys: string[];
+    selectedKeys: any[];
+    isLoading: boolean;
+    checkType: "radio" | "checkbox";
+    handleSelect: (_id: any, node?: TreeNodeDefine) => void;
+    handleDeSelect: (targetValue: any) => void;
+};
+export { useDeptUsersSearchData };

package/dist/components/DeptsMemberSelector/subcomponents/Panels/DeptUsersCorpPanel/alignDockCorpSelectedKeys.d.ts

@@ -0,0 +1,27 @@
+import { CorpLabelTreeNode } from './buildCorpLabelTreeData';
+export declare const resolveDockCorpBareId: (corpId: string | number | null | undefined) => string;
+/** 裸 id → label_corp 树中的 dockcorp 节点（用于勾选对齐与预览补名）。 */
+export declare const indexDockCorpTreeNodesByBare: (treeData?: CorpLabelTreeNode[]) => Map<string, CorpLabelTreeNode>;
+/**
+ * 按裸 id 把已选 dockcorp _id 对齐到 label_corp 树节点真实 _id。
+ * 解决 corp_id_list 与树节点 _host/_guest 形态不一致导致的不勾选。
+ */
+export declare const alignDockCorpSelectedKeys: (selectedIds: Array<string | number>, treeData?: CorpLabelTreeNode[]) => Array<string | number>;
+type SelectorLikeItem = {
+    _id?: string | number;
+    id?: string | number;
+    type?: string;
+    name?: string;
+    nickname?: string;
+    dock_corpname?: string;
+    [key: string]: unknown;
+};
+/**
+ * 用 label_corp 树回填已选 dockcorp：补 name、对齐 _id；不在树中的项视为已删除/不可用并剔除。
+ * 对齐旧版 memberSelect：预览名来自树/corpMap，失效企业不展示（或标 deleted）。
+ */
+export declare const reconcileDockCorpSelectionWithTree: <T extends SelectorLikeItem>(items?: T[], treeData?: CorpLabelTreeNode[]) => {
+    nextItems: T[];
+    changed: boolean;
+};
+export {};

package/dist/components/DeptsMemberSelector/subcomponents/Panels/DeptUsersCorpPanel/buildCorpLabelTreeData.d.ts

@@ -1,6 +1,8 @@
 type CorpLabelSourceItem = {
     _id?: string | number;
     name?: string;
+    /** label_corp 接口 dockcorp 节点可能带企业展示名 */
+    dock_corpname?: string;
     type?: string;
     departmentId?: string | number;
     parentId?: string | number;

package/dist/components/DeptsMemberSelector/subcomponents/Panels/DeptUsersCorpPanel/useCorpLabelTreePanelData.d.ts

@@ -2,7 +2,7 @@ import { CorpLabelTreeNode } from './buildCorpLabelTreeData';
 export declare const useCorpLabelTreePanelData: () => {
     treeData: CorpLabelTreeNode[];
     loading: boolean;
-    selectedCorpIds: any[];
+    selectedCorpIds: (string | number)[];
     selectionExpandKeys: (string | number)[];
     containerHeight: number;
     isSingleSelect: boolean | undefined;

package/dist/components/DeptsMemberSelector/subcomponents/Panels/DeptUsersRolePanel/useDeptUsersRolePanelData.d.ts

@@ -1,3 +1,4 @@
+import { InternalRolePickNode, RoleSourceItem } from '../../../utils/deptUsersRoleModel';
 import { TreeNodeDefine } from '@baishuyun/ui-base/components/Tree';
 type RoleEntryKey = 'internal' | 'external';
 type MenuItem = {
@@ -15,21 +16,6 @@ type DeptUsersRoleSelectionItem = {
 type DeptUsersRoleOptionItem = DeptUsersRoleSelectionItem & {
     label: string;
 };
-type RoleSourceItem = {
-    _id: string;
-    role_id: string | number;
-    name: string;
-    type?: string | number;
-    parent?: string | number;
-    children?: RoleSourceItem[];
-};
-/**
- * roleChildEnable:true 用的可勾选树节点：分组 checkable:false（点击仅展开），叶子 checkable:true。
- */
-type InternalRolePickNode = RoleSourceItem & {
-    checkable: boolean;
-    children?: InternalRolePickNode[];
-};
 declare const useDeptUsersRolePanelData: () => {
     containerHeight: number;
     menuItems: MenuItem[];

package/dist/components/DeptsMemberSelector/subcomponents/Panels/MemberPanel/useMemberPagedList.d.ts

@@ -0,0 +1,40 @@
+import { MemberPanelRequestGuard, SelectorType } from '../../../types/selector';
+export type MemberPagedListParams = {
+    /** 与父组件 key 对齐；同实例内变化时走 ahooks reload（测试 harness） */
+    memberQueryKey: string;
+    type: SelectorType;
+    activeKey: string;
+    selectKey: string | symbol;
+    uniqueAllKey: symbol;
+    externalActiveTab: string;
+    currentCorpId?: string;
+    requestContext: any;
+    limits: any;
+    memberSearchLimit: any;
+    isMemberLimitMode: boolean;
+    shouldUsePagedMembers: boolean;
+    isInternalDisabled: boolean;
+    isDockDisabled: boolean;
+    memberPanelRequestGuard: MemberPanelRequestGuard;
+    excludedMemberIdSet?: ReadonlySet<string>;
+    currentUsers?: any;
+    onUsersFirstPage?: (usersLen: number) => void;
+    onMemberLimitResult?: (result: {
+        users?: any[];
+        dock_user_list?: any[];
+        mappedRoles?: any[];
+        mappedDockRoles?: any[];
+    }) => void;
+};
+/**
+ * 成员第三栏分页列表。须由父组件用 key={memberQueryKey} 挂载，
+ * 以便 Tab/筛选切换时卸载重建，避免 ahooks useInfiniteScroll 跨 query 复用 finalData。
+ */
+declare const useMemberPagedList: (params: MemberPagedListParams) => {
+    userList: any[];
+    scrollRef: import('react').RefObject<HTMLDivElement>;
+    memberLoading: boolean;
+    memberLoadingMore: boolean;
+    memberData: any;
+};
+export { useMemberPagedList };

package/dist/components/DeptsMemberSelector/subcomponents/Panels/MemberPanel/useMemberPanelData.d.ts

@@ -3,7 +3,11 @@ type MenuItem = {
     label: string;
     visible: boolean;
 };
-declare const useMemberPanelData: () => {
+/**
+ * 成员面板壳层：侧栏、部门树、activeKey。
+ * 第三栏分页列表由 useMemberPagedList 承担，UI 侧须用 key={memberQueryKey} 挂载以重置 ahooks 状态。
+ */
+declare const useMemberPanelShell: () => {
     containerHeight: number;
     menuItems: MenuItem[];
     activeKey: string;
@@ -18,12 +22,93 @@ declare const useMemberPanelData: () => {
         external: any[];
     };
     currentTreeData: any[];
+    loading: boolean;
+    showUnavailableOverlay: boolean;
+    showTree: boolean;
+    memberQueryKey: string;
+    pagedListParams: {
+        memberQueryKey: string;
+        type: import('../../../types/selector').SelectorType;
+        activeKey: string;
+        selectKey: string | symbol;
+        uniqueAllKey: symbol;
+        externalActiveTab: string;
+        currentCorpId: string | undefined;
+        requestContext: import('../../../types/selector').RequestContext;
+        limits: import('../../../types/selector').SelectorLimits;
+        memberSearchLimit: import('../../../types/selector').MemberSearchLimit | undefined;
+        isMemberLimitMode: boolean;
+        shouldUsePagedMembers: boolean;
+        isInternalDisabled: boolean;
+        isDockDisabled: boolean;
+        memberPanelRequestGuard: import('../../../types/selector').MemberPanelRequestGuard;
+        excludedMemberIdSet: ReadonlySet<string> | undefined;
+        currentUsers: Record<string, unknown>[] | undefined;
+        onUsersFirstPage: (usersLen: number) => void;
+        onMemberLimitResult: (result: {
+            users?: any[];
+            dock_user_list?: any[];
+            mappedRoles?: any[];
+            mappedDockRoles?: any[];
+        }) => void;
+    };
+    shouldUsePagedMembers: boolean;
+    isMemberLimitMode: boolean;
+};
+/**
+ * 测试 / 兼容入口：壳层 + 分页列表同实例组合。
+ * 生产 UI 请用 useMemberPanelShell + key={memberQueryKey} 的列表子组件，避免跨 Tab 复用 ahooks finalData。
+ */
+declare const useMemberPanelData: () => {
     userList: any[];
     scrollRef: import('react').RefObject<HTMLDivElement>;
-    loading: boolean;
     memberLoading: boolean;
     memberLoadingMore: boolean;
+    containerHeight: number;
+    menuItems: MenuItem[];
+    activeKey: string;
+    setActiveKey: (nextKey: string) => void;
+    selectKey: string | symbol;
+    setSelectKey: import('react').Dispatch<import('react').SetStateAction<string | symbol>>;
+    uniqueAllKey: symbol;
+    externalActiveTab: string;
+    handleExternalActiveTabChange: (tab: string) => void;
+    treeData: {
+        internal: any[];
+        external: any[];
+    };
+    currentTreeData: any[];
+    loading: boolean;
     showUnavailableOverlay: boolean;
     showTree: boolean;
+    memberQueryKey: string;
+    pagedListParams: {
+        memberQueryKey: string;
+        type: import('../../../types/selector').SelectorType;
+        activeKey: string;
+        selectKey: string | symbol;
+        uniqueAllKey: symbol;
+        externalActiveTab: string;
+        currentCorpId: string | undefined;
+        requestContext: import('../../../types/selector').RequestContext;
+        limits: import('../../../types/selector').SelectorLimits;
+        memberSearchLimit: import('../../../types/selector').MemberSearchLimit | undefined;
+        isMemberLimitMode: boolean;
+        shouldUsePagedMembers: boolean;
+        isInternalDisabled: boolean;
+        isDockDisabled: boolean;
+        memberPanelRequestGuard: import('../../../types/selector').MemberPanelRequestGuard;
+        excludedMemberIdSet: ReadonlySet<string> | undefined;
+        currentUsers: Record<string, unknown>[] | undefined;
+        onUsersFirstPage: (usersLen: number) => void;
+        onMemberLimitResult: (result: {
+            users?: any[];
+            dock_user_list?: any[];
+            mappedRoles?: any[];
+            mappedDockRoles?: any[];
+        }) => void;
+    };
+    shouldUsePagedMembers: boolean;
+    isMemberLimitMode: boolean;
 };
-export { useMemberPanelData };
+export { useMemberPanelData, useMemberPanelShell };

package/dist/components/DeptsMemberSelector/types/selector.d.ts

@@ -212,13 +212,12 @@ type EntitySelectorProps = {
      */
     flowCreator?: FlowCreator;
     /**
-     * @description 为 true 时，在所有成员列表面板中隐藏「当前用户」：
-     * - 隐藏成员 Tab 中的「当前用户」子 Tab（覆盖 limit.creator 打开的情况）
-     * - 从成员、角色、职位、外部联系人、对接人、搜索结果等成员列表中过滤掉当前登录用户
-     * 仅作用于成员列表，不影响部门实体（「我所在部门」Tab）与流程发起人。
-     * @default false
+     * @description 成员黑名单 id 列表。仅 type === 'deptusers' 生效。
+     * 列表项的 `_id` / `id` / `dock_userid` 任一命中则不展示。
+     * 只过滤成员浏览/搜索列表，不隐藏 Tab，不影响已选回显与部门/职位/角色/企业等非成员实体。
+     * @default []
      */
-    noUserMe?: boolean;
+    excludedMemberIds?: string[];
 };
 /**
  * @description transfer 模式流程发起人，由调用方传入的固定结构。

package/dist/components/DeptsMemberSelector/utils/deptUsersCorpDeptSearchGroup.d.ts

@@ -1,19 +1,7 @@
 import { ReactNode } from 'react';
 import { ENTITY_ITEM_TYPE } from './entityItemType';
 import { RequestContext } from '../types/selector';
-type CorpDeptSearchVariant = 'department' | 'member';
-type DepartmentCorpDeptSearchGroup = {
-    title: string;
-    _id: string;
-    children: Array<{
-        _id: string | number;
-        name: string;
-        type: typeof ENTITY_ITEM_TYPE.USER;
-        owner_corpid: string;
-        title: ReactNode;
-    }>;
-};
-type MemberCorpDeptSearchGroup = {
+type CorpDeptSearchGroup = {
     title: string;
     value: string;
     children: Array<{
@@ -30,15 +18,14 @@ type MemberCorpDeptSearchGroup = {
  * 忽略 users，将 dock_user_list 各分组 userList 合并为对接人结果。
  * owner_corpid 取值：API 返回优先，否则回退分组 dockCorpid。
  */
-declare function useDeptUsersCorpDeptSearchGroup<V extends CorpDeptSearchVariant>({ enabled, variant, requestContext, hasDock, wd, groupTitle, }: {
+declare function useDeptUsersCorpDeptSearchGroup({ enabled, requestContext, hasDock, wd, groupTitle, }: {
     enabled: boolean;
-    variant: V;
     requestContext: RequestContext;
     hasDock?: boolean;
     wd?: string;
     groupTitle: string;
 }): {
-    searchGroup: V extends 'department' ? DepartmentCorpDeptSearchGroup | null : MemberCorpDeptSearchGroup | null;
+    searchGroup: CorpDeptSearchGroup | null;
     loading: boolean;
 };
 export { useDeptUsersCorpDeptSearchGroup };

package/dist/components/DeptsMemberSelector/utils/deptUsersCorpSearchGroup.d.ts

@@ -1,32 +1,23 @@
 import { ReactNode } from 'react';
 import { ENTITY_ITEM_TYPE } from './entityItemType';
-type CorpSearchVariant = 'department' | 'member';
-type CorpSearchTreeChild = {
-    _id: string;
-    name: string;
-    type: typeof ENTITY_ITEM_TYPE.DOCKCORP;
-    disabled?: boolean;
-    title: ReactNode;
-};
-type DepartmentCorpSearchGroup = {
-    title: string;
-    _id: string;
-    children: CorpSearchTreeChild[];
-};
-type MemberCorpSearchGroup = {
+type CorpSearchGroup = {
     title: string;
     value: string;
-    children: Array<CorpSearchTreeChild & {
+    children: Array<{
+        _id: string;
         value: string;
+        name: string;
+        type: typeof ENTITY_ITEM_TYPE.DOCKCORP;
+        disabled?: boolean;
+        title: ReactNode;
     }>;
 };
-declare function useDeptUsersCorpSearchGroup<V extends CorpSearchVariant>({ enabled, variant, wd, groupTitle, }: {
+declare function useDeptUsersCorpSearchGroup({ enabled, wd, groupTitle, }: {
     enabled: boolean;
-    variant: V;
     wd?: string;
     groupTitle: string;
 }): {
-    searchGroup: V extends 'department' ? DepartmentCorpSearchGroup | null : MemberCorpSearchGroup | null;
+    searchGroup: CorpSearchGroup | null;
     loading: boolean;
 };
 export { useDeptUsersCorpSearchGroup };

package/dist/components/DeptsMemberSelector/utils/deptUsersDockCacheKeys.d.ts

@@ -1,4 +1,16 @@
 declare const DEPT_USERS_CORPS_CACHE_KEY = "deptUsersCorps";
 declare const DEPT_USERS_CORP_LABEL_TREE_CACHE_KEY = "deptUsersCorpLabelTree";
 declare const DEPT_USERS_CORP_DEPT_TREE_CACHE_KEY = "deptUsersCorpDeptTree";
-export { DEPT_USERS_CORPS_CACHE_KEY, DEPT_USERS_CORP_LABEL_TREE_CACHE_KEY, DEPT_USERS_CORP_DEPT_TREE_CACHE_KEY, };
+/** 关系列表本地搜索与面板共用，避免反复全量拉取 */
+declare const DEPT_USERS_RELATIONS_CACHE_KEY = "deptUsersRelations";
+/** 角色叶子列表本地搜索缓存 */
+declare const DEPT_USERS_ROLE_LEAVES_CACHE_KEY = "deptUsersRoleLeaves";
+/** 组织架构内部组织：面板预拉与本地搜索共用 */
+declare const DEPT_USERS_ORG_INTERNAL_CACHE_KEY = "deptUsersOrgInternal";
+/** 组织架构外部组织：面板预拉与本地搜索共用 */
+declare const DEPT_USERS_ORG_EXTERNAL_CACHE_KEY = "deptUsersOrgExternal";
+declare const buildDeptUsersOrgCacheKey: (baseKey: string, requestContext?: {
+    appId?: string;
+    entryId?: string;
+}, dockEnabled?: boolean) => string;
+export { DEPT_USERS_CORPS_CACHE_KEY, DEPT_USERS_CORP_LABEL_TREE_CACHE_KEY, DEPT_USERS_CORP_DEPT_TREE_CACHE_KEY, DEPT_USERS_RELATIONS_CACHE_KEY, DEPT_USERS_ROLE_LEAVES_CACHE_KEY, DEPT_USERS_ORG_INTERNAL_CACHE_KEY, DEPT_USERS_ORG_EXTERNAL_CACHE_KEY, buildDeptUsersOrgCacheKey, };

package/dist/components/DeptsMemberSelector/utils/deptUsersEnterpriseLabelSearchGroup.d.ts

@@ -1,17 +1,6 @@
 import { ReactNode } from 'react';
 import { ENTITY_ITEM_TYPE } from './entityItemType';
-type EnterpriseLabelSearchVariant = 'department' | 'member';
-type DepartmentEnterpriseLabelSearchGroup = {
-    title: string;
-    _id: string;
-    children: Array<{
-        _id: string;
-        name: string;
-        type: typeof ENTITY_ITEM_TYPE.LABEL;
-        title: ReactNode;
-    }>;
-};
-type MemberEnterpriseLabelSearchGroup = {
+type EnterpriseLabelSearchGroup = {
     title: string;
     value: string;
     children: Array<{
@@ -22,13 +11,12 @@ type MemberEnterpriseLabelSearchGroup = {
         title: ReactNode;
     }>;
 };
-declare function useDeptUsersEnterpriseLabelSearchGroup<V extends EnterpriseLabelSearchVariant>({ enabled, variant, wd, groupTitle, }: {
+declare function useDeptUsersEnterpriseLabelSearchGroup({ enabled, wd, groupTitle, }: {
     enabled: boolean;
-    variant: V;
     wd?: string;
     groupTitle: string;
 }): {
-    searchGroup: V extends 'department' ? DepartmentEnterpriseLabelSearchGroup | null : MemberEnterpriseLabelSearchGroup | null;
+    searchGroup: EnterpriseLabelSearchGroup | null;
     loading: boolean;
 };
 export { useDeptUsersEnterpriseLabelSearchGroup };

package/dist/components/DeptsMemberSelector/utils/deptUsersOrgDepartmentsData.d.ts

@@ -0,0 +1,30 @@
+type DeptUsersOrgDockReadiness = {
+    isDockDisabled: boolean;
+    isInternalDisabled: boolean;
+    readyInternal: boolean;
+    readyExternal: boolean;
+    dockEnabled: boolean;
+};
+type DeptUsersOrgCounts = {
+    departmentsCount: number;
+    labelCorpCount: number;
+};
+type DeptUsersOrgPayload = {
+    departments_count?: number;
+    label_corp_count?: number;
+    departments?: unknown[];
+    label_corp_list?: unknown[];
+};
+/**
+ * 配置层预拉/请求门控：hasDeptDock 优先于 hasDock:false。
+ * readyGate 为 false 时两侧都不请求（如搜索未启用）。
+ */
+declare const resolveDeptUsersOrgDockReadiness: ({ hasDock, hasDeptDock, readyGate, }: {
+    hasDock?: boolean;
+    hasDeptDock?: boolean;
+    readyGate?: boolean;
+}) => DeptUsersOrgDockReadiness;
+/** 双路响应 count 交叉兜底：内部优先 departments_count，外部优先 label_corp_count。 */
+declare const mergeDeptUsersOrgCounts: (internal?: DeptUsersOrgPayload | null, external?: DeptUsersOrgPayload | null) => DeptUsersOrgCounts;
+export { resolveDeptUsersOrgDockReadiness, mergeDeptUsersOrgCounts };
+export type { DeptUsersOrgDockReadiness, DeptUsersOrgCounts, DeptUsersOrgPayload };

package/dist/components/DeptsMemberSelector/utils/deptUsersOrganizationSearchGroup.d.ts

@@ -0,0 +1,25 @@
+import { ReactNode } from 'react';
+type OrganizationSearchChild = {
+    _id: string | number;
+    value: string | number;
+    name: string;
+    type?: string;
+    title: ReactNode;
+    [key: string]: unknown;
+};
+type OrganizationSearchGroup = {
+    title: string;
+    value: string;
+    children: OrganizationSearchChild[];
+};
+/** deptusers 组织架构本地搜索；与面板共用 department/list 预拉缓存。 */
+declare const useDeptUsersOrganizationSearchGroup: ({ enabled, wd, groupTitle, externalLabel, }: {
+    enabled: boolean;
+    wd?: string;
+    groupTitle: string;
+    externalLabel: string;
+}) => {
+    searchGroup: OrganizationSearchGroup | null;
+    loading: boolean;
+};
+export { useDeptUsersOrganizationSearchGroup };

package/dist/components/DeptsMemberSelector/utils/deptUsersRelationSearchGroup.d.ts

@@ -1,18 +1,7 @@
 import { ReactNode } from 'react';
 import { ENTITY_ITEM_TYPE } from './entityItemType';
 import { RequestContext } from '../types/selector';
-type RelationSearchVariant = 'department' | 'member';
-type DepartmentRelationSearchGroup = {
-    title: string;
-    _id: string;
-    children: Array<{
-        _id: string;
-        name: string;
-        type: typeof ENTITY_ITEM_TYPE.RELATION;
-        title: ReactNode;
-    }>;
-};
-type MemberRelationSearchGroup = {
+type RelationSearchGroup = {
     title: string;
     value: string;
     children: Array<{
@@ -23,15 +12,14 @@ type MemberRelationSearchGroup = {
         title: ReactNode;
     }>;
 };
-declare function useDeptUsersRelationSearchGroup<V extends RelationSearchVariant>({ enabled, variant, requestContext, wd, groupTitle, }: {
+declare function useDeptUsersRelationSearchGroup({ enabled, requestContext, wd, groupTitle, }: {
     enabled: boolean;
-    variant: V;
     requestContext: RequestContext;
     wd?: string;
     groupTitle: string;
 }): {
-    searchGroup: V extends 'department' ? DepartmentRelationSearchGroup | null : MemberRelationSearchGroup | null;
+    searchGroup: RelationSearchGroup | null;
     loading: boolean;
 };
 export { useDeptUsersRelationSearchGroup };
-export type { RelationSearchVariant, DepartmentRelationSearchGroup, MemberRelationSearchGroup };
+export type { RelationSearchGroup };

package/dist/components/DeptsMemberSelector/utils/deptUsersRoleModel.d.ts

@@ -0,0 +1,43 @@
+type RoleSourceItem = {
+    _id: string;
+    role_id: string | number;
+    name: string;
+    type?: string | number;
+    parent?: string | number;
+    children?: RoleSourceItem[];
+};
+/** roleChildEnable:true 用的可勾选树节点：分组 checkable:false，叶子 checkable:true。 */
+type InternalRolePickNode = RoleSourceItem & {
+    checkable: boolean;
+    children?: InternalRolePickNode[];
+};
+type RoleLeafSelection = {
+    _id: string;
+    name: string;
+    type: 'role';
+    role_id?: string | number;
+};
+type RoleGroupScopeSelection = {
+    _id: string;
+    name: string;
+    type: 'rolegroup';
+};
+declare const ROLE_GROUP_SCOPE_SUFFIX = "-roleGroup";
+declare const ROLE_GROUP_SUB_SCOPE_SUFFIX = "-roleGroupSub";
+declare const toStoredId: (role: Pick<RoleSourceItem, "_id">) => string;
+declare const isRoleGroupNode: (role?: RoleSourceItem | null) => boolean;
+declare const normalizeRole: (role: RoleSourceItem) => RoleSourceItem;
+declare const toRoleGroupScopeId: (storedId: string) => string;
+declare const toRoleGroupSubScopeId: (storedId: string) => string;
+declare const toRoleLeafSelection: (role: RoleSourceItem) => RoleLeafSelection;
+declare const toRoleGroupCurrentScopeSelection: (role: RoleSourceItem) => RoleGroupScopeSelection;
+declare const toRoleGroupSubScopeSelection: (role: RoleSourceItem) => RoleGroupScopeSelection;
+/** 展平内部角色树：叶子 + 分组（不含「及子分组」范围 option）。 */
+declare const collectSearchableRoles: (nodes: RoleSourceItem[]) => RoleSourceItem[];
+declare const findRoleByStoredId: (roles: RoleSourceItem[], id?: string) => RoleSourceItem | undefined;
+declare const markInternalRolePickTree: (nodes: RoleSourceItem[]) => InternalRolePickNode[];
+declare const toRoleSearchSelection: (item: RoleSourceItem) => (RoleLeafSelection | RoleGroupScopeSelection) & {
+    value: string;
+};
+export { ROLE_GROUP_SCOPE_SUFFIX, ROLE_GROUP_SUB_SCOPE_SUFFIX, collectSearchableRoles, findRoleByStoredId, isRoleGroupNode, markInternalRolePickTree, normalizeRole, toRoleGroupCurrentScopeSelection, toRoleGroupScopeId, toRoleGroupSubScopeId, toRoleGroupSubScopeSelection, toRoleLeafSelection, toRoleSearchSelection, toStoredId, };
+export type { InternalRolePickNode, RoleGroupScopeSelection, RoleLeafSelection, RoleSourceItem };