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
sunyihao
bkunyun
Commits
7af8ea32
Commit
7af8ea32
authored
Jun 13, 2022
by
chenshouchao
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
feat: 项目管理 项目数据联调前提交
parent
4bb3fb83
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
165 additions
and
104 deletions
+165
-104
raysyncApi.ts
src/api/fileserver/raysyncApi.ts
+1
-1
MyTreeView.tsx
src/components/mui/MyTreeView.tsx
+50
-38
index.module.css
src/views/Project/ProjectData/MoveFile/index.module.css
+9
-0
index.tsx
src/views/Project/ProjectData/MoveFile/index.tsx
+97
-0
index.module.css
src/views/Project/ProjectData/index.module.css
+0
-16
index.tsx
src/views/Project/ProjectData/index.tsx
+8
-49
No files found.
src/api/fileserver/raysyncApi.ts
View file @
7af8ea32
...
...
@@ -104,7 +104,7 @@ const ZONEID = (params: string) => {
};
const
urlToken
=
(
filetoken
:
string
,
root
?:
string
)
=>
{
let
token
=
getLoaclStorageOfKey
(
"token"
).
access_token
;
let
token
=
getLoaclStorageOfKey
(
"token
_key
"
).
access_token
;
let
json
=
getLoaclStorageOfKey
(
"current-region"
);
const
userInfo
=
getLoaclStorageOfKey
(
"userinfo"
);
if
(
json
[
"location"
]
&&
json
[
"location"
]
===
"ON_PREMISE"
)
{
...
...
src/components/mui/MyTreeView.tsx
View file @
7af8ea32
import
TreeView
from
'@mui/lab/TreeView'
;
import
ArrowRightIcon
from
'@mui/icons-material/ArrowRight'
;
import
ArrowDropDownIcon
from
'@mui/icons-material/ArrowDropDown'
;
import
TreeItem
from
'@mui/lab/TreeItem'
;
import
TreeView
from
"@mui/lab/TreeView"
;
import
ArrowRightIcon
from
"@mui/icons-material/ArrowRight"
;
import
ArrowDropDownIcon
from
"@mui/icons-material/ArrowDropDown"
;
import
TreeItem
from
"@mui/lab/TreeItem"
;
type
MyTreeViewProps
=
{
treeData
:
RenderTree
onNodeFocus
?:
(
event
:
object
,
value
:
string
)
=>
void
;
// 点击某一项的回调
onNodeSelect
?:
(
event
:
object
,
value
:
Array
<
any
>
|
string
)
=>
void
;
// 点击某一项的回调
onNodeToggle
?:
(
event
:
object
,
nodeIds
:
Array
<
any
>
)
=>
void
;
// 点击某一项的回调
renderLabel
?:
(
labelNmae
:
string
)
=>
React
.
ReactNode
treeViewSx
?:
any
}
treeData
:
RenderTree
;
onNodeFocus
?:
(
event
:
object
,
value
:
string
)
=>
void
;
// 点击某一项的回调
onNodeSelect
?:
(
event
:
object
,
value
:
Array
<
any
>
|
string
)
=>
void
;
// 点击某一项的回调
onNodeToggle
?:
(
event
:
object
,
nodeIds
:
Array
<
any
>
)
=>
void
;
// 点击某一项的回调
renderLabel
?:
(
labelNmae
:
string
)
=>
React
.
ReactNode
;
treeViewSx
?:
any
;
defaultExpanded
?:
Array
<
string
>
;
};
interface
RenderTree
{
id
:
string
|
number
;
name
:
string
;
children
?:
readonly
RenderTree
[];
id
:
string
|
number
;
name
:
string
;
children
?:
readonly
RenderTree
[];
}
const
MyTreeView
=
(
props
:
MyTreeViewProps
)
=>
{
const
{
treeData
,
renderLabel
,
treeViewSx
,
onNodeFocus
,
onNodeSelect
,
onNodeToggle
}
=
props
const
renderTree
=
(
nodes
:
RenderTree
)
=>
(
<
TreeItem
key=
{
nodes
.
id
}
nodeId=
{
String
(
nodes
.
id
)
}
label=
{
renderLabel
===
undefined
?
nodes
.
name
:
renderLabel
(
nodes
.
name
)
}
>
{
Array
.
isArray
(
nodes
.
children
)
?
nodes
.
children
.
map
((
node
)
=>
renderTree
(
node
))
:
null
}
</
TreeItem
>
);
return
(
<
TreeView
defaultCollapseIcon=
{
<
ArrowRightIcon
/>
}
defaultExpandIcon=
{
<
ArrowDropDownIcon
/>
}
sx=
{
{
treeViewSx
}
}
onNodeFocus=
{
onNodeFocus
}
onNodeSelect=
{
onNodeSelect
}
onNodeToggle=
{
onNodeToggle
}
>
{
renderTree
(
treeData
)
}
</
TreeView
>
);
const
{
treeData
,
renderLabel
,
treeViewSx
,
onNodeFocus
,
onNodeSelect
,
onNodeToggle
,
defaultExpanded
,
}
=
props
;
const
renderTree
=
(
nodes
:
RenderTree
)
=>
(
<
TreeItem
key=
{
nodes
.
id
}
nodeId=
{
String
(
nodes
.
id
)
}
label=
{
renderLabel
===
undefined
?
nodes
.
name
:
renderLabel
(
nodes
.
name
)
}
>
{
Array
.
isArray
(
nodes
.
children
)
?
nodes
.
children
.
map
((
node
)
=>
renderTree
(
node
))
:
null
}
</
TreeItem
>
);
return
(
<
TreeView
defaultCollapseIcon=
{
<
ArrowRightIcon
/>
}
defaultExpandIcon=
{
<
ArrowDropDownIcon
/>
}
onNodeFocus=
{
onNodeFocus
}
onNodeSelect=
{
onNodeSelect
}
onNodeToggle=
{
onNodeToggle
}
defaultExpanded=
{
defaultExpanded
}
sx=
{
{
...
treeViewSx
}
}
>
{
renderTree
(
treeData
)
}
</
TreeView
>
);
};
export
default
MyTreeView
;
src/views/Project/ProjectData/MoveFile/index.module.css
0 → 100644
View file @
7af8ea32
.treeLabel
{
display
:
flex
;
justify-content
:
flex-start
;
align-items
:
center
;
line-height
:
44px
;
}
.labelFolderIcon
{
margin-right
:
9px
;
}
src/views/Project/ProjectData/MoveFile/index.tsx
0 → 100644
View file @
7af8ea32
import
React
,
{
useState
,
useImperativeHandle
}
from
"react"
;
import
style
from
"./index.module.css"
;
import
{
TextField
}
from
"@mui/material"
;
import
MyDialog
from
"@/components/mui/MyDialog"
;
import
{
checkIsNumberLetterChinese
}
from
"@/utils/util"
;
import
folderIcon
from
"@/assets/project/folderIcon.svg"
;
import
{
useMessage
}
from
"@/components/MySnackbar"
;
import
MyTreeView
from
"@/components/mui/MyTreeView"
;
const
MoveFile
=
(
props
:
any
)
=>
{
const
{
list
}
=
props
;
const
Message
=
useMessage
();
let
addFolderDialogRef
:
any
=
React
.
createRef
();
const
showDialog
=
()
=>
{
addFolderDialogRef
.
current
.
handleClickOpen
();
};
useImperativeHandle
(
props
.
onRef
,
()
=>
{
return
{
showDialog
:
showDialog
,
};
});
const
handleMoveFileSubmit
=
()
=>
{
console
.
log
(
"submit"
);
};
const
renderLabel
=
(
labelNmae
:
string
)
=>
{
return
(
<
span
className=
{
style
.
treeLabel
}
>
<
img
className=
{
style
.
labelFolderIcon
}
src=
{
folderIcon
}
alt=
""
/>
{
labelNmae
}
</
span
>
);
};
const
treeData
=
{
id
:
1232
,
name
:
"na567me"
,
children
:
[
{
id
:
1232358
,
name
:
"nam89e4123"
,
},
{
id
:
1232395
,
name
:
"nam89e32123"
,
},
{
id
:
1232035
,
name
:
"n2am89e123"
,
},
],
};
const
onNodeFocus
=
(
a
:
any
,
b
:
any
)
=>
{
console
.
log
(
"onNodeFocus"
,
a
,
b
);
};
const
onNodeSelect
=
(
a
:
any
,
b
:
any
)
=>
{
console
.
log
(
"onNodeSelect"
,
a
,
b
);
};
const
onNodeToggle
=
(
a
:
any
,
b
:
any
)
=>
{
console
.
log
(
"onNodeToggle"
,
a
,
b
);
};
const
moveFileSubmitloading
=
false
;
const
[
fileName
,
setFileName
]
=
useState
(
""
);
const
[
fileNameCheck
,
setFileNameCheck
]
=
useState
({
error
:
false
,
help
:
""
,
});
return
(
<
MyDialog
handleSubmit=
{
handleMoveFileSubmit
}
onRef=
{
addFolderDialogRef
}
title=
"移动至"
submitloading=
{
moveFileSubmitloading
}
>
<
MyTreeView
treeData=
{
treeData
}
renderLabel=
{
renderLabel
}
onNodeFocus=
{
onNodeFocus
}
onNodeSelect=
{
onNodeSelect
}
onNodeToggle=
{
onNodeToggle
}
defaultExpanded=
{
[
String
(
treeData
.
id
)]
}
treeViewSx=
{
{
width
:
400
,
}
}
></
MyTreeView
>
</
MyDialog
>
);
};
export
default
MoveFile
;
src/views/Project/ProjectData/index.module.css
View file @
7af8ea32
...
...
@@ -88,18 +88,3 @@
justify-content
:
flex-end
;
align-items
:
center
;
}
.treeLabel
{
display
:
flex
;
justify-content
:
flex-start
;
align-items
:
center
;
line-height
:
44px
;
}
.labelFolderIcon
{
margin-right
:
9px
;
}
\ No newline at end of file
src/views/Project/ProjectData/index.tsx
View file @
7af8ea32
...
...
@@ -16,12 +16,12 @@ import MyDialog from "@/components/mui/MyDialog";
import
{
useMessage
}
from
"@/components/MySnackbar"
;
import
{
getDataFileToken
}
from
"@/api/project_api"
;
import
AddFolder
from
"./AddFolder"
;
import
MoveFile
from
"./MoveFile"
;
import
UpLoaderFile
from
"./UpLoaderFile"
;
import
useMyRequest
from
"@/hooks/useMyRequest"
;
import
{
observer
}
from
"mobx-react-lite"
;
import
{
useStores
}
from
"@/store"
;
import
CloudEController
from
"@/api/fileserver/CloudEController"
;
import
MyTreeView
from
"@/components/mui/MyTreeView"
;
// import TreeView from '@mui/lab/TreeView';
// import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
// import ChevronRightIcon from '@mui/icons-material/ChevronRight';
...
...
@@ -72,7 +72,7 @@ const ProjectData = observer(() => {
useEffect
(()
=>
{
if
(
fileToken
)
{
//
CloudEController.JobOutFileList(path, false, fileToken);
CloudEController
.
JobOutFileList
(
path
,
false
,
fileToken
);
// 老项目测试环境
// https://fileserver.cloudam.cn/list/?username=6c8928fa719940dc964cf17a029b36c5&token=d1b07aa2-0b29-48ca-ad28-bb41af3bcbb1&filetoken=%2FMm%2BLhFrOpEDp0neVeESSD%2F45aY%3D&share=false&showhidden=false
// 新项目本地
...
...
@@ -163,6 +163,7 @@ const ProjectData = observer(() => {
sx=
{
{
position
:
"relative"
,
left
:
"-18px"
}
}
variant=
"text"
size=
"small"
onClick=
{
hanleShowMoveFileDialog
}
>
移动至
</
Button
>
...
...
@@ -189,58 +190,15 @@ const ProjectData = observer(() => {
addFolderRef
.
current
.
showDialog
();
};
const
renderLabel
=
(
labelNmae
:
string
)
=>
{
return
(
<
span
className=
{
style
.
treeLabel
}
>
<
img
className=
{
style
.
labelFolderIcon
}
src=
{
folderIcon
}
alt=
""
/>
{
labelNmae
}
</
span
>
)
}
let
moveFileRef
:
any
=
React
.
createRef
();
const
treeData
=
{
id
:
1232
,
name
:
'na567me'
,
children
:
[
{
id
:
1232358
,
name
:
'nam89e4123'
,
},
{
id
:
1232395
,
name
:
'nam89e32123'
,
},
{
id
:
1232035
,
name
:
'n2am89e123'
,
}
]
}
const
onNodeFocus
=
(
a
:
any
,
b
:
any
)
=>
{
console
.
log
(
'onNodeFocus'
,
a
,
b
)
}
const
onNodeSelect
=
(
a
:
any
,
b
:
any
)
=>
{
console
.
log
(
'onNodeSelect'
,
a
,
b
)
}
const
onNodeToggle
=
(
a
:
any
,
b
:
any
)
=>
{
console
.
log
(
'onNodeToggle'
,
a
,
b
)
}
// onNodeSelect
// onNodeToggle
const
hanleShowMoveFileDialog
=
()
=>
{
moveFileRef
.
current
.
showDialog
();
};
return
(
<
ThemeProvider
theme=
{
theme
}
>
<
div
className=
{
style
.
projectData
}
>
<
MyTreeView
treeData=
{
treeData
}
renderLabel=
{
renderLabel
}
onNodeFocus=
{
onNodeFocus
}
onNodeSelect=
{
onNodeSelect
}
onNodeToggle=
{
onNodeToggle
}
></
MyTreeView
>
<
div
className=
{
style
.
projectDataStickyTop
}
>
<
div
className=
{
style
.
projectDataTitle
}
>
项目数据
</
div
>
<
div
className=
{
style
.
projectDataHeader
}
>
...
...
@@ -362,6 +320,7 @@ const ProjectData = observer(() => {
list=
{
list
}
></
UpLoaderFile
>
<
AddFolder
onRef=
{
addFolderRef
}
list=
{
list
}
></
AddFolder
>
<
MoveFile
onRef=
{
moveFileRef
}
list=
{
list
}
></
MoveFile
>
</
div
>
</
ThemeProvider
>
);
...
...
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