Skip to content

B
bkunyun
Commit 60871319 authored by chenshouchao's avatar chenshouchao
Browse files
Options

Merge branch 'feat-20220608-projectdata' into 'release' 

Feat 20220608 projectdata

See merge request sunyihao/bkunyun!65
parents b47219a1 9a4ba99f
Hide whitespace changes
Inline Side-by-side
Showing with 23 additions and 24 deletions
src/views/Project/ProjectData/MoveFile/index.tsx
View file @ 60871319
...@@ -56,32 +56,31 @@ const MoveFile = (props: any) => { ...@@ -56,32 +56,31 @@ const MoveFile = (props: any) => {
} }
}, [fileToken, projectId]); }, [fileToken, projectId]);
const getDisabledRepeatFolder = useCallback((folderTree: any, samePathFolederArr: Array<string>) => { const getDisabledRepeatFolder = useCallback(
const arr = _.cloneDeep(folderTree) (folderTree: any, samePathFolederArr: Array<string>) => {
const disabledRepeatFolder = (tree: any, repeatPath: Array<string>) => { const arr = _.cloneDeep(folderTree);
tree.forEach((item: any, index: number) => { const disabledRepeatFolder = (tree: any, repeatPath: Array<string>) => {
if ( tree.forEach((item: any, index: number) => {
repeatPath.indexOf( if (repeatPath.indexOf(`${item.dir.substr(1)}${item.name}`) !== -1) {
`${item.dir.substr(1)}${item.name}` item.disabled = true;
) !== -1 } else {
) { item.disabled = false;
item.disabled = true; if (item.subdirs.length > 0) {
} else { disabledRepeatFolder(item.subdirs, repeatPath);
item.disabled = false; }
if (item.subdirs.length > 0) {
disabledRepeatFolder(item.subdirs, repeatPath);
} }
} });
}); };
} disabledRepeatFolder(arr, samePathFolederArr);
disabledRepeatFolder(arr, samePathFolederArr) return arr;
return arr },
}, []); []
);
useEffect(() => { useEffect(() => {
const tree = getDisabledRepeatFolder(treeData, moveFolderPathArr) const tree = getDisabledRepeatFolder(treeData, moveFolderPathArr);
setRenderTreeData(tree) setRenderTreeData(tree);
}, [moveFolderPathArr, getDisabledRepeatFolder, treeData]) }, [moveFolderPathArr, getDisabledRepeatFolder, treeData]);
useEffect(() => { useEffect(() => {
let moveFolderArr: any = []; let moveFolderArr: any = [];
...@@ -105,7 +104,7 @@ const MoveFile = (props: any) => { ...@@ -105,7 +104,7 @@ const MoveFile = (props: any) => {
const showDialog = () => { const showDialog = () => {
moveFileDialogRef.current.handleClickOpen(); moveFileDialogRef.current.handleClickOpen();
getTree() getTree();
}; };
useImperativeHandle(props.onRef, () => { useImperativeHandle(props.onRef, () => {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment