@blueking/bk-user-selector 0.0.28 → 0.0.29-beta.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/bk-user-selector",
-  "version": "0.0.28",
+  "version": "0.0.29-beta.1",
   "description": "蓝鲸用户选择器",
   "license": "MIT",
   "author": "Tencent BlueKing",
@@ -65,8 +65,5 @@
   },
   "engines": {
     "node": ">=18.16.0"
-  },
-  "devDependencies": {
-    "vite": "^6.2.2"
   }
 }

package/typings/api/user.d.ts

@@ -1,7 +1,3 @@
-/**
- * 用户选择器相关API
- * @module api/user
- */
 import { type User, type Tenant, type FormattedUser } from '../types';
 /**
  * 获取本租户所有数据来源的租户信息
@@ -17,7 +13,12 @@ export declare const getTenants: (apiBaseUrl: string, tenantId: string) => Promi
  * @param keyword - 搜索关键词
  * @returns 用户列表Promise
  */
-export declare const searchUsers: (apiBaseUrl?: string, tenantId?: string, keyword?: string) => Promise<User[]>;
+export declare const searchUsers: (params: {
+    apiBaseUrl: string;
+    tenantId: string;
+    keyword: string;
+    enableMultiTenantMode?: boolean;
+}) => Promise<User[]>;
 /**
  * 批量精准查找用户
  * @param apiBaseUrl - API基础URL
@@ -26,10 +27,29 @@ export declare const searchUsers: (apiBaseUrl?: string, tenantId?: string, keywo
  * @param exactSearchKey - 精确查找key
  * @returns 查找到的用户列表Promise
  */
-export declare const lookupUsers: (apiBaseUrl?: string, tenantId?: string, exactSearchKey?: string, usersList?: string[]) => Promise<User[]>;
+export declare const lookupUsers: (params: {
+    apiBaseUrl: string;
+    tenantId: string;
+    exactSearchKey: string;
+    usersList: string[];
+    enableMultiTenantMode?: boolean;
+}) => Promise<User[]>;
 /**
  * 将API返回的用户数据格式化为组件所需格式
  * @param users - API返回的用户列表
  * @returns 格式化后的用户列表
  */
 export declare const formatUsers: (users: User[]) => FormattedUser[];
+/**
+ * 获取用户列表 兼容旧版本的人员选择器
+ * @param url 请求的 URL
+ * @param params 请求参数
+ * @returns 用户列表
+ */
+export declare const getUserList: (url: string, params: {
+    userIds?: string[];
+    keyword?: string;
+    pageSize?: number;
+    page?: number;
+    appCode?: string;
+}) => Promise<User[]>;

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

@@ -1,4 +1,4 @@
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     /**
      * 当前用户ID
      */
@@ -13,7 +13,7 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     /**
@@ -30,10 +30,10 @@ declare const _default: import("vue").DefineComponent<{
         type: BooleanConstructor;
         default: boolean;
     };
-}>> & {
+}>> & Readonly<{
     onClick?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     currentUserId: string;
     isDisabled: boolean;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,42 +1,16 @@
 import { FormattedUser, MultipleSelectorProps } from '../types';
-declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<MultipleSelectorProps>, {
-    modelValue: () => never[];
-    placeholder: string;
-    draggable: boolean;
-    apiBaseUrl: string;
-    tenantId: string;
-    selectedUsers: () => never[];
-    tenants: () => {};
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-    excludeUserIds: () => never[];
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<MultipleSelectorProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:selectedUsers": (...args: any[]) => void;
     "add-user": (...args: any[]) => void;
     "remove-user": (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<MultipleSelectorProps>, {
-    modelValue: () => never[];
-    placeholder: string;
-    draggable: boolean;
-    apiBaseUrl: string;
-    tenantId: string;
-    selectedUsers: () => never[];
-    tenants: () => {};
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-    excludeUserIds: () => never[];
-}>>> & {
+}, string, import("vue").PublicProps, Readonly<MultipleSelectorProps> & Readonly<{
     "onUpdate:selectedUsers"?: ((...args: any[]) => any) | undefined;
     "onAdd-user"?: ((...args: any[]) => any) | undefined;
     "onRemove-user"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     tenantId: string;
+    apiBaseUrl: string;
+    exactSearchKey: string;
     currentUserId: string;
     tenants: Record<string, string>;
     userGroup: {
@@ -53,26 +27,7 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     draggable: boolean;
     modelValue: string[];
     selectedUsers: FormattedUser[];
-    apiBaseUrl: string;
     placeholder: string;
-    exactSearchKey: string;
     excludeUserIds: string[];
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};
-type __VLS_PrettifyLocal<T> = {
-    [K in keyof T]: T[K];
-} & {};

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

@@ -3,7 +3,7 @@
  */
 import { createVNode, VNode } from 'vue';
 import { FormattedUser } from '../types';
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     /**
      * 是否显示下拉菜单
      */
