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

package/vue2/index.es.min.js

@@ -1,5 +1,5 @@
 import * as __WEBPACK_EXTERNAL_MODULE_vue__ from "@blueking/bkui-library";
-import { shallowRef, watchEffect, unref, onScopeDispose, ref, onBeforeMount, defineComponent, openBlock, createElementBlock, normalizeClass, withModifiers, createCommentVNode, h as h$1, computed, createBlock, withCtx, createVNode, createElementVNode, toDisplayString, Fragment, renderList, watch, nextTick, onMounted, withDirectives, isRef, vModelText, createTextVNode, createApp } from "@blueking/bkui-library";
+import { unref, ref, onBeforeMount, defineComponent, openBlock, createElementBlock, normalizeClass, withModifiers, createCommentVNode, h as h$1, computed, createBlock, withCtx, createVNode, createElementVNode, toDisplayString, Fragment, renderList, renderSlot, watch, nextTick, onMounted, withDirectives, isRef, vModelText, createTextVNode, createApp } from "@blueking/bkui-library";
 var top = "top";
 var bottom = "bottom";
 var right = "right";
@@ -10678,10 +10678,15 @@ const generateCallbackName = () => {
 const jsonpRequest = (requestUrl, options = {}) => {
   return new Promise((resolve, reject) => {
     const url = unref(requestUrl);
-    const { timeout = 1e3 * 60 * 2, params } = options;
+    const { timeout = 1e3 * 60 * 2, params, withCredentials = true } = options;
     const callbackName = generateCallbackName();
     const script = document.createElement("script");
     let timeoutId;
+    if (withCredentials) {
+      script.crossOrigin = "use-credentials";
+    } else {
+      script.crossOrigin = "anonymous";
+    }
     const cleanup = () => {
       if (timeoutId) {
         clearTimeout(timeoutId);
@@ -10695,7 +10700,7 @@ const jsonpRequest = (requestUrl, options = {}) => {
     };
     window[callbackName] = (data2) => {
       cleanup();
-      resolve(data2);
+      resolve(data2.data || data2);
     };
     timeoutId = setTimeout(() => {
       cleanup();
@@ -10711,48 +10716,6 @@ const jsonpRequest = (requestUrl, options = {}) => {
     document.head.appendChild(script);
   });
 };
-const useJSONP = (url, options = {}) => {
-  const data2 = shallowRef(null);
-  const loading2 = shallowRef(false);
-  const error3 = shallowRef(null);
-  let abortFlag = false;
-  const executeRequest = async (requestUrl) => {
-    if (!requestUrl) return;
-    loading2.value = true;
-    error3.value = null;
-    abortFlag = false;
-    try {
-      const result = await jsonpRequest(requestUrl, options);
-      if (!abortFlag) {
-        data2.value = result;
-      }
-    } catch (err) {
-      if (!abortFlag) {
-        const errorObj = err instanceof Error ? err : new Error(String(err));
-        error3.value = errorObj;
-      }
-    } finally {
-      if (!abortFlag) {
-        loading2.value = false;
-      }
-    }
-  };
-  const stopWatcher = watchEffect(() => {
-    executeRequest(unref(url));
-  });
-  onScopeDispose(() => {
-    abortFlag = true;
-    stopWatcher();
-  });
-  return {
-    data: data2,
-    loading: loading2,
-    error: error3,
-    refetch: () => {
-      executeRequest(unref(url));
-    }
-  };
-};
 const getTenants = async (apiBaseUrl, tenantId) => {
   if (!apiBaseUrl || !tenantId) {
     console.warn("获取租户信息需要提供有效的apiBaseUrl和租户ID");
@@ -10779,7 +10742,7 @@ const getTenants = async (apiBaseUrl, tenantId) => {
 };
 const searchUsers = async (params) => {
   const { apiBaseUrl, tenantId, keyword, enableMultiTenantMode = true } = params;
-  if (enableMultiTenantMode) {
+  if (!enableMultiTenantMode) {
     const userList = await getUserList(apiBaseUrl, {
       keyword,
       pageSize: 100,
@@ -10815,13 +10778,13 @@ const searchUsers = async (params) => {
 const lookupUsers = async (params) => {
   const { apiBaseUrl, tenantId, exactSearchKey = "bk_username", usersList = [], enableMultiTenantMode = true } = params;
   const users = usersList.filter((user) => user).map((user) => user.trim());
-  if (enableMultiTenantMode) {
+  if (!enableMultiTenantMode) {
     const userList = await getUserList(apiBaseUrl, {
       userIds: users
     }).catch(() => {
       return [];
     });
-    return userList;
+    return users.map((user) => userList.find((u2) => u2.username === user)).filter(Boolean);
   }
   if (users.length === 0 || !apiBaseUrl || !tenantId) {
     console.warn("批量查找用户需要提供有效的apiBaseUrl、租户ID和至少一个用户名");
@@ -10846,18 +10809,26 @@ const lookupUsers = async (params) => {
     return [];
   }
 };
-const formatUsers = (users) => {
+const formatUsers = (users, enableMultiTenantMode = true) => {
   if (!users || !Array.isArray(users)) return [];
+  if (!enableMultiTenantMode) {
+    return users.map((user) => ({
+      ...user,
+      id: user.username,
+      name: `${user.display_name}(${user.username})`,
+      tenantId: user.owner_tenant_id
+    }));
+  }
   return users.map((user) => ({
-    id: user.bk_username || user.username,
+    id: user.bk_username,
     name: user.display_name,
     tenantId: user.owner_tenant_id,
     ...user
   }));
 };
 const getUserList = async (url, params) => {
-  const { userIds, keyword, pageSize, page, appCode } = params;
-  const { data: userList } = await useJSONP(url, {
+  const { userIds, keyword, pageSize = 20, page, appCode } = params;
+  const data2 = await jsonpRequest(url, {
     params: {
       exact_lookups: (userIds == null ? void 0 : userIds.join(",")) || void 0,
       fuzzy_lookups: keyword || void 0,
@@ -10866,9 +10837,9 @@ const getUserList = async (url, params) => {
       app_code: appCode || "bk-magicbox"
     }
   });
-  return userList.value || [];
+  return (data2 == null ? void 0 : data2.results) || [];
 };
-const useTenantData = (apiBaseUrl, tenantId) => {
+const useTenantData = (apiBaseUrl, tenantId, enableMultiTenantMode = true) => {
   const tenants = ref({});
   const loading2 = ref(false);
   const fetchTenants = async () => {
@@ -10893,7 +10864,9 @@ const useTenantData = (apiBaseUrl, tenantId) => {
     }
   };
   onBeforeMount(() => {
-    fetchTenants();
+    if (enableMultiTenantMode) {
+      fetchTenants();
+    }
   });
   return {
     tenants,
@@ -13695,7 +13668,7 @@ const calculateVisibleTags = (container, items, containerWidth) => {
   }
   return Math.max(1, visibleCount);
 };
-const useUserSearch = (apiBaseUrl, tenantId) => {
+const useUserSearch = (apiBaseUrl, tenantId, enableMultiTenantMode = true) => {
   const searchResults = ref([]);
   const loading2 = ref(false);
   const searchQuery = ref("");
@@ -13704,7 +13677,7 @@ const useUserSearch = (apiBaseUrl, tenantId) => {
       searchResults.value = [];
       return;
     }
-    if (!apiBaseUrl || !tenantId) {
+    if (enableMultiTenantMode && (!apiBaseUrl || !tenantId)) {
       console.warn("执行用户搜索需要提供有效的API基础URL和租户ID");
       return;
     }
@@ -13714,9 +13687,9 @@ const useUserSearch = (apiBaseUrl, tenantId) => {
         apiBaseUrl,
         tenantId,
         keyword,
-        enableMultiTenantMode: true
+        enableMultiTenantMode
       });
-      searchResults.value = formatUsers(results);
+      searchResults.value = formatUsers(results, enableMultiTenantMode);
     } catch (error3) {
       console.error("用户搜索失败:", error3);
       searchResults.value = [];
@@ -14058,13 +14031,16 @@ const _sfc_main$4 = /* @__PURE__ */ defineComponent({
             /* STABLE */
           }, 8, ["loading"])
         ]),
-        _: 1
-        /* STABLE */
+        default: withCtx(() => [
+          renderSlot(_ctx.$slots, "default", {}, void 0, true)
+        ]),
+        _: 3
+        /* FORWARDED */
       }, 8, ["is-show", "offset", "width"]);
     };
   }
 });
-const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-a4132257"]]);
+const SelectionPopover = /* @__PURE__ */ _export_sfc(_sfc_main$4, [["__scopeId", "data-v-6380faf5"]]);
 const _sfc_main$3 = /* @__PURE__ */ defineComponent({
   ...{
     name: "UserTag"
@@ -14148,7 +14124,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       searchQuery,
       // clearSearch,
       handleSearchInput
-    } = useUserSearch(props2.apiBaseUrl, props2.tenantId);
+    } = useUserSearch(props2.apiBaseUrl, props2.tenantId, props2.enableMultiTenantMode);
     const containerRef = ref(null);
     const tagsContainerRef = ref(null);
     const sortableContainerRef = ref(null);
@@ -14166,7 +14142,14 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
       return searchResults.value.filter((user) => !props2.selectedUsers.some((selectedUser) => selectedUser.id === user.id)).filter((user) => !props2.excludeUserIds.includes(user.id));
     });
     const userGroupFilter = computed(() => {
-      return props2.userGroup.filter((group) => !props2.selectedUsers.some((user) => user.id === group.id) && !group.hidden);
+      return props2.userGroup.filter((group) => {
+        var _a, _b;
+        const filtered = !props2.selectedUsers.some((user) => user.id === group.id) && !group.hidden;
+        if (filtered) {
+          return ((_a = group.id) == null ? void 0 : _a.includes(searchQuery.value)) || ((_b = group.name) == null ? void 0 : _b.includes(searchQuery.value));
+        }
+        return false;
+      });
     });
     const initSortable = () => {
       if (!props2.draggable || !sortableContainerRef.value) return;
@@ -14275,7 +14258,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           usersList: [props2.currentUserId],
           enableMultiTenantMode: props2.enableMultiTenantMode
         });
-        const formattedUsers = formatUsers(result);
+        const formattedUsers = formatUsers(result, props2.enableMultiTenantMode);
         if (formattedUsers.length > 0) {
           if (!props2.selectedUsers.some((item) => item.id === formattedUsers[0].id)) {
             emit("update:selectedUsers", [...props2.selectedUsers, formattedUsers[0]]);
@@ -14303,7 +14286,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
             usersList: users,
             enableMultiTenantMode: props2.enableMultiTenantMode
           });
-          const formattedUsers = formatUsers(result);
+          const formattedUsers = formatUsers(result, props2.enableMultiTenantMode);
           if (formattedUsers.length > 0) {
             const updatedUsers = [...props2.selectedUsers, ...formattedUsers];
             emit("update:selectedUsers", updatedUsers);
@@ -14406,210 +14389,215 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
           class: normalizeClass(["multiple-selector", { "is-disabled": _ctx.disabled }])
         },
         [
-          createCommentVNode(" 聚焦状态 - 可编辑模式 "),
-          isFocused.value ? (openBlock(), createElementBlock(
-            "div",
-            {
-              key: 0,
-              ref_key: "tagsContainerRef",
-              ref: tagsContainerRef,
-              class: "tags-container focused",
-              onClick: withModifiers(handleContainerClick, ["stop"])
-            },
-            [
-              createCommentVNode(" 用户标签列表 "),
-              createElementVNode(
+          createCommentVNode(" 下拉选项列表 "),
+          createVNode(SelectionPopover, {
+            "container-width": containerRef.value ? containerRef.value.offsetWidth : "auto",
+            "cross-axis-offset": crossAxisOffset.value,
+            "empty-text": _ctx.emptyText,
+            "is-show": showDropdown.value,
+            loading: unref(searchLoading),
+            options: options.value,
+            "render-list-item": _ctx.renderListItem,
+            "search-query": unref(searchQuery),
+            "tenant-id": _ctx.tenantId,
+            tenants: _ctx.tenants,
+            "user-group": userGroupFilter.value,
+            "user-group-name": _ctx.userGroupName,
+            onClickOutside: handleClickOutside,
+            onSelectUser: addUser
+          }, {
+            default: withCtx(() => [
+              createCommentVNode(" 聚焦状态 - 可编辑模式 "),
+              isFocused.value ? (openBlock(), createElementBlock(
                 "div",
                 {
-                  ref_key: "sortableContainerRef",
-                  ref: sortableContainerRef,
-                  class: "tag-list"
+                  key: 0,
+                  ref_key: "tagsContainerRef",
+                  ref: tagsContainerRef,
+                  class: "tags-container focused",
+                  onClick: withModifiers(handleContainerClick, ["stop"])
                 },
                 [
-                  (openBlock(true), createElementBlock(
-                    Fragment,
-                    null,
-                    renderList(_ctx.selectedUsers, (user, index) => {
-                      return openBlock(), createElementBlock("div", {
-                        class: "tag-wrapper",
-                        key: user.id,
-                        onClick: withModifiers(($event) => handleTagClick(index), ["stop"])
-                      }, [
-                        createVNode(UserTag, {
-                          active: index === activeTagIndex.value,
-                          "current-tenant-id": _ctx.tenantId,
-                          draggable: _ctx.draggable,
-                          "render-tag": _ctx.renderTag,
-                          tenants: _ctx.tenants,
-                          user,
-                          onClick: ($event) => handleTagClick(index),
-                          onClose: ($event) => removeUser(user)
-                        }, null, 8, ["active", "current-tenant-id", "draggable", "render-tag", "tenants", "user", "onClick", "onClose"]),
-                        createCommentVNode(" 在当前激活标签后插入输入框 "),
-                        index === activeTagIndex.value && activeTagIndex.value !== _ctx.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock(
-                          "input",
-                          {
-                            key: 0,
-                            ref_for: true,
-                            ref_key: "inlineInputRef",
-                            ref: inlineInputRef,
-                            class: "search-input inline",
-                            "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
-                            onFocus: handleInputFocus,
-                            onInput: handleInput,
-                            onKeydown: handleKeyDown,
-                            onPaste: handlePaste
-                          },
-                          null,
-                          544
-                          /* NEED_HYDRATION, NEED_PATCH */
-                        )), [
-                          [vModelText, unref(searchQuery)]
-                        ]) : createCommentVNode("v-if", true)
-                      ], 8, _hoisted_1$1);
-                    }),
-                    128
-                    /* KEYED_FRAGMENT */
-                  )),
-                  createCommentVNode(" 最后一个输入框 "),
-                  activeTagIndex.value === -1 || activeTagIndex.value === _ctx.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock("input", {
-                    key: 0,
-                    ref_key: "lastInputRef",
-                    ref: lastInputRef,
-                    class: "search-input last",
-                    "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
-                    placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
-                    onFocus: handleInputFocus,
-                    onInput: handleInput,
-                    onKeydown: handleKeyDown,
-                    onPaste: handlePaste
-                  }, null, 40, _hoisted_2$1)), [
-                    [vModelText, unref(searchQuery)]
-                  ]) : createCommentVNode("v-if", true),
-                  createCommentVNode(' "我"标签 '),
-                  createVNode(MeTag, {
-                    "current-user-id": _ctx.currentUserId,
-                    "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user.id === _ctx.currentUserId),
-                    onClick: addCurrentUser
-                  }, null, 8, ["current-user-id", "is-disabled"])
+                  createCommentVNode(" 用户标签列表 "),
+                  createElementVNode(
+                    "div",
+                    {
+                      ref_key: "sortableContainerRef",
+                      ref: sortableContainerRef,
+                      class: "tag-list"
+                    },
+                    [
+                      (openBlock(true), createElementBlock(
+                        Fragment,
+                        null,
+                        renderList(_ctx.selectedUsers, (user, index) => {
+                          return openBlock(), createElementBlock("div", {
+                            class: "tag-wrapper",
+                            key: user.id,
+                            onClick: withModifiers(($event) => handleTagClick(index), ["stop"])
+                          }, [
+                            createVNode(UserTag, {
+                              active: index === activeTagIndex.value,
+                              "current-tenant-id": _ctx.tenantId,
+                              draggable: _ctx.draggable,
+                              "render-tag": _ctx.renderTag,
+                              tenants: _ctx.tenants,
+                              user,
+                              onClick: ($event) => handleTagClick(index),
+                              onClose: ($event) => removeUser(user)
+                            }, null, 8, ["active", "current-tenant-id", "draggable", "render-tag", "tenants", "user", "onClick", "onClose"]),
+                            createCommentVNode(" 在当前激活标签后插入输入框 "),
+                            index === activeTagIndex.value && activeTagIndex.value !== _ctx.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock(
+                              "input",
+                              {
+                                key: 0,
+                                ref_for: true,
+                                ref_key: "inlineInputRef",
+                                ref: inlineInputRef,
+                                class: "search-input inline",
+                                "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
+                                onFocus: handleInputFocus,
+                                onInput: handleInput,
+                                onKeydown: handleKeyDown,
+                                onPaste: handlePaste
+                              },
+                              null,
+                              544
+                              /* NEED_HYDRATION, NEED_PATCH */
+                            )), [
+                              [vModelText, unref(searchQuery)]
+                            ]) : createCommentVNode("v-if", true)
+                          ], 8, _hoisted_1$1);
+                        }),
+                        128
+                        /* KEYED_FRAGMENT */
+                      )),
+                      createCommentVNode(" 最后一个输入框 "),
+                      activeTagIndex.value === -1 || activeTagIndex.value === _ctx.selectedUsers.length - 1 ? withDirectives((openBlock(), createElementBlock("input", {
+                        key: 0,
+                        ref_key: "lastInputRef",
+                        ref: lastInputRef,
+                        class: "search-input last",
+                        "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
+                        placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
+                        onFocus: handleInputFocus,
+                        onInput: handleInput,
+                        onKeydown: handleKeyDown,
+                        onPaste: handlePaste
+                      }, null, 40, _hoisted_2$1)), [
+                        [vModelText, unref(searchQuery)]
+                      ]) : createCommentVNode("v-if", true),
+                      createCommentVNode(' "我"标签 '),
+                      createVNode(MeTag, {
+                        "current-user-id": _ctx.currentUserId,
+                        "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user.id === _ctx.currentUserId),
+                        onClick: addCurrentUser
+                      }, null, 8, ["current-user-id", "is-disabled"])
+                    ],
+                    512
+                    /* NEED_PATCH */
+                  )
                 ],
                 512
                 /* NEED_PATCH */
-              )
-            ],
-            512
-            /* NEED_PATCH */
-          )) : (openBlock(), createElementBlock(
-            Fragment,
-            { key: 1 },
-            [
-              createCommentVNode(" 未聚焦状态 - 只读展示模式 "),
-              createElementVNode(
-                "div",
-                {
-                  ref_key: "collapsedContainerRef",
-                  ref: collapsedContainerRef,
-                  class: "tags-container collapsed",
-                  onClick: withModifiers(handleFocus, ["stop"])
-                },
+              )) : (openBlock(), createElementBlock(
+                Fragment,
+                { key: 1 },
                 [
-                  (openBlock(true), createElementBlock(
-                    Fragment,
-                    null,
-                    renderList(visibleUsers.value, (user) => {
-                      return openBlock(), createBlock(UserTag, {
-                        "current-tenant-id": _ctx.tenantId,
-                        key: user.id,
-                        "render-tag": _ctx.renderTag,
-                        "show-tenant": true,
-                        tenants: _ctx.tenants,
-                        user,
-                        onClick: handleFocus,
-                        onClose: ($event) => removeUser(user)
-                      }, null, 8, ["current-tenant-id", "render-tag", "tenants", "user", "onClose"]);
-                    }),
-                    128
-                    /* KEYED_FRAGMENT */
-                  )),
-                  createCommentVNode(" 显示折叠标签数量 "),
-                  hiddenCount.value > 0 ? (openBlock(), createBlock(unref(__webpack_exports__default$1), {
-                    key: 0,
-                    placement: "top"
-                  }, {
-                    content: withCtx(() => [
+                  createCommentVNode(" 未聚焦状态 - 只读展示模式 "),
+                  createElementVNode(
+                    "div",
+                    {
+                      ref_key: "collapsedContainerRef",
+                      ref: collapsedContainerRef,
+                      class: "tags-container collapsed",
+                      onClick: withModifiers(handleFocus, ["stop"])
+                    },
+                    [
                       (openBlock(true), createElementBlock(
                         Fragment,
                         null,
-                        renderList(_ctx.selectedUsers.slice(visibleUsers.value.length), (user) => {
-                          return openBlock(), createBlock(unref(UserRender), {
+                        renderList(visibleUsers.value, (user) => {
+                          return openBlock(), createBlock(UserTag, {
+                            "current-tenant-id": _ctx.tenantId,
                             key: user.id,
-                            "tenant-id": _ctx.tenantId,
+                            "render-tag": _ctx.renderTag,
+                            "show-tenant": true,
                             tenants: _ctx.tenants,
-                            user
-                          }, null, 8, ["tenant-id", "tenants", "user"]);
+                            user,
+                            onClick: handleFocus,
+                            onClose: ($event) => removeUser(user)
+                          }, null, 8, ["current-tenant-id", "render-tag", "tenants", "user", "onClose"]);
                         }),
                         128
                         /* KEYED_FRAGMENT */
-                      ))
-                    ]),
-                    default: withCtx(() => [
-                      createVNode(unref(__webpack_exports__default), null, {
+                      )),
+                      createCommentVNode(" 显示折叠标签数量 "),
+                      hiddenCount.value > 0 ? (openBlock(), createBlock(unref(__webpack_exports__default$1), {
+                        key: 0,
+                        placement: "top"
+                      }, {
+                        content: withCtx(() => [
+                          (openBlock(true), createElementBlock(
+                            Fragment,
+                            null,
+                            renderList(_ctx.selectedUsers.slice(visibleUsers.value.length), (user) => {
+                              return openBlock(), createBlock(unref(UserRender), {
+                                key: user.id,
+                                "tenant-id": _ctx.tenantId,
+                                tenants: _ctx.tenants,
+                                user
+                              }, null, 8, ["tenant-id", "tenants", "user"]);
+                            }),
+                            128
+                            /* KEYED_FRAGMENT */
+                          ))
+                        ]),
                         default: withCtx(() => [
-                          createTextVNode(
-                            " +" + toDisplayString(hiddenCount.value),
-                            1
-                            /* TEXT */
-                          )
+                          createVNode(unref(__webpack_exports__default), null, {
+                            default: withCtx(() => [
+                              createTextVNode(
+                                " +" + toDisplayString(hiddenCount.value),
+                                1
+                                /* TEXT */
+                              )
+                            ]),
+                            _: 1
+                            /* STABLE */
+                          })
                         ]),
                         _: 1
                         /* STABLE */
-                      })
-                    ]),
-                    _: 1
-                    /* STABLE */
-                  })) : createCommentVNode("v-if", true),
-                  createCommentVNode(" 搜索输入框 "),
-                  withDirectives(createElementVNode("input", {
-                    ref_key: "collapsedInputRef",
-                    ref: collapsedInputRef,
-                    class: "search-input collapsed",
-                    "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
-                    placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
-                    onFocus: handleFocus
-                  }, null, 40, _hoisted_3), [
-                    [vModelText, unref(searchQuery)]
-                  ]),
-                  createCommentVNode(' 未聚焦状态下的"我"标签 '),
-                  createVNode(MeTag, {
-                    "current-user-id": _ctx.currentUserId,
-                    "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user[props2.exactSearchKey] === _ctx.currentUserId),
-                    onClick: addCurrentUser
-                  }, null, 8, ["current-user-id", "is-disabled"])
+                      })) : createCommentVNode("v-if", true),
+                      createCommentVNode(" 搜索输入框 "),
+                      withDirectives(createElementVNode("input", {
+                        ref_key: "collapsedInputRef",
+                        ref: collapsedInputRef,
+                        class: "search-input collapsed",
+                        "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => isRef(searchQuery) ? searchQuery.value = $event : null),
+                        placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
+                        onFocus: handleFocus
+                      }, null, 40, _hoisted_3), [
+                        [vModelText, unref(searchQuery)]
+                      ]),
+                      createCommentVNode(' 未聚焦状态下的"我"标签 '),
+                      createVNode(MeTag, {
+                        "current-user-id": _ctx.currentUserId,
+                        "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user[props2.exactSearchKey] === _ctx.currentUserId),
+                        onClick: addCurrentUser
+                      }, null, 8, ["current-user-id", "is-disabled"])
+                    ],
+                    512
+                    /* NEED_PATCH */
+                  )
                 ],
-                512
-                /* NEED_PATCH */
-              )
-            ],
-            2112
-            /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-          )),
-          createCommentVNode(" 下拉选项列表 "),
-          createVNode(SelectionPopover, {
-            "container-width": containerRef.value ? containerRef.value.offsetWidth : "auto",
-            "cross-axis-offset": crossAxisOffset.value,
-            "empty-text": _ctx.emptyText,
-            "is-show": showDropdown.value,
-            loading: unref(searchLoading),
-            options: options.value,
-            "render-list-item": _ctx.renderListItem,
-            "search-query": unref(searchQuery),
-            "tenant-id": _ctx.tenantId,
-            tenants: _ctx.tenants,
-            "user-group": userGroupFilter.value,
-            "user-group-name": _ctx.userGroupName,
-            onClickOutside: handleClickOutside,
-            onSelectUser: addUser
-          }, null, 8, ["container-width", "cross-axis-offset", "empty-text", "is-show", "loading", "options", "render-list-item", "search-query", "tenant-id", "tenants", "user-group", "user-group-name"])
+                2112
+                /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
+              ))
+            ]),
+            _: 1
+            /* STABLE */
+          }, 8, ["container-width", "cross-axis-offset", "empty-text", "is-show", "loading", "options", "render-list-item", "search-query", "tenant-id", "tenants", "user-group", "user-group-name"])
         ],
         2
         /* CLASS */
@@ -14617,7 +14605,7 @@ const _sfc_main$2 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-bebe517d"]]);
+const MultipleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$2, [["__scopeId", "data-v-69acfacb"]]);
 const _hoisted_1 = { class: "input-container" };
 const _hoisted_2 = ["placeholder"];
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
@@ -14654,7 +14642,14 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     const searchQuery = ref("");
     const showDropdown = ref(false);
     const userGroupFilter = computed(() => {
-      return props2.userGroup.filter((group) => group.id !== selectedUser.value && !group.hidden);
+      return props2.userGroup.filter((group) => {
+        var _a, _b;
+        const filtered = group.id !== selectedUser.value && !group.hidden;
+        if (filtered) {
+          return ((_a = group.id) == null ? void 0 : _a.includes(searchQuery.value)) || ((_b = group.name) == null ? void 0 : _b.includes(searchQuery.value));
+        }
+        return false;
+      });
     });
     const selectedUserInfo = computed(() => {
       const userGroup = (props2.userGroup || []).map((group) => ({
@@ -14678,7 +14673,9 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             usersList: [props2.modelValue],
             enableMultiTenantMode: props2.enableMultiTenantMode
           });
-          options.value = formatUsers(result).filter((user) => !props2.excludeUserIds.includes(user.id));
+          options.value = formatUsers(result, props2.enableMultiTenantMode).filter(
+            (user) => !props2.excludeUserIds.includes(user.id)
+          );
           if (props2.userGroup.length > 0) {
             const groupResult = props2.userGroup.filter((group) => group.id == props2.modelValue);
             options.value = groupResult.map((group) => ({
@@ -14709,7 +14706,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           usersList: [props2.currentUserId],
           enableMultiTenantMode: props2.enableMultiTenantMode
         });
-        const formattedResults = formatUsers(result);
+        const formattedResults = formatUsers(result, props2.enableMultiTenantMode);
         if (formattedResults.length > 0) {
           options.value = formattedResults.filter((user) => !props2.excludeUserIds.includes(user.id));
           addUser(formattedResults[0]);
@@ -14731,7 +14728,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           keyword,
           enableMultiTenantMode: props2.enableMultiTenantMode
         });
-        options.value = formatUsers(result).filter((user) => !selectedUser.value || user.id !== selectedUser.value).filter((user) => !props2.excludeUserIds.includes(user.id));
+        options.value = formatUsers(result, props2.enableMultiTenantMode).filter((user) => !selectedUser.value || user.id !== selectedUser.value).filter((user) => !props2.excludeUserIds.includes(user.id));
       } catch (error3) {
         console.error("获取用户列表失败:", error3);
         options.value = [];
@@ -14778,39 +14775,6 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
           class: normalizeClass(["single-selector", { "is-disabled": _ctx.disabled }])
         },
         [
-          createCommentVNode(" 输入框 "),
-          createElementVNode("div", _hoisted_1, [
-            createCommentVNode(" 用户标签显示 "),
-            selectedUserInfo.value ? (openBlock(), createElementBlock("div", {
-              key: 0,
-              onClick: withModifiers(removeSelectedUser, ["stop"])
-            }, [
-              createVNode(UserTag, {
-                "current-tenant-id": _ctx.tenantId,
-                "render-tag": _ctx.renderTag,
-                tenants: _ctx.tenants,
-                user: selectedUserInfo.value,
-                onClose: removeSelectedUser
-              }, null, 8, ["current-tenant-id", "render-tag", "tenants", "user"])
-            ])) : createCommentVNode("v-if", true),
-            withDirectives(createElementVNode("input", {
-              ref_key: "inputRef",
-              ref: inputRef,
-              class: "search-input",
-              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => searchQuery.value = $event),
-              placeholder: selectedUserInfo.value ? "" : _ctx.placeholder,
-              onFocus: handleInputFocus,
-              onInput: handleInput
-            }, null, 40, _hoisted_2), [
-              [vModelText, searchQuery.value]
-            ]),
-            createCommentVNode(' "我"标签 '),
-            createVNode(MeTag, {
-              "current-user-id": _ctx.currentUserId,
-              "is-disabled": !!_ctx.currentUserId && !!selectedUserInfo.value && selectedUserInfo.value[_ctx.exactSearchKey] === _ctx.currentUserId,
-              onClick: addCurrentUser
-            }, null, 8, ["current-user-id", "is-disabled"])
-          ]),
           createCommentVNode(" 使用新的公共下拉选项组件 "),
           createVNode(SelectionPopover, {
             "container-width": containerRef.value ? containerRef.value.offsetWidth : "auto",
@@ -14825,7 +14789,45 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
             "user-group": userGroupFilter.value,
             "user-group-name": _ctx.userGroupName,
             onSelectUser: addUser
-          }, null, 8, ["container-width", "empty-text", "is-show", "loading", "options", "render-list-item", "search-query", "tenant-id", "tenants", "user-group", "user-group-name"])
+          }, {
+            default: withCtx(() => [
+              createCommentVNode(" 输入框 "),
+              createElementVNode("div", _hoisted_1, [
+                createCommentVNode(" 用户标签显示 "),
+                selectedUserInfo.value ? (openBlock(), createElementBlock("div", {
+                  key: 0,
+                  onClick: withModifiers(removeSelectedUser, ["stop"])
+                }, [
+                  createVNode(UserTag, {
+                    "current-tenant-id": _ctx.tenantId,
+                    "render-tag": _ctx.renderTag,
+                    tenants: _ctx.tenants,
+                    user: selectedUserInfo.value,
+                    onClose: removeSelectedUser
+                  }, null, 8, ["current-tenant-id", "render-tag", "tenants", "user"])
+                ])) : createCommentVNode("v-if", true),
+                withDirectives(createElementVNode("input", {
+                  ref_key: "inputRef",
+                  ref: inputRef,
+                  class: "search-input",
+                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => searchQuery.value = $event),
+                  placeholder: selectedUserInfo.value ? "" : _ctx.placeholder,
+                  onFocus: handleInputFocus,
+                  onInput: handleInput
+                }, null, 40, _hoisted_2), [
+                  [vModelText, searchQuery.value]
+                ]),
+                createCommentVNode(' "我"标签 '),
+                createVNode(MeTag, {
+                  "current-user-id": _ctx.currentUserId,
+                  "is-disabled": !!_ctx.currentUserId && !!selectedUserInfo.value && selectedUserInfo.value[_ctx.exactSearchKey] === _ctx.currentUserId,
+                  onClick: addCurrentUser
+                }, null, 8, ["current-user-id", "is-disabled"])
+              ])
+            ]),
+            _: 1
+            /* STABLE */
+          }, 8, ["container-width", "empty-text", "is-show", "loading", "options", "render-list-item", "search-query", "tenant-id", "tenants", "user-group", "user-group-name"])
         ],
         2
         /* CLASS */
@@ -14835,7 +14837,7 @@ const _sfc_main$1 = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-67f2ee6a"]]);
+const SingleSelector = /* @__PURE__ */ _export_sfc(_sfc_main$1, [["__scopeId", "data-v-d52d578d"]]);
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "BkUserSelector"
@@ -14857,7 +14859,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     renderListItem: {},
     renderTag: {},
     excludeUserIds: { default: () => [] },
-    enableMultiTenantMode: { type: Boolean, default: false }
+    enableMultiTenantMode: { type: Boolean, default: true }
   },
   emits: ["update:modelValue", "change"],
   setup(__props, { emit: __emit }) {
@@ -14866,7 +14868,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     });
     const props2 = __props;
     const emit = __emit;
-    const { tenants = {} } = useTenantData(props2.apiBaseUrl, props2.tenantId);
+    const { tenants = {} } = useTenantData(props2.apiBaseUrl, props2.tenantId, props2.enableMultiTenantMode);
     const selectedUsers = ref([]);
     const selectedUser = ref(props2.multiple ? "" : props2.modelValue);
     const selectedUserIds = computed(() => {
@@ -14893,7 +14895,8 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               usersList: ids,
               enableMultiTenantMode: props2.enableMultiTenantMode
             });
-            selectedUsers.value = [...selected, ...formatUsers(result)];
+            const selectedList = [...selected, ...formatUsers(result, props2.enableMultiTenantMode)];
+            selectedUsers.value = ids.map((id) => selectedList.find((user) => user.id === id)).filter(Boolean);
           } catch (error3) {
             console.error("获取选中用户信息失败:", error3);
           }
@@ -15000,7 +15003,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-30b84150"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-02466e5e"]]);
 const vue2 = {
   model: {
     prop: "modelValue",