@blueking/bk-user-selector 0.0.37 → 0.0.38-beta.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/bk-user-selector",
-  "version": "0.0.37",
+  "version": "0.0.38-beta.2",
   "description": "蓝鲸用户选择器",
   "license": "MIT",
   "author": "Tencent BlueKing",
@@ -66,4 +66,4 @@
   "engines": {
     "node": ">=18.16.0"
   }
-}
+}

package/typings/api/user.d.ts

@@ -1,4 +1,4 @@
-import { type User, type Tenant, type FormattedUser } from '../types';
+import type { FormattedUser, Tenant, User } from '../types';
 /**
  * 获取本租户所有数据来源的租户信息
  * @param apiBaseUrl - API基础URL
@@ -15,9 +15,9 @@ export declare const getTenants: (apiBaseUrl: string, tenantId: string) => Promi
  */
 export declare const searchUsers: (params: {
     apiBaseUrl: string;
-    tenantId: string;
-    keyword: string;
     enableMultiTenantMode?: boolean;
+    keyword: string;
+    tenantId: string;
 }) => Promise<User[]>;
 /**
  * 批量精准查找用户
@@ -29,10 +29,10 @@ export declare const searchUsers: (params: {
  */
 export declare const lookupUsers: (params: {
     apiBaseUrl: string;
-    tenantId: string;
+    enableMultiTenantMode?: boolean;
     exactSearchKey: string;
+    tenantId: string;
     usersList: string[];
-    enableMultiTenantMode?: boolean;
 }) => Promise<User[]>;
 /**
  * 将API返回的用户数据格式化为组件所需格式
@@ -47,9 +47,9 @@ export declare const formatUsers: (users: User[], enableMultiTenantMode?: boolea
  * @returns 用户列表
  */
 export declare const getUserList: (url: string, params: {
-    userIds?: string[];
+    appCode?: string;
     keyword?: string;
-    pageSize?: number;
     page?: number;
-    appCode?: string;
+    pageSize?: number;
+    userIds?: string[];
 }) => Promise<User[]>;

package/typings/components/multiple-selector.vue.d.ts

@@ -5,12 +5,16 @@ declare const _default: import("vue").DefineComponent<MultipleSelectorProps, {},
     "update:selectedUsers": (...args: any[]) => void;
     "add-user": (...args: any[]) => void;
     "remove-user": (...args: any[]) => void;
