Movatterモバイル変換

[0]ホーム
URL:

Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly

 Sign up
Appearance settings
This repository was archived by the owner on Nov 8, 2022. It is now read-only.

Commite11524d

Browse files
committed
refactor(Filters): badic refactor
1 parente84294c commite11524d

File tree

6 files changed

+137
-62
lines changed

6 files changed

+137
-62
lines changed
Lines changed: 81 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,81 @@
1+
importReactfrom'react'
2+
3+
import{FiltrPanelWrapper}from'./styles'
4+
5+
importTimeFilterfrom'./TimeFilter'
6+
importSortFilterfrom'./SortFilter'
7+
importLengthFilterfrom'./LengthFilter'
8+
// job
9+
importJobSalaryFilterfrom'./JobSalaryFilter'
10+
importJobExpFilterfrom'./JobExpFilter'
11+
importJobEducationFilterfrom'./JobEducationFilter'
12+
importJobFieldFilterfrom'./JobFieldFilter'
13+
importJobFinaceFilterfrom'./JobFinaceFilter'
14+
importJobScaleFilterfrom'./JobScaleFilter'
15+
// video
16+
importVideoSourceFilterfrom'./VideoSourceFilter'
17+
18+
import{THREAD}from'../../utils'
19+
20+
constFilterPanel=({ activeFilter, onSelect})=>{
21+
constthread=THREAD.VIDEO
22+
switch(thread){
23+
caseTHREAD.POST:{
24+
return(
25+
<FiltrPanelWrapper>
26+
<TimeFilteractiveFilter={activeFilter}onSelect={onSelect}/>
27+
<SortFilteractiveFilter={activeFilter}onSelect={onSelect}/>
28+
<LengthFilteractiveFilter={activeFilter}onSelect={onSelect}/>
29+
</FiltrPanelWrapper>
30+
)
31+
}
32+
caseTHREAD.VIDEO:{
33+
return(
34+
<FiltrPanelWrapper>
35+
<TimeFilteractiveFilter={activeFilter}onSelect={onSelect}/>
36+
<SortFilteractiveFilter={activeFilter}onSelect={onSelect}/>
37+
<VideoSourceFilteronSelect={onSelect}/>
38+
</FiltrPanelWrapper>
39+
)
40+
}
41+
caseTHREAD.REPO:{
42+
return(
43+
<FiltrPanelWrapper>
44+
<TimeFilteractiveFilter={activeFilter}onSelect={onSelect}/>
45+
<SortFilteractiveFilter={activeFilter}onSelect={onSelect}/>
46+
</FiltrPanelWrapper>
47+
)
48+
}
49+
caseTHREAD.JOB:{
50+
return(
51+
<FiltrPanelWrapper>
52+
<TimeFilteractiveFilter={activeFilter}onSelect={onSelect}/>
53+
<SortFilteractiveFilter={activeFilter}onSelect={onSelect}/>
54+
<JobSalaryFilteronSelect={onSelect}/>
55+
<JobExpFilteronSelect={onSelect}/>
56+
<JobEducationFilteronSelect={onSelect}/>
57+
<JobFieldFilteronSelect={onSelect}/>
58+
<JobFinaceFilteronSelect={onSelect}/>
59+
<JobScaleFilteronSelect={onSelect}/>
60+
</FiltrPanelWrapper>
61+
)
62+
}
63+
default:{
64+
return(
65+
<FiltrPanelWrapper>
66+
<TimeFilteractiveFilter={activeFilter}onSelect={onSelect}/>
67+
<SortFilteractiveFilter={activeFilter}onSelect={onSelect}/>
68+
<LengthFilteractiveFilter={activeFilter}onSelect={onSelect}/>
69+
<JobSalaryFilteronSelect={onSelect}/>
70+
<JobExpFilteronSelect={onSelect}/>
71+
<JobEducationFilteronSelect={onSelect}/>
72+
<JobFieldFilteronSelect={onSelect}/>
73+
<JobFinaceFilteronSelect={onSelect}/>
74+
<JobScaleFilteronSelect={onSelect}/>
75+
</FiltrPanelWrapper>
76+
)
77+
}
78+
}
79+
}
80+
81+
exportdefaultFilterPanel
Lines changed: 48 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,48 @@
1+
importReactfrom'react'
2+
3+
import{ICON_CMD}from'../../config'
4+
5+
import{
6+
ColumnWrapper,
7+
SelectLable,
8+
SelectIcon,
9+
SelectTitle,
10+
SelectItem,
11+
}from'./styles'
12+
13+
import{FILTER}from'../../utils'
14+
15+
constVideoSourceFilter=({ onSelect})=>(
16+
<ColumnWrapper>
17+
<SelectLable>
18+
<SelectIconsrc={`${ICON_CMD}/player_play.svg`}/>
19+
<SelectTitle>来源</SelectTitle>
20+
</SelectLable>
21+
<SelectItem
22+
active={false}
23+
onClick={onSelect.bind(this,{wordLength:FILTER.MOST_WORDS})}
24+
>
25+
youtube
26+
</SelectItem>
27+
<SelectItem
28+
active={false}
29+
onClick={onSelect.bind(this,{wordLength:FILTER.LEAST_WORDS})}
30+
>
31+
vimeo
32+
</SelectItem>
33+
<SelectItem
34+
active={false}
35+
onClick={onSelect.bind(this,{wordLength:FILTER.LEAST_WORDS})}
36+
>
37+
B 站
38+
</SelectItem>
39+
<SelectItem
40+
active={false}
41+
onClick={onSelect.bind(this,{wordLength:FILTER.LEAST_WORDS})}
42+
>
43+
其他网站
44+
</SelectItem>
45+
</ColumnWrapper>
46+
)
47+
48+
exportdefaultVideoSourceFilter

