@blueking/bk-user-selector 0.0.3 → 0.0.4

package/README.md

@@ -57,6 +57,7 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
     :api-base-url="apiBaseUrl"
     :tenant-id="tenantId"
     :current-user-id="currentUserId"
+    :exact-key="exactKey"
     @change="handleUserChange"
   />
 
@@ -66,6 +67,7 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
     :api-base-url="apiBaseUrl"
     :tenant-id="tenantId"
     :current-user-id="currentUserId"
+    :exact-key="exactKey"
     :multiple="true"
     :draggable="true"
     @change="handleUsersChange"
@@ -80,7 +82,9 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
   // 租户 ID
   const tenantId = ref('default');
   // 当前用户ID
-  const currentUserId = ref('admin'); 
+  const currentUserId = ref('admin');
+  // 精确查找key
+  const exactKey = ref('bk_username');
   // 单选选中值
   const selectedUser = ref('');
   // 多选选中值
@@ -102,17 +106,18 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
 
 ### 属性
 
-| 参数                 | 说明                             | 类型           | 默认值               |
-| -------------------- | -------------------------------- | -------------- | -------------------- |
-| modelValue / v-model | 绑定值，单选为字符串，多选为数组 | String / Array | '' / []              |
-| label                | 文本标签                         | String         | '人员选择'           |
-| required             | 是否必填                         | Boolean        | false                |
-| placeholder          | 占位文本                         | String         | '请输入人员名称搜索' |
-| multiple             | 是否多选                         | Boolean        | false                |
-| draggable            | 是否可拖拽（仅多选模式有效）     | Boolean        | false                |
-| apiBaseUrl           | API 基础 URL                     | String         | ''                   |
-| tenantId             | 租户 ID                          | String         | ''                   |
-| currentUserId        | 当前用户ID（用于快速选择"我"）   | String         | ''                   |
+| 参数                 | 说明                                                                    | 类型           | 默认值               |
+| -------------------- | ----------------------------------------------------------------------- | -------------- | -------------------- |
+| modelValue / v-model | 绑定值，单选为字符串，多选为数组                                        | String / Array | '' / []              |
+| label                | 文本标签                                                                | String         | '人员选择'           |
+| required             | 是否必填                                                                | Boolean        | false                |
+| placeholder          | 占位文本                                                                | String         | '请输入人员名称搜索' |
+| multiple             | 是否多选                                                                | Boolean        | false                |
+| draggable            | 是否可拖拽（仅多选模式有效）                                            | Boolean        | false                |
+| apiBaseUrl           | API 基础 URL                                                            | String         | ''                   |
+| tenantId             | 租户 ID                                                                 | String         | ''                   |
+| exactKey             | 精确查找key,可选值为 bk_username、login_name、full_name, 多个以逗号分隔 | String         | 'bk_username'        |
+| currentUserId        | 当前用户ID（用于快速选择"我"）                                          | String         | ''                   |
 
 ### 事件
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@blueking/bk-user-selector",
-  "version": "0.0.3",
+  "version": "0.0.4",
   "description": "蓝鲸用户选择器",
   "license": "MIT",
   "author": "Tencent BlueKing",

package/typings/api/user.d.ts

@@ -23,9 +23,10 @@ export declare const searchUsers: (apiBaseUrl?: string, tenantId?: string, keywo
  * @param apiBaseUrl - API基础URL
  * @param tenantId - 租户ID
  * @param users - 用户名列表
+ * @param exactKey - 精确查找key
  * @returns 查找到的用户列表Promise
  */
-export declare const lookupUsers: (apiBaseUrl?: string, tenantId?: string, users?: string[]) => Promise<User[]>;
+export declare const lookupUsers: (apiBaseUrl?: string, tenantId?: string, exactKey?: string, users?: string[]) => Promise<User[]>;
 /**
  * 将API返回的用户数据格式化为组件所需格式
  * @param users - API返回的用户列表

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

@@ -56,6 +56,13 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    /**
+     * 精确查找key
+     */
+    exactKey: {
+        type: StringConstructor;
+        default: string;
+    };
 }, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     "update:selectedUsers": (...args: any[]) => void;
     "add-user": (...args: any[]) => void;
@@ -117,6 +124,13 @@ declare const _default: import("vue").DefineComponent<{
         type: StringConstructor;
         default: string;
     };
+    /**
+     * 精确查找key
+     */
+    exactKey: {
+        type: StringConstructor;
+        default: string;
+    };
 }>> & {
     "onUpdate:selectedUsers"?: ((...args: any[]) => any) | undefined;
     "onAdd-user"?: ((...args: any[]) => any) | undefined;
@@ -130,5 +144,6 @@ declare const _default: import("vue").DefineComponent<{
     tenantId: string;
     selectedUsers: FormattedUser[];
     currentUserId: string;
+    exactKey: string;
 }, {}>;
 export default _default;

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

@@ -7,6 +7,7 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     draggable: boolean;
     multiple: boolean;
     currentUserId: string;
+    exactKey: string;
 }>, {}, unknown, {}, {}, import("vue").ComponentOptionsMixin, import("vue").ComponentOptionsMixin, {
     change: (...args: any[]) => void;
     "update:modelValue": (...args: any[]) => void;
@@ -18,6 +19,7 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     draggable: boolean;
     multiple: boolean;
     currentUserId: string;
+    exactKey: string;
 }>>> & {
     onChange?: ((...args: any[]) => any) | undefined;
     "onUpdate:modelValue"?: ((...args: any[]) => any) | undefined;
@@ -28,6 +30,7 @@ declare const _default: import("vue").DefineComponent<__VLS_WithDefaults<__VLS_T
     apiBaseUrl: string;
     tenantId: string;
     currentUserId: string;
+    exactKey: string;
     multiple: boolean;
 }, {}>;
 export default _default;

