@giteeteam/apps-team-components 1.11.18-alpha.1 → 1.11.19

package/dist/components/common/user-field/UserAvatar.d.ts

@@ -5,7 +5,6 @@ interface UserAvatarProps {
         avatar?: {
             url?: string;
         };
-        bosKey?: string;
         username?: string;
         name?: string;
         nickname?: string;

package/dist/components/common/user-field/UserAvatar.js

@@ -1,38 +1,15 @@
 import { jsx } from '@emotion/react/jsx-runtime';
-import React__default, { useState, useMemo, useEffect } from 'react';
+import React__default, { useMemo } from 'react';
 import { ClassNames } from '@emotion/react';
-import useCurrentWorkspace from '../../../lib/hooks/useCurrentWorkspace.js';
 import { getNameBadge, getBackgroundColor } from '../utils.js';
 import { avatarItemStyle, avatarStyle, defaultAvatarStyle } from './style/index.js';
 
-const imgInAvatarStyle = `
-  display: block;
-  width: 100%;
-  height: 100%;
-  object-fit: contain;
-  border-radius: 50%;
-`;
 const UserAvatar = React__default.memo(({ user, className }) => {
-    const { workspaceKey } = useCurrentWorkspace();
-    const [imageLoadFailed, setImageLoadFailed] = useState(false);
-    const avatarUrl = useMemo(() => {
-        var _a, _b, _c, _d;
-        const url = (_a = user === null || user === void 0 ? void 0 : user.avatar) === null || _a === void 0 ? void 0 : _a.url;
-        if (url)
-            return url;
-        const bosKey = (_d = (_c = (_b = user === null || user === void 0 ? void 0 : user.bosKey) === null || _b === void 0 ? void 0 : _b.trim) === null || _c === void 0 ? void 0 : _c.call(_b)) !== null && _d !== void 0 ? _d : user === null || user === void 0 ? void 0 : user.bosKey;
-        if (!workspaceKey || !bosKey)
-            return undefined;
-        return `/api/one/${workspaceKey}/rest/v1/companies/${workspaceKey}/users/logo/picture?url=${encodeURIComponent(bosKey)}`;
-    }, [user, workspaceKey]);
-    useEffect(() => {
-        setImageLoadFailed(false);
-    }, [avatarUrl]);
+    const avatarUrl = useMemo(() => { var _a; return (_a = user === null || user === void 0 ? void 0 : user.avatar) === null || _a === void 0 ? void 0 : _a.url; }, [user]);
     const displayName = useMemo(() => (user === null || user === void 0 ? void 0 : user.name) || (user === null || user === void 0 ? void 0 : user.nickname) || (user === null || user === void 0 ? void 0 : user.username), [user]);
     const userBadge = useMemo(() => getNameBadge(displayName), [displayName]);
-    const showImage = Boolean(avatarUrl) && !imageLoadFailed;
     return (jsx(ClassNames, { children: ({ cx, css }) => {
-            return showImage ? (jsx("span", { className: cx('avatar-item', css(avatarItemStyle), css(avatarStyle), css(className)), style: { overflow: 'hidden' }, children: jsx("img", { src: avatarUrl, alt: "", decoding: "async", className: cx(css(imgInAvatarStyle)), onError: () => setImageLoadFailed(true) }) })) : (jsx("span", { className: cx('avatar-item', css(avatarItemStyle), css(defaultAvatarStyle), css(className)), style: getBackgroundColor(userBadge), children: userBadge }));
+            return avatarUrl ? (jsx("span", { className: cx('avatar-item', css(avatarItemStyle), css(avatarStyle), css(className)), style: { backgroundImage: `url(${avatarUrl})` } })) : (jsx("span", { className: cx('avatar-item', css(avatarItemStyle), css(defaultAvatarStyle), css(className)), style: getBackgroundColor(userBadge), children: userBadge }));
         } }));
 });
 UserAvatar.displayName = 'UserAvatar';

package/dist/lib/useUser.d.ts

@@ -13,6 +13,5 @@ export type UserValueOption = {
     deleted: boolean;
     enabled: boolean;
     email?: string;
-    bosKey?: string | null;
 };
 export declare const userDataFormat: (user: UserValue) => UserValueOption;

package/dist/lib/useUser.js

@@ -22,7 +22,7 @@ const generateUserDisplayName = (user, onlyNickname = false) => {
     return (user === null || user === void 0 ? void 0 : user.nickname) ? `${user === null || user === void 0 ? void 0 : user.nickname}${displaySuffix}` : user === null || user === void 0 ? void 0 : user.username;
 };
 const userDataFormat = (user) => {
-    var _a, _b;
+    var _a;
     return ({
         label: generateUserDisplayName(user),
         value: (_a = user.objectId) !== null && _a !== void 0 ? _a : user.value,
@@ -31,7 +31,6 @@ const userDataFormat = (user) => {
         deleted: user.deleted,
         enabled: user.enabled,
         email: user.email,
-        bosKey: (_b = user.bosKey) !== null && _b !== void 0 ? _b : null,
     });
 };
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@giteeteam/apps-team-components",
-  "version": "1.11.18-alpha.1",
+  "version": "1.11.19",
   "description": "Gitee team components",
   "main": "./dist/index.js",
   "module": "./dist/index.js",