+    dragStart: (...args: any[]) => void;
+    dragEnd: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<MultipleSelectorProps> & Readonly<{
     onBlur?: ((...args: any[]) => any) | undefined;
     onFocus?: ((...args: any[]) => any) | undefined;
     "onUpdate:selectedUsers"?: ((...args: any[]) => any) | undefined;
     "onAdd-user"?: ((...args: any[]) => any) | undefined;
     "onRemove-user"?: ((...args: any[]) => any) | undefined;
+    onDragStart?: ((...args: any[]) => any) | undefined;
+    onDragEnd?: ((...args: any[]) => any) | undefined;
 }>, {
     tenantId: string;
     apiBaseUrl: string;
@@ -18,21 +22,21 @@ declare const _default: import("vue").DefineComponent<MultipleSelectorProps, {},
     currentUserId: string;
     tenants: Record<string, string>;
     userGroup: {
-        id: string;
-        name: string;
         hidden
         /**
          * 多选模式用户选择器组件
          */
         ?: boolean;
+        id: string;
+        name: string;
     }[];
     userGroupName: string;
     emptyText: string;
     draggable: boolean;
     modelValue: string[];
     selectedUsers: FormattedUser[];
-    placeholder: string;
-    excludeUserIds: string[];
     allowCreate: boolean;
+    excludeUserIds: string[];
+    placeholder: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/typings/components/selection-popover.vue.d.ts

@@ -76,9 +76,9 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
      */
     userGroup: {
         type: () => {
+            hidden?: boolean;
             id: string;
             name: string;
-            hidden?: boolean;
         }[];
         default: () => never[];
     };
@@ -167,9 +167,9 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
      */
     userGroup: {
         type: () => {
+            hidden?: boolean;
             id: string;
             name: string;
-            hidden?: boolean;
         }[];
         default: () => never[];
     };
@@ -206,9 +206,9 @@ declare const __VLS_component: import("vue").DefineComponent<import("vue").Extra
     options: FormattedUser[];
     searchQuery: string;
     userGroup: {
+        hidden?: boolean;
         id: string;
         name: string;
-        hidden?: boolean;
     }[];
     userGroupName: string;
     emptyText: string;

package/typings/components/single-selector.vue.d.ts

@@ -15,18 +15,18 @@ declare const _default: import("vue").DefineComponent<SingleSelectorProps, {}, {
     exactSearchKey: string;
     currentUserId: string;
     userGroup: {
-        id: string;
-        name: string;
         hidden
         /**
          * 单选模式用户选择器组件
          */
         ?: boolean;
+        id: string;
+        name: string;
     }[];
     userGroupName: string;
     emptyText: string;
     modelValue: string;
-    placeholder: string;
     excludeUserIds: string[];
+    placeholder: string;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/typings/components/user-selector.vue.d.ts

@@ -3,11 +3,15 @@ declare const _default: import("vue").DefineComponent<UserSelectorProps, {}, {},
     blur: (...args: any[]) => void;
     change: (...args: any[]) => void;
     focus: (...args: any[]) => void;
+    dragStart: (...args: any[]) => void;
+    dragEnd: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<UserSelectorProps> & Readonly<{
     onBlur?: ((...args: any[]) => any) | undefined;
     onChange?: ((...args: any[]) => any) | undefined;
     onFocus?: ((...args: any[]) => any) | undefined;
+    onDragStart?: ((...args: any[]) => any) | undefined;
+    onDragEnd?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
 }>, {
     tenantId: string;
@@ -17,22 +21,22 @@ declare const _default: import("vue").DefineComponent<UserSelectorProps, {}, {},
     currentUserId: string;
     disabled: boolean;
     userGroup: {
-        id: string;
-        name: string;
         hidden
         /**
          * 蓝鲸用户选择器组件
          * @module components/UserSelector
          */
         ?: boolean;
+        id: string;
+        name: string;
     }[];
     userGroupName: string;
     emptyText: string;
     draggable: boolean;
     modelValue: string | string[];
-    placeholder: string;
-    excludeUserIds: string[];
     allowCreate: boolean;
+    excludeUserIds: string[];
+    placeholder: string;
     multiple: boolean;
 }, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;

package/typings/components/user-tag.vue.d.ts

@@ -2,13 +2,9 @@ import { createVNode, VNode } from 'vue';
 import { FormattedUser } from '../types';
 declare const _default: import("vue").DefineComponent<{
     /**
-     * 用户信息
-     */
-    user: FormattedUser;
-    /**
-     * 租户数据映射
+     * 是否激活状态
      */
-    tenants: Record<string, string>;
+    active?: boolean;
     /**
      * 当前租户ID
      */
@@ -18,29 +14,29 @@ declare const _default: import("vue").DefineComponent<{
      */
     draggable?: boolean;
     /**
-     * 是否激活状态
+     * 渲染标签
      */
-    active?: boolean;
+    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
     /**
      * 是否显示租户信息
      */
     showTenant?: boolean;
     /**
-     * 渲染标签
+     * 租户数据映射
      */
-    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
-}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
-    click: (...args: any[]) => void;
-    close: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<{
+    tenants: Record<string, string>;
     /**
      * 用户信息
      */
     user: FormattedUser;
+}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+    click: (...args: any[]) => void;
+    close: (...args: any[]) => void;
+}, string, import("vue").PublicProps, Readonly<{
     /**
-     * 租户数据映射
+     * 是否激活状态
      */
-    tenants: Record<string, string>;
+    active?: boolean;
     /**
      * 当前租户ID
      */
@@ -50,17 +46,21 @@ declare const _default: import("vue").DefineComponent<{
      */
     draggable?: boolean;
     /**
-     * 是否激活状态
+     * 渲染标签
      */
-    active?: boolean;
+    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
     /**
      * 是否显示租户信息
      */
     showTenant?: boolean;
     /**
-     * 渲染标签
+     * 租户数据映射
      */
-    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
+    tenants: Record<string, string>;
+    /**
+     * 用户信息
+     */
+    user: FormattedUser;
 }> & Readonly<{
     onClick?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;

package/typings/hooks/use-jsonp.d.ts

@@ -1,19 +1,19 @@
 import { type MaybeRef, type ShallowRef } from 'vue';
 export interface JSONPOptions {
-    /** 超时时间（毫秒），默认为 2 * 60 * 1000 */
-    timeout?: number;
     /** 请求参数 */
     params?: Record<string, string | undefined>;
+    /** 超时时间（毫秒），默认为 2 * 60 * 1000 */
+    timeout?: number;
     /** 是否携带凭证（cookie），默认为 true */
     withCredentials?: boolean;
 }
 export interface JSONPResult<T> {
     /** 响应数据 */
-    data: ShallowRef<T | null>;
-    /** 加载状态 */
-    loading: ShallowRef<boolean>;
+    data: ShallowRef<null | T>;
     /** 错误信息 */
     error: ShallowRef<Error | null>;
+    /** 加载状态 */
+    loading: ShallowRef<boolean>;
     /** 手动触发请求的函数 */
     refetch: () => void;
 }

package/typings/hooks/useUserSearch.d.ts

@@ -3,7 +3,7 @@
  * @module hooks/useUserSearch
  */
 import { type Ref } from 'vue';
-import { type FormattedUser } from '../types';
+import type { FormattedUser } from '../types';
 /**
  * 使用用户搜索的Hook
  * @param apiBaseUrl - API基础URL

package/typings/types/index.d.ts

@@ -1,62 +1,63 @@
-import { type createVNode } from 'vue';
+import type { createVNode } from 'vue';
 import type { VNode } from 'vue';
 /**
- * 用户对象接口
+ * 格式化后的用户信息
  */
-export interface User {
-    /**
-     * 用户名
-     */
-    bk_username: string;
-    /**
-     * 显示名称
-     */
-    display_name: string;
+export interface FormattedUser {
     /**
-     * 所属租户ID
+     * 其他属性
      */
-    owner_tenant_id: string;
+    [key: string]: boolean | string | undefined;
     /**
-     * 数据源类型
+     * 是否隐藏
      */
-    data_source_type: string;
+    hidden?: boolean;
     /**
-     * 全名
+     * 用户ID
      */
-    full_name: string;
+    id: string;
     /**
-     * 登录名, 对应内网企微英文名
+     * 用户名称
      */
-    login_name: string;
+    name: string;
     /**
-     * 用户名 旧版
+     * 租户ID
      */
-    username: string;
+    tenantId: string;
 }
 /**
- * 格式化后的用户信息
+ * 多选模式属性
  */
-export interface FormattedUser {
+export interface MultipleSelectorProps extends BaseSelectorProps {
     /**
-     * 用户ID
+     * 是否支持拖拽排序
      */
-    id: string;
+    draggable?: boolean;
     /**
-     * 用户名称
+     * 选中的用户ID列表
      */
-    name: string;
+    modelValue: string[];
     /**
-     * 租户ID
+     * 已选用户列表
      */
-    tenantId: string;
+    selectedUsers: FormattedUser[];
     /**
-     * 是否隐藏
+     * 租户信息映射
      */
-    hidden?: boolean;
+    tenants: Record<string, string>;
+}
+/**
+ * 单选模式属性
+ */
+export interface SingleSelectorProps extends BaseSelectorProps {
     /**
-     * 其他属性
+     * 选中的用户ID
      */
-    [key: string]: boolean | string | undefined;
+    modelValue?: string;
+    /**
+     * 租户信息映射
+     */
+    tenants: Record<string, string>;
 }
 /**
  * 租户信息
@@ -72,119 +73,118 @@ export interface Tenant {
     name: string;
 }
 /**
- * 基础选择器属性
+ * 用户对象接口
  */
-interface BaseSelectorProps {
+export interface User {
     /**
-     * 接口基础URL
+     * 用户名
      */
-    apiBaseUrl: string;
+    bk_username: string;
     /**
-     * 租户ID
+     * 数据源类型
      */
-    tenantId: string;
+    data_source_type: string;
     /**
-     * 占位文字
+     * 显示名称
      */
-    placeholder?: string;
+    display_name: string;
     /**
-     * 本人ID
+     * 全名
      */
-    currentUserId?: string;
+    full_name: string;
     /**
-     * 精确查找key
+     * 登录名, 对应内网企微英文名
      */
-    exactSearchKey?: string;
+    login_name: string;
     /**
-     * 用户组配置
+     * 所属租户ID
      */
-    userGroup?: {
-        id: string;
-        name: string;
-        hidden?: boolean;
-    }[];
+    owner_tenant_id: string;
     /**
-     * 用户组名称
+     * 用户名 旧版
      */
-    userGroupName?: string;
+    username: string;
+}
+/**
+ * 用户选择器属性
+ */
+export interface UserSelectorProps extends BaseSelectorProps {
     /**
-     * 无匹配人员时的提示文本
+     * 是否支持拖拽排序
      */
-    emptyText?: string;
+    draggable?: boolean;
     /**
-     * 是否禁用
+     * 默认选中的用户(单选时为字符串，多选时为数组)
      */
-    disabled?: boolean;
+    modelValue?: string | string[];
     /**
-     * 渲染列表项
+     * 是否多选
      */
-    renderListItem?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
+    multiple?: boolean;
+}
+/**
+ * 基础选择器属性
+ */
+interface BaseSelectorProps {
     /**
-     * 渲染标签
+     * 是否允许创建用户
      */
-    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
+    allowCreate?: boolean;
     /**
-     * 排除的用户ID列表
+     * 接口基础URL
      */
-    excludeUserIds?: string[];
+    apiBaseUrl: string;
     /**
-     * 是否启用多租户模式
+     * 本人ID
      */
-    enableMultiTenantMode?: boolean;
+    currentUserId?: string;
     /**
-     * 是否允许创建用户
+     * 是否禁用
      */
-    allowCreate?: boolean;
-}
-/**
- * 用户选择器属性
- */
-export interface UserSelectorProps extends BaseSelectorProps {
+    disabled?: boolean;
     /**
-     * 默认选中的用户(单选时为字符串，多选时为数组)
+     * 无匹配人员时的提示文本
      */
-    modelValue?: string | string[];
+    emptyText?: string;
     /**
-     * 是否支持拖拽排序
+     * 是否启用多租户模式
      */
-    draggable?: boolean;
+    enableMultiTenantMode?: boolean;
     /**
-     * 是否多选
+     * 精确查找key
      */
-    multiple?: boolean;
-}
-/**
- * 单选模式属性
- */
-export interface SingleSelectorProps extends BaseSelectorProps {
+    exactSearchKey?: string;
     /**
-     * 选中的用户ID
+     * 排除的用户ID列表
      */
-    modelValue?: string;
+    excludeUserIds?: string[];
     /**
-     * 租户信息映射
+     * 占位文字
      */
-    tenants: Record<string, string>;
-}
-/**
- * 多选模式属性
- */
-export interface MultipleSelectorProps extends BaseSelectorProps {
+    placeholder?: string;
     /**
-     * 选中的用户ID列表
+     * 租户ID
      */
-    modelValue: string[];
+    tenantId: string;
     /**
-     * 是否支持拖拽排序
+     * 用户组名称
      */
-    draggable?: boolean;
+    userGroupName?: string;
     /**
-     * 已选用户列表
+     * 渲染列表项
      */
-    selectedUsers: FormattedUser[];
+    renderListItem?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
     /**
-     * 租户信息映射
+     * 渲染标签
      */
-    tenants: Record<string, string>;
+    renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
+    /**
+     * 用户组配置
+     */
+    userGroup?: {
+        hidden?: boolean;
+        id: string;
+        name: string;
+    }[];
 }
 export {};

package/typings/utils/common.d.ts

@@ -2,7 +2,7 @@
  * 通用工具函数
  * @module utils/common
  */
-import { type FormattedUser } from '../types';
+import type { FormattedUser } from '../types';
 /**
  * 防抖函数
  * @param fn - 需要防抖的函数