package/typings/types/index.d.ts

@@ -19,7 +19,7 @@ export interface User {
      */
     full_name: string;
     /**
-     * 登录名
+     * 登录名, 对应内网企微英文名
      */
     login_name: string;
     /**
@@ -89,6 +89,10 @@ export interface UserSelectorProps {
      * 本人ID
      */
     currentUserId?: string;
+    /**
+     * 精确查找key, 默认是 bk_username, 可选值为 bk_username、login_name、full_name, 多个以逗号分隔
+     */
+    exactKey?: string;
 }
 /**
  * 单选模式属性
@@ -118,4 +122,8 @@ export interface SingleSelectorProps {
      * 本人ID
      */
     currentUserId?: string;
+    /**
+     * 精确查找key
+     */
+    exactKey?: string;
 }

package/vue2/index.es.min.js

@@ -2,7 +2,7 @@ import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "@blueking/bkui-library";
 import { ref, onBeforeMount, defineComponent, createBlock, openBlock, unref, withModifiers, normalizeClass, withCtx, createElementVNode, createElementBlock, createCommentVNode, toDisplayString, watch, nextTick, onMounted, withDirectives, createVNode, Fragment, renderList, isRef, vModelText, createTextVNode, computed, pushScopeId, popScopeId, createApp, h as h$1 } from "@blueking/bkui-library";
 const getTenants = async (apiBaseUrl, tenantId) => {
   if (!apiBaseUrl || !tenantId) {
-    console.warn("获取租户信息需要提供有效的API基础URL和租户ID");
+    console.warn("获取租户信息需要提供有效的apiBaseUrl和租户ID");
     return [];
   }
   try {
@@ -26,7 +26,7 @@ const getTenants = async (apiBaseUrl, tenantId) => {
 };
 const searchUsers = async (apiBaseUrl = "", tenantId = "", keyword = "") => {
   if (!keyword || !apiBaseUrl || !tenantId) {
-    console.warn("搜索用户需要提供有效的API基础URL、租户ID和关键词");
+    console.warn("搜索用户需要提供有效的apiBaseUrl、租户ID和关键词");
     return [];
   }
   try {
@@ -48,13 +48,13 @@ const searchUsers = async (apiBaseUrl = "", tenantId = "", keyword = "") => {
     return [];
   }
 };
-const lookupUsers = async (apiBaseUrl = "", tenantId = "", users = []) => {
+const lookupUsers = async (apiBaseUrl = "", tenantId = "", exactKey = "bk_username", users = []) => {
   if (users.length === 0 || !apiBaseUrl || !tenantId) {
-    console.warn("批量查找用户需要提供有效的API基础URL、租户ID和至少一个用户名");
+    console.warn("批量查找用户需要提供有效的apiBaseUrl、租户ID和至少一个用户名");
     return [];
   }
   try {
-    const url = `${apiBaseUrl}/api/v3/open-web/tenant/users/-/lookup/?lookups=${users.join(",")}&lookup_fields=bk_username`;
+    const url = `${apiBaseUrl}/api/v3/open-web/tenant/users/-/lookup/?lookups=${users.join(",")}&lookup_fields=${exactKey}`;
     const response = await fetch(url, {
       method: "GET",
       headers: {
@@ -16776,6 +16776,13 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     currentUserId: {
       type: String,
       default: ""
+    },
+    /**
+     * 精确查找key
+     */
+    exactKey: {
+      type: String,
+      default: "bk_username"
     }
   },
   emits: ["update:selectedUsers", "add-user", "remove-user"],
@@ -16816,7 +16823,6 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           const [movedUser] = updatedUsers.splice(oldIndex, 1);
           updatedUsers.splice(newIndex, 0, movedUser);
           emit("update:selectedUsers", updatedUsers);
-          activeTagIndex.value = newIndex;
         }
       });
     };
@@ -16892,7 +16898,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const addCurrentUser = async () => {
       if (!props2.currentUserId || props2.selectedUsers.some((user) => user.id === props2.currentUserId)) return;
       try {
-        const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, [props2.currentUserId]);
+        const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactKey, [props2.currentUserId]);
         const formattedUsers = formatUsers(result);
         if (formattedUsers.length > 0) {
           if (!props2.selectedUsers.some((item) => item.id === formattedUsers[0].id)) {
@@ -16913,7 +16919,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       if (pastedText.trim()) {
         try {
           const users = pastedText.trim().split(/[,，;\n\s]+/).filter(Boolean);
-          const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, users);
+          const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactKey, users);
           const formattedUsers = formatUsers(result);
           if (formattedUsers.length > 0) {
             const updatedUsers = [...props2.selectedUsers, ...formattedUsers];
@@ -16943,8 +16949,16 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const addUser = (user) => {
       if (!(user == null ? void 0 : user.id)) return;
       if (!props2.selectedUsers.some((item) => item.id === user.id)) {
-        const updatedUsers = [...props2.selectedUsers, user];
-        emit("update:selectedUsers", updatedUsers);
+        if (activeTagIndex.value !== -1) {
+          const updatedUsers = [
+            ...props2.selectedUsers.slice(0, activeTagIndex.value + 1),
+            user,
+            ...props2.selectedUsers.slice(activeTagIndex.value + 1)
+          ];
+          emit("update:selectedUsers", updatedUsers);
+        } else {
+          emit("update:selectedUsers", [...props2.selectedUsers, user]);
+        }
         emit("add-user", user);
       }
       searchQuery.value = "";
@@ -17243,8 +17257,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-0bc02f6f"]]);
-const _withScopeId = (n2) => (pushScopeId("data-v-02788d3d"), n2 = n2(), popScopeId(), n2);
+const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-55945956"]]);
+const _withScopeId = (n2) => (pushScopeId("data-v-d17d0282"), n2 = n2(), popScopeId(), n2);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = {
   key: 0,
@@ -17278,7 +17292,8 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     apiBaseUrl: {},
     tenantId: {},
     tenants: {},
-    currentUserId: {}
+    currentUserId: {},
+    exactKey: {}
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -17298,7 +17313,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (typeof props2.modelValue === "string" && props2.modelValue) {
         try {
           isLoading.value = true;
-          const result = await lookupUsers(props2.apiBaseUrl || "", props2.tenantId || "", [props2.modelValue]);
+          const result = await lookupUsers(props2.apiBaseUrl || "", props2.tenantId || "", props2.exactKey, [
+            props2.modelValue
+          ]);
           options.value = formatUsers(result);
         } catch (error3) {
           console.error("获取用户信息失败:", error3);
@@ -17310,7 +17327,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const addCurrentUser = async () => {
       if (!props2.currentUserId || selectedUser.value === props2.currentUserId) return;
       try {
-        const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, [props2.currentUserId]);
+        const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactKey, [props2.currentUserId]);
         const formattedResults = formatUsers(result);
         if (formattedResults.length > 0) {
           options.value = formattedResults;
@@ -17486,7 +17503,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-02788d3d"]]);
+const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-d17d0282"]]);
 const _hoisted_1 = { class: "bk-user-selector" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
@@ -17500,7 +17517,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     modelValue: { default: "" },
     draggable: { type: Boolean, default: false },
     multiple: { type: Boolean, default: false },
-    currentUserId: { default: "" }
+    currentUserId: { default: "" },
+    exactKey: { default: "" }
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -17517,7 +17535,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const ids = Array.isArray(props2.modelValue) ? props2.modelValue : [];
         if (ids.length > 0) {
           try {
-            const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, ids);
+            console.log(props2.exactKey);
+            const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactKey, ids);
             selectedUsers.value = formatUsers(result);
           } catch (error3) {
             console.error("获取选中用户信息失败:", error3);
@@ -17555,11 +17574,12 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
           "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => selectedUser.value = $event),
           "api-base-url": _ctx.apiBaseUrl,
           "current-user-id": _ctx.currentUserId,
+          "exact-key": _ctx.exactKey,
           placeholder: _ctx.placeholder,
           "tenant-id": _ctx.tenantId,
           tenants: unref(tenants),
           onChange: handleUpdateUser
-        }, null, 8, ["modelValue", "api-base-url", "current-user-id", "placeholder", "tenant-id", "tenants"])) : (openBlock(), createElementBlock(
+        }, null, 8, ["modelValue", "api-base-url", "current-user-id", "exact-key", "placeholder", "tenant-id", "tenants"])) : (openBlock(), createElementBlock(
           Fragment,
           { key: 1 },
           [
@@ -17570,12 +17590,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               "api-base-url": _ctx.apiBaseUrl,
               "current-user-id": _ctx.currentUserId,
               draggable: _ctx.draggable,
+              "exact-key": _ctx.exactKey,
               placeholder: _ctx.placeholder,
               "selected-users": selectedUsers.value,
               "tenant-id": _ctx.tenantId,
               tenants: unref(tenants),
               "onUpdate:selectedUsers": handleUpdateSelectedUsers
-            }, null, 8, ["modelValue", "api-base-url", "current-user-id", "draggable", "placeholder", "selected-users", "tenant-id", "tenants"])
+            }, null, 8, ["modelValue", "api-base-url", "current-user-id", "draggable", "exact-key", "placeholder", "selected-users", "tenant-id", "tenants"])
           ],
           2112
           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
@@ -17584,7 +17605,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-bb73e41f"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ee509d86"]]);
 const vue2 = {
   beforeDestroy() {
     var _a;