@blueking/bk-user-selector 0.0.4 → 0.0.6

package/vue2/vue2.css

@@ -1338,11 +1338,11 @@ optgroup {
   border-radius: 2px;
 }.bk-user-selector-popover.bk-popover.bk-pop2-content {
   padding: 0;
-}.multiple-selector[data-v-55945956] {
+}.multiple-selector[data-v-50540b99] {
   position: relative;
   width: 100%;
 }
-.multiple-selector .tags-container[data-v-55945956] {
+.multiple-selector .tags-container[data-v-50540b99] {
   min-height: 32px;
   border: 1px solid #dcdee5;
   border-radius: 2px;
@@ -1350,69 +1350,69 @@ optgroup {
   transition: all 0.2s ease;
   background-color: #fff;
 }
-.multiple-selector .tags-container.focused[data-v-55945956] {
+.multiple-selector .tags-container.focused[data-v-50540b99] {
   border-color: #3a84ff;
   box-shadow: 0 0 0 2px rgba(58, 132, 255, 0.1);
 }
-.multiple-selector .tags-container.collapsed[data-v-55945956] {
+.multiple-selector .tags-container.collapsed[data-v-50540b99] {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
 }
-.multiple-selector .tag-list[data-v-55945956] {
+.multiple-selector .tag-list[data-v-50540b99] {
   display: flex;
   flex-wrap: wrap;
   align-items: center;
 }
-.multiple-selector .tag-wrapper[data-v-55945956] {
+.multiple-selector .tag-wrapper[data-v-50540b99] {
   display: inline-flex;
   align-items: center;
   max-width: 100%;
 }
-.multiple-selector .search-input[data-v-55945956] {
+.multiple-selector .search-input[data-v-50540b99] {
   outline: none;
   border: none;
   height: 28px;
   min-width: 10px;
   background: transparent;
 }
-.multiple-selector .search-input[data-v-55945956]::placeholder {
+.multiple-selector .search-input[data-v-50540b99]::placeholder {
   color: #c4c6cc;
 }
-.multiple-selector .search-input.inline[data-v-55945956] {
+.multiple-selector .search-input.inline[data-v-50540b99] {
   min-width: 10px;
 }
-.multiple-selector .search-input.last[data-v-55945956], .multiple-selector .search-input.collapsed[data-v-55945956] {
+.multiple-selector .search-input.last[data-v-50540b99], .multiple-selector .search-input.collapsed[data-v-50540b99] {
   flex: 1;
   min-width: 60px;
 }
-.dropdown-content[data-v-55945956] {
+.dropdown-content[data-v-50540b99] {
   min-height: 40px;
   max-height: 300px;
   overflow-y: auto;
   padding: 5px 0;
 }
-.dropdown-content .no-data[data-v-55945956] {
+.dropdown-content .no-data[data-v-50540b99] {
   padding: 10px;
   text-align: center;
   color: #979ba5;
 }
-.dropdown-content .user-option[data-v-55945956] {
+.dropdown-content .user-option[data-v-50540b99] {
   padding: 8px 12px;
   cursor: pointer;
   display: flex;
   align-items: center;
   height: 32px;
 }
-.dropdown-content .user-option[data-v-55945956]:hover {
+.dropdown-content .user-option[data-v-50540b99]:hover {
   background-color: #f5f7fa;
 }
-.dropdown-content .user-option .tenant-name[data-v-55945956] {
+.dropdown-content .user-option .tenant-name[data-v-50540b99] {
   color: #f59500;
   margin-left: 4px;
   padding: 0 4px;
 }
-.me-tag[data-v-55945956] {
+.me-tag[data-v-50540b99] {
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -1430,19 +1430,19 @@ optgroup {
   transform: translateY(-50%);
   z-index: 1;
 }
-.me-tag[data-v-55945956]:hover {
+.me-tag[data-v-50540b99]:hover {
   background-color: #cddffe;
   color: #3a84ff;
 }
-.me-tag.disabled[data-v-55945956] {
+.me-tag.disabled[data-v-50540b99] {
   background-color: #f0f1f5;
   color: #c4c6cc;
   cursor: not-allowed;
-}.single-selector[data-v-d17d0282] {
+}.single-selector[data-v-308925e9] {
   position: relative;
   width: 100%;
 }
-.input-container[data-v-d17d0282] {
+.input-container[data-v-308925e9] {
   position: relative;
   display: flex;
   align-items: center;
@@ -1452,21 +1452,21 @@ optgroup {
   padding: 0 8px;
   background-color: #fff;
 }
-.input-container[data-v-d17d0282]:focus-within {
+.input-container[data-v-308925e9]:focus-within {
   border-color: #3a84ff;
   box-shadow: 0 0 0 2px rgba(58, 132, 255, 0.1);
 }
-.search-input[data-v-d17d0282] {
+.search-input[data-v-308925e9] {
   flex: 1;
   outline: none;
   border: none;
   height: 30px;
   background: transparent;
 }
-.search-input[data-v-d17d0282]::placeholder {
+.search-input[data-v-308925e9]::placeholder {
   color: #c4c6cc;
 }
-.selected-user[data-v-d17d0282] {
+.selected-user[data-v-308925e9] {
   display: inline-flex;
   align-items: center;
   background-color: #f0f1f5;
@@ -1476,42 +1476,42 @@ optgroup {
   height: 24px;
   max-width: calc(100% - 32px);
 }
-.selected-user .tenant-name[data-v-d17d0282] {
+.selected-user .tenant-name[data-v-308925e9] {
   color: #f59500;
   margin-left: 4px;
 }
-.selected-user .close-icon[data-v-d17d0282] {
+.selected-user .close-icon[data-v-308925e9] {
   margin-left: 4px;
   cursor: pointer;
   font-style: normal;
 }
-.dropdown-content[data-v-d17d0282] {
+.dropdown-content[data-v-308925e9] {
   min-height: 40px;
   max-height: 300px;
   overflow-y: auto;
   padding: 5px 0;
 }
-.dropdown-content .no-data[data-v-d17d0282] {
+.dropdown-content .no-data[data-v-308925e9] {
   padding: 10px;
   text-align: center;
   color: #979ba5;
 }
-.dropdown-content .user-option[data-v-d17d0282] {
+.dropdown-content .user-option[data-v-308925e9] {
   padding: 8px 12px;
   cursor: pointer;
   display: flex;
   align-items: center;
   height: 32px;
 }
-.dropdown-content .user-option[data-v-d17d0282]:hover {
+.dropdown-content .user-option[data-v-308925e9]:hover {
   background-color: #f5f7fa;
 }
-.dropdown-content .user-option .tenant-name[data-v-d17d0282] {
+.dropdown-content .user-option .tenant-name[data-v-308925e9] {
   color: #f59500;
   margin-left: 4px;
   padding: 0 4px;
 }
-.me-tag[data-v-d17d0282] {
+.me-tag[data-v-308925e9] {
   display: inline-flex;
   align-items: center;
   justify-content: center;
@@ -1529,15 +1529,15 @@ optgroup {
   transform: translateY(-50%);
   z-index: 1;
 }
-.me-tag[data-v-d17d0282]:hover {
+.me-tag[data-v-308925e9]:hover {
   background-color: #cddffe;
   color: #3a84ff;
 }
-.me-tag.disabled[data-v-d17d0282] {
+.me-tag.disabled[data-v-308925e9] {
   background-color: #f0f1f5;
   color: #c4c6cc;
   cursor: not-allowed;
-}.bk-user-selector[data-v-ee509d86] {
+}.bk-user-selector[data-v-fe084750] {
   width: 100%;
   position: relative;
   font-size: 12px;

package/vue3/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) => {
@@ -3103,7 +3104,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     /**
      * 精确查找key
      */
-    exactKey: {
+    exactSearchKey: {
       type: String,
       default: "bk_username"
     }
@@ -3221,7 +3222,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     const addCurrentUser = async () => {
       if (!props.currentUserId || props.selectedUsers.some((user) => user.id === props.currentUserId)) return;
       try {
-        const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactKey, [props.currentUserId]);
+        const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactSearchKey, [props.currentUserId]);
         const formattedUsers = formatUsers(result);
         if (formattedUsers.length > 0) {
           if (!props.selectedUsers.some((item) => item.id === formattedUsers[0].id)) {
@@ -3242,7 +3243,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       if (pastedText.trim()) {
         try {
           const users = pastedText.trim().split(/[,，;\n\s]+/).filter(Boolean);
-          const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactKey, users);
+          const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactSearchKey, users);
           const formattedUsers = formatUsers(result);
           if (formattedUsers.length > 0) {
             const updatedUsers = [...props.selectedUsers, ...formattedUsers];
@@ -3419,16 +3420,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 */
@@ -3494,16 +3496,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[props.exactSearchKey] === __props.currentUserId) }]),
                     onClick: _cache[4] || (_cache[4] = withModifiers(($event) => addCurrentUser(), ["stop"]))
                   },
                   " 我 ",
                   2
                   /* CLASS */
-                )
+                )) : createCommentVNode("v-if", true)
               ],
               512
               /* NEED_PATCH */
@@ -3580,8 +3583,8 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-55945956"]]);
-const _withScopeId = (n) => (pushScopeId("data-v-d17d0282"), n = n(), popScopeId(), n);
+const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-50540b99"]]);
+const _withScopeId = (n) => (pushScopeId("data-v-308925e9"), n = n(), popScopeId(), n);
 const _hoisted_1$1 = { class: "input-container" };
 const _hoisted_2 = {
   key: 0,
@@ -3616,7 +3619,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     tenantId: {},
     tenants: {},
     currentUserId: {},
-    exactKey: {}
+    exactSearchKey: {}
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -3636,7 +3639,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
       if (typeof props.modelValue === "string" && props.modelValue) {
         try {
           isLoading.value = true;
-          const result = await lookupUsers(props.apiBaseUrl || "", props.tenantId || "", props.exactKey, [
+          const result = await lookupUsers(props.apiBaseUrl || "", props.tenantId || "", props.exactSearchKey, [
             props.modelValue
           ]);
           options.value = formatUsers(result);
@@ -3650,7 +3653,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const addCurrentUser = async () => {
       if (!props.currentUserId || selectedUser.value === props.currentUserId) return;
       try {
-        const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactKey, [props.currentUserId]);
+        const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactSearchKey, [props.currentUserId]);
         const formattedResults = formatUsers(result);
         if (formattedResults.length > 0) {
           options.value = formattedResults;
@@ -3705,6 +3708,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,
@@ -3725,7 +3729,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
               1
               /* TEXT */
             ),
-            selectedUserInfo.value.tenantId !== props.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]),
@@ -3739,18 +3743,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 ? "" : props.placeholder,
+            placeholder: selectedUserInfo.value ? "" : _ctx.placeholder,
             onFocus: handleInputFocus,
             onInput: handleInput
           }, null, 40, _hoisted_4), [
             [vModelText, searchQuery.value]
           ]),
           createCommentVNode(' "我"标签 '),
-          props.currentUserId ? (openBlock(), createElementBlock(
+          _ctx.currentUserId ? (openBlock(), createElementBlock(
             "div",
             {
               key: 1,
-              class: normalizeClass(["me-tag", { disabled: props.currentUserId && selectedUser.value === props.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())
             },
             " 我 ",
@@ -3800,10 +3804,10 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
                         1
                         /* TEXT */
                       ),
-                      user.tenantId !== props.tenantId && user.tenantId && props.tenants[user.tenantId] ? (openBlock(), createElementBlock(
+                      user.tenantId !== _ctx.tenantId && user.tenantId && _ctx.tenants[user.tenantId] ? (openBlock(), createElementBlock(
                         "span",
                         _hoisted_7,
-                        "@" + toDisplayString(props.tenants[user.tenantId]),
+                        "@" + toDisplayString(_ctx.tenants[user.tenantId]),
                         1
                         /* TEXT */
                       )) : createCommentVNode("v-if", true)
@@ -3826,7 +3830,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({
   ...{
@@ -3841,7 +3845,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 }) {
@@ -3858,8 +3862,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
         const ids = Array.isArray(props.modelValue) ? props.modelValue : [];
         if (ids.length > 0) {
           try {
-            console.log(props.exactKey);
-            const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactKey, ids);
+            console.log(props.exactSearchKey);
+            const result = await lookupUsers(props.apiBaseUrl, props.tenantId, props.exactSearchKey, ids);
             selectedUsers.value = formatUsers(result);
           } catch (error) {
             console.error("获取选中用户信息失败:", error);
@@ -3897,12 +3901,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 },
           [
@@ -3913,13 +3917,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 */
@@ -3928,7 +3932,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"]]);
 export {
   BkUserSelector,
   BkUserSelector as default