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
20c01e08
Commit
20c01e08
authored
Jul 07, 2018
by
xiaohu
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
1.add list search layout
parent
5ef482ed
Changes
10
Hide whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
22 additions
and
23 deletions
+22
-23
src/pages/Account/Center/Applications.js
src/pages/Account/Center/Applications.js
+1
-1
src/pages/Account/Center/Articles.js
src/pages/Account/Center/Articles.js
+1
-1
src/pages/Account/Center/Projects.js
src/pages/Account/Center/Projects.js
+1
-1
src/pages/List/Search/Applications.js
src/pages/List/Search/Applications.js
+1
-1
src/pages/List/Search/Applications.less
src/pages/List/Search/Applications.less
+1
-1
src/pages/List/Search/Articles.js
src/pages/List/Search/Articles.js
+0
-0
src/pages/List/Search/Articles.less
src/pages/List/Search/Articles.less
+1
-1
src/pages/List/Search/Projects.js
src/pages/List/Search/Projects.js
+0
-0
src/pages/List/Search/Projects.less
src/pages/List/Search/Projects.less
+1
-1
src/pages/List/Search/_layout.js
src/pages/List/Search/_layout.js
+15
-16
No files found.
src/pages/Account/Center/Applications.js
View file @
20c01e08
...
...
@@ -2,7 +2,7 @@ import React from 'react';
import
{
List
,
Card
,
Icon
,
Dropdown
,
Menu
,
Avatar
,
Tooltip
}
from
'
antd
'
;
import
numeral
from
'
numeral
'
;
import
{
formatWan
}
from
'
../../../utils/utils
'
;
import
stylesApplications
from
'
../../List/Applications.less
'
;
import
stylesApplications
from
'
../../List/
Search/
Applications.less
'
;
export
default
props
=>
{
const
{
list
}
=
props
;
...
...
src/pages/Account/Center/Articles.js
View file @
20c01e08
import
React
from
'
react
'
;
import
{
List
,
Icon
,
Avatar
,
Tag
}
from
'
antd
'
;
import
moment
from
'
moment
'
;
import
stylesArticles
from
'
../../List/Articles.less
'
;
import
stylesArticles
from
'
../../List/
Search/
Articles.less
'
;
import
styles
from
'
./Articles.less
'
;
export
default
props
=>
{
...
...
src/pages/Account/Center/Projects.js
View file @
20c01e08
...
...
@@ -2,7 +2,7 @@ import React from 'react';
import
{
List
,
Card
}
from
'
antd
'
;
import
moment
from
'
moment
'
;
import
AvatarList
from
'
../../../components/AvatarList
'
;
import
stylesProjects
from
'
../../List/Projects.less
'
;
import
stylesProjects
from
'
../../List/
Search/
Projects.less
'
;
export
default
props
=>
{
const
{
list
}
=
props
;
...
...
src/pages/List/Applications.js
→
src/pages/List/
Search/
Applications.js
View file @
20c01e08
...
...
@@ -5,7 +5,7 @@ import { Row, Col, Form, Card, Select, Icon, Avatar, List, Tooltip, Dropdown, Me
import
TagSelect
from
'
components/TagSelect
'
;
import
StandardFormRow
from
'
components/StandardFormRow
'
;
import
{
formatWan
}
from
'
../../utils/utils
'
;
import
{
formatWan
}
from
'
../../
../
utils/utils
'
;
import
styles
from
'
./Applications.less
'
;
...
...
src/pages/List/Applications.less
→
src/pages/List/
Search/
Applications.less
View file @
20c01e08
@import '~antd/lib/style/themes/default.less';
@import '../../utils/utils.less';
@import '../../
../
utils/utils.less';
.filterCardList {
margin-bottom: -24px;
...
...
src/pages/List/Articles.js
→
src/pages/List/
Search/
Articles.js
View file @
20c01e08
File moved
src/pages/List/Articles.less
→
src/pages/List/
Search/
Articles.less
View file @
20c01e08
@import '~antd/lib/style/themes/default.less';
@import '../../utils/utils.less';
@import '../../
../
utils/utils.less';
.listContent {
.description {
...
...
src/pages/List/Projects.js
→
src/pages/List/
Search/
Projects.js
View file @
20c01e08
File moved
src/pages/List/Projects.less
→
src/pages/List/
Search/
Projects.less
View file @
20c01e08
@import '~antd/lib/style/themes/default.less';
@import '../../utils/utils.less';
@import '../../
../
utils/utils.less';
.coverCardList {
margin-bottom: -24px;
...
...
src/pages/List/
Lis
t.js
→
src/pages/List/
Search/_layou
t.js
View file @
20c01e08
import
React
,
{
Component
}
from
'
react
'
;
import
{
routerRedux
,
Route
,
Switch
}
from
'
dva/router
'
;
import
{
routerRedux
}
from
'
dva/router
'
;
import
{
connect
}
from
'
dva
'
;
import
{
Input
}
from
'
antd
'
;
import
PageHeaderLayout
from
'
../../layouts/PageHeaderLayout
'
;
import
{
getRoutes
}
from
'
../../utils/utils
'
;
import
PageHeaderLayout
from
'
../../../layouts/PageHeaderLayout
'
;
@
connect
()
export
default
class
SearchList
extends
Component
{
handleTabChange
=
key
=>
{
const
{
dispatch
,
match
}
=
this
.
props
;
switch
(
key
)
{
case
'
a
rticles
'
:
dispatch
(
routerRedux
.
push
(
`
${
match
.
url
}
/
a
rticles`
));
case
'
A
rticles
'
:
dispatch
(
routerRedux
.
push
(
`
${
match
.
url
}
/
A
rticles`
));
break
;
case
'
a
pplications
'
:
dispatch
(
routerRedux
.
push
(
`
${
match
.
url
}
/
a
pplications`
));
case
'
A
pplications
'
:
dispatch
(
routerRedux
.
push
(
`
${
match
.
url
}
/
A
pplications`
));
break
;
case
'
p
rojects
'
:
dispatch
(
routerRedux
.
push
(
`
${
match
.
url
}
/
p
rojects`
));
case
'
P
rojects
'
:
dispatch
(
routerRedux
.
push
(
`
${
match
.
url
}
/
P
rojects`
));
break
;
default
:
break
;
...
...
@@ -27,15 +26,15 @@ export default class SearchList extends Component {
render
()
{
const
tabList
=
[
{
key
:
'
a
rticles
'
,
key
:
'
A
rticles
'
,
tab
:
'
文章
'
,
},
{
key
:
'
a
pplications
'
,
key
:
'
A
pplications
'
,
tab
:
'
应用
'
,
},
{
key
:
'
p
rojects
'
,
key
:
'
P
rojects
'
,
tab
:
'
项目
'
,
},
];
...
...
@@ -52,8 +51,7 @@ export default class SearchList extends Component {
<
/div
>
);
const
{
match
,
routerData
,
location
}
=
this
.
props
;
const
routes
=
getRoutes
(
match
.
path
,
routerData
);
const
{
match
,
children
,
location
}
=
this
.
props
;
return
(
<
PageHeaderLayout
...
...
@@ -63,11 +61,12 @@ export default class SearchList extends Component {
tabActiveKey
=
{
location
.
pathname
.
replace
(
`
${
match
.
path
}
/`
,
''
)}
onTabChange
=
{
this
.
handleTabChange
}
>
<
Switch
>
{
children
}
{
/* <Switch>
{routes.map(item => (
<Route key={item.key} path={item.path} component={item.component} exact={item.exact} />
))}
<
/Switch
>
</Switch>
*/
}
<
/PageHeaderLayout
>
);
}
...
...
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