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

package/vue3/index.umd.min.js

@@ -3,7 +3,7 @@
 })(this, function(exports2, vue, bkuiVue) {
   "use strict";
   var __vite_style__ = document.createElement("style");
-  __vite_style__.textContent = ".me-tag[data-v-9ccd9029] {\n  position: absolute;\n  top: 50%;\n  right: 8px;\n  z-index: 1;\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 24px;\n  padding: 0 8px;\n  font-size: 12px;\n  color: #4d4f56;\n  cursor: pointer;\n  background-color: #e1ecff;\n  border-radius: 50%;\n  transform: translateY(-50%);\n}\n.me-tag[data-v-9ccd9029]:hover {\n  color: #3a84ff;\n  background-color: #cddffe;\n}\n.me-tag.disabled[data-v-9ccd9029] {\n  color: #c4c6cc;\n  cursor: not-allowed;\n  background-color: #f0f1f5;\n}.dropdown-content[data-v-a4132257] {\n  min-height: 40px;\n  max-height: 300px;\n  padding: 5px 0;\n  overflow-y: auto;\n}\n.dropdown-content .no-data[data-v-a4132257] {\n  padding: 10px;\n  color: #979ba5;\n  text-align: center;\n}\n.dropdown-content .user-group .group-header[data-v-a4132257] {\n  display: flex;\n  align-items: center;\n  padding: 8px 12px;\n  color: #979ba5;\n}\n.dropdown-content .user-group .group-header .group-count[data-v-a4132257] {\n  margin-left: 4px;\n}\n.dropdown-content .user-option[data-v-a4132257] {\n  display: flex;\n  align-items: center;\n  height: 32px;\n  padding: 8px 12px;\n  cursor: pointer;\n}\n.dropdown-content .user-option[data-v-a4132257]:hover {\n  background-color: #f5f7fa;\n}.bk-user-selector-popover.bk-user-selector-pop2-content {\n  padding: 0;\n}.user-tag[data-v-51944a49] {\n  margin-right: 4px;\n  margin-left: 0;\n}\n.user-tag.draggable[data-v-51944a49] {\n  cursor: move;\n}\n.user-tag.active[data-v-51944a49] {\n  background-color: #e1ecff;\n  border-color: #3a84ff;\n}\n.user-tag .tag-content .user-name[data-v-51944a49] {\n  overflow: hidden;\n  font-size: 12px;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}.multiple-selector[data-v-bebe517d] {\n  position: relative;\n  width: 100%;\n}\n.multiple-selector.is-disabled[data-v-bebe517d] {\n  pointer-events: none;\n}\n.multiple-selector .tags-container[data-v-bebe517d] {\n  min-height: 32px;\n  padding: 1px 10px 1px 8px;\n  background-color: #fff;\n  border: 1px solid #c4c6cc;\n  border-radius: 2px;\n  transition: all 0.2s ease;\n}\n.multiple-selector .tags-container.focused[data-v-bebe517d] {\n  border-color: #3a84ff;\n  box-shadow: 0 0 0 2px rgba(58, 132, 255, 0.1);\n}\n.multiple-selector .tags-container.collapsed[data-v-bebe517d] {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n}\n.multiple-selector .tag-list[data-v-bebe517d] {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n}\n.multiple-selector .tag-wrapper[data-v-bebe517d] {\n  display: inline-flex;\n  align-items: center;\n  max-width: 100%;\n}\n.multiple-selector .search-input[data-v-bebe517d] {\n  min-width: 10px;\n  height: 28px;\n  background: transparent;\n  border: none;\n  outline: none;\n}\n.multiple-selector .search-input[data-v-bebe517d]::placeholder {\n  color: #c4c6cc;\n}\n.multiple-selector .search-input.inline[data-v-bebe517d] {\n  min-width: 10px;\n}\n.multiple-selector .search-input.last[data-v-bebe517d], .multiple-selector .search-input.collapsed[data-v-bebe517d] {\n  flex: 1;\n  min-width: 60px;\n}.single-selector[data-v-67f2ee6a] {\n  position: relative;\n  width: 100%;\n}\n.single-selector.is-disabled[data-v-67f2ee6a] {\n  pointer-events: none;\n}\n.input-container[data-v-67f2ee6a] {\n  position: relative;\n  display: flex;\n  align-items: center;\n  min-height: 32px;\n  padding: 0 8px;\n  background-color: #fff;\n  border: 1px solid #c4c6cc;\n  border-radius: 2px;\n}\n.input-container[data-v-67f2ee6a]:focus-within {\n  border-color: #3a84ff;\n  box-shadow: 0 0 0 2px rgba(58, 132, 255, 0.1);\n}\n.search-input[data-v-67f2ee6a] {\n  flex: 1;\n  height: 30px;\n  background: transparent;\n  border: none;\n  outline: none;\n}\n.search-input[data-v-67f2ee6a]::placeholder {\n  color: #c4c6cc;\n}.bk-user-selector[data-v-30b84150] {\n  position: relative;\n  width: 100%;\n  font-size: 12px;\n}\n.bk-user-selector.is-disabled[data-v-30b84150] {\n  cursor: not-allowed;\n  background-color: #dcdee5;\n}";
+  __vite_style__.textContent = ".me-tag[data-v-9ccd9029] {\n  position: absolute;\n  top: 50%;\n  right: 8px;\n  z-index: 1;\n  display: inline-flex;\n  align-items: center;\n  justify-content: center;\n  width: 24px;\n  height: 24px;\n  padding: 0 8px;\n  font-size: 12px;\n  color: #4d4f56;\n  cursor: pointer;\n  background-color: #e1ecff;\n  border-radius: 50%;\n  transform: translateY(-50%);\n}\n.me-tag[data-v-9ccd9029]:hover {\n  color: #3a84ff;\n  background-color: #cddffe;\n}\n.me-tag.disabled[data-v-9ccd9029] {\n  color: #c4c6cc;\n  cursor: not-allowed;\n  background-color: #f0f1f5;\n}.dropdown-content[data-v-6380faf5] {\n  min-height: 40px;\n  max-height: 300px;\n  padding: 5px 0;\n  overflow-y: auto;\n}\n.dropdown-content .no-data[data-v-6380faf5] {\n  padding: 10px;\n  color: #979ba5;\n  text-align: center;\n}\n.dropdown-content .user-group .group-header[data-v-6380faf5] {\n  display: flex;\n  align-items: center;\n  padding: 8px 12px;\n  color: #979ba5;\n}\n.dropdown-content .user-group .group-header .group-count[data-v-6380faf5] {\n  margin-left: 4px;\n}\n.dropdown-content .user-option[data-v-6380faf5] {\n  display: flex;\n  align-items: center;\n  height: 32px;\n  padding: 8px 12px;\n  cursor: pointer;\n}\n.dropdown-content .user-option[data-v-6380faf5]:hover {\n  background-color: #f5f7fa;\n}.bk-user-selector-popover.bk-user-selector-pop2-content {\n  padding: 0;\n}.user-tag[data-v-51944a49] {\n  margin-right: 4px;\n  margin-left: 0;\n}\n.user-tag.draggable[data-v-51944a49] {\n  cursor: move;\n}\n.user-tag.active[data-v-51944a49] {\n  background-color: #e1ecff;\n  border-color: #3a84ff;\n}\n.user-tag .tag-content .user-name[data-v-51944a49] {\n  overflow: hidden;\n  font-size: 12px;\n  text-overflow: ellipsis;\n  white-space: nowrap;\n}.multiple-selector[data-v-69acfacb] {\n  position: relative;\n  width: 100%;\n}\n.multiple-selector.is-disabled[data-v-69acfacb] {\n  pointer-events: none;\n}\n.multiple-selector .tags-container[data-v-69acfacb] {\n  min-height: 32px;\n  padding: 1px 10px 1px 8px;\n  background-color: #fff;\n  border: 1px solid #c4c6cc;\n  border-radius: 2px;\n  transition: all 0.2s ease;\n}\n.multiple-selector .tags-container.focused[data-v-69acfacb] {\n  border-color: #3a84ff;\n  box-shadow: 0 0 0 2px rgba(58, 132, 255, 0.1);\n}\n.multiple-selector .tags-container.collapsed[data-v-69acfacb] {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n}\n.multiple-selector .tag-list[data-v-69acfacb] {\n  display: flex;\n  flex-wrap: wrap;\n  align-items: center;\n}\n.multiple-selector .tag-wrapper[data-v-69acfacb] {\n  display: inline-flex;\n  align-items: center;\n  max-width: 100%;\n}\n.multiple-selector .search-input[data-v-69acfacb] {\n  min-width: 10px;\n  height: 28px;\n  background: transparent;\n  border: none;\n  outline: none;\n}\n.multiple-selector .search-input[data-v-69acfacb]::placeholder {\n  color: #c4c6cc;\n}\n.multiple-selector .search-input.inline[data-v-69acfacb] {\n  min-width: 10px;\n}\n.multiple-selector .search-input.last[data-v-69acfacb], .multiple-selector .search-input.collapsed[data-v-69acfacb] {\n  flex: 1;\n  min-width: 60px;\n}.single-selector[data-v-d52d578d] {\n  position: relative;\n  width: 100%;\n}\n.single-selector.is-disabled[data-v-d52d578d] {\n  pointer-events: none;\n}\n.input-container[data-v-d52d578d] {\n  position: relative;\n  display: flex;\n  align-items: center;\n  min-height: 32px;\n  padding: 0 8px;\n  background-color: #fff;\n  border: 1px solid #c4c6cc;\n  border-radius: 2px;\n}\n.input-container[data-v-d52d578d]:focus-within {\n  border-color: #3a84ff;\n  box-shadow: 0 0 0 2px rgba(58, 132, 255, 0.1);\n}\n.search-input[data-v-d52d578d] {\n  flex: 1;\n  height: 30px;\n  background: transparent;\n  border: none;\n  outline: none;\n}\n.search-input[data-v-d52d578d]::placeholder {\n  color: #c4c6cc;\n}.bk-user-selector[data-v-02466e5e] {\n  position: relative;\n  width: 100%;\n  font-size: 12px;\n}\n.bk-user-selector.is-disabled[data-v-02466e5e] {\n  cursor: not-allowed;\n  background-color: #dcdee5;\n}";
   document.head.appendChild(__vite_style__);
   const generateCallbackName = () => {
     const timestamp = Date.now();
@@ -13,10 +13,15 @@
   const jsonpRequest = (requestUrl, options = {}) => {
     return new Promise((resolve, reject) => {
       const url = vue.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);
@@ -30,7 +35,7 @@
       };
       window[callbackName] = (data) => {
         cleanup();
-        resolve(data);
+        resolve(data.data || data);
       };
       timeoutId = setTimeout(() => {
         cleanup();
@@ -46,48 +51,6 @@
       document.head.appendChild(script);
     });
   };
-  const useJSONP = (url, options = {}) => {
-    const data = vue.shallowRef(null);
-    const loading = vue.shallowRef(false);
-    const error = vue.shallowRef(null);
-    let abortFlag = false;
-    const executeRequest = async (requestUrl) => {
-      if (!requestUrl) return;
-      loading.value = true;
-      error.value = null;
-      abortFlag = false;
-      try {
-        const result = await jsonpRequest(requestUrl, options);
-        if (!abortFlag) {
-          data.value = result;
-        }
-      } catch (err) {
-        if (!abortFlag) {
-          const errorObj = err instanceof Error ? err : new Error(String(err));
-          error.value = errorObj;
-        }
-      } finally {
-        if (!abortFlag) {
-          loading.value = false;
-        }
-      }
-    };
-    const stopWatcher = vue.watchEffect(() => {
-      executeRequest(vue.unref(url));
-    });
-    vue.onScopeDispose(() => {
-      abortFlag = true;
-      stopWatcher();
-    });
-    return {
-      data,
-      loading,
-      error,
-      refetch: () => {
-        executeRequest(vue.unref(url));
-      }
-    };
-  };
   const getTenants = async (apiBaseUrl, tenantId) => {
     if (!apiBaseUrl || !tenantId) {
       console.warn("获取租户信息需要提供有效的apiBaseUrl和租户ID");
@@ -114,7 +77,7 @@
   };
   const searchUsers = async (params) => {
     const { apiBaseUrl, tenantId, keyword, enableMultiTenantMode = true } = params;
-    if (enableMultiTenantMode) {
+    if (!enableMultiTenantMode) {
       const userList = await getUserList(apiBaseUrl, {
         keyword,
         pageSize: 100,
@@ -150,13 +113,13 @@
   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((u) => u.username === user)).filter(Boolean);
     }
     if (users.length === 0 || !apiBaseUrl || !tenantId) {
       console.warn("批量查找用户需要提供有效的apiBaseUrl、租户ID和至少一个用户名");
@@ -181,18 +144,26 @@
       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 data = await jsonpRequest(url, {
       params: {
         exact_lookups: (userIds == null ? void 0 : userIds.join(",")) || void 0,
         fuzzy_lookups: keyword || void 0,
@@ -201,9 +172,9 @@
         app_code: appCode || "bk-magicbox"
       }
     });
-    return userList.value || [];
+    return (data == null ? void 0 : data.results) || [];
   };
-  const useTenantData = (apiBaseUrl, tenantId) => {
+  const useTenantData = (apiBaseUrl, tenantId, enableMultiTenantMode = true) => {
     const tenants = vue.ref({});
     const loading = vue.ref(false);
     const fetchTenants = async () => {
@@ -228,7 +199,9 @@
       }
     };
     vue.onBeforeMount(() => {
-      fetchTenants();
+      if (enableMultiTenantMode) {
+        fetchTenants();
+      }
     });
     return {
       tenants,
@@ -3034,7 +3007,7 @@
     }
     return Math.max(1, visibleCount);
   };
-  const useUserSearch = (apiBaseUrl, tenantId) => {
+  const useUserSearch = (apiBaseUrl, tenantId, enableMultiTenantMode = true) => {
     const searchResults = vue.ref([]);
     const loading = vue.ref(false);
     const searchQuery = vue.ref("");
@@ -3043,7 +3016,7 @@
         searchResults.value = [];
         return;
       }
-      if (!apiBaseUrl || !tenantId) {
+      if (enableMultiTenantMode && (!apiBaseUrl || !tenantId)) {
         console.warn("执行用户搜索需要提供有效的API基础URL和租户ID");
         return;
       }
@@ -3053,9 +3026,9 @@
           apiBaseUrl,
           tenantId,
           keyword,
-          enableMultiTenantMode: true
+          enableMultiTenantMode
         });
-        searchResults.value = formatUsers(results);
+        searchResults.value = formatUsers(results, enableMultiTenantMode);
       } catch (error) {
         console.error("用户搜索失败:", error);
         searchResults.value = [];
@@ -3397,13 +3370,16 @@
               /* STABLE */
             }, 8, ["loading"])
           ]),
-          _: 1
-          /* STABLE */
+          default: vue.withCtx(() => [
+            vue.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__ */ vue.defineComponent({
     ...{
       name: "UserTag"
@@ -3487,7 +3463,7 @@
         searchQuery,
         // clearSearch,
         handleSearchInput
-      } = useUserSearch(props.apiBaseUrl, props.tenantId);
+      } = useUserSearch(props.apiBaseUrl, props.tenantId, props.enableMultiTenantMode);
       const containerRef = vue.ref(null);
       const tagsContainerRef = vue.ref(null);
       const sortableContainerRef = vue.ref(null);
@@ -3505,7 +3481,14 @@
         return searchResults.value.filter((user) => !props.selectedUsers.some((selectedUser) => selectedUser.id === user.id)).filter((user) => !props.excludeUserIds.includes(user.id));
       });
       const userGroupFilter = vue.computed(() => {
-        return props.userGroup.filter((group) => !props.selectedUsers.some((user) => user.id === group.id) && !group.hidden);
+        return props.userGroup.filter((group) => {
+          var _a, _b;
+          const filtered = !props.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 (!props.draggable || !sortableContainerRef.value) return;
@@ -3614,7 +3597,7 @@
             usersList: [props.currentUserId],
             enableMultiTenantMode: props.enableMultiTenantMode
           });
-          const formattedUsers = formatUsers(result);
+          const formattedUsers = formatUsers(result, props.enableMultiTenantMode);
           if (formattedUsers.length > 0) {
             if (!props.selectedUsers.some((item) => item.id === formattedUsers[0].id)) {
               emit("update:selectedUsers", [...props.selectedUsers, formattedUsers[0]]);
@@ -3642,7 +3625,7 @@
               usersList: users,
               enableMultiTenantMode: props.enableMultiTenantMode
             });
-            const formattedUsers = formatUsers(result);
+            const formattedUsers = formatUsers(result, props.enableMultiTenantMode);
             if (formattedUsers.length > 0) {
               const updatedUsers = [...props.selectedUsers, ...formattedUsers];
               emit("update:selectedUsers", updatedUsers);
@@ -3745,210 +3728,215 @@
             class: vue.normalizeClass(["multiple-selector", { "is-disabled": _ctx.disabled }])
           },
           [
-            vue.createCommentVNode(" 聚焦状态 - 可编辑模式 "),
-            isFocused.value ? (vue.openBlock(), vue.createElementBlock(
-              "div",
-              {
-                key: 0,
-                ref_key: "tagsContainerRef",
-                ref: tagsContainerRef,
-                class: "tags-container focused",
-                onClick: vue.withModifiers(handleContainerClick, ["stop"])
-              },
-              [
-                vue.createCommentVNode(" 用户标签列表 "),
-                vue.createElementVNode(
+            vue.createCommentVNode(" 下拉选项列表 "),
+            vue.createVNode(SelectionPopover, {
+              "container-width": containerRef.value ? containerRef.value.offsetWidth : "auto",
+              "cross-axis-offset": crossAxisOffset.value,
+              "empty-text": _ctx.emptyText,
+              "is-show": showDropdown.value,
+              loading: vue.unref(searchLoading),
+              options: options.value,
+              "render-list-item": _ctx.renderListItem,
+              "search-query": vue.unref(searchQuery),
+              "tenant-id": _ctx.tenantId,
+              tenants: _ctx.tenants,
+              "user-group": userGroupFilter.value,
+              "user-group-name": _ctx.userGroupName,
+              onClickOutside: handleClickOutside,
+              onSelectUser: addUser
+            }, {
+              default: vue.withCtx(() => [
+                vue.createCommentVNode(" 聚焦状态 - 可编辑模式 "),
+                isFocused.value ? (vue.openBlock(), vue.createElementBlock(
                   "div",
                   {
-                    ref_key: "sortableContainerRef",
-                    ref: sortableContainerRef,
-                    class: "tag-list"
+                    key: 0,
+                    ref_key: "tagsContainerRef",
+                    ref: tagsContainerRef,
+                    class: "tags-container focused",
+                    onClick: vue.withModifiers(handleContainerClick, ["stop"])
                   },
                   [
-                    (vue.openBlock(true), vue.createElementBlock(
-                      vue.Fragment,
-                      null,
-                      vue.renderList(_ctx.selectedUsers, (user, index) => {
-                        return vue.openBlock(), vue.createElementBlock("div", {
-                          class: "tag-wrapper",
-                          key: user.id,
-                          onClick: vue.withModifiers(($event) => handleTagClick(index), ["stop"])
-                        }, [
-                          vue.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"]),
-                          vue.createCommentVNode(" 在当前激活标签后插入输入框 "),
-                          index === activeTagIndex.value && activeTagIndex.value !== _ctx.selectedUsers.length - 1 ? vue.withDirectives((vue.openBlock(), vue.createElementBlock(
-                            "input",
-                            {
-                              key: 0,
-                              ref_for: true,
-                              ref_key: "inlineInputRef",
-                              ref: inlineInputRef,
-                              class: "search-input inline",
-                              "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(searchQuery) ? searchQuery.value = $event : null),
-                              onFocus: handleInputFocus,
-                              onInput: handleInput,
-                              onKeydown: handleKeyDown,
-                              onPaste: handlePaste
-                            },
-                            null,
-                            544
-                            /* NEED_HYDRATION, NEED_PATCH */
-                          )), [
-                            [vue.vModelText, vue.unref(searchQuery)]
-                          ]) : vue.createCommentVNode("v-if", true)
-                        ], 8, _hoisted_1$1);
-                      }),
-                      128
-                      /* KEYED_FRAGMENT */
-                    )),
-                    vue.createCommentVNode(" 最后一个输入框 "),
-                    activeTagIndex.value === -1 || activeTagIndex.value === _ctx.selectedUsers.length - 1 ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("input", {
-                      key: 0,
-                      ref_key: "lastInputRef",
-                      ref: lastInputRef,
-                      class: "search-input last",
-                      "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.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)), [
-                      [vue.vModelText, vue.unref(searchQuery)]
-                    ]) : vue.createCommentVNode("v-if", true),
-                    vue.createCommentVNode(' "我"标签 '),
-                    vue.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"])
+                    vue.createCommentVNode(" 用户标签列表 "),
+                    vue.createElementVNode(
+                      "div",
+                      {
+                        ref_key: "sortableContainerRef",
+                        ref: sortableContainerRef,
+                        class: "tag-list"
+                      },
+                      [
+                        (vue.openBlock(true), vue.createElementBlock(
+                          vue.Fragment,
+                          null,
+                          vue.renderList(_ctx.selectedUsers, (user, index) => {
+                            return vue.openBlock(), vue.createElementBlock("div", {
+                              class: "tag-wrapper",
+                              key: user.id,
+                              onClick: vue.withModifiers(($event) => handleTagClick(index), ["stop"])
+                            }, [
+                              vue.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"]),
+                              vue.createCommentVNode(" 在当前激活标签后插入输入框 "),
+                              index === activeTagIndex.value && activeTagIndex.value !== _ctx.selectedUsers.length - 1 ? vue.withDirectives((vue.openBlock(), vue.createElementBlock(
+                                "input",
+                                {
+                                  key: 0,
+                                  ref_for: true,
+                                  ref_key: "inlineInputRef",
+                                  ref: inlineInputRef,
+                                  class: "search-input inline",
+                                  "onUpdate:modelValue": _cache[0] || (_cache[0] = ($event) => vue.isRef(searchQuery) ? searchQuery.value = $event : null),
+                                  onFocus: handleInputFocus,
+                                  onInput: handleInput,
+                                  onKeydown: handleKeyDown,
+                                  onPaste: handlePaste
+                                },
+                                null,
+                                544
+                                /* NEED_HYDRATION, NEED_PATCH */
+                              )), [
+                                [vue.vModelText, vue.unref(searchQuery)]
+                              ]) : vue.createCommentVNode("v-if", true)
+                            ], 8, _hoisted_1$1);
+                          }),
+                          128
+                          /* KEYED_FRAGMENT */
+                        )),
+                        vue.createCommentVNode(" 最后一个输入框 "),
+                        activeTagIndex.value === -1 || activeTagIndex.value === _ctx.selectedUsers.length - 1 ? vue.withDirectives((vue.openBlock(), vue.createElementBlock("input", {
+                          key: 0,
+                          ref_key: "lastInputRef",
+                          ref: lastInputRef,
+                          class: "search-input last",
+                          "onUpdate:modelValue": _cache[1] || (_cache[1] = ($event) => vue.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)), [
+                          [vue.vModelText, vue.unref(searchQuery)]
+                        ]) : vue.createCommentVNode("v-if", true),
+                        vue.createCommentVNode(' "我"标签 '),
+                        vue.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 */
-            )) : (vue.openBlock(), vue.createElementBlock(
-              vue.Fragment,
-              { key: 1 },
-              [
-                vue.createCommentVNode(" 未聚焦状态 - 只读展示模式 "),
-                vue.createElementVNode(
-                  "div",
-                  {
-                    ref_key: "collapsedContainerRef",
-                    ref: collapsedContainerRef,
-                    class: "tags-container collapsed",
-                    onClick: vue.withModifiers(handleFocus, ["stop"])
-                  },
+                )) : (vue.openBlock(), vue.createElementBlock(
+                  vue.Fragment,
+                  { key: 1 },
                   [
-                    (vue.openBlock(true), vue.createElementBlock(
-                      vue.Fragment,
-                      null,
-                      vue.renderList(visibleUsers.value, (user) => {
-                        return vue.openBlock(), vue.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 */
-                    )),
-                    vue.createCommentVNode(" 显示折叠标签数量 "),
-                    hiddenCount.value > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(bkuiVue.Popover), {
-                      key: 0,
-                      placement: "top"
-                    }, {
-                      content: vue.withCtx(() => [
+                    vue.createCommentVNode(" 未聚焦状态 - 只读展示模式 "),
+                    vue.createElementVNode(
+                      "div",
+                      {
+                        ref_key: "collapsedContainerRef",
+                        ref: collapsedContainerRef,
+                        class: "tags-container collapsed",
+                        onClick: vue.withModifiers(handleFocus, ["stop"])
+                      },
+                      [
                         (vue.openBlock(true), vue.createElementBlock(
                           vue.Fragment,
                           null,
-                          vue.renderList(_ctx.selectedUsers.slice(visibleUsers.value.length), (user) => {
-                            return vue.openBlock(), vue.createBlock(vue.unref(UserRender), {
+                          vue.renderList(visibleUsers.value, (user) => {
+                            return vue.openBlock(), vue.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: vue.withCtx(() => [
-                        vue.createVNode(vue.unref(bkuiVue.Tag), null, {
+                        )),
+                        vue.createCommentVNode(" 显示折叠标签数量 "),
+                        hiddenCount.value > 0 ? (vue.openBlock(), vue.createBlock(vue.unref(bkuiVue.Popover), {
+                          key: 0,
+                          placement: "top"
+                        }, {
+                          content: vue.withCtx(() => [
+                            (vue.openBlock(true), vue.createElementBlock(
+                              vue.Fragment,
+                              null,
+                              vue.renderList(_ctx.selectedUsers.slice(visibleUsers.value.length), (user) => {
+                                return vue.openBlock(), vue.createBlock(vue.unref(UserRender), {
+                                  key: user.id,
+                                  "tenant-id": _ctx.tenantId,
+                                  tenants: _ctx.tenants,
+                                  user
+                                }, null, 8, ["tenant-id", "tenants", "user"]);
+                              }),
+                              128
+                              /* KEYED_FRAGMENT */
+                            ))
+                          ]),
                           default: vue.withCtx(() => [
-                            vue.createTextVNode(
-                              " +" + vue.toDisplayString(hiddenCount.value),
-                              1
-                              /* TEXT */
-                            )
+                            vue.createVNode(vue.unref(bkuiVue.Tag), null, {
+                              default: vue.withCtx(() => [
+                                vue.createTextVNode(
+                                  " +" + vue.toDisplayString(hiddenCount.value),
+                                  1
+                                  /* TEXT */
+                                )
+                              ]),
+                              _: 1
+                              /* STABLE */
+                            })
                           ]),
                           _: 1
                           /* STABLE */
-                        })
-                      ]),
-                      _: 1
-                      /* STABLE */
-                    })) : vue.createCommentVNode("v-if", true),
-                    vue.createCommentVNode(" 搜索输入框 "),
-                    vue.withDirectives(vue.createElementVNode("input", {
-                      ref_key: "collapsedInputRef",
-                      ref: collapsedInputRef,
-                      class: "search-input collapsed",
-                      "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.isRef(searchQuery) ? searchQuery.value = $event : null),
-                      placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
-                      onFocus: handleFocus
-                    }, null, 40, _hoisted_3), [
-                      [vue.vModelText, vue.unref(searchQuery)]
-                    ]),
-                    vue.createCommentVNode(' 未聚焦状态下的"我"标签 '),
-                    vue.createVNode(MeTag, {
-                      "current-user-id": _ctx.currentUserId,
-                      "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user[props.exactSearchKey] === _ctx.currentUserId),
-                      onClick: addCurrentUser
-                    }, null, 8, ["current-user-id", "is-disabled"])
+                        })) : vue.createCommentVNode("v-if", true),
+                        vue.createCommentVNode(" 搜索输入框 "),
+                        vue.withDirectives(vue.createElementVNode("input", {
+                          ref_key: "collapsedInputRef",
+                          ref: collapsedInputRef,
+                          class: "search-input collapsed",
+                          "onUpdate:modelValue": _cache[2] || (_cache[2] = ($event) => vue.isRef(searchQuery) ? searchQuery.value = $event : null),
+                          placeholder: !_ctx.selectedUsers.length ? _ctx.placeholder : "",
+                          onFocus: handleFocus
+                        }, null, 40, _hoisted_3), [
+                          [vue.vModelText, vue.unref(searchQuery)]
+                        ]),
+                        vue.createCommentVNode(' 未聚焦状态下的"我"标签 '),
+                        vue.createVNode(MeTag, {
+                          "current-user-id": _ctx.currentUserId,
+                          "is-disabled": !!_ctx.currentUserId && _ctx.selectedUsers.some((user) => user[props.exactSearchKey] === _ctx.currentUserId),
+                          onClick: addCurrentUser
+                        }, null, 8, ["current-user-id", "is-disabled"])
+                      ],
+                      512
+                      /* NEED_PATCH */
+                    )
                   ],
-                  512
-                  /* NEED_PATCH */
-                )
-              ],
-              2112
-              /* STABLE_FRAGMENT, DEV_ROOT_FRAGMENT */
-            )),
-            vue.createCommentVNode(" 下拉选项列表 "),
-            vue.createVNode(SelectionPopover, {
-              "container-width": containerRef.value ? containerRef.value.offsetWidth : "auto",
-              "cross-axis-offset": crossAxisOffset.value,
-              "empty-text": _ctx.emptyText,
-              "is-show": showDropdown.value,
-              loading: vue.unref(searchLoading),
-              options: options.value,
-              "render-list-item": _ctx.renderListItem,
-              "search-query": vue.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 */
@@ -3956,7 +3944,7 @@
       };
     }
   });
-  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__ */ vue.defineComponent({
@@ -3993,7 +3981,14 @@
       const searchQuery = vue.ref("");
       const showDropdown = vue.ref(false);
       const userGroupFilter = vue.computed(() => {
-        return props.userGroup.filter((group) => group.id !== selectedUser.value && !group.hidden);
+        return props.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 = vue.computed(() => {
         const userGroup = (props.userGroup || []).map((group) => ({
@@ -4017,7 +4012,9 @@
               usersList: [props.modelValue],
               enableMultiTenantMode: props.enableMultiTenantMode
             });
-            options.value = formatUsers(result).filter((user) => !props.excludeUserIds.includes(user.id));
+            options.value = formatUsers(result, props.enableMultiTenantMode).filter(
+              (user) => !props.excludeUserIds.includes(user.id)
+            );
             if (props.userGroup.length > 0) {
               const groupResult = props.userGroup.filter((group) => group.id == props.modelValue);
               options.value = groupResult.map((group) => ({
@@ -4048,7 +4045,7 @@
             usersList: [props.currentUserId],
             enableMultiTenantMode: props.enableMultiTenantMode
           });
-          const formattedResults = formatUsers(result);
+          const formattedResults = formatUsers(result, props.enableMultiTenantMode);
           if (formattedResults.length > 0) {
             options.value = formattedResults.filter((user) => !props.excludeUserIds.includes(user.id));
             addUser(formattedResults[0]);
@@ -4070,7 +4067,7 @@
             keyword,
             enableMultiTenantMode: props.enableMultiTenantMode
           });
-          options.value = formatUsers(result).filter((user) => !selectedUser.value || user.id !== selectedUser.value).filter((user) => !props.excludeUserIds.includes(user.id));
+          options.value = formatUsers(result, props.enableMultiTenantMode).filter((user) => !selectedUser.value || user.id !== selectedUser.value).filter((user) => !props.excludeUserIds.includes(user.id));
         } catch (error) {
           console.error("获取用户列表失败:", error);
           options.value = [];
@@ -4117,39 +4114,6 @@
             class: vue.normalizeClass(["single-selector", { "is-disabled": _ctx.disabled }])
           },
           [
-            vue.createCommentVNode(" 输入框 "),
-            vue.createElementVNode("div", _hoisted_1, [
-              vue.createCommentVNode(" 用户标签显示 "),
-              selectedUserInfo.value ? (vue.openBlock(), vue.createElementBlock("div", {
-                key: 0,
-                onClick: vue.withModifiers(removeSelectedUser, ["stop"])
-              }, [
-                vue.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"])
-              ])) : vue.createCommentVNode("v-if", true),
-              vue.withDirectives(vue.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), [
-                [vue.vModelText, searchQuery.value]
-              ]),
-              vue.createCommentVNode(' "我"标签 '),
-              vue.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"])
-            ]),
             vue.createCommentVNode(" 使用新的公共下拉选项组件 "),
             vue.createVNode(SelectionPopover, {
               "container-width": containerRef.value ? containerRef.value.offsetWidth : "auto",
@@ -4164,7 +4128,45 @@
               "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: vue.withCtx(() => [
+                vue.createCommentVNode(" 输入框 "),
+                vue.createElementVNode("div", _hoisted_1, [
+                  vue.createCommentVNode(" 用户标签显示 "),
+                  selectedUserInfo.value ? (vue.openBlock(), vue.createElementBlock("div", {
+                    key: 0,
+                    onClick: vue.withModifiers(removeSelectedUser, ["stop"])
+                  }, [
+                    vue.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"])
+                  ])) : vue.createCommentVNode("v-if", true),
+                  vue.withDirectives(vue.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), [
+                    [vue.vModelText, searchQuery.value]
+                  ]),
+                  vue.createCommentVNode(' "我"标签 '),
+                  vue.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 */
@@ -4174,7 +4176,7 @@
       };
     }
   });
-  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__ */ vue.defineComponent({
     ...{
       name: "BkUserSelector"
@@ -4196,7 +4198,7 @@
       renderListItem: {},
       renderTag: {},
       excludeUserIds: { default: () => [] },
-      enableMultiTenantMode: { type: Boolean, default: false }
+      enableMultiTenantMode: { type: Boolean, default: true }
     },
     emits: ["update:modelValue", "change"],
     setup(__props, { emit: __emit }) {
@@ -4205,7 +4207,7 @@
       });
       const props = __props;
       const emit = __emit;
-      const { tenants = {} } = useTenantData(props.apiBaseUrl, props.tenantId);
+      const { tenants = {} } = useTenantData(props.apiBaseUrl, props.tenantId, props.enableMultiTenantMode);
       const selectedUsers = vue.ref([]);
       const selectedUser = vue.ref(props.multiple ? "" : props.modelValue);
       const selectedUserIds = vue.computed(() => {
@@ -4232,7 +4234,8 @@
                 usersList: ids,
                 enableMultiTenantMode: props.enableMultiTenantMode
               });
-              selectedUsers.value = [...selected, ...formatUsers(result)];
+              const selectedList = [...selected, ...formatUsers(result, props.enableMultiTenantMode)];
+              selectedUsers.value = ids.map((id) => selectedList.find((user) => user.id === id)).filter(Boolean);
             } catch (error) {
               console.error("获取选中用户信息失败:", error);
             }
@@ -4339,7 +4342,7 @@
       };
     }
   });
-  const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-30b84150"]]);
+  const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-02466e5e"]]);
   exports2.BkUserSelector = BkUserSelector;
   exports2.default = BkUserSelector;
   Object.defineProperties(exports2, { __esModule: { value: true }, [Symbol.toStringTag]: { value: "Module" } });