@blueking/bk-user-selector 0.0.29-beta.2 → 0.0.29-beta.4

package/package.json

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

package/typings/api/user.d.ts

@@ -39,7 +39,7 @@ export declare const lookupUsers: (params: {
  * @param users - API返回的用户列表
  * @returns 格式化后的用户列表
  */
-export declare const formatUsers: (users: User[]) => FormattedUser[];
+export declare const formatUsers: (users: User[], enableMultiTenantMode?: boolean) => FormattedUser[];
 /**
  * 获取用户列表 兼容旧版本的人员选择器
  * @param url 请求的 URL

package/typings/hooks/use-jsonp.d.ts

@@ -4,6 +4,8 @@ export interface JSONPOptions {
     timeout?: number;
     /** 请求参数 */
     params?: Record<string, string | undefined>;
+    /** 是否携带凭证（cookie），默认为 true */
+    withCredentials?: boolean;
 }
 export interface JSONPResult<T> {
     /** 响应数据 */

package/typings/hooks/useUserSearch.d.ts

@@ -10,7 +10,7 @@ import { type FormattedUser } from '../types';
  * @param tenantId - 租户ID
  * @returns 用户搜索相关状态和方法
  */
-export declare const useUserSearch: (apiBaseUrl: string, tenantId: string) => {
+export declare const useUserSearch: (apiBaseUrl: string, tenantId: string, enableMultiTenantMode?: boolean) => {
     searchResults: Ref<FormattedUser[], FormattedUser[]>;
     loading: Ref<boolean, boolean>;
     searchQuery: Ref<string, string>;

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, 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,7 +10778,7 @@ 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(() => {
@@ -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,7 +10837,7 @@ const getUserList = async (url, params) => {
       app_code: appCode || "bk-magicbox"
     }
   });
-  return userList.value || [];
+  return (data2 == null ? void 0 : data2.results) || [];
 };
 const useTenantData = (apiBaseUrl, tenantId, enableMultiTenantMode = true) => {
   const tenants = ref({});
@@ -13697,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("");
@@ -13716,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 = [];
@@ -14150,7 +14121,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);
@@ -14277,7 +14248,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]]);
@@ -14305,7 +14276,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);
@@ -14619,7 +14590,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-7ff53892"]]);
 const _hoisted_1 = { class: "input-container" };
 const _hoisted_2 = ["placeholder"];
 const _sfc_main$1 = /* @__PURE__ */ defineComponent({
@@ -14680,7 +14651,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) => ({
@@ -14711,7 +14684,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]);
@@ -14733,7 +14706,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 = [];
@@ -14837,7 +14810,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-d56195a1"]]);
 const _sfc_main = /* @__PURE__ */ defineComponent({
   ...{
     name: "BkUserSelector"
@@ -14895,7 +14868,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
               usersList: ids,
               enableMultiTenantMode: props2.enableMultiTenantMode
             });
-            selectedUsers.value = [...selected, ...formatUsers(result)];
+            selectedUsers.value = [...selected, ...formatUsers(result, props2.enableMultiTenantMode)];
           } catch (error3) {
             console.error("获取选中用户信息失败:", error3);
           }
@@ -15002,7 +14975,7 @@ const _sfc_main = /* @__PURE__ */ defineComponent({
     };
   }
 });
-const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-617ed278"]]);
+const BkUserSelector = /* @__PURE__ */ _export_sfc(_sfc_main, [["__scopeId", "data-v-812cbe5a"]]);
 const vue2 = {
   model: {
     prop: "modelValue",