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

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/components/fields/comment/ReadView.d.ts

@@ -0,0 +1,6 @@
+declare const _default: import("react").NamedExoticComponent<{
+    itemValues?: {
+        commentCount?: number;
+    };
+}>;
+export default _default;

package/dist/components/fields/comment/ReadView.js

@@ -0,0 +1,29 @@
+import { jsxs, jsx } from '@emotion/react/jsx-runtime';
+import { memo } from 'react';
+import { css } from '@emotion/react';
+import useI18n from '../../../lib/hooks/useI18n.js';
+import { Icons } from '../../../icons/index.js';
+
+const CommentReadViewStyle = css `
+  display: inline-flex;
+  align-items: center;
+  &:hover {
+    cursor: pointer;
+    color: var(--color-brand-6);
+  }
+
+  &.add-comment {
+    color: var(--color-gray-7);
+  }
+`;
+const CommentReadView = props => {
+    const { itemValues } = props;
+    const { t } = useI18n();
+    const commentCount = (itemValues === null || itemValues === void 0 ? void 0 : itemValues.commentCount) || 0;
+    const hasComment = commentCount > 0;
+    return (jsxs("span", { css: CommentReadViewStyle, className: hasComment ? '' : 'add-comment', children: [jsx(Icons.Comment, {}), jsx("span", { style: { marginLeft: '8px' }, children: hasComment ? t('fields.comment.count', { count: commentCount }) : t('fields.comment.add') })] }));
+};
+CommentReadView.displayName = 'CommentReadView';
+var CommentReadView$1 = memo(CommentReadView);
+
+export { CommentReadView$1 as default };

package/dist/components/table-components/utils.js

@@ -6,6 +6,7 @@ import BaseLineItemVersionReadView from '../fields/baseline-item-version/ReadVie
 import BindWorkspaceReadView from '../fields/bind-workspace/ReadView.js';
 import Cascade from '../fields/cascade/ReadView.js';
 import CheckboxReadView from '../fields/checkbox/ReadView.js';
+import CommentReadView from '../fields/comment/ReadView.js';
 import CreatedAtReadView from '../fields/created-at/ReadView.js';
 import CreatedByReadView from '../fields/created-by/ReadView.js';
 import DataQuoteReadView from '../fields/data-quote/ReadView.js';
@@ -79,6 +80,7 @@ const getStandardReadComponents = () => {
         [FIELD_TYPE_KEY_MAPPINGS.Workspace]: WorkspaceReadView,
         [FIELD_TYPE_KEY_MAPPINGS.ItemLinkedStatistics]: TextReadView,
         [FIELD_TYPE_KEY_MAPPINGS.Actors]: ActorReadView,
+        [FIELD_TYPE_KEY_MAPPINGS.Comment]: CommentReadView,
     };
     return standardReadComponents;
 };

package/dist/icons/index.js