@@ -91,7 +91,7 @@ declare const _default: import("vue").DefineComponent<{
     renderListItem: {
         type: () => (h: typeof createVNode, item: FormattedUser) => VNode;
     };
-}, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}>, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "select-user": (...args: any[]) => void;
     "click-outside": (...args: any[]) => void;
 }, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
@@ -182,10 +182,10 @@ declare const _default: import("vue").DefineComponent<{
     renderListItem: {
         type: () => (h: typeof createVNode, item: FormattedUser) => VNode;
     };
-}>> & {
+}>> & Readonly<{
     "onSelect-user"?: ((...args: any[]) => any) | undefined;
     "onClick-outside"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     tenantId: string;
     tenants: Record<string, string>;
     isShow: boolean;
@@ -201,5 +201,5 @@ declare const _default: import("vue").DefineComponent<{
     }[];
     userGroupName: string;
     emptyText: string;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,34 +1,14 @@
 import { SingleSelectorProps } from '../types';
-declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<SingleSelectorProps>, {
-    apiBaseUrl: string;
-    tenantId: string;
-    placeholder: string;
-    modelValue: string;
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-    excludeUserIds: () => never[];
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<SingleSelectorProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<SingleSelectorProps>, {
-    apiBaseUrl: string;
-    tenantId: string;
-    placeholder: string;
-    modelValue: string;
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-    excludeUserIds: () => never[];
-}>>> & {
+}, string, import("vue").PublicProps, Readonly<SingleSelectorProps> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     tenantId: string;
+    apiBaseUrl: string;
+    exactSearchKey: string;
     currentUserId: string;
     userGroup: {
         id: string;
@@ -42,26 +22,7 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     userGroupName: string;
     emptyText: string;
     modelValue: string;
-    apiBaseUrl: string;
     placeholder: string;
-    exactSearchKey: string;
     excludeUserIds: string[];
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};
-type __VLS_PrettifyLocal<T> = {
-    [K in keyof T]: T[K];
-} & {};

package/typings/components/user-render.d.ts

@@ -1,5 +1,5 @@
 import type { FormattedUser } from '../types';
-declare const _default: import("vue").DefineComponent<{
+declare const _default: import("vue").DefineComponent<import("vue").ExtractPropTypes<{
     user: {
         type: () => FormattedUser;
         required: true;
@@ -16,7 +16,7 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         required: false;
     };
-}, () => any, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
+}>, () => any, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<{
     user: {
         type: () => FormattedUser;
         required: true;
@@ -33,5 +33,5 @@ declare const _default: import("vue").DefineComponent<{
         type: FunctionConstructor;
         required: false;
     };
-}>>, {}, {}>;
+}>> & Readonly<{}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, true, {}, any>;
 export default _default;

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

@@ -1,40 +1,15 @@
 import { UserSelectorProps } from '../types';
-declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_TypePropsToOption<UserSelectorProps>, {
-    apiBaseUrl: string;
-    tenantId: string;
-    placeholder: string;
-    modelValue: string;
-    draggable: boolean;
-    multiple: boolean;
-    disabled: boolean;
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-    excludeUserIds: () => never[];
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+declare const _default: import("vue").DefineComponent<UserSelectorProps, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_WithDefaults<__VLS_TypePropsToOption<UserSelectorProps>, {
-    apiBaseUrl: string;
-    tenantId: string;
-    placeholder: string;
-    modelValue: string;
-    draggable: boolean;
-    multiple: boolean;
-    disabled: boolean;
-    currentUserId: string;
-    exactSearchKey: string;
-    userGroup: () => never[];
-    userGroupName: string;
-    emptyText: string;
-    excludeUserIds: () => never[];
-}>>> & {
+}, string, import("vue").PublicProps, Readonly<UserSelectorProps> & Readonly<{
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
-}, {
+}>, {
     tenantId: string;
+    apiBaseUrl: string;
+    enableMultiTenantMode: boolean;
+    exactSearchKey: string;
     currentUserId: string;
     disabled: boolean;
     userGroup: {
@@ -51,27 +26,8 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     emptyText: string;
     draggable: boolean;
     modelValue: string | string[];
-    apiBaseUrl: string;
     placeholder: string;
-    exactSearchKey: string;
     excludeUserIds: string[];
     multiple: boolean;
-}, {}>;
+}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;
-type __VLS_WithDefaults<P, D> = {
-    [K in keyof Pick<P, keyof P>]: K extends keyof D ? __VLS_PrettifyLocal<P[K] & {
-        default: D[K];
-    }> : P[K];
-};
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};
-type __VLS_PrettifyLocal<T> = {
-    [K in keyof T]: T[K];
-} & {};

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

@@ -1,6 +1,6 @@
 import { createVNode, VNode } from 'vue';
 import { FormattedUser } from '../types';
-declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<{
+declare const _default: import("vue").DefineComponent<{
     /**
      * 用户信息
      */
@@ -29,10 +29,10 @@ declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<{
      * 渲染标签
      */
     renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
-}>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
+}, {}, {}, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     click: (...args: any[]) => void;
     close: (...args: any[]) => void;
-}, string, import("vue").PublicProps, Readonly<import("vue").ExtractPropTypes<__VLS_TypePropsToOption<{
+}, string, import("vue").PublicProps, Readonly<{
     /**
      * 用户信息
      */
@@ -61,17 +61,8 @@ declare const _default: import("vue").DefineComponent<__VLS_TypePropsToOption<{
      * 渲染标签
      */
     renderTag?: (h: typeof createVNode, userInfo: FormattedUser) => VNode;
-}>>> & {
+}> & Readonly<{
     onClick?: ((...args: any[]) => any) | undefined;
     onClose?: ((...args: any[]) => any) | undefined;
-}, {}, {}>;
+}>, {}, {}, {}, {}, string, import("vue").ComponentProvideOptions, false, {}, any>;
 export default _default;
-type __VLS_NonUndefinedable<T> = T extends undefined ? never : T;
-type __VLS_TypePropsToOption<T> = {
-    [K in keyof T]-?: {} extends Pick<T, K> ? {
-        type: import('vue').PropType<__VLS_NonUndefinedable<T[K]>>;
-    } : {
-        type: import('vue').PropType<T[K]>;
-        required: true;
-    };
-};

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

@@ -0,0 +1,29 @@
+import { type MaybeRef, type ShallowRef } from 'vue';
+export interface JSONPOptions {
+    /** 超时时间（毫秒），默认为 2 * 60 * 1000 */
+    timeout?: number;
+    /** 请求参数 */
+    params?: Record<string, string | undefined>;
+}
+export interface JSONPResult<T> {
+    /** 响应数据 */
+    data: ShallowRef<T | null>;
+    /** 加载状态 */
+    loading: ShallowRef<boolean>;
+    /** 错误信息 */
+    error: ShallowRef<Error | null>;
+    /** 手动触发请求的函数 */
+    refetch: () => void;
+}
+/**
+ * JSONP 请求函数
+ */
+export declare const jsonpRequest: <T>(requestUrl: MaybeRef<string>, options?: JSONPOptions) => Promise<T>;
+/**
+ * useJSONP
+ * @param url 请求的 URL，可以是字符串或 ref
+ * @param options JSONP 选项配置
+ * @returns JSONPResult 包含数据、加载状态、错误信息和重新请求函数
+ */
+export declare const useJSONP: <T = unknown>(url: MaybeRef<string>, options?: JSONPOptions) => JSONPResult<T>;
+export default useJSONP;

package/typings/hooks/useTenantData.d.ts

@@ -10,7 +10,7 @@ import { type Ref } from 'vue';
  * @returns 租户数据和加载状态
  */
 export declare const useTenantData: (apiBaseUrl: string, tenantId: string) => {
-    tenants: Ref<Record<string, string>>;
-    loading: Ref<boolean>;
+    tenants: Ref<Record<string, string>, Record<string, string>>;
+    loading: Ref<boolean, boolean>;
     fetchTenants: () => Promise<void>;
 };

package/typings/hooks/useUserSearch.d.ts

@@ -11,9 +11,9 @@ import { type FormattedUser } from '../types';
  * @returns 用户搜索相关状态和方法
  */
 export declare const useUserSearch: (apiBaseUrl: string, tenantId: string) => {
-    searchResults: Ref<FormattedUser[]>;
-    loading: Ref<boolean>;
-    searchQuery: Ref<string>;
+    searchResults: Ref<FormattedUser[], FormattedUser[]>;
+    loading: Ref<boolean, boolean>;
+    searchQuery: Ref<string, string>;
     performSearch: (keyword: string) => Promise<void>;
     handleSearchInput: (value: string) => void;
     clearSearch: () => void;

package/typings/types/index.d.ts

@@ -28,6 +28,10 @@ export interface User {
      * 登录名, 对应内网企微英文名
      */
     login_name: string;
+    /**
+     * 用户名 旧版
+     */
+    username: string;
 }
 /**
  * 格式化后的用户信息
@@ -123,6 +127,10 @@ interface BaseSelectorProps {
      * 排除的用户ID列表
      */
     excludeUserIds?: string[];
+    /**
+     * 是否启用多租户模式
+     */
+    enableMultiTenantMode?: boolean;
 }
 /**
  * 用户选择器属性