@lark-apaas/client-toolkit 1.1.25-alpha.0 → 1.1.25-user-test.0

package/lib/components/User/UserDisplay.d.ts

@@ -1,6 +1,6 @@
 import * as React from 'react';
 import type { IUserProfile } from '../../apis/udt-types';
-export interface UserDisplayProps {
+export interface IUserDisplayProps {
     /**
      * 支持传入完整的用户资料（IUserProfile）/ 列表（IUserProfile[]）
      * 或仅传入用户 ID（string）/ 列表（string[]）。
@@ -11,5 +11,6 @@ export interface UserDisplayProps {
     className?: string;
     style?: React.CSSProperties;
     showLabel?: boolean;
+    showUserProfile?: boolean;
 }
-export declare const UserDisplay: React.FC<UserDisplayProps>;
+export declare const UserDisplay: React.FC<IUserDisplayProps>;

package/lib/components/User/UserDisplay.js

@@ -1,10 +1,11 @@
 import { jsx, jsxs } from "react/jsx-runtime";
 import { useEffect, useMemo, useState } from "react";
-import { getDataloom } from "../../integrations/dataloom.js";
+import { getCachedUserProfiles, setCachedUserProfiles } from "../../utils/userProfileCache.js";
 import { clsxWithTw } from "../../utils/utils.js";
 import { UserProfile } from "./UserProfile/index.js";
 import { UserWithAvatar } from "./UserWithAvatar.js";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover.js";
+import { fetchWithDeduplication } from "../../utils/requestManager.js";
 const UserDisplay = ({ users, size, className, style, showLabel = true })=>{
     const normalizedIds = useMemo(()=>{
         if (!users) return [];
@@ -71,22 +72,20 @@ const UserDisplay = ({ users, size, className, style, showLabel = true })=>{
         const fetchProfiles = async ()=>{
             try {
                 setLoadingProfiles(true);
-                const dataloom = await getDataloom();
-                if (!dataloom) throw new Error('dataloom client is unavailable');
-                const ids = normalizedIds.map((id)=>Number(id)).filter((id)=>Number.isFinite(id));
-                if (!ids.length) {
-                    setResolvedUsers(normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
-                            user_id: id,
-                            name: '',
-                            avatar: '',
-                            email: '',
-                            status: 1
-                        }));
-                    setLoadingProfiles(false);
-                    return;
-                }
-                const response = await dataloom.service.user.getByIds(ids);
-                const fetchedList = Array.isArray(response?.data) ? response?.data : Array.isArray(response?.data?.user_list) ? response?.data?.user_list : [];
+                const { cachedProfiles, remainingIds } = getCachedUserProfiles(normalizedIds);
+                if (cachedProfiles.length > 0) setResolvedUsers((prev)=>{
+                    const updatedUsers = [
+                        ...prev
+                    ];
+                    cachedProfiles.forEach((cached)=>{
+                        const index = updatedUsers.findIndex((u)=>u.user_id === cached.user_id);
+                        if (-1 !== index) updatedUsers[index] = cached;
+                    });
+                    return updatedUsers;
+                });
+                if (0 === remainingIds.length) return void setLoadingProfiles(false);
+                const fetchedList = await fetchWithDeduplication(remainingIds);
+                if (isCancelled || !fetchedList) return;
                 const fetchedMap = new Map();
                 fetchedList.forEach((profile)=>{
                     const id = String(profile?.user_id ?? '');
@@ -99,13 +98,15 @@ const UserDisplay = ({ users, size, className, style, showLabel = true })=>{
                         status: profile?.status ?? 1
                     });
                 });
+                setCachedUserProfiles(fetchedList);
                 const mergedUsers = normalizedIds.map((id)=>{
                     const fetched = fetchedMap.get(id);
                     const given = inputProfilesMap.get(id);
-                    const name = given?.name?.trim() ? given.name : fetched?.name ?? '';
-                    const avatar = given?.avatar || fetched?.avatar || '';
-                    const email = given?.email || fetched?.email || '';
-                    const status = given?.status ?? fetched?.status ?? 1;
+                    const cached = cachedProfiles.find((p)=>p.user_id === id);
+                    const name = given?.name?.trim() || fetched?.name || cached?.name || '';
+                    const avatar = given?.avatar || fetched?.avatar || cached?.avatar || '';
+                    const email = given?.email || fetched?.email || cached?.email || '';
+                    const status = given?.status ?? fetched?.status ?? cached?.status ?? 1;
                     return {
                         user_id: id,
                         name,

package/lib/components/User/index.d.ts

@@ -1,7 +1,7 @@
 export { UserSelect } from './UserSelect';
 export type { UserSelectProps } from './UserSelect';
 export { UserDisplay } from './UserDisplay';
-export type { UserDisplayProps } from './UserDisplay';
+export type { IUserDisplayProps as UserDisplayProps } from './UserDisplay';
 export { UserWithAvatar } from './UserWithAvatar';
 export type { UserWithAvatarProps } from './type';
 export { UserProfile } from './UserProfile';

package/lib/server-log/poller.js

@@ -7,7 +7,7 @@ class ServerLogPoller {
     constructor(options){
         this.options = {
             serverUrl: options.serverUrl,
-            apiPath: options.apiPath || '/dev/logs/server-logs',
+            apiPath: (process.env.CLIENT_BASE_PATH || '') + (options.apiPath || '/dev/logs/server-logs'),
             pollInterval: options.pollInterval || 2000,
             limit: options.limit || 100,
             debug: options.debug ?? false

package/lib/utils/requestManager.d.ts

@@ -0,0 +1,2 @@
+import type { IUserProfile } from '../apis/udt-types';
+export declare function fetchWithDeduplication(ids: string[]): Promise<IUserProfile[] | null>;

package/lib/utils/requestManager.js

@@ -0,0 +1,26 @@
+import { getDataloom } from "../integrations/dataloom.js";
+const pendingRequests = new Map();
+async function fetchUserProfilesByIds(ids) {
+    try {
+        const dataloom = await getDataloom();
+        if (!dataloom) throw new Error('Dataloom client is unavailable');
+        const numericIds = ids.map(Number).filter(Number.isFinite);
+        if (0 === numericIds.length) return [];
+        const response = await dataloom.service.user.getByIds(numericIds);
+        return Array.isArray(response?.data) ? response.data : response?.data?.user_list || [];
+    } catch (error) {
+        console.error(`Failed to fetch profiles for user IDs ${ids.join(', ')}:`, error);
+        return null;
+    }
+}
+function fetchWithDeduplication(ids) {
+    const key = ids.sort().join(',');
+    if (pendingRequests.has(key)) return pendingRequests.get(key);
+    const fetchPromise = fetchUserProfilesByIds(ids);
+    pendingRequests.set(key, fetchPromise);
+    fetchPromise.finally(()=>{
+        pendingRequests.delete(key);
+    });
+    return fetchPromise;
+}
+export { fetchWithDeduplication };

package/lib/utils/userProfileCache.d.ts

@@ -0,0 +1,12 @@
+import type { IUserProfile } from '../apis/udt-types';
+export interface ICachedUserProfile {
+    profile: IUserProfile;
+    timestamp: number;
+}
+export declare const cache: Map<string, ICachedUserProfile>;
+export declare const cacheExpiry: number;
+export declare function setCachedUserProfiles(profiles: IUserProfile[]): void;
+export declare function getCachedUserProfiles(ids: string[]): {
+    cachedProfiles: IUserProfile[];
+    remainingIds: string[];
+};

package/lib/utils/userProfileCache.js

@@ -0,0 +1,26 @@
+const cache = new Map();
+const cacheExpiry = 1 / 0;
+function setCachedUserProfiles(profiles) {
+    const now = Date.now();
+    profiles.forEach((profile)=>{
+        if (profile && profile.user_id) cache.set(String(profile.user_id), {
+            profile,
+            timestamp: now
+        });
+    });
+}
+function getCachedUserProfiles(ids) {
+    const cachedProfiles = [];
+    const remainingIds = [];
+    const now = Date.now();
+    ids.forEach((id)=>{
+        const cachedItem = cache.get(id);
+        if (cachedItem && now - cachedItem.timestamp < cacheExpiry) cachedProfiles.push(cachedItem.profile);
+        else remainingIds.push(id);
+    });
+    return {
+        cachedProfiles,
+        remainingIds
+    };
+}
+export { cache, cacheExpiry, getCachedUserProfiles, setCachedUserProfiles };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@lark-apaas/client-toolkit",
-  "version": "1.1.25-alpha.0",
+  "version": "1.1.25-user-test.0",
   "types": "./lib/index.d.ts",
   "main": "./lib/index.js",
   "files": [