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
63b76456
Commit
63b76456
authored
Nov 13, 2017
by
afc163
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove v2 reset styles
parent
ebde3e57
Changes
19
Show whitespace changes
Inline
Side-by-side
Showing
19 changed files
with
34 additions
and
23 deletions
+34
-23
src/components/Charts/ChartCard/index.js
src/components/Charts/ChartCard/index.js
+1
-1
src/components/Charts/ChartCard/index.less
src/components/Charts/ChartCard/index.less
+1
-0
src/components/Charts/Field/index.js
src/components/Charts/Field/index.js
+2
-2
src/components/Charts/Field/index.less
src/components/Charts/Field/index.less
+1
-0
src/components/Charts/Pie/index.js
src/components/Charts/Pie/index.js
+1
-1
src/components/Charts/Pie/index.less
src/components/Charts/Pie/index.less
+2
-0
src/components/Charts/Radar/index.less
src/components/Charts/Radar/index.less
+4
-0
src/components/StandardTable/index.js
src/components/StandardTable/index.js
+6
-6
src/index.less
src/index.less
+0
-2
src/layouts/BasicLayout.less
src/layouts/BasicLayout.less
+1
-1
src/layouts/UserLayout.js
src/layouts/UserLayout.js
+1
-1
src/routes/Dashboard/Analysis.less
src/routes/Dashboard/Analysis.less
+3
-1
src/routes/Dashboard/Workplace.js
src/routes/Dashboard/Workplace.js
+2
-2
src/routes/Dashboard/Workplace.less
src/routes/Dashboard/Workplace.less
+1
-0
src/routes/List/BasicList.less
src/routes/List/BasicList.less
+1
-0
src/routes/List/FilterCardList.less
src/routes/List/FilterCardList.less
+1
-0
src/routes/List/SearchList.js
src/routes/List/SearchList.js
+1
-1
src/routes/Profile/AdvancedProfile.js
src/routes/Profile/AdvancedProfile.js
+1
-1
src/routes/User/Register.js
src/routes/User/Register.js
+4
-4
No files found.
src/components/Charts/ChartCard/index.js
View file @
63b76456
...
@@ -14,7 +14,7 @@ const ChartCard = ({
...
@@ -14,7 +14,7 @@ const ChartCard = ({
<
/div
>
<
/div
>
{
{
// eslint-disable-next-line
// eslint-disable-next-line
total
&&
<
p
className
=
{
styles
.
total
}
dangerouslySetInnerHTML
=
{{
__html
:
total
}}
/
>
total
&&
<
div
className
=
{
styles
.
total
}
dangerouslySetInnerHTML
=
{{
__html
:
total
}}
/
>
}
}
<
div
className
=
{
styles
.
content
}
style
=
{{
height
:
contentHeight
||
'
auto
'
}}
>
<
div
className
=
{
styles
.
content
}
style
=
{{
height
:
contentHeight
||
'
auto
'
}}
>
<
div
className
=
{
contentHeight
&&
styles
.
contentFixed
}
>
<
div
className
=
{
contentHeight
&&
styles
.
contentFixed
}
>
...
...
src/components/Charts/ChartCard/index.less
View file @
63b76456
...
@@ -26,6 +26,7 @@
...
@@ -26,6 +26,7 @@
.textOverflow();
.textOverflow();
color: @heading-color;
color: @heading-color;
margin-top: 4px;
margin-top: 4px;
margin-bottom: 0;
font-size: 30px;
font-size: 30px;
line-height: 38px;
line-height: 38px;
height: 38px;
height: 38px;
...
...
src/components/Charts/Field/index.js
View file @
63b76456
...
@@ -3,10 +3,10 @@ import React from 'react';
...
@@ -3,10 +3,10 @@ import React from 'react';
import
styles
from
'
./index.less
'
;
import
styles
from
'
./index.less
'
;
const
Field
=
({
label
,
value
,
...
rest
})
=>
(
const
Field
=
({
label
,
value
,
...
rest
})
=>
(
<
p
className
=
{
styles
.
field
}
{...
rest
}
>
<
div
className
=
{
styles
.
field
}
{...
rest
}
>
<
span
>
{
label
}
<
/span
>
<
span
>
{
label
}
<
/span
>
<
span
>
{
value
}
<
/span
>
<
span
>
{
value
}
<
/span
>
<
/
p
>
<
/
div
>
);
);
export
default
Field
;
export
default
Field
;
src/components/Charts/Field/index.less
View file @
63b76456
...
@@ -4,6 +4,7 @@
...
@@ -4,6 +4,7 @@
white-space: nowrap;
white-space: nowrap;
overflow: hidden;
overflow: hidden;
text-overflow: ellipsis;
text-overflow: ellipsis;
margin: 0;
span {
span {
font-size: @font-size-base;
font-size: @font-size-base;
line-height: 22px;
line-height: 22px;
...
...
src/components/Charts/Pie/index.js
View file @
63b76456
...
@@ -219,7 +219,7 @@ class Pie extends Component {
...
@@ -219,7 +219,7 @@ class Pie extends Component {
{
subTitle
&&
<
h4
className
=
"
pie-sub-title
"
>
{
subTitle
}
<
/h4>
}
{
subTitle
&&
<
h4
className
=
"
pie-sub-title
"
>
{
subTitle
}
<
/h4>
}
{
{
// eslint-disable-next-line
// eslint-disable-next-line
total
&&
<
p
className
=
"
pie-stat
"
dangerouslySetInnerHTML
=
{{
__html
:
total
}}
/
>
total
&&
<
div
className
=
"
pie-stat
"
dangerouslySetInnerHTML
=
{{
__html
:
total
}}
/
>
}
}
<
/div
>
<
/div
>
)
)
...
...
src/components/Charts/Pie/index.less
View file @
63b76456
...
@@ -15,6 +15,8 @@
...
@@ -15,6 +15,8 @@
top: 50%;
top: 50%;
transform: translateY(-50%);
transform: translateY(-50%);
margin: 0 20px;
margin: 0 20px;
list-style: none;
padding: 0;
li {
li {
cursor: pointer;
cursor: pointer;
margin-bottom: 16px;
margin-bottom: 16px;
...
...
src/components/Charts/Radar/index.less
View file @
63b76456
...
@@ -9,12 +9,16 @@
...
@@ -9,12 +9,16 @@
cursor: pointer;
cursor: pointer;
color: @text-color-secondary;
color: @text-color-secondary;
line-height: 22px;
line-height: 22px;
p {
margin: 0;
}
h6 {
h6 {
color: @heading-color;
color: @heading-color;
padding-left: 16px;
padding-left: 16px;
font-size: 24px;
font-size: 24px;
line-height: 32px;
line-height: 32px;
margin-top: 4px;
margin-top: 4px;
margin-bottom: 0;
}
}
&:after {
&:after {
background-color: @border-color-split;
background-color: @border-color-split;
...
...
src/components/StandardTable/index.js
View file @
63b76456
...
@@ -60,9 +60,9 @@ class StandardTable extends PureComponent {
...
@@ -60,9 +60,9 @@ class StandardTable extends PureComponent {
dataIndex
:
'
callNo
'
,
dataIndex
:
'
callNo
'
,
sorter
:
true
,
sorter
:
true
,
render
:
val
=>
(
render
:
val
=>
(
<
p
style
=
{{
textAlign
:
'
center
'
}}
>
<
div
style
=
{{
textAlign
:
'
center
'
}}
>
{
val
}
万
{
val
}
万
<
/
p
>
<
/
div
>
),
),
},
},
{
{
...
@@ -99,11 +99,11 @@ class StandardTable extends PureComponent {
...
@@ -99,11 +99,11 @@ class StandardTable extends PureComponent {
{
{
title
:
'
操作
'
,
title
:
'
操作
'
,
render
:
()
=>
(
render
:
()
=>
(
<
p
>
<
div
>
<
a
href
=
""
>
配置
<
/a
>
<
a
href
=
""
>
配置
<
/a
>
<
span
className
=
{
styles
.
splitLine
}
/
>
<
span
className
=
{
styles
.
splitLine
}
/
>
<
a
href
=
""
>
订阅警报
<
/a
>
<
a
href
=
""
>
订阅警报
<
/a
>
<
/
p
>
<
/
div
>
),
),
},
},
];
];
...
@@ -127,11 +127,11 @@ class StandardTable extends PureComponent {
...
@@ -127,11 +127,11 @@ class StandardTable extends PureComponent {
<
div
className
=
{
styles
.
tableAlert
}
>
<
div
className
=
{
styles
.
tableAlert
}
>
<
Alert
<
Alert
message
=
{(
message
=
{(
<
p
>
<
div
>
已选择
<
a
style
=
{{
fontWeight
:
600
}}
>
{
selectedRowKeys
.
length
}
<
/a> 项  
;
已选择
<
a
style
=
{{
fontWeight
:
600
}}
>
{
selectedRowKeys
.
length
}
<
/a> 项  
;
服务调用总计
<
span
style
=
{{
fontWeight
:
600
}}
>
{
totalCallNo
}
<
/span>
万
服务调用总计
<
span
style
=
{{
fontWeight
:
600
}}
>
{
totalCallNo
}
<
/span>
万
<
a
onClick
=
{
this
.
cleanSelectedKeys
}
style
=
{{
marginLeft
:
24
}}
>
清空
<
/a
>
<
a
onClick
=
{
this
.
cleanSelectedKeys
}
style
=
{{
marginLeft
:
24
}}
>
清空
<
/a
>
<
/
p
>
<
/
div
>
)}
)}
type
=
"
info
"
type
=
"
info
"
showIcon
showIcon
...
...
src/index.less
View file @
63b76456
@import '~antd/lib/style/v2-compatible-reset.less';
html, body, :global(#root) {
html, body, :global(#root) {
height: 100%;
height: 100%;
}
}
...
...
src/layouts/BasicLayout.less
View file @
63b76456
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
display: inline-block;
display: inline-block;
vertical-align: middle;
vertical-align: middle;
font-size: 20px;
font-size: 20px;
margin
-left:
12px;
margin
: 0 0 0
12px;
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-family: 'Myriad Pro', 'Helvetica Neue', Arial, Helvetica, sans-serif;
font-weight: 600;
font-weight: 600;
}
}
...
...
src/layouts/UserLayout.js
View file @
63b76456
...
@@ -50,7 +50,7 @@ class UserLayout extends React.PureComponent {
...
@@ -50,7 +50,7 @@ class UserLayout extends React.PureComponent {
<
span
className
=
{
styles
.
title
}
>
Ant
Design
<
/span
>
<
span
className
=
{
styles
.
title
}
>
Ant
Design
<
/span
>
<
/Link
>
<
/Link
>
<
/div
>
<
/div
>
<
p
className
=
{
styles
.
desc
}
>
Ant
Design
是西湖区最具影响力的
Web
设计规范
<
/p
>
<
div
className
=
{
styles
.
desc
}
>
Ant
Design
是西湖区最具影响力的
Web
设计规范
<
/div
>
<
/div
>
<
/div
>
{
{
getRouteData
(
'
UserLayout
'
).
map
(
item
=>
getRouteData
(
'
UserLayout
'
).
map
(
item
=>
...
...
src/routes/Dashboard/Analysis.less
View file @
63b76456
...
@@ -14,7 +14,9 @@
...
@@ -14,7 +14,9 @@
}
}
.rankingList {
.rankingList {
margin-top: 25px;
margin: 25px 0 0;
padding: 0;
list-style: none;
li {
li {
.clearfix();
.clearfix();
margin-top: 16px;
margin-top: 16px;
...
...
src/routes/Dashboard/Workplace.js
View file @
63b76456
...
@@ -142,8 +142,8 @@ export default class Workplace extends PureComponent {
...
@@ -142,8 +142,8 @@ export default class Workplace extends PureComponent {
<
Avatar
size
=
"
large
"
src
=
"
https://gw.alipayobjects.com/zos/rmsportal/lctvVCLfRpYCkYxAsiVQ.png
"
/>
<
Avatar
size
=
"
large
"
src
=
"
https://gw.alipayobjects.com/zos/rmsportal/lctvVCLfRpYCkYxAsiVQ.png
"
/>
<
/div
>
<
/div
>
<
div
className
=
{
styles
.
content
}
>
<
div
className
=
{
styles
.
content
}
>
<
p
className
=
{
styles
.
contentTitle
}
>
早安
,
曲丽丽
,
祝你开心每一天
!
<
/p
>
<
div
className
=
{
styles
.
contentTitle
}
>
早安
,
曲丽丽
,
祝你开心每一天
!
<
/div
>
<
p
>
交互专家
|
蚂蚁金服
-
某某某事业群
-
某某平台部
-
某某技术部
-
UED
<
/p
>
<
div
>
交互专家
|
蚂蚁金服
-
某某某事业群
-
某某平台部
-
某某技术部
-
UED
<
/div
>
<
/div
>
<
/div
>
<
/div
>
<
/div
>
);
);
...
...
src/routes/Dashboard/Workplace.less
View file @
63b76456
...
@@ -57,6 +57,7 @@
...
@@ -57,6 +57,7 @@
color: @heading-color;
color: @heading-color;
font-size: 30px;
font-size: 30px;
line-height: 38px;
line-height: 38px;
margin: 0;
& > span {
& > span {
color: @text-color-secondary;
color: @text-color-secondary;
font-size: 20px;
font-size: 20px;
...
...
src/routes/List/BasicList.less
View file @
63b76456
...
@@ -61,6 +61,7 @@
...
@@ -61,6 +61,7 @@
}
}
& > p {
& > p {
margin-top: 4px;
margin-top: 4px;
margin-bottom: 0;
line-height: 22px;
line-height: 22px;
}
}
}
}
...
...
src/routes/List/FilterCardList.less
View file @
63b76456
...
@@ -27,6 +27,7 @@
...
@@ -27,6 +27,7 @@
p {
p {
line-height: 32px;
line-height: 32px;
font-size: 24px;
font-size: 24px;
margin: 0;
}
}
p:first-child {
p:first-child {
color: @text-color-secondary;
color: @text-color-secondary;
...
...
src/routes/List/SearchList.js
View file @
63b76456
...
@@ -107,7 +107,7 @@ export default class SearchList extends Component {
...
@@ -107,7 +107,7 @@ export default class SearchList extends Component {
const
ListContent
=
({
data
:
{
content
,
updatedAt
,
avatar
,
owner
,
href
}
})
=>
(
const
ListContent
=
({
data
:
{
content
,
updatedAt
,
avatar
,
owner
,
href
}
})
=>
(
<
div
className
=
{
styles
.
listContent
}
>
<
div
className
=
{
styles
.
listContent
}
>
<
p
className
=
{
styles
.
description
}
>
{
content
}
<
/p
>
<
div
className
=
{
styles
.
description
}
>
{
content
}
<
/div
>
<
div
className
=
{
styles
.
extra
}
>
<
div
className
=
{
styles
.
extra
}
>
<
Avatar
src
=
{
avatar
}
size
=
"
small
"
/><
a
href
=
{
href
}
>
{
owner
}
<
/a> 发布在 <a href={href}>{href}</
a
>
<
Avatar
src
=
{
avatar
}
size
=
"
small
"
/><
a
href
=
{
href
}
>
{
owner
}
<
/a> 发布在 <a href={href}>{href}</
a
>
<
em
>
{
moment
(
updatedAt
).
format
(
'
YYYY-MM-DD hh:mm
'
)}
<
/em
>
<
em
>
{
moment
(
updatedAt
).
format
(
'
YYYY-MM-DD hh:mm
'
)}
<
/em
>
...
...
src/routes/Profile/AdvancedProfile.js
View file @
63b76456
...
@@ -92,7 +92,7 @@ const popoverContent = (
...
@@ -92,7 +92,7 @@ const popoverContent = (
<
span
className
=
{
styles
.
textSecondary
}
style
=
{{
float
:
'
right
'
}}
>
<
span
className
=
{
styles
.
textSecondary
}
style
=
{{
float
:
'
right
'
}}
>
<
Badge
status
=
"
default
"
text
=
{
<
span
style
=
{{
color
:
'
rgba(0, 0, 0, 0.45)
'
}}
>
未响应
<
/span>} /
>
<
Badge
status
=
"
default
"
text
=
{
<
span
style
=
{{
color
:
'
rgba(0, 0, 0, 0.45)
'
}}
>
未响应
<
/span>} /
>
<
/span
>
<
/span
>
<
p
className
=
{
styles
.
textSecondary
}
style
=
{{
marginTop
:
4
}}
>
耗时
:
2
小时25分钟
<
/p
>
<
div
className
=
{
styles
.
textSecondary
}
style
=
{{
marginTop
:
4
}}
>
耗时
:
2
小时25分钟
<
/div
>
<
/div
>
<
/div
>
);
);
...
...
src/routes/User/Register.js
View file @
63b76456
...
@@ -9,9 +9,9 @@ const { Option } = Select;
...
@@ -9,9 +9,9 @@ const { Option } = Select;
const
InputGroup
=
Input
.
Group
;
const
InputGroup
=
Input
.
Group
;
const
passwordStatusMap
=
{
const
passwordStatusMap
=
{
ok
:
<
p
className
=
{
styles
.
success
}
>
强度
:
强
<
/p
>
,
ok
:
<
div
className
=
{
styles
.
success
}
>
强度
:
强
<
/div
>
,
pass
:
<
p
className
=
{
styles
.
warning
}
>
强度
:
中
<
/p
>
,
pass
:
<
div
className
=
{
styles
.
warning
}
>
强度
:
中
<
/div
>
,
pool
:
<
p
className
=
{
styles
.
error
}
>
强度
:
太短
<
/p
>
,
pool
:
<
div
className
=
{
styles
.
error
}
>
强度
:
太短
<
/div
>
,
};
};
const
passwordProgressMap
=
{
const
passwordProgressMap
=
{
...
@@ -163,7 +163,7 @@ export default class Register extends Component {
...
@@ -163,7 +163,7 @@ export default class Register extends Component {
<
div
style
=
{{
padding
:
'
4px 0
'
}}
>
<
div
style
=
{{
padding
:
'
4px 0
'
}}
>
{
passwordStatusMap
[
this
.
getPasswordStatus
()]}
{
passwordStatusMap
[
this
.
getPasswordStatus
()]}
{
this
.
renderPasswordProgress
()}
{
this
.
renderPasswordProgress
()}
<
p
style
=
{{
marginTop
:
10
}}
>
请至少输入
6
个字符
。
请不要使用容易被猜到的密码
。
<
/p
>
<
div
style
=
{{
marginTop
:
10
}}
>
请至少输入
6
个字符
。
请不要使用容易被猜到的密码
。
<
/div
>
<
/div
>
<
/div
>
}
}
overlayStyle
=
{{
width
:
240
}}
overlayStyle
=
{{
width
:
240
}}
...
...
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