Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in
Toggle navigation
B
bkunyun
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
bkunyun
Commits
b08567c0
Commit
b08567c0
authored
Aug 04, 2022
by
jiangzijing
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat:滚动时显示阴影、一些交互
parent
ed810906
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
73 additions
and
10 deletions
+73
-10
index.module.css
src/views/Project/ProjectData/index.module.css
+4
-3
index.module.css
...workbenchTemplate/components/AddTemplate/index.module.css
+28
-1
index.tsx
...kbench/workbenchTemplate/components/AddTemplate/index.tsx
+24
-2
templateBox.tsx
...ectWorkbench/workbenchTemplate/components/templateBox.tsx
+1
-1
index.tsx
src/views/Project/components/AddProject/index.tsx
+2
-2
index.tsx
...iews/WorkFlowEdit/components/SaveCustomTemplate/index.tsx
+14
-1
No files found.
src/views/Project/ProjectData/index.module.css
View file @
b08567c0
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
position
:
relative
;
position
:
relative
;
}
}
.projectDataStickyTop
{
.projectDataStickyTop
{
padding
:
28px
24px
;
padding
:
28px
24px
64px
;
position
:
relative
;
position
:
relative
;
}
}
.projectDataTitle
{
.projectDataTitle
{
...
@@ -56,8 +56,9 @@
...
@@ -56,8 +56,9 @@
.projectDataStickyBox
{
.projectDataStickyBox
{
height
:
64px
;
height
:
64px
;
position
:
sticky
;
width
:
calc
(
100vw
-
220px
);
bottom
:
-1px
;
position
:
fixed
;
bottom
:
0px
;
border
:
1px
solid
#ebedf0
;
border
:
1px
solid
#ebedf0
;
z-index
:
100
;
z-index
:
100
;
background-color
:
#fff
;
background-color
:
#fff
;
...
...
src/views/Project/ProjectWorkbench/workbenchTemplate/components/AddTemplate/index.module.css
View file @
b08567c0
...
@@ -2,16 +2,31 @@
...
@@ -2,16 +2,31 @@
flex
:
1
;
flex
:
1
;
background-color
:
#fff
;
background-color
:
#fff
;
border-radius
:
16px
0
0
0
;
border-radius
:
16px
0
0
0
;
padding
:
24px
32
px
;
padding
-top
:
24
px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
}
.headerBox
{
padding
:
0
32px
;
}
.headerBoxShadow
{
box-shadow
:
0
5px
4px
-4px
rgb
(
0
,
0
,
0
,
.15
);
}
.templateBox
{
padding
:
20px
32px
0
;
height
:
calc
(
100vh
-
188px
);
overflow
:
auto
;
overflow
:
auto
;
}
}
.templateList
{
.templateList
{
/* height: 2000px; */
/* height: 2000px; */
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
flex-wrap
:
wrap
;
flex-wrap
:
wrap
;
}
}
.templateLi
{
.templateLi
{
height
:
146px
;
height
:
146px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
@@ -24,12 +39,15 @@
...
@@ -24,12 +39,15 @@
margin-right
:
16px
;
margin-right
:
16px
;
margin-bottom
:
16px
;
margin-bottom
:
16px
;
}
}
.templateLiCustom
{
.templateLiCustom
{
height
:
194px
;
height
:
194px
;
}
}
.templateLiHidden
{
.templateLiHidden
{
visibility
:
hidden
;
visibility
:
hidden
;
}
}
.addCustomTemplate
{
.addCustomTemplate
{
height
:
194px
;
height
:
194px
;
box-sizing
:
border-box
;
box-sizing
:
border-box
;
...
@@ -38,23 +56,28 @@
...
@@ -38,23 +56,28 @@
align-items
:
center
;
align-items
:
center
;
flex-direction
:
column
;
flex-direction
:
column
;
}
}
.addCustomTemplateText
{
.addCustomTemplateText
{
margin-top
:
12px
;
margin-top
:
12px
;
line-height
:
22px
;
line-height
:
22px
;
font-size
:
14px
;
font-size
:
14px
;
color
:
rgba
(
138
,
144
,
153
,
1
);
color
:
rgba
(
138
,
144
,
153
,
1
);
}
}
.templateLi
:hover
{
.templateLi
:hover
{
box-shadow
:
6px
8px
22px
0px
rgba
(
0
,
24
,
57
,
0.08
);
box-shadow
:
6px
8px
22px
0px
rgba
(
0
,
24
,
57
,
0.08
);
}
}
.templateLi
:nth-child
(
4n
)
{
.templateLi
:nth-child
(
4n
)
{
margin-right
:
0
;
margin-right
:
0
;
}
}
.templateLiTop
{
.templateLiTop
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
}
}
.templateTitle
{
.templateTitle
{
font-size
:
14px
;
font-size
:
14px
;
font-weight
:
600
;
font-weight
:
600
;
...
@@ -64,14 +87,17 @@
...
@@ -64,14 +87,17 @@
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
line-height
:
22px
;
line-height
:
22px
;
}
}
.templateLiInfo
{
.templateLiInfo
{
margin-bottom
:
8px
;
margin-bottom
:
8px
;
}
}
.templateLiInfoText
{
.templateLiInfoText
{
line-height
:
20px
;
line-height
:
20px
;
font-size
:
12px
;
font-size
:
12px
;
color
:
rgba
(
19
,
112
,
255
,
1
);
color
:
rgba
(
19
,
112
,
255
,
1
);
}
}
.templateLiDesc
{
.templateLiDesc
{
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
...
@@ -82,6 +108,7 @@
...
@@ -82,6 +108,7 @@
font-size
:
12px
;
font-size
:
12px
;
color
:
rgba
(
138
,
144
,
153
,
1
);
color
:
rgba
(
138
,
144
,
153
,
1
);
}
}
.templateLiEditBox
{
.templateLiEditBox
{
display
:
flex
;
display
:
flex
;
justify-content
:
flex-end
;
justify-content
:
flex-end
;
...
...
src/views/Project/ProjectWorkbench/workbenchTemplate/components/AddTemplate/index.tsx
View file @
b08567c0
...
@@ -50,6 +50,9 @@ const AddTemplate = (props: IAddTemplateProps) => {
...
@@ -50,6 +50,9 @@ const AddTemplate = (props: IAddTemplateProps) => {
const
[
templateType
,
setTemplateType
]
=
useState
(
"public"
);
const
[
templateType
,
setTemplateType
]
=
useState
(
"public"
);
// 滚轮是否到顶,判断是否显示阴影
const
[
isTop
,
setIsTop
]
=
useState
(
true
)
const
handleRadio
=
(
value
:
string
)
=>
{
const
handleRadio
=
(
value
:
string
)
=>
{
setTemplateType
(
value
);
setTemplateType
(
value
);
};
};
...
@@ -161,9 +164,24 @@ const AddTemplate = (props: IAddTemplateProps) => {
...
@@ -161,9 +164,24 @@ const AddTemplate = (props: IAddTemplateProps) => {
return
arr
;
return
arr
;
},
[
addTemplateList
,
templateType
]);
},
[
addTemplateList
,
templateType
]);
// 滚动滚轮时监听是否到顶
const
onscroll
=
(
e
:
any
)
=>
{
if
(
e
.
target
.
scrollTop
<=
0
)
{
setIsTop
(
true
)
}
else
{
setIsTop
(
false
)
}
}
return
(
return
(
<
FullScreenDrawer
handleClose=
{
setShowAddTemplate
}
>
<
FullScreenDrawer
handleClose=
{
setShowAddTemplate
}
>
<
div
className=
{
style
.
content
}
>
<
div
className=
{
style
.
content
}
>
<
div
className=
{
classNames
({
[
style
.
headerBox
]:
true
,
[
style
.
headerBoxShadow
]:
!
isTop
,
})
}
>
<
Typography
<
Typography
sx=
{
{
fontSize
:
"18px"
,
fontWeight
:
"600"
,
color
:
"#1E2633"
}
}
sx=
{
{
fontSize
:
"18px"
,
fontWeight
:
"600"
,
color
:
"#1E2633"
}
}
>
>
...
@@ -174,7 +192,8 @@ const AddTemplate = (props: IAddTemplateProps) => {
...
@@ -174,7 +192,8 @@ const AddTemplate = (props: IAddTemplateProps) => {
display
:
"flex"
,
display
:
"flex"
,
justifyContent
:
"space-between"
,
justifyContent
:
"space-between"
,
alignItems
:
"center"
,
alignItems
:
"center"
,
marginBottom
:
"20px"
,
paddingBottom
:
"20px"
,
paddingTop
:
"20px"
,
}
}
}
}
>
>
<
OutlinedInput
<
OutlinedInput
...
@@ -184,7 +203,7 @@ const AddTemplate = (props: IAddTemplateProps) => {
...
@@ -184,7 +203,7 @@ const AddTemplate = (props: IAddTemplateProps) => {
}
}
}
}
placeholder=
"输入关键词搜索"
placeholder=
"输入关键词搜索"
size=
"small"
size=
"small"
sx=
{
{
width
:
340
,
height
:
32
,
marginTop
:
"20px"
}
}
sx=
{
{
width
:
340
,
height
:
32
}
}
endAdornment=
{
<
SearchIcon
style=
{
{
color
:
"#8A9099"
}
}
/>
}
endAdornment=
{
<
SearchIcon
style=
{
{
color
:
"#8A9099"
}
}
/>
}
/>
/>
<
Box
<
Box
...
@@ -214,6 +233,8 @@ const AddTemplate = (props: IAddTemplateProps) => {
...
@@ -214,6 +233,8 @@ const AddTemplate = (props: IAddTemplateProps) => {
/>
/>
</
Box
>
</
Box
>
</
Box
>
</
Box
>
</
div
>
<
div
className=
{
style
.
templateBox
}
onScroll=
{
onscroll
}
>
{
templateType
===
"public"
&&
addTemplateList
.
length
===
0
&&
(
{
templateType
===
"public"
&&
addTemplateList
.
length
===
0
&&
(
<
Box
<
Box
sx=
{
{
sx=
{
{
...
@@ -310,6 +331,7 @@ const AddTemplate = (props: IAddTemplateProps) => {
...
@@ -310,6 +331,7 @@ const AddTemplate = (props: IAddTemplateProps) => {
})
}
})
}
</
div
>
</
div
>
</
div
>
</
div
>
</
div
>
{
customTemplateInfo
?.
show
?
(
{
customTemplateInfo
?.
show
?
(
<
WorkFlowEdit
<
WorkFlowEdit
id=
{
customTemplateInfo
.
id
||
""
}
id=
{
customTemplateInfo
.
id
||
""
}
...
...
src/views/Project/ProjectWorkbench/workbenchTemplate/components/templateBox.tsx
View file @
b08567c0
...
@@ -81,7 +81,7 @@ const TemplateBox = (props: any) => {
...
@@ -81,7 +81,7 @@ const TemplateBox = (props: any) => {
</
Typography
>
</
Typography
>
</
Box
>
</
Box
>
<
Typography
className=
{
styles
.
templateDescText
}
>
<
Typography
className=
{
styles
.
templateDescText
}
>
{
info
.
description
}
{
info
.
description
?
info
.
description
:
"此模板暂无描述。"
}
</
Typography
>
</
Typography
>
</
Box
>
</
Box
>
<
Box
<
Box
...
...
src/views/Project/components/AddProject/index.tsx
View file @
b08567c0
...
@@ -214,7 +214,7 @@ const AddProject = (props: IAddProjectProps) => {
...
@@ -214,7 +214,7 @@ const AddProject = (props: IAddProjectProps) => {
id=
"desc"
id=
"desc"
label=
"项目描述"
label=
"项目描述"
multiline
multiline
rows=
{
5
}
rows=
{
4
}
placeholder=
"请输入项目描述"
placeholder=
"请输入项目描述"
onChange=
{
handleDescChange
}
onChange=
{
handleDescChange
}
helperText=
{
descCheck
.
help
}
helperText=
{
descCheck
.
help
}
...
@@ -224,7 +224,7 @@ const AddProject = (props: IAddProjectProps) => {
...
@@ -224,7 +224,7 @@ const AddProject = (props: IAddProjectProps) => {
position
:
"absolute"
,
position
:
"absolute"
,
bottom
:
"7px"
,
bottom
:
"7px"
,
right
:
"12px"
,
right
:
"12px"
,
color
:
desc
.
length
>=
1
00
?
"#d32f2f"
:
"#C2C6CC"
color
:
desc
.
length
>=
3
00
?
"#d32f2f"
:
"#C2C6CC"
}
}
}
}
>
>
{
desc
.
length
}
/300
{
desc
.
length
}
/300
...
...
src/views/WorkFlowEdit/components/SaveCustomTemplate/index.tsx
View file @
b08567c0
...
@@ -240,14 +240,27 @@ const SaveCustomTemplate = (props: IProps) => {
...
@@ -240,14 +240,27 @@ const SaveCustomTemplate = (props: IProps) => {
helperText=
{
versionHelper
.
helperText
}
helperText=
{
versionHelper
.
helperText
}
style=
{
{
marginBottom
:
"20px"
}
}
style=
{
{
marginBottom
:
"20px"
}
}
></
MyInput
>
></
MyInput
>
<
div
style=
{
{
position
:
"relative"
}
}
>
<
MyInput
<
MyInput
value=
{
description
}
value=
{
description
}
id=
"desc"
label=
"模板描述"
label=
"模板描述"
placeholder=
"模板描述"
placeholder=
"模板描述"
onChange=
{
handleDescriptionChange
}
onChange=
{
handleDescriptionChange
}
multiline
multiline
rows=
{
4
}
rows=
{
4
}
></
MyInput
>
/>
<
span
style=
{
{
position
:
"absolute"
,
bottom
:
"7px"
,
right
:
"12px"
,
color
:
description
.
length
>=
300
?
"#d32f2f"
:
"#C2C6CC"
}
}
>
{
description
.
length
}
/300
</
span
>
</
div
>
</
div
>
</
div
>
</
MyDialog
>
</
MyDialog
>
);
);
...
...
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