@lark-apaas/client-toolkit 1.1.11 → 1.1.13-userprofile-test.0

package/lib/apis/hooks/useTheme.d.ts

@@ -0,0 +1 @@
+export * from '../../hooks/useTheme';

package/lib/apis/hooks/useTheme.js

@@ -0,0 +1 @@
+export * from "../../hooks/useTheme.js";

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

@@ -1,7 +1,12 @@
 import * as React from 'react';
 import type { IUserProfile } from '../../apis/udt-types';
 export interface UserDisplayProps {
-    users: IUserProfile[];
+    /**
+     * 支持传入完整的用户资料（IUserProfile）/ 列表（IUserProfile[]）
+     * 或仅传入用户 ID（string）/ 列表（string[]）。
+     * 当传入 user_id 或 user_id[] 时组件会自动拉取用户资料并渲染。
+     */
+    users: IUserProfile | IUserProfile[] | string | string[];
     size?: 'small' | 'medium' | 'large';
     className?: string;
     style?: React.CSSProperties;

package/lib/components/User/UserDisplay.js

@@ -6,38 +6,82 @@ import { UserProfile } from "./UserProfile/index.js";
 import { UserWithAvatar } from "./UserWithAvatar.js";
 import { Popover, PopoverContent, PopoverTrigger } from "../ui/popover.js";
 const UserDisplay = ({ users, size, className, style, showLabel = true })=>{
-    const normalizedUsers = useMemo(()=>Array.isArray(users) ? users : [
-            users
-        ].filter(Boolean), [
+    const normalizedIds = useMemo(()=>{
+        if (!users) return [];
+        if (Array.isArray(users)) {
+            if (0 === users.length) return [];
+            const first = users[0];
+            const isStringArray = 'string' == typeof first;
+            return isStringArray ? users.filter(Boolean).map((id)=>String(id)) : users.map((u)=>String(u.user_id)).filter(Boolean);
+        }
+        return 'string' == typeof users ? [
+            String(users)
+        ] : [
+            String(users.user_id)
+        ].filter(Boolean);
+    }, [
+        users
+    ]);
+    const inputProfilesMap = useMemo(()=>{
+        const map = new Map();
+        if (!users) return map;
+        if (Array.isArray(users)) {
+            const first = users[0];
+            const isStringArray = 'string' == typeof first;
+            if (!isStringArray) {
+                for (const u of users)if (u?.user_id) map.set(String(u.user_id), {
+                    user_id: String(u.user_id),
+                    name: u?.name ?? '',
+                    avatar: u?.avatar ?? '',
+                    email: u?.email ?? '',
+                    status: u?.status ?? 1
+                });
+            }
+        } else if ('string' != typeof users) {
+            const u = users;
+            if (u?.user_id) map.set(String(u.user_id), {
+                user_id: String(u.user_id),
+                name: u?.name ?? '',
+                avatar: u?.avatar ?? '',
+                email: u?.email ?? '',
+                status: u?.status ?? 1
+            });
+        }
+        return map;
+    }, [
         users
     ]);
-    const [resolvedUsers, setResolvedUsers] = useState(normalizedUsers);
+    const [resolvedUsers, setResolvedUsers] = useState(()=>normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
+                user_id: id,
+                name: '',
+                avatar: '',
+                email: '',
+                status: 1
+            }));
     const [loadingProfiles, setLoadingProfiles] = useState(false);
     useEffect(()=>{
         let isCancelled = false;
-        if (!normalizedUsers.length) {
+        if (!normalizedIds.length) {
             setResolvedUsers([]);
             setLoadingProfiles(false);
             return ()=>{
                 isCancelled = true;
             };
         }
-        const usersNeedingDetails = normalizedUsers.filter((user)=>!user?.name?.trim());
-        if (!usersNeedingDetails.length) {
-            setResolvedUsers(normalizedUsers);
-            setLoadingProfiles(false);
-            return ()=>{
-                isCancelled = true;
-            };
-        }
         const fetchProfiles = async ()=>{
             try {
                 setLoadingProfiles(true);
                 const dataloom = await getDataloom();
                 if (!dataloom) throw new Error('dataloom client is unavailable');
-                const ids = usersNeedingDetails.map((user)=>Number(user.user_id)).filter((id)=>Number.isFinite(id));
+                const ids = normalizedIds.map((id)=>Number(id)).filter((id)=>Number.isFinite(id));
                 if (!ids.length) {
-                    setResolvedUsers(normalizedUsers);
+                    setResolvedUsers(normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
+                            user_id: id,
+                            name: '',
+                            avatar: '',
+                            email: '',
+                            status: 1
+                        }));
                     setLoadingProfiles(false);
                     return;
                 }
@@ -51,28 +95,35 @@ const UserDisplay = ({ users, size, className, style, showLabel = true })=>{
                         user_id: id,
                         name: profile?.name ?? '',
                         avatar: profile?.avatar ?? '',
-                        email: profile?.email,
-                        status: profile?.status,
-                        ...profile
+                        email: profile?.email ?? '',
+                        status: profile?.status ?? 1
                     });
                 });
-                const mergedUsers = normalizedUsers.map((user)=>{
-                    const id = String(user.user_id);
+                const mergedUsers = normalizedIds.map((id)=>{
                     const fetched = fetchedMap.get(id);
-                    if (!fetched) return user;
+                    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;
                     return {
-                        ...fetched,
-                        ...user,
-                        name: user?.name?.trim() ? user.name : fetched.name,
-                        avatar: user.avatar || fetched.avatar,
-                        email: user.email || fetched.email,
-                        status: user.status ?? fetched.status
+                        user_id: id,
+                        name,
+                        avatar,
+                        email,
+                        status
                     };
                 });
                 if (!isCancelled) setResolvedUsers(mergedUsers);
             } catch (error) {
                 console.error('Failed to resolve user profiles:', error);
-                if (!isCancelled) setResolvedUsers(normalizedUsers);
+                if (!isCancelled) setResolvedUsers(normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
+                        user_id: id,
+                        name: '',
+                        avatar: '',
+                        email: '',
+                        status: 1
+                    }));
             } finally{
                 if (!isCancelled) setLoadingProfiles(false);
             }
@@ -82,7 +133,7 @@ const UserDisplay = ({ users, size, className, style, showLabel = true })=>{
             isCancelled = true;
         };
     }, [
-        normalizedUsers.length
+        normalizedIds
     ]);
     if (!resolvedUsers.length || loadingProfiles) return null;
     return /*#__PURE__*/ jsx("div", {

package/lib/hooks/useTheme.d.ts

@@ -0,0 +1,4 @@
+export declare function useTheme(): {
+    theme: string;
+    setTheme: import("react").Dispatch<import("react").SetStateAction<string>>;
+};

package/lib/hooks/useTheme.js

@@ -0,0 +1,9 @@
+import { useState } from "react";
+function useTheme() {
+    const [theme, setTheme] = useState('system');
+    return {
+        theme,
+        setTheme
+    };
+}
+export { useTheme };

package/lib/logger/intercept-global-error.js

@@ -17,10 +17,11 @@ function interceptErrors() {
         const originalMethod = window.console[method];
         window.console[method] = (...args)=>{
             originalMethod(...args);
+            const level = 'log' === method ? 'info' : method;
             const log = args[0];
-            if ('string' == typeof log && log.startsWith('[Dataloom]') && levelSchema.safeParse(method).success) {
+            if ('string' == typeof log && log.startsWith('[Dataloom]') && levelSchema.safeParse(level).success) {
                 logger.log({
-                    level: method,
+                    level: level,
                     args
                 });
                 postMessage({

package/lib/logger/log-types.d.ts

@@ -28,10 +28,10 @@ export declare const logStackFrameSchema: z.ZodObject<{
 }, z.core.$strip>;
 export declare const levelSchema: z.ZodEnum<{
     success: "success";
+    debug: "debug";
     info: "info";
     warn: "warn";
     error: "error";
-    debug: "debug";
 }>;
 export declare const logMeta: z.ZodObject<{
     stacktrace: z.ZodOptional<z.ZodArray<z.ZodObject<{
@@ -45,15 +45,18 @@ export declare const logMeta: z.ZodObject<{
     noStacktrace: z.ZodOptional<z.ZodBoolean>;
     repairMessage: z.ZodOptional<z.ZodString>;
     type: z.ZodOptional<z.ZodString>;
+    isDuplicate: z.ZodOptional<z.ZodBoolean>;
+    duplicateCount: z.ZodOptional<z.ZodNumber>;
+    duplicateOfId: z.ZodOptional<z.ZodString>;
 }, z.core.$strip>;
 export declare const selectedLogSchema: z.ZodObject<{
     type: z.ZodLiteral<"typedLogV2">;
     level: z.ZodEnum<{
         success: "success";
+        debug: "debug";
         info: "info";
         warn: "warn";
         error: "error";
-        debug: "debug";
     }>;
     id: z.ZodString;
     args: z.ZodArray<z.ZodUnknown>;
@@ -69,16 +72,19 @@ export declare const selectedLogSchema: z.ZodObject<{
         noStacktrace: z.ZodOptional<z.ZodBoolean>;
         repairMessage: z.ZodOptional<z.ZodString>;
         type: z.ZodOptional<z.ZodString>;
+        isDuplicate: z.ZodOptional<z.ZodBoolean>;
+        duplicateCount: z.ZodOptional<z.ZodNumber>;
+        duplicateOfId: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>;
 }, z.core.$strip>;
-export type LogLevel = 'debug' | 'info' | 'warn' | 'error' | 'success';
+export type LogLevel = z.infer<typeof levelSchema>;
 export declare const logWithMetaSchema: z.ZodObject<{
     level: z.ZodEnum<{
         success: "success";
+        debug: "debug";
         info: "info";
         warn: "warn";
         error: "error";
-        debug: "debug";
     }>;
     args: z.ZodArray<z.ZodUnknown>;
     meta: z.ZodOptional<z.ZodObject<{
@@ -93,6 +99,9 @@ export declare const logWithMetaSchema: z.ZodObject<{
         noStacktrace: z.ZodOptional<z.ZodBoolean>;
         repairMessage: z.ZodOptional<z.ZodString>;
         type: z.ZodOptional<z.ZodString>;
+        isDuplicate: z.ZodOptional<z.ZodBoolean>;
+        duplicateCount: z.ZodOptional<z.ZodNumber>;
+        duplicateOfId: z.ZodOptional<z.ZodString>;
     }, z.core.$strip>>;
 }, z.core.$strip>;
 export type LogStackFrame = z.infer<typeof logStackFrameSchema>;

package/lib/logger/log-types.js

@@ -27,10 +27,10 @@ const logStackFrameSchema = zod.object({
     columnNumber: zod.number()
 });
 const levelSchema = zod["enum"]([
+    'debug',
     'info',
     'warn',
     'error',
-    'debug',
     'success'
 ]);
 const logMeta = zod.object({
@@ -39,7 +39,10 @@ const logMeta = zod.object({
     skipFrame: zod.optional(zod.number()),
     noStacktrace: zod.optional(zod.boolean()),
     repairMessage: zod.optional(zod.string()),
-    type: zod.optional(zod.string())
+    type: zod.optional(zod.string()),
+    isDuplicate: zod.optional(zod.boolean()),
+    duplicateCount: zod.optional(zod.number()),
+    duplicateOfId: zod.optional(zod.string())
 });
 const selectedLogSchema = zod.object({
     type: zod.literal('typedLogV2'),

package/lib/logger/selected-logs.js

@@ -40,7 +40,17 @@ async function sendSelectedLog(logWithoutID) {
             if (!log.meta.stacktrace) try {
                 const stacktrace = await stacktrace_js.fromError(error);
                 log.meta.stacktrace = mapStacktrace(stacktrace);
-            } catch (e) {}
+            } catch (e) {
+                if (window.parent !== window) try {
+                    window.parent.postMessage({
+                        type: 'STACKTRACE_PARSE_ERROR',
+                        payload: {
+                            error: e instanceof Error ? e.message : String(e),
+                            context: 'StackTrace.fromError'
+                        }
+                    }, '*');
+                } catch (postError) {}
+            }
             newParts.push(newError.message, newError);
         } else newParts.push(log.args[i]);
         log.args = newParts;
@@ -49,11 +59,46 @@ async function sendSelectedLog(logWithoutID) {
             const firstFrameIndex = frames.findIndex((frame)=>!frame.fileName.includes('node_modules/@lark-apaas/client-toolkit/lib/logger'));
             frames = -1 === firstFrameIndex ? [] : frames.slice(firstFrameIndex);
             log.meta.stacktrace = frames;
-        } catch (e) {}
+        } catch (e) {
+            if (window.parent !== window) try {
+                window.parent.postMessage({
+                    type: 'STACKTRACE_PARSE_ERROR',
+                    payload: {
+                        error: e instanceof Error ? e.message : String(e),
+                        context: 'getStacktrace'
+                    }
+                }, '*');
+            } catch (postError) {}
+        }
         if (void 0 === log.meta.skipFrame) log.meta.skipFrame = 2;
         const logJSON = JSON.stringify(log);
-        console.log(JSON.parse(logJSON));
-        console.log(logJSON);
+        const logForDedup = {
+            ...log
+        };
+        delete logForDedup.id;
+        const logContentForDedup = JSON.stringify(logForDedup);
+        if (lastLogInfo && lastLogInfo.content === logContentForDedup) {
+            lastLogInfo.count++;
+            log.meta.isDuplicate = true;
+            log.meta.duplicateCount = lastLogInfo.count;
+            log.meta.duplicateOfId = lastLogInfo.id;
+            const updatedLogJSON = JSON.stringify(log);
+            try {
+                batchLogInfo('info', updatedLogJSON);
+            } catch (e) {}
+            if (window.parent !== window) try {
+                window.parent.postMessage({
+                    type: 'SELECTED_LOG',
+                    payload: updatedLogJSON
+                }, '*');
+            } catch (e) {}
+            return;
+        }
+        lastLogInfo = {
+            content: logContentForDedup,
+            id: log.id,
+            count: 1
+        };
         try {
             batchLogInfo('info', logJSON);
         } catch (e) {}
@@ -70,6 +115,7 @@ async function getStacktrace() {
     const frames = mapStacktrace(stacktrace);
     return frames;
 }
+let lastLogInfo = null;
 async function sendTypedLogV2(logWithMeta) {
     sendSelectedLog({
         type: 'typedLogV2',
@@ -84,7 +130,7 @@ const typedLogInterceptor = (logger)=>({
                 logger.debug(message, ...args);
             } catch (e) {}
             sendTypedLogV2({
-                level: 'debug',
+                level: 'info',
                 args: [
                     message,
                     ...args

package/package.json

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