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
47fa4ab1
Commit
47fa4ab1
authored
Sep 01, 2022
by
wuyongsheng
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 上传文件默认打开传输列表
parent
5ab557f9
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
54 additions
and
33 deletions
+54
-33
MyPopover.tsx
src/components/mui/MyPopover.tsx
+21
-5
Tabs.tsx
src/components/mui/Tabs.tsx
+1
-1
fileList.ts
src/store/modules/fileList.ts
+8
-2
index.tsx
src/views/ConsoleLayout/components/FileItem/index.tsx
+2
-2
index.tsx
src/views/ConsoleLayout/index.tsx
+7
-12
index.tsx
src/views/Project/ProjectData/UpLoaderFile/index.tsx
+2
-1
index.tsx
src/views/WorkFlowEdit/components/ParameterSetting/index.tsx
+13
-10
No files found.
src/components/mui/MyPopover.tsx
View file @
47fa4ab1
/*
/*
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-11 09:33:46
* @Date: 2022-06-11 09:33:46
* @LastEditors: 吴永生
#A02208 yongsheng.wu@wholion
.com
* @LastEditors: 吴永生
15770852798@163
.com
* @LastEditTime: 2022-0
6-16 14:21:00
* @LastEditTime: 2022-0
9-01 19:34:26
* @FilePath: /bkunyun/src/components/mui/MyPopover.tsx
* @FilePath: /bkunyun/src/components/mui/MyPopover.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
*/
*/
import
*
as
React
from
"react"
;
import
{
useRef
,
useEffect
,
useState
}
from
"react"
;
import
Popover
,
{
PopoverProps
}
from
"@mui/material/Popover"
;
import
Popover
,
{
PopoverProps
}
from
"@mui/material/Popover"
;
import
Typography
from
"@mui/material/Typography"
;
import
Typography
from
"@mui/material/Typography"
;
...
@@ -17,10 +17,15 @@ interface IProps extends Omit<PopoverProps, "open"> {
...
@@ -17,10 +17,15 @@ interface IProps extends Omit<PopoverProps, "open"> {
children
:
React
.
ReactNode
;
children
:
React
.
ReactNode
;
/** 显示内容 */
/** 显示内容 */
content
:
React
.
ReactNode
;
content
:
React
.
ReactNode
;
/** 是否打开 */
open
?:
boolean
;
/** open 修改 */
changeOpen
:
(
val
:
boolean
)
=>
void
;
}
}
const
MyPopover
=
(
props
:
IProps
)
=>
{
const
MyPopover
=
(
props
:
IProps
)
=>
{
const
[
anchorEl
,
setAnchorEl
]
=
React
.
useState
<
any
|
null
>
(
null
);
const
[
anchorEl
,
setAnchorEl
]
=
useState
<
any
|
null
>
(
null
);
const
ref
=
useRef
(
null
);
const
{
const
{
trigger
=
"click"
,
trigger
=
"click"
,
...
@@ -28,26 +33,37 @@ const MyPopover = (props: IProps) => {
...
@@ -28,26 +33,37 @@ const MyPopover = (props: IProps) => {
content
,
content
,
anchorOrigin
,
anchorOrigin
,
transformOrigin
,
transformOrigin
,
open
=
false
,
changeOpen
,
}
=
props
;
}
=
props
;
const
handlePopoverOpen
=
(
event
:
any
)
=>
{
const
handlePopoverOpen
=
(
event
:
any
)
=>
{
changeOpen
(
true
);
setAnchorEl
(
event
.
currentTarget
);
setAnchorEl
(
event
.
currentTarget
);
};
};
const
handelClick
=
(
event
:
any
)
=>
{
const
handelClick
=
(
event
:
any
)
=>
{
changeOpen
(
true
);
setAnchorEl
(
event
?.
currentTarget
);
setAnchorEl
(
event
?.
currentTarget
);
};
};
const
handlePopoverClose
=
()
=>
{
const
handlePopoverClose
=
()
=>
{
changeOpen
(
false
);
setAnchorEl
(
null
);
setAnchorEl
(
null
);
};
};
const
open
=
Boolean
(
anchorEl
);
useEffect
(()
=>
{
if
(
open
)
{
setAnchorEl
(
ref
.
current
);
}
},
[
open
]);
const
id
=
open
?
"simple-popover"
:
undefined
;
const
id
=
open
?
"simple-popover"
:
undefined
;
return
(
return
(
<
div
>
<
div
>
<
Typography
<
Typography
ref=
{
ref
}
aria
-
owns=
{
id
}
aria
-
owns=
{
id
}
onClick=
{
trigger
===
"click"
?
handelClick
:
undefined
}
onClick=
{
trigger
===
"click"
?
handelClick
:
undefined
}
onMouseEnter=
{
trigger
===
"hover"
?
handlePopoverOpen
:
undefined
}
onMouseEnter=
{
trigger
===
"hover"
?
handlePopoverOpen
:
undefined
}
...
...
src/components/mui/Tabs.tsx
View file @
47fa4ab1
...
@@ -2,7 +2,7 @@
...
@@ -2,7 +2,7 @@
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-05-31 10:18:13
* @Date: 2022-05-31 10:18:13
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditors: 吴永生 15770852798@163.com
* @LastEditTime: 2022-09-01 1
1:20:24
* @LastEditTime: 2022-09-01 1
9:34:35
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/index.tsx
* @FilePath: /bkunyun/src/views/Project/ProjectSetting/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
*/
*/
...
...
src/store/modules/fileList.ts
View file @
47fa4ab1
/*
/*
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Author: 吴永生#A02208 yongsheng.wu@wholion.com
* @Date: 2022-06-13 17:00:19
* @Date: 2022-06-13 17:00:19
* @LastEditors: 吴永生
#A02208 yongsheng.wu@wholion
.com
* @LastEditors: 吴永生
15770852798@163
.com
* @LastEditTime: 2022-0
6-16 09:43:42
* @LastEditTime: 2022-0
9-01 19:34:46
* @FilePath: /bkunyun/src/store/modules/upload.ts
* @FilePath: /bkunyun/src/store/modules/upload.ts
* @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
*/
*/
...
@@ -25,6 +25,8 @@ class FileList {
...
@@ -25,6 +25,8 @@ class FileList {
/** 文件上传列表 */
/** 文件上传列表 */
fileList
:
IUploadInfo
[]
=
[];
fileList
:
IUploadInfo
[]
=
[];
/** 是否打开传输列表 */
openFileList
:
boolean
=
false
// setFileList (val: IUploadInfo[]) {
// setFileList (val: IUploadInfo[]) {
// this.fileList = val
// this.fileList = val
...
@@ -39,6 +41,10 @@ class FileList {
...
@@ -39,6 +41,10 @@ class FileList {
this
.
newFileList
=
val
this
.
newFileList
=
val
}
}
/** 打开关闭文件列表 */
setOpenFileList
=
(
val
:
boolean
)
=>
{
this
.
openFileList
=
val
}
/** 设置文件上传信息 */
/** 设置文件上传信息 */
setUploadInfo
=
(
id
:
string
,
val
:
IUploadInfo
)
=>
{
setUploadInfo
=
(
id
:
string
,
val
:
IUploadInfo
)
=>
{
...
...
src/views/ConsoleLayout/components/FileItem/index.tsx
View file @
47fa4ab1
...
@@ -88,12 +88,12 @@ const FileItem = observer((props: IProps) => {
...
@@ -88,12 +88,12 @@ const FileItem = observer((props: IProps) => {
const
speed
=
useMemo
(()
=>
{
const
speed
=
useMemo
(()
=>
{
let
val
=
0
;
let
val
=
0
;
const
time
=
Math
.
floor
((
itemInfo
?.
endTime
-
itemInfo
.
startTime
)
/
1000
);
const
time
=
Math
.
floor
((
itemInfo
?.
endTime
-
itemInfo
?
.
startTime
)
/
1000
);
if
(
time
>
0
)
{
if
(
time
>
0
)
{
val
=
Math
.
floor
(
itemInfo
?.
bytesUploaded
/
time
);
val
=
Math
.
floor
(
itemInfo
?.
bytesUploaded
/
time
);
}
}
return
val
;
return
val
;
},
[
itemInfo
?.
bytesUploaded
,
itemInfo
?.
endTime
,
itemInfo
.
startTime
]);
},
[
itemInfo
?.
bytesUploaded
,
itemInfo
?.
endTime
,
itemInfo
?
.
startTime
]);
return
(
return
(
<
div
className=
{
styles
.
itemBox
}
>
<
div
className=
{
styles
.
itemBox
}
>
<
div
className=
{
styles
.
leftBox
}
>
<
div
className=
{
styles
.
leftBox
}
>
...
...
src/views/ConsoleLayout/index.tsx
View file @
47fa4ab1
import
React
,
{
useEffect
}
from
"react"
;
import
React
,
{
useEffect
,
useState
}
from
"react"
;
import
{
Outlet
,
useLocation
,
useNavigate
}
from
"react-router-dom"
;
import
{
Outlet
,
useLocation
,
useNavigate
}
from
"react-router-dom"
;
import
cx
from
"classnames"
;
import
{
observer
}
from
"mobx-react-lite"
;
import
{
observer
}
from
"mobx-react-lite"
;
import
Avatar
from
"@mui/material/Avatar"
;
import
Avatar
from
"@mui/material/Avatar"
;
import
{
Box
,
Menu
,
MenuItem
}
from
"@mui/material"
;
import
{
Box
,
Menu
,
MenuItem
}
from
"@mui/material"
;
...
@@ -26,17 +25,11 @@ import {
...
@@ -26,17 +25,11 @@ import {
import
style
from
"./index.module.css"
;
import
style
from
"./index.module.css"
;
const
ConsoleLayout
=
observer
(()
=>
{
const
ConsoleLayout
=
observer
(()
=>
{
const
{
const
{
utilityAnchorEl
,
utilityOpen
,
handleUtilityClick
,
handleClose
}
=
productAnchorEl
,
useIndex
();
utilityAnchorEl
,
productOpen
,
utilityOpen
,
handleProductClick
,
handleUtilityClick
,
handleClose
,
}
=
useIndex
();
const
{
currentProjectStore
}
=
useStores
();
const
{
currentProjectStore
,
fileListStore
}
=
useStores
();
const
{
openFileList
,
setOpenFileList
}
=
fileListStore
;
const
productInfo
=
toJS
(
currentProjectStore
.
currentProductInfo
);
const
productInfo
=
toJS
(
currentProjectStore
.
currentProductInfo
);
const
{
run
:
runGetProjectList
}
=
useMyRequest
(
getProjectList
,
{
const
{
run
:
runGetProjectList
}
=
useMyRequest
(
getProjectList
,
{
onSuccess
:
(
res
)
=>
{
onSuccess
:
(
res
)
=>
{
...
@@ -129,6 +122,8 @@ const ConsoleLayout = observer(() => {
...
@@ -129,6 +122,8 @@ const ConsoleLayout = observer(() => {
<
Box
className=
{
style
.
topRightBox
}
>
<
Box
className=
{
style
.
topRightBox
}
>
<
MyPopover
<
MyPopover
open=
{
openFileList
}
changeOpen=
{
(
val
)
=>
setOpenFileList
(
val
)
}
content=
{
<
TranSferList
/>
}
content=
{
<
TranSferList
/>
}
transformOrigin=
{
{
transformOrigin=
{
{
vertical
:
"top"
,
vertical
:
"top"
,
...
...
src/views/Project/ProjectData/UpLoaderFile/index.tsx
View file @
47fa4ab1
...
@@ -135,6 +135,7 @@ const UpLoaderFile = observer((props: IMoveFileProps) => {
...
@@ -135,6 +135,7 @@ const UpLoaderFile = observer((props: IMoveFileProps) => {
};
};
}) || [];
}) || [];
toJS(fileListStore?.setNewFileList)(newFileList);
toJS(fileListStore?.setNewFileList)(newFileList);
fileListStore?.setOpenFileList(true);
if (newFileList?.length) {
if (newFileList?.length) {
getFileToken(newFileList);
getFileToken(newFileList);
}
}
...
@@ -173,7 +174,7 @@ const UpLoaderFile = observer((props: IMoveFileProps) => {
...
@@ -173,7 +174,7 @@ const UpLoaderFile = observer((props: IMoveFileProps) => {
const renderButtons = (item: any, index: number) => {
const renderButtons = (item: any, index: number) => {
return (
return (
<MyButton
<MyButton
text='删除'
text="删除"
style={{ position: "relative", left: "-18px" }}
style={{ position: "relative", left: "-18px" }}
variant="text"
variant="text"
size="small"
size="small"
...
...
src/views/WorkFlowEdit/components/ParameterSetting/index.tsx
View file @
47fa4ab1
import
_
from
"lodash"
;
import
_
from
"lodash"
;
import
{
useCallback
,
useMemo
,
useRef
,
useState
}
from
"react"
;
import
{
useCallback
,
use
Effect
,
use
Memo
,
useRef
,
useState
}
from
"react"
;
import
classNames
from
"classnames"
;
import
classNames
from
"classnames"
;
import
{
import
{
...
@@ -36,8 +36,9 @@ const ParameterSetting = (props: IParameterSettingProps) => {
...
@@ -36,8 +36,9 @@ const ParameterSetting = (props: IParameterSettingProps) => {
const
[
fileSelectType
,
setFileSelectType
]
=
useState
<
FileSelectType
>
(
"path"
);
const
[
fileSelectType
,
setFileSelectType
]
=
useState
<
FileSelectType
>
(
"path"
);
const
[
parameterName
,
setParameterName
]
=
useState
(
""
);
// 当前算子中的parameters中正在编辑饿parameter(参数)
const
[
parameterName
,
setParameterName
]
=
useState
(
""
);
// 当前算子中的parameters中正在编辑饿parameter(参数)
const
resizeRef
=
useRef
<
HTMLDivElement
>
(
null
);
const
resizeRef
=
useRef
<
HTMLDivElement
>
(
null
);
const
[
activeParamsTab
,
setActiveParamsTab
]
=
useState
<
string
>
(
""
);
const
size
=
useSize
(
resizeRef
)
;
const
size
=
useSize
(
resizeRef
);
// 文件夹路线选择器弹窗
// 文件夹路线选择器弹窗
const
handleFileSelectOnClose
=
()
=>
{
const
handleFileSelectOnClose
=
()
=>
{
...
@@ -497,15 +498,13 @@ const ParameterSetting = (props: IParameterSettingProps) => {
...
@@ -497,15 +498,13 @@ const ParameterSetting = (props: IParameterSettingProps) => {
},
[
basisParameters
,
seniorParameters
,
hardwareParameters
,
randerParameters
]);
},
[
basisParameters
,
seniorParameters
,
hardwareParameters
,
randerParameters
]);
// 激活的参数组tab
// 激活的参数组tab
const
activeParamsTab
=
useMemo
(()
=>
{
useEffect
(()
=>
{
if
(
basisParameters
.
length
!==
0
)
{
if
(
basisParameters
.
length
!==
0
)
{
return
"basis"
;
setActiveParamsTab
(
"basis"
)
;
}
else
if
(
seniorParameters
.
length
!==
0
)
{
}
else
if
(
seniorParameters
.
length
!==
0
)
{
return
"senior"
;
setActiveParamsTab
(
"senior"
)
;
}
else
if
(
hardwareParameters
.
length
!==
0
)
{
}
else
if
(
hardwareParameters
.
length
!==
0
)
{
return
"hardware"
;
setActiveParamsTab
(
"hardware"
);
}
else
{
return
""
;
}
}
},
[
basisParameters
,
seniorParameters
,
hardwareParameters
]);
},
[
basisParameters
,
seniorParameters
,
hardwareParameters
]);
...
@@ -648,11 +647,15 @@ const ParameterSetting = (props: IParameterSettingProps) => {
...
@@ -648,11 +647,15 @@ const ParameterSetting = (props: IParameterSettingProps) => {
<
Tabs
<
Tabs
tabList=
{
paramsTabList
}
tabList=
{
paramsTabList
}
value=
{
activeParamsTab
}
value=
{
activeParamsTab
}
// defaultValue=
{
activeParamsTab
}
onChange=
{
(
val
)
=>
setActiveParamsTab
(
val
)
}
allowNullValue=
{
true
}
allowNullValue=
{
true
}
tabPanelSx=
{
{
padding
:
"7px 0"
}
}
tabPanelSx=
{
{
padding
:
"7px 0"
}
}
/>
/>
{
basisParameters
.
length
===
0
&&
seniorParameters
.
length
===
0
&&
hardwareParameters
.
length
===
0
&&
(<
div
className=
{
styles
.
noParameters
}
>
暂无可设置参数
</
div
>)
}
{
basisParameters
.
length
===
0
&&
seniorParameters
.
length
===
0
&&
hardwareParameters
.
length
===
0
&&
(
<
div
className=
{
styles
.
noParameters
}
>
暂无可设置参数
</
div
>
)
}
</
div
>
</
div
>
)
}
)
}
{
!
taskInfo
&&
(
{
!
taskInfo
&&
(
...
...
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