@blueking/bk-user-selector 0.0.4 → 0.0.6

package/README.md

@@ -57,7 +57,7 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
     :api-base-url="apiBaseUrl"
     :tenant-id="tenantId"
     :current-user-id="currentUserId"
-    :exact-key="exactKey"
+    :exact-search-key="exactSearchKey"
     @change="handleUserChange"
   />
 
@@ -67,7 +67,7 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
     :api-base-url="apiBaseUrl"
     :tenant-id="tenantId"
     :current-user-id="currentUserId"
-    :exact-key="exactKey"
+    :exact-search-key="exactSearchKey"
     :multiple="true"
     :draggable="true"
     @change="handleUsersChange"
@@ -84,7 +84,7 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
   // 当前用户ID
   const currentUserId = ref('admin');
   // 精确查找key
-  const exactKey = ref('bk_username');
+  const exactSearchKey = ref('bk_username');
   // 单选选中值
   const selectedUser = ref('');
   // 多选选中值
@@ -116,7 +116,7 @@ import '@blueking/bk-user-selector/vue2/vue2.css';
 | draggable            | 是否可拖拽（仅多选模式有效）                                            | Boolean        | false                |
 | apiBaseUrl           | API 基础 URL                                                            | String         | ''                   |
 | tenantId             | 租户 ID                                                                 | String         | ''                   |
-| exactKey             | 精确查找key,可选值为 bk_username、login_name、full_name, 多个以逗号分隔 | String         | 'bk_username'        |
+| exactSearchKey       | 精确查找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.4",
+  "version": "0.0.6",
   "description": "蓝鲸用户选择器",
   "license": "MIT",
   "author": "Tencent BlueKing",

package/typings/api/user.d.ts

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

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

