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
6ba78984
Commit
6ba78984
authored
Sep 02, 2022
by
chenshouchao
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'feat-20220801' of
http://120.77.149.83/root/bkunyun
into feat-20220801
parents
28a04a0e
da9a8ead
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
44 additions
and
32 deletions
+44
-32
index.module.css
src/views/ConsoleLayout/components/FileItem/index.module.css
+30
-23
index.tsx
src/views/ConsoleLayout/components/FileItem/index.tsx
+1
-1
index.tsx
src/views/ConsoleLayout/components/TransferList/index.tsx
+8
-5
index.tsx
...iews/Project/ProjectWorkbench/workbenchTemplate/index.tsx
+3
-2
index.module.css
...ews/Project/components/ProjectListPopper/index.module.css
+2
-1
No files found.
src/views/ConsoleLayout/components/FileItem/index.module.css
View file @
6ba78984
.itemBox
{
.itemBox
{
height
:
50px
;
height
:
50px
;
padding
:
16px
0
;
padding
:
16px
0
;
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
border-bottom
:
1px
solid
#f0f2f5
;
border-bottom
:
1px
solid
#f0f2f5
;
}
}
.fileNameBox
{
.fileNameBox
{
white-space
:
nowrap
;
white-space
:
nowrap
;
display
:
inline-block
;
display
:
inline-block
;
vertical-align
:
middle
;
vertical-align
:
middle
;
color
:
#1e2633
;
color
:
#1e2633
;
max-width
:
260px
;
max-width
:
260px
;
overflow
:
hidden
;
overflow
:
hidden
;
text-overflow
:
ellipsis
;
text-overflow
:
ellipsis
;
font-size
:
14px
;
font-size
:
14px
;
}
}
.contentBox
{
display
:
flex
;
flex-direction
:
column
;
justify-content
:
space-between
;
}
.speedBox
{
.speedBox
{
display
:
flex
;
display
:
flex
;
justify-content
:
space-between
;
justify-content
:
space-between
;
align-items
:
center
;
align-items
:
center
;
}
}
.rightBox
{
.rightBox
{
cursor
:
pointer
;
cursor
:
pointer
;
font-size
:
12px
;
font-size
:
12px
;
color
:
#1370ff
;
color
:
#1370ff
;
}
}
.leftBox
{
.leftBox
{
display
:
flex
;
display
:
flex
;
}
}
.span
{
.span
{
color
:
#8a9099
;
color
:
#8a9099
;
font-size
:
12px
;
font-size
:
12px
;
}
}
src/views/ConsoleLayout/components/FileItem/index.tsx
View file @
6ba78984
...
@@ -98,7 +98,7 @@ const FileItem = observer((props: IProps) => {
...
@@ -98,7 +98,7 @@ const FileItem = observer((props: IProps) => {
<
div
className=
{
styles
.
itemBox
}
>
<
div
className=
{
styles
.
itemBox
}
>
<
div
className=
{
styles
.
leftBox
}
>
<
div
className=
{
styles
.
leftBox
}
>
<
img
src=
{
bkunyunFile
}
alt=
""
style=
{
{
marginRight
:
16
}
}
/>
<
img
src=
{
bkunyunFile
}
alt=
""
style=
{
{
marginRight
:
16
}
}
/>
<
div
>
<
div
className=
{
styles
.
contentBox
}
>
<
div
>
<
div
>
<
b
className=
{
styles
.
fileNameBox
}
title=
{
itemInfo
?.
name
||
""
}
>
<
b
className=
{
styles
.
fileNameBox
}
title=
{
itemInfo
?.
name
||
""
}
>
{
itemInfo
?.
name
||
""
}
{
itemInfo
?.
name
||
""
}
...
...
src/views/ConsoleLayout/components/TransferList/index.tsx
View file @
6ba78984
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-10 18:05:21
* @Date: 2022-06-10 18:05:21
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-09-0
1 15:54
:33
* @LastEditTime: 2022-09-0
2 10:47
:33
* @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/index.tsx
* @FilePath: /bkunyun/src/views/ConsoleLayout/components/TransferList/index.tsx
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
* @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
*/
*/
...
@@ -20,16 +20,19 @@ const TranSferList = observer(() => {
...
@@ -20,16 +20,19 @@ const TranSferList = observer(() => {
const
uploadInfoStore
=
toJS
(
useGlobalStore
(
"fileListStore"
));
const
uploadInfoStore
=
toJS
(
useGlobalStore
(
"fileListStore"
));
return
(
return
(
<
Box
style=
{
{
width
:
520
,
padding
:
20
}
}
>
<
Box
style=
{
{
width
:
520
}
}
>
<
MyTitle
title=
"传输列表"
/>
<
MyTitle
style=
{
{
padding
:
"12px 16px"
}
}
title=
"传输列表"
/>
<
Box
<
Box
style=
{
{
style=
{
{
display
:
"flex"
,
display
:
"flex"
,
justifyContent
:
"space-between"
,
justifyContent
:
"space-between"
,
alignItems
:
"center"
,
alignItems
:
"center"
,
padding
:
"0 16px"
,
}
}
}
}
>
>
<
Box
style=
{
{
color
:
"#8A9099"
}
}
>
请勿在上传过程中刷新页面!
</
Box
>
<
Box
style=
{
{
color
:
"#8A9099"
,
fontSize
:
14
}
}
>
请勿在上传过程中刷新页面!
</
Box
>
<
MySelect
<
MySelect
variant=
"standard"
variant=
"standard"
value=
{
"default"
}
value=
{
"default"
}
...
@@ -43,7 +46,7 @@ const TranSferList = observer(() => {
...
@@ -43,7 +46,7 @@ const TranSferList = observer(() => {
size=
"small"
size=
"small"
/>
/>
</
Box
>
</
Box
>
<
div
style=
{
{
height
:
400
,
overflow
:
"overlay"
}
}
>
<
div
style=
{
{
height
:
400
,
overflow
:
"overlay"
,
padding
:
"0 16px"
}
}
>
{
uploadInfoStore
?.
fileList
.
map
((
item
)
=>
{
{
uploadInfoStore
?.
fileList
.
map
((
item
)
=>
{
return
<
FileItem
fileItemInfo=
{
item
}
key=
{
item
.
id
}
/>;
return
<
FileItem
fileItemInfo=
{
item
}
key=
{
item
.
id
}
/>;
})
}
})
}
...
...
src/views/Project/ProjectWorkbench/workbenchTemplate/index.tsx
View file @
6ba78984
...
@@ -10,7 +10,8 @@ import { memo, useEffect, useState } from "react";
...
@@ -10,7 +10,8 @@ import { memo, useEffect, useState } from "react";
import
{
Box
,
Typography
}
from
"@mui/material"
;
import
{
Box
,
Typography
}
from
"@mui/material"
;
import
{
toJS
}
from
"mobx"
;
import
{
toJS
}
from
"mobx"
;
import
{
observer
}
from
"mobx-react-lite"
;
import
{
observer
}
from
"mobx-react-lite"
;
import
Add
from
"@mui/icons-material/Add"
;
import
FormatListBulletedRoundedIcon
from
'@mui/icons-material/FormatListBulletedRounded'
;
import
MyButton
from
"@/components/mui/MyButton"
;
import
MyButton
from
"@/components/mui/MyButton"
;
import
SearchInput
from
"@/components/BusinessComponents/SearchInput"
;
import
SearchInput
from
"@/components/BusinessComponents/SearchInput"
;
...
@@ -115,7 +116,7 @@ const ProjectMembers = observer(() => {
...
@@ -115,7 +116,7 @@ const ProjectMembers = observer(() => {
{
isPass
(
"PROJECT_WORKBENCH_FLOES_ADD"
,
"MANAGER"
)
&&
(
{
isPass
(
"PROJECT_WORKBENCH_FLOES_ADD"
,
"MANAGER"
)
&&
(
<
MyButton
<
MyButton
text=
{
"管理工作流模板"
}
text=
{
"管理工作流模板"
}
img=
{
<
Add
/>
}
startIcon=
{
<
FormatListBulletedRoundedIcon
fontSize=
"small"
/>
}
onClick=
{
addTemplateBlock
}
onClick=
{
addTemplateBlock
}
size=
{
"medium"
}
size=
{
"medium"
}
/>
/>
...
...
src/views/Project/components/ProjectListPopper/index.module.css
View file @
6ba78984
...
@@ -56,7 +56,8 @@
...
@@ -56,7 +56,8 @@
border-top
:
1px
solid
#f0f2f5
;
border-top
:
1px
solid
#f0f2f5
;
}
}
.noProjectBox
{
.noProjectBox
{
color
:
#edeff2
;
color
:
#8a9099
;
font-size
:
14px
;
height
:
48px
;
height
:
48px
;
line-height
:
48px
;
line-height
:
48px
;
text-align
:
center
;
text-align
:
center
;
...
...
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