@@ -307,7 +307,7 @@ const CustomIconFont = React__default.memo(props => {
 CustomIconFont.displayName = 'CustomIconFont';
 const SingleColorIcon = ({ type, ...props }) => {
     const { antPrefix } = useAntdConfig();
-    return (jsx(ClassNames, { children: ({ css, cx }) => (jsx("i", { ...props, className: cx('icon', css(proximaSingleColor(antPrefix)), `proxima-single-color-${type}`, props.className) })) }));
+    return (jsx(ClassNames, { children: ({ css, cx }) => (jsx("i", { ...props, className: cx('icon', css(proximaSingleColor(antPrefix)), 'proxima-single-color', `proxima-single-color-${type}`, props.className) })) }));
 };
 const Icons = [...MULTI_COLOR_KEYS, ...SIMPLE_COLOR_KEYS, ...Object.keys(ROTATE_ICONS)].reduce((res, key) => {
     res[key] = ({ className, ...props }) => {

package/dist/icons/style/index.js

@@ -1,4 +1,5 @@
 const proximaSingleColor = (antPrefix = 'ant') => `
+    position: static; /** 防止icon被其他产品模块影响 */
     display: inline-block;
     width: 1em;
     height: 1em;

package/dist/index.d.ts

@@ -8,6 +8,7 @@ export { default as AncestorReadView } from './components/fields/ancestor/ReadVi
 export { default as AssigneeReadView } from './components/fields/assignee/ReadView';
 export { default as BindWorkspaceReadView } from './components/fields/bind-workspace/ReadView';
 export { default as CheckboxReadView } from './components/fields/checkbox/ReadView';
+export { default as CommentReadView } from './components/fields/comment/ReadView';
 export { default as CreatedAtReadView } from './components/fields/created-at/ReadView';
 export { default as CreatedByReadView } from './components/fields/created-by/ReadView';
 export { default as DataQuoteReadView } from './components/fields/data-quote/ReadView';

package/dist/index.js

@@ -8,6 +8,7 @@ export { default as AncestorReadView } from './components/fields/ancestor/ReadVi
 export { default as AssigneeReadView } from './components/fields/assignee/ReadView.js';
 export { default as BindWorkspaceReadView } from './components/fields/bind-workspace/ReadView.js';
 export { default as CheckboxReadView } from './components/fields/checkbox/ReadView.js';
+export { default as CommentReadView } from './components/fields/comment/ReadView.js';
 export { default as CreatedAtReadView } from './components/fields/created-at/ReadView.js';
 export { default as CreatedByReadView } from './components/fields/created-by/ReadView.js';
 export { default as DataQuoteReadView } from './components/fields/data-quote/ReadView.js';

package/dist/lib/global.d.ts

@@ -51,6 +51,7 @@ export declare const FIELD_TYPE_KEY_MAPPINGS: {
     Editor: string;
     Formula: string;
     Annex: string;
+    Comment: string;
     File: string;
     Tag: string;
     DataQuote: string;

package/dist/lib/global.js

@@ -50,6 +50,7 @@ const FIELD_TYPE_KEY_MAPPINGS = {
     Editor: 'Editor',
     Formula: 'Formula',
     Annex: 'Annex',
+    Comment: 'Comment',
     File: 'File',
     Tag: 'Tag',
     DataQuote: 'DataQuote',

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/dist/locales/index.d.ts

@@ -10,6 +10,8 @@ export declare const en: {
     'date.week': string;
     'date.month': string;
     'date.year': string;
+    'fields.comment.count': string;
+    'fields.comment.add': string;
     'pages.fields.default.toWorkspacePage': string;
     'pages.fields.default.onlyWorkspace': string;
     'pages.fields.default.getImageError': string;
@@ -81,6 +83,8 @@ export declare const zh: {
     'date.week': string;
     'date.month': string;
     'date.year': string;
+    'fields.comment.count': string;
+    'fields.comment.add': string;
     'pages.fields.default.toWorkspacePage': string;
     'pages.fields.default.onlyWorkspace': string;
     'pages.fields.default.getImageError': string;
@@ -152,6 +156,8 @@ export declare const ru: {
     'date.week': string;
     'date.month': string;
     'date.year': string;
+    'fields.comment.count': string;
+    'fields.comment.add': string;
     'pages.fields.default.toWorkspacePage': string;
     'pages.fields.default.onlyWorkspace': string;
     'pages.fields.default.getImageError': string;

package/dist/locales/index.js

@@ -10,6 +10,8 @@ const en = {
     'date.week': 'Week',
     'date.month': 'Month',
     'date.year': 'Year',
+    'fields.comment.count': '{{count}} comment(s)',
+    'fields.comment.add': 'Add comment',
     'pages.fields.default.toWorkspacePage': 'Click to enter the workspace',
     'pages.fields.default.onlyWorkspace': 'Current Workspace',
     'pages.fields.default.getImageError': 'Image acquisition failure',
@@ -81,6 +83,8 @@ const zh = {
     'date.week': '周',
     'date.month': '月',
     'date.year': '年',
+    'fields.comment.count': '{{count}} 条评论',
+    'fields.comment.add': '添加评论',
     'pages.fields.default.toWorkspacePage': '点击进入空间',
     'pages.fields.default.onlyWorkspace': '只显示当前空间的{{name}}',
     'pages.fields.default.getImageError': '图片获取失败',
@@ -152,6 +156,8 @@ const ru = {
     'date.week': 'Неделя',
     'date.month': 'Месяц',
     'date.year': 'Год',
+    'fields.comment.count': '{{count}} комментариев',
+    'fields.comment.add': 'Добавить комментарий',
     'pages.fields.default.toWorkspacePage': 'Нажмите, чтобы войти в рабочее пространство',
     'pages.fields.default.onlyWorkspace': 'Current Workspace',
     'pages.fields.default.getImageError': 'Не удалось получить изображение',

package/package.json

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