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
2e0efbb0
Commit
2e0efbb0
authored
Dec 29, 2017
by
afc163
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
update dependencies and fix lint and test case
parent
e2b1261c
Changes
9
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
37 additions
and
44 deletions
+37
-44
.stylelintrc
.stylelintrc
+1
-0
package.json
package.json
+6
-7
src/components/DescriptionList/DescriptionList.js
src/components/DescriptionList/DescriptionList.js
+2
-2
src/components/DescriptionList/index.less
src/components/DescriptionList/index.less
+22
-22
src/components/GlobalHeader/index.less
src/components/GlobalHeader/index.less
+2
-2
src/routes/Dashboard/Analysis.less
src/routes/Dashboard/Analysis.less
+0
-5
src/routes/Forms/StepForm/style.less
src/routes/Forms/StepForm/style.less
+1
-1
src/routes/List/BasicList.less
src/routes/List/BasicList.less
+1
-3
tests/setupTests.js
tests/setupTests.js
+2
-2
No files found.
.stylelintrc
View file @
2e0efbb0
...
...
@@ -20,6 +20,7 @@
"selector-list-comma-newline-after": null,
"selector-pseudo-element-colon-notation": null,
"unit-no-unknown": null,
"no-descending-specificity": null,
"value-list-max-empty-lines": null
}
}
package.json
View file @
2e0efbb0
...
...
@@ -26,13 +26,11 @@
"
bizcharts
"
:
"
^3.1.0-beta.4
"
,
"
bizcharts-plugin-slider
"
:
"
^2.0.1
"
,
"
classnames
"
:
"
^2.2.5
"
,
"
core-js
"
:
"
^2.5.1
"
,
"
dva
"
:
"
^2.1.0
"
,
"
enquire-js
"
:
"
^0.1.1
"
,
"
fastclick
"
:
"
^1.0.6
"
,
"
lodash
"
:
"
^4.17.4
"
,
"
lodash-decorators
"
:
"
^4.4.1
"
,
"
lodash.clonedeep
"
:
"
^4.5.0
"
,
"
moment
"
:
"
^2.19.1
"
,
"
numeral
"
:
"
^2.0.6
"
,
"
prop-types
"
:
"
^15.5.10
"
,
...
...
@@ -46,8 +44,8 @@
},
"devDependencies"
:
{
"
babel-eslint
"
:
"
^8.0.1
"
,
"
babel-jest
"
:
"
^2
1.0.0
"
,
"
babel-plugin-dva-hmr
"
:
"
^0.
3.2
"
,
"
babel-jest
"
:
"
^2
2.0.4
"
,
"
babel-plugin-dva-hmr
"
:
"
^0.
4.0
"
,
"
babel-plugin-import
"
:
"
^1.2.1
"
,
"
babel-plugin-transform-class-properties
"
:
"
^6.24.1
"
,
"
babel-plugin-transform-decorators-legacy
"
:
"
^1.3.4
"
,
...
...
@@ -68,8 +66,9 @@
"
eslint-plugin-react
"
:
"
^7.0.1
"
,
"
gh-pages
"
:
"
^1.0.0
"
,
"
husky
"
:
"
^0.14.3
"
,
"
jest
"
:
"
^21.0.1
"
,
"
lint-staged
"
:
"
^4.3.0
"
,
"
jest
"
:
"
^22.0.4
"
,
"
jsdom
"
:
"
^11.5.1
"
,
"
lint-staged
"
:
"
^6.0.0
"
,
"
mockjs
"
:
"
^1.0.1-beta3
"
,
"
prettier
"
:
"
^1.9.0
"
,
"
pro-download
"
:
"
^1.0.0
"
,
...
...
@@ -79,7 +78,7 @@
"
roadhog-api-doc
"
:
"
^0.3.3
"
,
"
rollbar
"
:
"
^2.3.1
"
,
"
stylelint
"
:
"
^8.1.0
"
,
"
stylelint-config-standard
"
:
"
^1
7
.0.0
"
"
stylelint-config-standard
"
:
"
^1
8
.0.0
"
},
"optionalDependencies"
:
{
"nightmare"
:
"^2.10.0"
...
...
src/components/DescriptionList/DescriptionList.js
View file @
2e0efbb0
...
...
@@ -6,8 +6,8 @@ import styles from './index.less';
export
default
({
className
,
title
,
col
=
3
,
layout
=
'
horizontal
'
,
gutter
=
32
,
children
,
size
,
...
restProps
})
=>
{
const
clsString
=
classNames
(
styles
.
descriptionList
,
styles
[
layout
],
className
,
{
[
styles
.
descriptionListS
mall
]:
size
===
'
small
'
,
[
styles
.
descriptionListL
arge
]:
size
===
'
large
'
,
[
styles
.
s
mall
]:
size
===
'
small
'
,
[
styles
.
l
arge
]:
size
===
'
large
'
,
});
const
column
=
col
>
4
?
4
:
col
;
return
(
...
...
src/components/DescriptionList/index.less
View file @
2e0efbb0
...
...
@@ -40,8 +40,29 @@
display: table-cell;
}
&.vertical {
&.small {
// offset the padding-bottom of last row
:global {
.ant-row {
margin-bottom: -8px;
}
}
.title {
margin-bottom: 12px;
color: @text-color;
}
.term, .detail {
padding-bottom: 8px;
}
}
&.large {
.title {
font-size: 16px;
}
}
&.vertical {
.term {
padding-bottom: 8px;
display: block;
...
...
@@ -52,24 +73,3 @@
}
}
}
.descriptionListSmall {
// offset the padding-bottom of last row
:global {
.ant-row {
margin-bottom: -8px;
}
}
.title {
margin-bottom: 12px;
color: @text-color;
}
.term, .detail {
padding-bottom: 8px;
}
}
.descriptionListLarge {
.title {
font-size: 16px;
}
}
src/components/GlobalHeader/index.less
View file @
2e0efbb0
...
...
@@ -60,8 +60,8 @@ i.trigger {
font-size: 16px;
vertical-align: middle;
}
&:
global(.ant-popover-open)
,
&:
hover
{
&:
hover
,
&:
global(.ant-popover-open)
{
background: @primary-1;
}
}
...
...
src/routes/Dashboard/Analysis.less
View file @
2e0efbb0
...
...
@@ -83,11 +83,6 @@
padding-right: 24px;
line-height: 55px;
}
}
}
.salesCard {
:global {
.ant-card-head {
position: relative;
}
...
...
src/routes/Forms/StepForm/style.less
View file @
2e0efbb0
...
...
@@ -64,7 +64,7 @@
}
.money {
font-family:
Helvetica Neue
;
font-family:
"Helvetica Neue", sans-serif
;
font-weight: 500;
font-size: 20px;
line-height: 14px;
...
...
src/routes/List/BasicList.less
View file @
2e0efbb0
...
...
@@ -15,15 +15,13 @@
}
.ant-list-pagination {
text-align: right;
margin-top: 24px;
}
.ant-avatar-lg {
width: 48px;
height: 48px;
line-height: 48px;
}
.ant-list-pagination {
margin-top: 24px;
}
}
.headerInfo {
position: relative;
...
...
tests/setupTests.js
View file @
2e0efbb0
...
...
@@ -3,7 +3,7 @@ global.requestAnimationFrame =
global
.
requestAnimationFrame
||
function
requestAnimationFrame
(
callback
)
{
setTimeout
(
callback
,
0
);
};
import
{
jsdom
}
from
'
jsdom
'
;
import
{
JSDOM
}
from
'
jsdom
'
;
import
Enzyme
from
'
enzyme
'
;
import
Adapter
from
'
enzyme-adapter-react-16
'
;
...
...
@@ -11,6 +11,6 @@ Enzyme.configure({ adapter: new Adapter() });
// fixed jsdom miss
const
documentHTML
=
'
<!doctype html><html><body><div id="root"></div></body></html>
'
;
global
.
document
=
jsdom
(
documentHTML
);
global
.
document
=
new
JSDOM
(
documentHTML
);
global
.
window
=
document
.
defaultView
;
global
.
navigator
=
global
.
window
.
navigator
;
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