Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
P
pro-blocks
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Service Desk
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Incidents
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
duanledexianxianxian
pro-blocks
Commits
0153ec13
Commit
0153ec13
authored
Oct 23, 2017
by
nikogu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update detail
parent
16d768d1
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
45 additions
and
40 deletions
+45
-40
src/components/Charts/TagCloud/index.js
src/components/Charts/TagCloud/index.js
+39
-33
src/components/DescriptionList/index.less
src/components/DescriptionList/index.less
+3
-5
src/routes/Profile/BasicProfile.js
src/routes/Profile/BasicProfile.js
+2
-2
src/routes/Profile/BasicProfile.less
src/routes/Profile/BasicProfile.less
+1
-0
No files found.
src/components/Charts/TagCloud/index.js
View file @
0153ec13
...
...
@@ -6,6 +6,9 @@ import Cloud from 'g-cloud';
/* eslint no-param-reassign: 0 */
/* eslint no-return-assign: 0 */
const
imgUrl
=
'
https://gw.alipayobjects.com/zos/rmsportal/SQlwcHhAbFVjjbDCLROB.png
'
;
// const imgUrl = 'https://zos.alipayobjects.com/rmsportal/EEFqYWuloqIHRnh.jpg';
class
TagCloud
extends
PureComponent
{
componentDidMount
()
{
this
.
initTagCloud
();
...
...
@@ -25,7 +28,8 @@ class TagCloud extends PureComponent {
const
textAttrs
=
Util
.
mix
(
true
,
{},
{
fillOpacity
:
cfg
.
opacity
,
fontSize
:
cfg
.
size
,
rotate
:
0
,
// cfg.origin._origin.rotate,
// rotate: 0, // cfg.origin._origin.rotate,
rotate
:
cfg
.
origin
.
_origin
.
rotate
,
text
:
cfg
.
origin
.
_origin
.
text
,
textAlign
:
'
center
'
,
fill
:
cfg
.
color
,
...
...
@@ -78,45 +82,47 @@ class TagCloud extends PureComponent {
height
,
// 设定文字大小配置函数(默认为12-40px的随机大小)
size
:
words
=>
(((
words
.
value
-
min
)
/
(
max
-
min
))
*
12
)
+
6
,
size
:
words
=>
(((
words
.
value
-
min
)
/
(
max
-
min
))
*
4
)
+
10
,
// 设定文字内容
text
:
words
=>
words
.
name
,
});
// 执行词云布局函数,并在回调函数中调用G2对结果进行绘制
layout
.
exec
((
texts
)
=>
{
const
chart
=
new
G2
.
Chart
({
container
:
this
.
node
,
width
,
height
,
plotCfg
:
{
margin
:
0
,
},
});
chart
.
legend
(
false
);
chart
.
axis
(
false
);
chart
.
tooltip
(
false
);
chart
.
source
(
texts
);
// 将词云坐标系调整为G2的坐标系
chart
.
coord
().
reflect
();
chart
.
point
()
.
position
(
'
x*y
'
)
.
color
(
'
text
'
)
.
size
(
'
size
'
,
size
=>
size
)
.
shape
(
'
cloud
'
)
.
style
({
fontStyle
:
texts
[
0
].
style
,
fontFamily
:
texts
[
0
].
font
,
fontWeight
:
texts
[
0
].
weight
,
layout
.
image
(
imgUrl
,
(
imageCloud
)
=>
{
// 执行词云布局函数,并在回调函数中调用G2对结果进行绘制
imageCloud
.
exec
((
texts
)
=>
{
const
chart
=
new
G2
.
Chart
({
container
:
this
.
node
,
width
,
height
,
plotCfg
:
{
margin
:
0
,
},
});
chart
.
render
();
chart
.
legend
(
false
);
chart
.
axis
(
false
);
chart
.
tooltip
(
false
);
chart
.
source
(
texts
);
// 将词云坐标系调整为G2的坐标系
chart
.
coord
().
reflect
();
chart
.
point
()
.
position
(
'
x*y
'
)
.
color
(
'
text
'
)
.
size
(
'
size
'
,
size
=>
size
)
.
shape
(
'
cloud
'
)
.
style
({
fontStyle
:
texts
[
0
].
style
,
fontFamily
:
texts
[
0
].
font
,
fontWeight
:
texts
[
0
].
weight
,
});
chart
.
render
();
});
});
}
...
...
src/components/DescriptionList/index.less
View file @
0153ec13
...
...
@@ -10,6 +10,7 @@
}
.title {
font-size: 14px;
color: @heading-color;
font-weight: 500;
margin-bottom: 16px;
...
...
@@ -59,10 +60,7 @@
}
}
.descriptionListLarge {
.large {
margin-bottom: 24px;
}
.term {
padding-bottom: 24px;
.title {
font-size: 16px;
}
}
src/routes/Profile/BasicProfile.js
View file @
0153ec13
...
...
@@ -127,14 +127,14 @@ export default class BasicProfile extends Component {
return
(
<
PageHeaderLayout
title
=
"
基础详情页
"
>
<
Card
bordered
=
{
false
}
>
<
DescriptionList
title
=
"
退款申请
"
style
=
{{
marginBottom
:
32
}}
>
<
DescriptionList
size
=
"
large
"
title
=
"
退款申请
"
style
=
{{
marginBottom
:
32
}}
>
<
Description
term
=
"
取货单号
"
>
1000000000
<
/Description
>
<
Description
term
=
"
状态
"
>
已取货
<
/Description
>
<
Description
term
=
"
销售单号
"
>
1234123421
<
/Description
>
<
Description
term
=
"
子订单
"
>
3214321432
<
/Description
>
<
/DescriptionList
>
<
Divider
style
=
{{
marginBottom
:
32
}}
/
>
<
DescriptionList
title
=
"
用户信息
"
style
=
{{
marginBottom
:
32
}}
>
<
DescriptionList
size
=
"
large
"
title
=
"
用户信息
"
style
=
{{
marginBottom
:
32
}}
>
<
Description
term
=
"
用户姓名
"
>
付小小
<
/Description
>
<
Description
term
=
"
联系电话
"
>
18100000000
<
/Description
>
<
Description
term
=
"
常用快递
"
>
菜鸟仓储
<
/Description
>
...
...
src/routes/Profile/BasicProfile.less
View file @
0153ec13
...
...
@@ -2,6 +2,7 @@
.title {
color: @heading-color;
font-size: 16px;
font-weight: 500;
margin-bottom: 16px;
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment