haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-05 00:43:53 +00:00
Code Issues Releases Wiki Activity

update new file postion arithmetic (#2776)

Browse Source
This commit is contained in:
杨顺强
2019-01-07 12:41:24 +08:00
committed by Daniel Pan
parent d561acd24f
commit d3d4650071
2 changed files with 36 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
frontend/src/components/dir-view/dir-view.js
View File

@@ -469,10 +469,27 @@ class DirView extends React.Component {
if (type === 'dir') { if (type === 'dir') {
direntList.unshift(dirent); direntList.unshift(dirent);
return direntList; return direntList;
} } else { // type === 'file'
// there will be there conditions;
// first: direntList.length === 0;
// second: all the direntList's items are dir;
// third: direntList has dir and file;
let length = direntList.length
if (length === 0 || direntList[length - 1].type === 'dir') {
direntList.push(dirent); direntList.push(dirent);
} else {
let index = 0;
for (let i = 0; i <= length; i++) {
if (direntList[i].type === 'file') {
index = i;
break;
}
}
direntList.splice(index, 0, dirent);
}
return direntList; return direntList;
} }
}
deleteItem = (dirent) => { deleteItem = (dirent) => {
return this.state.direntList.filter(item => { return this.state.direntList.filter(item => {

16
frontend/src/repo-wiki-mode.js
View File

@@ -546,7 +546,23 @@ class Wiki extends Component {
if (type === 'dir') { if (type === 'dir') {
direntList.unshift(item); direntList.unshift(item);
} else { } else {
// there will be there conditions;
// first: direntList.length === 0;
// second: all the direntList's items are dir;
// third: direntList has dir and file;
let length = direntList.length
if (length === 0 || direntList[length - 1].type === 'dir') {
direntList.push(item); direntList.push(item);
} else {
let index = 0;
for (let i = 0; i <= length; i++) {
if (direntList[i].type === 'file') {
index = i;
break;
}
}
direntList.splice(index, 0, item);
}
} }
this.setState({direntList: direntList}); this.setState({direntList: direntList});
} }