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

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

@@ -1,9 +1,13 @@
 import React from 'react';
 import type { IUserProfile } from '../../apis/udt-types';
 export interface UserSelectProps {
-    value?: IUserProfile | IUserProfile[];
-    onChange?: (value: IUserProfile | IUserProfile[]) => void;
-    defaultValue?: IUserProfile | IUserProfile[];
+    /**
+     * 支持传入完整的用户资料（IUserProfile）/ 列表（IUserProfile[]）
+     * 或仅传入用户 ID（string）/ 列表（string[]）。
+     */
+    value?: IUserProfile | IUserProfile[] | string | string[];
+    onChange?: (value: IUserProfile | IUserProfile[] | undefined) => void;
+    defaultValue?: IUserProfile | IUserProfile[] | string | string[];
     mode?: 'single' | 'multiple';
     placeholder?: string;
     fetchUsers?: (keyword: string) => Promise<IUserProfile[]>;

package/lib/components/User/UserSelect.js

@@ -3,6 +3,127 @@ import react from "react";
 import { getDataloom } from "../../integrations/dataloom.js";
 import { UserSelectUI } from "./UserSelectUI/index.js";
 const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholder, fetchUsers })=>{
+    const normalizedIds = react.useMemo(()=>{
+        const src = value ?? defaultValue;
+        if (!src) return [];
+        if (Array.isArray(src)) {
+            if (0 === src.length) return [];
+            const first = src[0];
+            const isStringArray = 'string' == typeof first;
+            return isStringArray ? src.filter(Boolean).map((id)=>String(id)) : src.map((u)=>String(u.user_id)).filter(Boolean);
+        }
+        return 'string' == typeof src ? [
+            String(src)
+        ] : [
+            String(src.user_id)
+        ].filter(Boolean);
+    }, [
+        value,
+        defaultValue
+    ]);
+    const inputProfilesMap = react.useMemo(()=>{
+        const map = new Map();
+        const src = value ?? defaultValue;
+        if (!src) return map;
+        if (Array.isArray(src)) {
+            const first = src[0];
+            const isStringArray = 'string' == typeof first;
+            if (!isStringArray) {
+                for (const u of src)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 src) {
+            const u = src;
+            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;
+    }, [
+        value,
+        defaultValue
+    ]);
+    const [uiValue, setUiValue] = react.useState(()=>{
+        if (!normalizedIds.length) return;
+        const profiles = normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
+                user_id: id,
+                name: '',
+                avatar: '',
+                email: '',
+                status: 1
+            });
+        return 'single' === mode ? profiles[0] : profiles;
+    });
+    react.useEffect(()=>{
+        if (!normalizedIds.length) return void setUiValue(void 0);
+        const fetchProfiles = async ()=>{
+            try {
+                const ids = normalizedIds.map((id)=>Number(id)).filter((id)=>Number.isFinite(id));
+                if (!ids.length) {
+                    const profiles = normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
+                            user_id: id,
+                            name: '',
+                            avatar: '',
+                            email: '',
+                            status: 1
+                        });
+                    setUiValue('single' === mode ? profiles[0] : profiles);
+                    return;
+                }
+                const dataloom = await getDataloom();
+                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 fetchedMap = new Map();
+                fetchedList.forEach((profile)=>{
+                    const id = String(profile?.user_id ?? '');
+                    if (!id) return;
+                    fetchedMap.set(id, {
+                        user_id: id,
+                        name: profile?.name ?? '',
+                        avatar: profile?.avatar ?? '',
+                        email: profile?.email ?? '',
+                        status: profile?.status ?? 1
+                    });
+                });
+                const merged = normalizedIds.map((id)=>{
+                    const fetched = fetchedMap.get(id);
+                    const given = inputProfilesMap.get(id);
+                    return {
+                        user_id: id,
+                        name: given?.name?.trim() ? given.name : fetched?.name ?? '',
+                        avatar: given?.avatar || fetched?.avatar || '',
+                        email: given?.email || fetched?.email || '',
+                        status: given?.status ?? fetched?.status ?? 1
+                    };
+                });
+                setUiValue('single' === mode ? merged[0] : merged);
+            } catch (error) {
+                console.error('Failed to resolve select value profiles:', error);
+                const profiles = normalizedIds.map((id)=>inputProfilesMap.get(id) ?? {
+                        user_id: id,
+                        name: '',
+                        avatar: '',
+                        email: '',
+                        status: 1
+                    });
+                setUiValue('single' === mode ? profiles[0] : profiles);
+            }
+        };
+        fetchProfiles();
+    }, [
+        normalizedIds,
+        inputProfilesMap,
+        mode
+    ]);
     const fetchUsersImpl = react.useCallback(async (search)=>{
         if (fetchUsers) return fetchUsers(search);
         try {
@@ -30,15 +151,23 @@ const UserSelect = ({ mode = 'single', defaultValue, value, onChange, placeholde
     return /*#__PURE__*/ jsx("div", {
         className: "user-select-container",
         children: /*#__PURE__*/ jsx(UserSelectUI, {
-            defaultValue: defaultValue,
+            defaultValue: void 0,
             mode: selectMode,
             onSearch: fetchUsersImpl,
             allowClear: true,
             placeholder: placeholder,
-            value: value,
-            onChange: (value)=>{
-                if ('multiple' === selectMode) onChange?.(value ?? []);
-                else onChange?.(value);
+            value: uiValue,
+            onChange: (next)=>{
+                if (!onChange) return;
+                if ('multiple' === selectMode) {
+                    const arr = Array.isArray(next) ? next ?? [] : next ? [
+                        next
+                    ] : [];
+                    onChange(arr);
+                } else {
+                    const single = Array.isArray(next) ? next[0] ?? void 0 : next ?? void 0;
+                    onChange(single);
+                }
             }
         })
     });

package/package.json

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