@yeeyoon/library 3.3.1 → 3.3.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.
- package/lib/components/AvatarPackaged/index.jsx +31 -20
- package/lib/utils/utils.js +2 -2
- package/package.json +1 -1
- package/src/global.css +1 -1
- package/src/pages/index.js +9 -12
|
@@ -18,27 +18,37 @@ const AvatarInfo = ({
|
|
|
18
18
|
style,
|
|
19
19
|
showInfo = true, // 是否展示信息卡片
|
|
20
20
|
size = 30,
|
|
21
|
+
mode,
|
|
21
22
|
...rest
|
|
22
23
|
}) => {
|
|
23
|
-
const CustomAvatar =
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
24
|
+
const CustomAvatar =
|
|
25
|
+
mode === 'group' ? (
|
|
26
|
+
<Avatar
|
|
27
|
+
size={size}
|
|
28
|
+
shape={shape}
|
|
29
|
+
className={styles['user-avatar-scale']}
|
|
30
|
+
src={icon || defaultHeadUrl}
|
|
31
|
+
style={{ ...defaultUserStyle, ...style }}
|
|
32
|
+
/>
|
|
33
|
+
) : (
|
|
34
|
+
<span>
|
|
35
|
+
{icon || name || id ? (
|
|
36
|
+
<Avatar
|
|
37
|
+
size={size}
|
|
38
|
+
shape={shape}
|
|
39
|
+
className={styles['user-avatar-scale']}
|
|
40
|
+
src={icon || defaultHeadUrl}
|
|
41
|
+
style={{ ...defaultUserStyle, ...style }}
|
|
42
|
+
/>
|
|
43
|
+
) : null}
|
|
44
|
+
{showName &&
|
|
45
|
+
(icon || name || id ? (
|
|
46
|
+
<span className={styles['user-avatar-name']}>{name || '-'}</span>
|
|
47
|
+
) : (
|
|
48
|
+
'-'
|
|
49
|
+
))}
|
|
50
|
+
</span>
|
|
51
|
+
);
|
|
42
52
|
|
|
43
53
|
return showInfo && id ? (
|
|
44
54
|
<Popover
|
|
@@ -76,7 +86,7 @@ const AvatarPackaged = ({ data, maxCount = 5, maxStyle, ...rest }) => {
|
|
|
76
86
|
}
|
|
77
87
|
>
|
|
78
88
|
{data.map((x, i) => (
|
|
79
|
-
<AvatarInfo key={i} {...rest} {...x} />
|
|
89
|
+
<AvatarInfo key={i} {...rest} {...x} mode="group" />
|
|
80
90
|
))}
|
|
81
91
|
</Avatar.Group>
|
|
82
92
|
) : data ? (
|
|
@@ -91,6 +101,7 @@ AvatarInfo.propTypes = {
|
|
|
91
101
|
showName: PropTypes.bool,
|
|
92
102
|
placement: PropTypes.string,
|
|
93
103
|
shape: PropTypes.string,
|
|
104
|
+
mode: PropTypes.string,
|
|
94
105
|
size: PropTypes.number,
|
|
95
106
|
style: PropTypes.object,
|
|
96
107
|
showInfo: PropTypes.bool,
|
package/lib/utils/utils.js
CHANGED
|
@@ -81,9 +81,9 @@ export function mergeTableColumnCommonConfig(config) {
|
|
|
81
81
|
render: (_, record) => {
|
|
82
82
|
const key = item.dataIndex;
|
|
83
83
|
let data;
|
|
84
|
-
if (key === 'creator
|
|
84
|
+
if (key === 'creator') {
|
|
85
85
|
data = record.creator;
|
|
86
|
-
} else if (key === 'updater
|
|
86
|
+
} else if (key === 'updater') {
|
|
87
87
|
data = record.updater;
|
|
88
88
|
}
|
|
89
89
|
return <UserAvatar data={data} showName={true} />;
|
package/package.json
CHANGED
package/src/global.css
CHANGED
package/src/pages/index.js
CHANGED
|
@@ -1,17 +1,14 @@
|
|
|
1
|
-
import React from 'react';
|
|
1
|
+
import React, { useState, useEffect } from 'react';
|
|
2
2
|
import Header from '../../lib/components/Header/';
|
|
3
|
-
import TenantSelector from '../../lib/components/TenantSelector';
|
|
4
3
|
|
|
5
4
|
// eslint-disable-next-line react/display-name
|
|
6
5
|
export default function () {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
</>
|
|
16
|
-
);
|
|
6
|
+
const [tenantId, setTenantId] = useState('');
|
|
7
|
+
useEffect(() => {
|
|
8
|
+
setTimeout(() => {
|
|
9
|
+
setTenantId('053a033a063711ecb0c00c42a1ff8370');
|
|
10
|
+
// setTenantId('f12a71b6063611ecb0c00c42a1ff8370');
|
|
11
|
+
}, 3000);
|
|
12
|
+
}, []);
|
|
13
|
+
return <Header productName="bpm" tenantId={tenantId} />;
|
|
17
14
|
}
|