@yeeyoon/library 3.3.2 → 3.3.6
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.
|
@@ -19,27 +19,46 @@ const AvatarInfo = ({
|
|
|
19
19
|
showInfo = true, // 是否展示信息卡片
|
|
20
20
|
size = 30,
|
|
21
21
|
mode,
|
|
22
|
+
blocked = false,
|
|
22
23
|
...rest
|
|
23
24
|
}) => {
|
|
24
25
|
const CustomAvatar =
|
|
25
26
|
mode === 'group' ? (
|
|
26
|
-
<
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
27
|
+
<div style={{ position: 'relative' }}>
|
|
28
|
+
<div
|
|
29
|
+
className={`${blocked ? styles.blocked : styles.unDisplay} ${
|
|
30
|
+
styles['user-avatar-blocked-scale']
|
|
31
|
+
}`}
|
|
32
|
+
>
|
|
33
|
+
已屏蔽
|
|
34
|
+
</div>
|
|
35
|
+
<Avatar
|
|
36
|
+
size={size}
|
|
37
|
+
shape={shape}
|
|
38
|
+
className={styles['user-avatar-scale']}
|
|
39
|
+
src={icon || defaultHeadUrl}
|
|
40
|
+
style={{ ...defaultUserStyle, ...style }}
|
|
41
|
+
/>
|
|
42
|
+
</div>
|
|
33
43
|
) : (
|
|
34
|
-
<span>
|
|
44
|
+
<span style={{ display: 'flex' }}>
|
|
35
45
|
{icon || name || id ? (
|
|
36
|
-
<
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
46
|
+
<div style={{ position: 'relative' }}>
|
|
47
|
+
<div
|
|
48
|
+
className={`${blocked ? styles.blocked : styles.unDisplay} ${
|
|
49
|
+
styles['user-avatar-blocked-scale']
|
|
50
|
+
}`}
|
|
51
|
+
>
|
|
52
|
+
已屏蔽
|
|
53
|
+
</div>
|
|
54
|
+
<Avatar
|
|
55
|
+
size={size}
|
|
56
|
+
shape={shape}
|
|
57
|
+
className={styles['user-avatar-scale']}
|
|
58
|
+
src={icon || defaultHeadUrl}
|
|
59
|
+
style={{ ...defaultUserStyle, ...style }}
|
|
60
|
+
/>
|
|
61
|
+
</div>
|
|
43
62
|
) : null}
|
|
44
63
|
{showName &&
|
|
45
64
|
(icon || name || id ? (
|
|
@@ -105,6 +124,7 @@ AvatarInfo.propTypes = {
|
|
|
105
124
|
size: PropTypes.number,
|
|
106
125
|
style: PropTypes.object,
|
|
107
126
|
showInfo: PropTypes.bool,
|
|
127
|
+
blocked: PropTypes.bool,
|
|
108
128
|
};
|
|
109
129
|
|
|
110
130
|
AvatarPackaged.propTypes = {
|
|
@@ -6,15 +6,44 @@
|
|
|
6
6
|
.user-avatar-name {
|
|
7
7
|
color: #6e6b7b;
|
|
8
8
|
margin-left: 7px;
|
|
9
|
+
vertical-align: middle;
|
|
9
10
|
&:hover {
|
|
10
11
|
color: @primary-color;
|
|
11
12
|
}
|
|
12
13
|
}
|
|
13
14
|
:global {
|
|
14
15
|
.ant-list:not(.ant-list-lg):not(.ant-list-sm) .ant-list-item {
|
|
15
|
-
padding: 12px
|
|
16
|
+
padding: 12px 0 !important;
|
|
16
17
|
}
|
|
17
18
|
.ant-progress-text {
|
|
18
19
|
font-size: 0.7em;
|
|
19
20
|
}
|
|
20
21
|
}
|
|
22
|
+
.blocked {
|
|
23
|
+
position: absolute;
|
|
24
|
+
top: -14px;
|
|
25
|
+
left: -14px;
|
|
26
|
+
z-index: 2;
|
|
27
|
+
display: flex;
|
|
28
|
+
align-items: center;
|
|
29
|
+
justify-content: center;
|
|
30
|
+
width: 58px;
|
|
31
|
+
height: 58px;
|
|
32
|
+
color: #b4b7bd;
|
|
33
|
+
font-size: 16px;
|
|
34
|
+
background: rgba(0, 0, 0, 0.6);
|
|
35
|
+
border-radius: 12px;
|
|
36
|
+
transform: scale(0.5);
|
|
37
|
+
}
|
|
38
|
+
.unDisplay {
|
|
39
|
+
display: none;
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
.user-avatar-blocked-scale {
|
|
43
|
+
&:hover {
|
|
44
|
+
transform: scale(0.6);
|
|
45
|
+
}
|
|
46
|
+
}
|
|
47
|
+
.user-avatar-blocked-scale:hover + .user-avatar-scale {
|
|
48
|
+
transform: scale(1.2);
|
|
49
|
+
}
|
|
@@ -12,7 +12,7 @@ function InfoCart(props) {
|
|
|
12
12
|
const { baseMsg, ...rest } = props;
|
|
13
13
|
const reg = /^(\d{3})\d*(\d{4})$/;
|
|
14
14
|
const [cardData, setCardData] = useState({});
|
|
15
|
-
const [chartData, setChartData] = useState(
|
|
15
|
+
const [chartData, setChartData] = useState([]);
|
|
16
16
|
const [projectData] = useState([
|
|
17
17
|
{
|
|
18
18
|
title: '贡献数据',
|
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.name') {
|
|
85
85
|
data = record.creator;
|
|
86
|
-
} else if (key === 'updater') {
|
|
86
|
+
} else if (key === 'updater.name') {
|
|
87
87
|
data = record.updater;
|
|
88
88
|
}
|
|
89
89
|
return <UserAvatar data={data} showName={true} />;
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@yeeyoon/library",
|
|
3
|
-
"version": "3.3.
|
|
3
|
+
"version": "3.3.6",
|
|
4
4
|
"description": "宜云前端组件库和通用服务",
|
|
5
5
|
"main": "index.js",
|
|
6
6
|
"repository": {
|
|
@@ -22,7 +22,7 @@
|
|
|
22
22
|
"dependencies": {
|
|
23
23
|
"@ant-design/pro-layout": "^6.26.0",
|
|
24
24
|
"@ant-design/pro-list": "^1.12.0",
|
|
25
|
-
"antd": "^4.
|
|
25
|
+
"antd": "^4.18.6",
|
|
26
26
|
"dva": "^2.6.0-beta.6",
|
|
27
27
|
"local-storage": "^2.0.0",
|
|
28
28
|
"lodash": "^4.17.21",
|