aldehyde 0.1.75 → 0.1.76
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/layout/header/index.css +8 -1
- package/lib/layout/menu/user-bar.d.ts.map +1 -1
- package/lib/layout/menu/user-bar.js +2 -3
- package/lib/layout/menu/user-bar.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/layout/header/index.css +8 -1
- package/src/aldehyde/layout/menu/user-bar.tsx +6 -3
|
@@ -41,7 +41,6 @@
|
|
|
41
41
|
width:auto;
|
|
42
42
|
text-align:center;
|
|
43
43
|
cursor: pointer;
|
|
44
|
-
font-size: 14px!important;
|
|
45
44
|
}
|
|
46
45
|
.userLogin i{
|
|
47
46
|
font-size: 24px!important;
|
|
@@ -51,6 +50,14 @@
|
|
|
51
50
|
color:#000;
|
|
52
51
|
}
|
|
53
52
|
|
|
53
|
+
.loginAvatar{
|
|
54
|
+
background: #4a5f74;
|
|
55
|
+
font-size:20px;
|
|
56
|
+
vertical-align: middle;
|
|
57
|
+
line-height: 46px;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
|
|
54
61
|
.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
|
|
55
62
|
color:#1890FF;
|
|
56
63
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/user-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAO9C,UAAU,YAAY;CAErB;AAGD,UAAU,YAAa,SAAQ,QAAQ;CAEtC;AAGD,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC;IACjE,KAAK;;;;MAIJ;IAEK,iBAAiB;IAOvB,UAAU,aAMT;IAGD,MAAM;
|
|
1
|
+
{"version":3,"file":"user-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/user-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAGzB,OAAO,EAAC,QAAQ,EAAC,MAAM,sBAAsB,CAAC;AAO9C,UAAU,YAAY;CAErB;AAGD,UAAU,YAAa,SAAQ,QAAQ;CAEtC;AAGD,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC;IACjE,KAAK;;;;MAIJ;IAEK,iBAAiB;IAOvB,UAAU,aAMT;IAGD,MAAM;CAwCT;AAED,eAAe,OAAO,CAAC"}
|
|
@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import React from 'react';
|
|
11
|
-
import { Dropdown, Menu, Tooltip } from 'antd';
|
|
11
|
+
import { Dropdown, Menu, Tooltip, Avatar } from 'antd';
|
|
12
12
|
import { UserOutlined, LogoutOutlined, ClearOutlined } from '@ant-design/icons';
|
|
13
13
|
import HcserviceV3 from '../../tmpl/hcservice-v3';
|
|
14
14
|
import HCDataSource from "../../tmpl/hc-data-source";
|
|
@@ -54,9 +54,8 @@ class UserBar extends React.PureComponent {
|
|
|
54
54
|
return (React.createElement(React.Fragment, null,
|
|
55
55
|
React.createElement(Dropdown, { overlay: menu, placement: "bottomRight", trigger: ['click'] },
|
|
56
56
|
React.createElement("div", { className: "userLogin" },
|
|
57
|
-
React.createElement(UserOutlined, null),
|
|
58
57
|
React.createElement(Tooltip, { placement: "left", title: name },
|
|
59
|
-
React.createElement(
|
|
58
|
+
React.createElement(Avatar, { className: 'loginAvatar', icon: React.createElement(UserOutlined, null), size: "large" }))))));
|
|
60
59
|
}
|
|
61
60
|
}
|
|
62
61
|
export default UserBar;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"user-bar.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/user-bar.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAC,OAAO,EAAC,MAAM,MAAM,CAAC;
|
|
1
|
+
{"version":3,"file":"user-bar.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/user-bar.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAC,QAAQ,EAAE,IAAI,EAAC,OAAO,EAAC,MAAM,EAAC,MAAM,MAAM,CAAC;AACnD,OAAO,EAAC,YAAY,EAAC,cAAc,EAAC,aAAa,EAAC,MAAM,mBAAmB,CAAC;AAE5E,OAAO,WAAW,MAAM,yBAAyB,CAAC;AAClD,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,WAAW,MAAM,gBAAgB,CAAA;AACxC,OAAO,aAAa,MAAM,kBAAkB,CAAC;AAa7C,MAAM,OAAQ,SAAQ,KAAK,CAAC,aAAyC;IAArE;;QACI,UAAK,GAAC;YACH,EAAE,EAAC,SAAS;YACZ,IAAI,EAAC,SAAS;YACb,KAAK,EAAC,EAAE;SACX,CAAA;QASD,eAAU,GAAC,GAAE,EAAE;YACX,IAAI,EAAC,KAAK,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;YACvB,IAAI,OAAO,GAAG,QAAQ,CAAC,cAAc,CAAC,aAAa,CAAC,CAAC;YACrD,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,OAAO,CAAC;YAChC,YAAY,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC1B,OAAO,CAAC,KAAK,CAAC,OAAO,GAAG,MAAM,CAAC;QACnC,CAAC,CAAA;IA2CL,CAAC;IAxDS,iBAAiB;;YACnB,IAAI,QAAQ,GAAG,MAAM,WAAW,CAAC,OAAO,EAAE,CAAC;YAC3C,IAAI,CAAC,QAAQ,mBACN,QAAQ,EACb,CAAC;QACP,CAAC;KAAA;IAWD,MAAM;QACF,MAAM,EAAC,IAAI,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAE1B,MAAM,IAAI,GAAG,CACT,oBAAC,IAAI,IAAC,KAAK,EAAE,EAAC,QAAQ,EAAC,OAAO,EAAC;YAC3B,oBAAC,IAAI,CAAC,IAAI;gBACF,oBAAC,WAAW,OAAG,CACX;YACZ,oBAAC,IAAI,CAAC,IAAI;gBACN,oBAAC,aAAa,OAAiB,CACvB;YACZ,oBAAC,IAAI,CAAC,IAAI;gBACN,8BAAM,OAAO,EAAE,IAAI,CAAC,UAAU;oBAAE,oBAAC,aAAa,OAAG;+CAAW,CACpD;YACZ,oBAAC,IAAI,CAAC,IAAI;gBACF,8BAAM,OAAO,EAAE,WAAW,CAAC,MAAM;oBAAE,oBAAC,cAAc,OAAE;+CAAW,CAC1D,CACV,CACV,CAAC;QACF,OAAO,CACH;YACI,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,aAAa,EAAC,OAAO,EAAE,CAAC,OAAO,CAAC;gBAC/D,6BAAK,SAAS,EAAC,WAAW;oBAMtB,oBAAC,OAAO,IAAC,SAAS,EAAC,MAAM,EAAC,KAAK,EAAE,IAAI;wBACjC,oBAAC,MAAM,IAAC,SAAS,EAAE,aAAa,EAAG,IAAI,EAAG,oBAAC,YAAY,OAAE,EAAE,IAAI,EAAC,OAAO,GAE9D,CAEH,CAER,CACC,CACZ,CACN,CAAC;IACN,CAAC;CACJ;AAED,eAAe,OAAO,CAAC"}
|
package/package.json
CHANGED
|
@@ -41,7 +41,6 @@
|
|
|
41
41
|
width:auto;
|
|
42
42
|
text-align:center;
|
|
43
43
|
cursor: pointer;
|
|
44
|
-
font-size: 14px!important;
|
|
45
44
|
}
|
|
46
45
|
.userLogin i{
|
|
47
46
|
font-size: 24px!important;
|
|
@@ -51,6 +50,14 @@
|
|
|
51
50
|
color:#000;
|
|
52
51
|
}
|
|
53
52
|
|
|
53
|
+
.loginAvatar{
|
|
54
|
+
background: #4a5f74;
|
|
55
|
+
font-size:20px;
|
|
56
|
+
vertical-align: middle;
|
|
57
|
+
line-height: 46px;
|
|
58
|
+
}
|
|
59
|
+
|
|
60
|
+
|
|
54
61
|
.ant-dropdown-menu-item:hover, .ant-dropdown-menu-submenu-title:hover{
|
|
55
62
|
color:#1890FF;
|
|
56
63
|
}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {Dropdown, Menu,Tooltip} from 'antd';
|
|
2
|
+
import {Dropdown, Menu,Tooltip,Avatar} from 'antd';
|
|
3
3
|
import {UserOutlined,LogoutOutlined,ClearOutlined} from '@ant-design/icons';
|
|
4
4
|
import {UserInfo} from "../../tmpl/interface";
|
|
5
5
|
import HcserviceV3 from '../../tmpl/hcservice-v3';
|
|
@@ -68,9 +68,12 @@ class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
|
|
|
68
68
|
{/*<Avatar style={{ color:'#1890ff' }} shape="square" icon={<UserOutlined/>} size={{ xs: 8, sm: 16, md: 24, lg: 32, xl: 40, xxl: 48 }}>*/}
|
|
69
69
|
{/*</Avatar>*/}
|
|
70
70
|
{/*</Tooltip>*/}
|
|
71
|
-
|
|
71
|
+
{/*<UserOutlined/>*/}
|
|
72
72
|
<Tooltip placement="left" title={name}>
|
|
73
|
-
<
|
|
73
|
+
<Avatar className={'loginAvatar'} icon={ <UserOutlined/>} size="large" >
|
|
74
|
+
{/*{name ?name.substring(0,1).toUpperCase():null}*/}
|
|
75
|
+
</Avatar>
|
|
76
|
+
{/*<span>{name && name.length>=8?name.substring(0,5)+'...':name}</span>*/}
|
|
74
77
|
</Tooltip>
|
|
75
78
|
|
|
76
79
|
</div>
|