‎components/ContentFilter/index.js‎

Lines changed: 3 additions & 58 deletions
Original file line numberDiff line numberDiff line change
@@ -11,23 +11,8 @@ import { Button, Tag } from 'antd'
1111
import{ICON_CMD}from'../../config'
1212

1313
importPopoverfrom'../Popover'
14-
15-
import{
16-
Wrapper,
17-
InnerBtnWrapper,
18-
FilterIcon,
19-
SelectPanelWrapper,
20-
}from'./styles'
21-
22-
importTimeFilterfrom'./TimeFilter'
23-
importSortFilterfrom'./SortFilter'
24-
importLengthFilterfrom'./LengthFilter'
25-
importJobSalaryFilterfrom'./JobSalaryFilter'
26-
importJobExpFilterfrom'./JobExpFilter'
27-
importJobEducationFilterfrom'./JobEducationFilter'
28-
importJobFieldFilterfrom'./JobFieldFilter'
29-
importJobFinaceFilterfrom'./JobFinaceFilter'
30-
importJobScaleFilterfrom'./JobScaleFilter'
14+
import{Wrapper,InnerBtnWrapper,FilterIcon}from'./styles'
15+
importFilterPanelfrom'./FilterPanel'
3116

3217
import{makeDebugger,isEmptyValue}from'../../utils'
3318
/* eslint-disable no-unused-vars */
@@ -47,59 +32,19 @@ const filterDict = {
4732
LEAST_WORDS:'字数最少',
4833
}
4934

50-
constSelectPanel=({ activeFilter, onSelect})=>(
51-
<SelectPanelWrapper>
52-
<TimeFilteractiveFilter={activeFilter}onSelect={onSelect}/>
53-
<SortFilteractiveFilter={activeFilter}onSelect={onSelect}/>
54-
<LengthFilteractiveFilter={activeFilter}onSelect={onSelect}/>
55-
<JobSalaryFilteronSelect={onSelect}/>
56-
<JobExpFilteronSelect={onSelect}/>
57-
<JobEducationFilteronSelect={onSelect}/>
58-
<JobFieldFilteronSelect={onSelect}/>
59-
<JobFinaceFilteronSelect={onSelect}/>
60-
<JobScaleFilteronSelect={onSelect}/>
61-
</SelectPanelWrapper>
62-
)
63-
6435
constFilterTag=({ onSelect, active, type})=>
6536
isEmptyValue(active) ?null :(
6637
<TagclosableonClose={onSelect.bind(this,{[type]:''})}>
6738
{filterDict[active]}
6839
</Tag>
6940
)
7041

71-
/* most-views selector: ..... */
72-
/* most-favorite selector: ..... */
73-
/* most-star selector: ..... */
74-
/* most-comments selector: ..... */
75-
76-
// post
77-
/* Time selector: ..... */
78-
/* Sort selector: ..... */
79-
/* Length selector: ..... */
80-
81-
// job
82-
/* time selector: ..... */
83-
/* sort selector: ..... */
84-
/* salary selector: ..... */
85-
/* ... selector: ..... */
86-
/* ... selector: ..... */
87-
88-
// repo
89-
/* time selector: ... */
90-
/* sort selector: ... */
91-
92-
// video
93-
/* time selector */
94-
/* sort selector */
95-
/* source selector */
96-
9742
constContentFilter=({ activeFilter, onSelect})=>(
9843
<Wrapper>
9944
<Popover
10045
placement="bottomLeft"
10146
trigger="click"
102-
content={<SelectPanelonSelect={onSelect}activeFilter={activeFilter}/>}
47+
content={<FilterPanelonSelect={onSelect}activeFilter={activeFilter}/>}
10348
>
10449
<Buttonsize="small"type="primary"ghost>
10550
<InnerBtnWrapper>

‎components/ContentFilter/styles/index.js‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,10 @@ export const FilterIcon = styled(Img)`
1919
margin-top: 2px;
2020
margin-left: 3px;
2121
`
22-
exportconstSelectPanelWrapper=styled.div`
22+
exportconstFiltrPanelWrapper=styled.div`
2323
display: flex;
2424
min-width: 280px;
25-
padding: 10px;
26-
padding-bottom: 0px;
25+
padding: 12px;
2726
`
2827
exportconstColumnWrapper=styled.div`
2928
display: flex;

‎config/label_pool.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ const LABEL_POOL = {
88
iconSrc:`${ICON_CMD}/city_map.svg`,
99
},
1010
salary:{
11-
data:['2k-','2k-5k','5k-10k','10k-15k','15k-25k','25k-50k','50k+'],
11+
data:['2k-','2k-5k','5k-10k','10k-15k','15k-25k','25k-50k','50k+'],
1212
iconSrc:`${ICON_CMD}/money_yuan.svg`,
1313
},
1414
exp:{

‎containers/VideosThread/logic.js‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,12 @@ export function onTitleSelect(video) {
6464
store.setViewing({ video})
6565
debug('onTitleSelect: ',video)
6666

67+
/*
6768
dispatchEvent(EVENT.PREVIEW_OPEN, {
6869
type: TYPE.PREVIEW_VIDEO_VIEW,
6970
data: video,
7071
})
72+
*/
7173
}
7274

7375
exportfunctioncreateContent(){

0 commit comments

Comments
 (0)
[8]ページ先頭
©2009-2025 Movatter.jp