@giteeteam/apps-team-components 1.11.15 → 1.11.16-alpha.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -5,6 +5,7 @@ interface UserAvatarProps {
5
5
  avatar?: {
6
6
  url?: string;
7
7
  };
8
+ bosKey?: string;
8
9
  username?: string;
9
10
  name?: string;
10
11
  nickname?: string;
@@ -1,11 +1,22 @@
1
1
  import { jsx } from '@emotion/react/jsx-runtime';
2
2
  import React__default, { useMemo } from 'react';
3
3
  import { ClassNames } from '@emotion/react';
4
+ import useCurrentWorkspace from '../../../lib/hooks/useCurrentWorkspace.js';
4
5
  import { getNameBadge, getBackgroundColor } from '../utils.js';
5
6
  import { avatarItemStyle, avatarStyle, defaultAvatarStyle } from './style/index.js';
6
7
 
7
8
  const UserAvatar = React__default.memo(({ user, className }) => {
8
- 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]);
9
+ const { workspaceKey } = useCurrentWorkspace();
10
+ const avatarUrl = useMemo(() => {
11
+ var _a, _b, _c, _d;
12
+ const url = (_a = user === null || user === void 0 ? void 0 : user.avatar) === null || _a === void 0 ? void 0 : _a.url;
13
+ if (url)
14
+ return url;
15
+ 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;
16
+ if (!workspaceKey || !bosKey)
17
+ return undefined;
18
+ return `/api/one/${workspaceKey}/rest/v1/companies/${workspaceKey}/users/logo/picture?url=${encodeURIComponent(bosKey)}`;
19
+ }, [user, workspaceKey]);
9
20
  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]);
10
21
  const userBadge = useMemo(() => getNameBadge(displayName), [displayName]);
11
22
  return (jsx(ClassNames, { children: ({ cx, css }) => {
@@ -13,5 +13,6 @@ export type UserValueOption = {
13
13
  deleted: boolean;
14
14
  enabled: boolean;
15
15
  email?: string;
16
+ bosKey?: string | null;
16
17
  };
17
18
  export declare const userDataFormat: (user: UserValue) => UserValueOption;
@@ -22,7 +22,7 @@ const generateUserDisplayName = (user, onlyNickname = false) => {
22
22
  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;
23
23
  };
24
24
  const userDataFormat = (user) => {
25
- var _a;
25
+ var _a, _b;
26
26
  return ({
27
27
  label: generateUserDisplayName(user),
28
28
  value: (_a = user.objectId) !== null && _a !== void 0 ? _a : user.value,
@@ -31,6 +31,7 @@ const userDataFormat = (user) => {
31
31
  deleted: user.deleted,
32
32
  enabled: user.enabled,
33
33
  email: user.email,
34
+ bosKey: (_b = user.bosKey) !== null && _b !== void 0 ? _b : null,
34
35
  });
35
36
  };
36
37
 
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@giteeteam/apps-team-components",
3
- "version": "1.11.15",
3
+ "version": "1.11.16-alpha.2",
4
4
  "description": "Gitee team components",
5
5
  "main": "./dist/index.js",
6
6
  "module": "./dist/index.js",