@@ -59,7 +59,7 @@ declare const _default: import("vue").DefineComponent<{
     /**
      * 精确查找key
      */
-    exactKey: {
+    exactSearchKey: {
         type: StringConstructor;
         default: string;
     };
@@ -127,7 +127,7 @@ declare const _default: import("vue").DefineComponent<{
     /**
      * 精确查找key
      */
-    exactKey: {
+    exactSearchKey: {
         type: StringConstructor;
         default: string;
     };
@@ -136,14 +136,14 @@ declare const _default: import("vue").DefineComponent<{
     "onAdd-user"?: ((...args: any[]) => any) | undefined;
     "onRemove-user"?: ((...args: any[]) => any) | undefined;
 }, {
+    tenantId: string;
     tenants: Record<string, string>;
     draggable: boolean;
     modelValue: unknown[];
     placeholder: string;
     apiBaseUrl: string;
-    tenantId: string;
     selectedUsers: FormattedUser[];
     currentUserId: string;
-    exactKey: string;
+    exactSearchKey: string;
 }, {}>;
 export default _default;

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

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

package/typings/types/index.d.ts

@@ -42,7 +42,11 @@ export interface FormattedUser {
     /**
      * 租户ID
      */
-    tenantId?: string;
+    tenantId: string;
+    /**
+     * 其他属性
+     */
+    [key: string]: string;
 }
 /**
  * 租户信息
@@ -92,7 +96,7 @@ export interface UserSelectorProps {
     /**
      * 精确查找key, 默认是 bk_username, 可选值为 bk_username、login_name、full_name, 多个以逗号分隔
      */
-    exactKey?: string;
+    exactSearchKey?: string;
 }
 /**
  * 单选模式属性
@@ -125,5 +129,5 @@ export interface SingleSelectorProps {
     /**
      * 精确查找key
      */
-    exactKey?: string;
+    exactSearchKey: string;
 }

package/vue2/index.es.min.js

@@ -48,13 +48,13 @@ const searchUsers = async (apiBaseUrl = "", tenantId = "", keyword = "") => {
     return [];
   }
 };
-const lookupUsers = async (apiBaseUrl = "", tenantId = "", exactKey = "bk_username", users = []) => {
+const lookupUsers = async (apiBaseUrl = "", tenantId = "", exactSearchKey = "bk_username", users = []) => {
   if (users.length === 0 || !apiBaseUrl || !tenantId) {
     console.warn("批量查找用户需要提供有效的apiBaseUrl、租户ID和至少一个用户名");
     return [];
   }
   try {
-    const url = `${apiBaseUrl}/api/v3/open-web/tenant/users/-/lookup/?lookups=${users.join(",")}&lookup_fields=${exactKey}`;
+    const url = `${apiBaseUrl}/api/v3/open-web/tenant/users/-/lookup/?lookups=${users.join(",")}&lookup_fields=${exactSearchKey}`;
     const response = await fetch(url, {
       method: "GET",
       headers: {
@@ -77,7 +77,8 @@ const formatUsers = (users) => {
   return users.map((user) => ({
     id: user.bk_username,
     name: user.display_name,
-    tenantId: user.owner_tenant_id
+    tenantId: user.owner_tenant_id,
+    ...user
   }));
 };
 const useTenantData = (apiBaseUrl, tenantId) => {
@@ -16780,7 +16781,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     /**
      * 精确查找key
      */
-    exactKey: {
+    exactSearchKey: {
       type: String,
       default: "bk_username"
     }
@@ -16898,7 +16899,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.exactKey, [props2.currentUserId]);
+        const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactSearchKey, [props2.currentUserId]);
         const formattedUsers = formatUsers(result);
         if (formattedUsers.length > 0) {
           if (!props2.selectedUsers.some((item) => item.id === formattedUsers[0].id)) {
@@ -16919,7 +16920,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, props2.exactKey, users);
+          const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactSearchKey, users);
           const formattedUsers = formatUsers(result);
           if (formattedUsers.length > 0) {
             const updatedUsers = [...props2.selectedUsers, ...formattedUsers];
@@ -17096,16 +17097,17 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   [vModelText, unref(searchQuery)]
                 ]) : createCommentVNode("v-if", true),
                 createCommentVNode(' "我"标签 '),
-                createElementVNode(
+                __props.currentUserId ? (openBlock(), createElementBlock(
                   "div",
                   {
+                    key: 1,
                     class: normalizeClass(["me-tag", { disabled: __props.currentUserId && __props.selectedUsers.some((user) => user.id === __props.currentUserId) }]),
                     onClick: _cache[2] || (_cache[2] = withModifiers(($event) => addCurrentUser(), ["stop"]))
                   },
                   " 我 ",
                   2
                   /* CLASS */
-                )
+                )) : createCommentVNode("v-if", true)
               ],
               512
               /* NEED_PATCH */
@@ -17171,16 +17173,17 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
                   [vModelText, unref(searchQuery)]
                 ]),
                 createCommentVNode(' 未聚焦状态下的"我"标签 '),
-                createElementVNode(
+                __props.currentUserId ? (openBlock(), createElementBlock(
                   "div",
                   {
-                    class: normalizeClass(["me-tag", { disabled: __props.currentUserId && __props.selectedUsers.some((user) => user.id === __props.currentUserId) }]),
+                    key: 1,
+                    class: normalizeClass(["me-tag", { disabled: __props.currentUserId && __props.selectedUsers.some((user) => user[props2.exactSearchKey] === __props.currentUserId) }]),
                     onClick: _cache[4] || (_cache[4] = withModifiers(($event) => addCurrentUser(), ["stop"]))
                   },
                   " 我 ",
                   2
                   /* CLASS */
-                )
+                )) : createCommentVNode("v-if", true)
               ],
               512
               /* NEED_PATCH */
@@ -17257,8 +17260,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-55945956"]]);
-const _withScopeId = (n2) => (pushScopeId("data-v-d17d0282"), n2 = n2(), popScopeId(), n2);
+const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-50540b99"]]);
+const _withScopeId = (n2) => (pushScopeId("data-v-308925e9"), n2 = n2(), popScopeId(), n2);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = {
   key: 0,
@@ -17293,7 +17296,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     tenantId: {},
     tenants: {},
     currentUserId: {},
-    exactKey: {}
+    exactSearchKey: {}
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -17313,7 +17316,7 @@ 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.exactKey, [
+          const result = await lookupUsers(props2.apiBaseUrl || "", props2.tenantId || "", props2.exactSearchKey, [
             props2.modelValue
           ]);
           options.value = formatUsers(result);
@@ -17327,7 +17330,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.exactKey, [props2.currentUserId]);
+        const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactSearchKey, [props2.currentUserId]);
         const formattedResults = formatUsers(result);
         if (formattedResults.length > 0) {
           options.value = formattedResults;
@@ -17382,6 +17385,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       emit("change", selectedUserInfo2 || null);
     });
     return (_ctx, _cache) => {
+      var _a;
       return withDirectives((openBlock(), createElementBlock("div", {
         ref_key: "containerRef",
         ref: containerRef,
@@ -17402,7 +17406,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               1
               /* TEXT */
             ),
-            selectedUserInfo.value.tenantId !== props2.tenantId && selectedUserInfo.value.tenantId && _ctx.tenants[selectedUserInfo.value.tenantId] ? (openBlock(), createElementBlock(
+            selectedUserInfo.value.tenantId !== _ctx.tenantId && selectedUserInfo.value.tenantId && _ctx.tenants[selectedUserInfo.value.tenantId] ? (openBlock(), createElementBlock(
               "span",
               _hoisted_2,
               "@" + toDisplayString(_ctx.tenants[selectedUserInfo.value.tenantId]),
@@ -17416,18 +17420,18 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             ref: inputRef,
             class: "search-input",
             "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => searchQuery.value = $event),
-            placeholder: selectedUserInfo.value ? "" : props2.placeholder,
+            placeholder: selectedUserInfo.value ? "" : _ctx.placeholder,
             onFocus: handleInputFocus,
             onInput: handleInput
           }, null, 40, _hoisted_4), [
             [vModelText, searchQuery.value]
           ]),
           createCommentVNode(' "我"标签 '),
-          props2.currentUserId ? (openBlock(), createElementBlock(
+          _ctx.currentUserId ? (openBlock(), createElementBlock(
             "div",
             {
               key: 1,
-              class: normalizeClass(["me-tag", { disabled: props2.currentUserId && selectedUser.value === props2.currentUserId }]),
+              class: normalizeClass(["me-tag", { disabled: _ctx.currentUserId && ((_a = selectedUserInfo.value) == null ? void 0 : _a[_ctx.exactSearchKey]) === _ctx.currentUserId }]),
               onClick: _cache[1] || (_cache[1] = ($event) => addCurrentUser())
             },
             " 我 ",
@@ -17477,10 +17481,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                         1
                         /* TEXT */
                       ),
-                      user.tenantId !== props2.tenantId && user.tenantId && props2.tenants[user.tenantId] ? (openBlock(), createElementBlock(
+                      user.tenantId !== _ctx.tenantId && user.tenantId && _ctx.tenants[user.tenantId] ? (openBlock(), createElementBlock(
                         "span",
                         _hoisted_7,
-                        "@" + toDisplayString(props2.tenants[user.tenantId]),
+                        "@" + toDisplayString(_ctx.tenants[user.tenantId]),
                         1
                         /* TEXT */
                       )) : createCommentVNode("v-if", true)
@@ -17503,7 +17507,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-d17d0282"]]);
+const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-308925e9"]]);
 const _hoisted_1 = { class: "bk-user-selector" };
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
@@ -17518,7 +17522,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     draggable: { type: Boolean, default: false },
     multiple: { type: Boolean, default: false },
     currentUserId: { default: "" },
-    exactKey: { default: "" }
+    exactSearchKey: { default: "" }
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -17535,8 +17539,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const ids = Array.isArray(props2.modelValue) ? props2.modelValue : [];
         if (ids.length > 0) {
           try {
-            console.log(props2.exactKey);
-            const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactKey, ids);
+            console.log(props2.exactSearchKey);
+            const result = await lookupUsers(props2.apiBaseUrl, props2.tenantId, props2.exactSearchKey, ids);
             selectedUsers.value = formatUsers(result);
           } catch (error3) {
             console.error("获取选中用户信息失败:", error3);
@@ -17574,12 +17578,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,
+          "exact-search-key": _ctx.exactSearchKey,
           placeholder: _ctx.placeholder,
           "tenant-id": _ctx.tenantId,
           tenants: unref(tenants),
           onChange: handleUpdateUser
-        }, null, 8, ["modelValue", "api-base-url", "current-user-id", "exact-key", "placeholder", "tenant-id", "tenants"])) : (openBlock(), createElementBlock(
+        }, null, 8, ["modelValue", "api-base-url", "current-user-id", "exact-search-key", "placeholder", "tenant-id", "tenants"])) : (openBlock(), createElementBlock(
           Fragment,
           { key: 1 },
           [
@@ -17590,13 +17594,13 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               "api-base-url": _ctx.apiBaseUrl,
               "current-user-id": _ctx.currentUserId,
               draggable: _ctx.draggable,
-              "exact-key": _ctx.exactKey,
+              "exact-search-key": _ctx.exactSearchKey,
               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", "exact-key", "placeholder", "selected-users", "tenant-id", "tenants"])
+            }, null, 8, ["modelValue", "api-base-url", "current-user-id", "draggable", "exact-search-key", "placeholder", "selected-users", "tenant-id", "tenants"])
           ],
           2112
           /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
@@ -17605,7 +17609,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-ee509d86"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-fe084750"]]);
 const vue2 = {
   beforeDestroy() {
     var _a;