1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-27 23:56:18 +00:00

Fix upload folder bug (#7879)

* delete unnecessary console

* optimize code

---------

Co-authored-by: 小强 <shuntian@Mac.lan>
This commit is contained in:
杨顺强
2025-06-03 14:20:39 +08:00
committed by GitHub
parent b92da16b1d
commit c6a3617648
2 changed files with 6 additions and 12 deletions

View File

@@ -327,7 +327,6 @@ class FileUploader extends React.Component {
let isExist = this.notifiedFolders.some(item => {return item.name === dirent.name;}); let isExist = this.notifiedFolders.some(item => {return item.name === dirent.name;});
if (!isExist) { if (!isExist) {
this.notifiedFolders.push(dirent); this.notifiedFolders.push(dirent);
console.log('test dev: ', JSON.stringify(dirent));
this.props.onFileUploadSuccess(dirent); this.props.onFileUploadSuccess(dirent);
} }

View File

@@ -208,7 +208,6 @@ class LibContentView extends React.Component {
} }
} else if (noticeData.type === 'repo-update') { } else if (noticeData.type === 'repo-update') {
seafileAPI.listDir(this.props.repoID, this.state.path, { 'with_thumbnail': true }).then(res => { seafileAPI.listDir(this.props.repoID, this.state.path, { 'with_thumbnail': true }).then(res => {
console.log('test dev:', 'socket updated');
const { dirent_list, user_perm: userPerm, dir_id: dirID } = res.data; const { dirent_list, user_perm: userPerm, dir_id: dirID } = res.data;
const direntList = Utils.sortDirents(dirent_list.map(item => new Dirent(item)), this.state.sortBy, this.state.sortOrder); const direntList = Utils.sortDirents(dirent_list.map(item => new Dirent(item)), this.state.sortBy, this.state.sortOrder);
this.setState({ this.setState({
@@ -621,7 +620,6 @@ class LibContentView extends React.Component {
path, path,
}); });
seafileAPI.listDir(repoID, path, { 'with_thumbnail': true }).then(res => { seafileAPI.listDir(repoID, path, { 'with_thumbnail': true }).then(res => {
console.log('test dev: ', 'page updated');
const { dirent_list, user_perm: userPerm, dir_id: dirID } = res.data; const { dirent_list, user_perm: userPerm, dir_id: dirID } = res.data;
const direntList = Utils.sortDirents(dirent_list.map(item => new Dirent(item)), sortBy, sortOrder); const direntList = Utils.sortDirents(dirent_list.map(item => new Dirent(item)), sortBy, sortOrder);
this.setState({ this.setState({
@@ -1716,26 +1714,24 @@ class LibContentView extends React.Component {
}; };
onFileUploadSuccess = (direntObject) => { onFileUploadSuccess = (direntObject) => {
console.log(this.state.direntList); let dirent = null;
const isExist = this.state.direntList.some(item => item.name === direntObject.name && item.type === direntObject.type); const isExist = this.state.direntList.some(item => item.name === direntObject.name && item.type === direntObject.type);
console.log('dev test: ', isExist);
if (isExist) { if (isExist) {
const dirent = this.state.direntList.find(dirent => dirent.name === direntObject.name && dirent.type === direntObject.type); dirent = this.state.direntList.find(dirent => dirent.name === direntObject.name && dirent.type === direntObject.type);
const mtime = dayjs.unix(direntObject.mtime).fromNow(); const mtime = dayjs.unix(direntObject.mtime).fromNow();
dirent && this.updateDirent(dirent, 'mtime', mtime); dirent && this.updateDirent(dirent, 'mtime', mtime);
} else { } else {
// use current dirent parent's permission as it's permission // use current dirent parent's permission as it's permission
direntObject.permission = this.state.userPerm; direntObject.permission = this.state.userPerm;
const dirent = new Dirent(direntObject); dirent = new Dirent(direntObject);
this.setState(prevState => ({ this.setState(prevState => ({
direntList: direntObject.type === 'dir' ? [dirent, ...prevState.direntList] : [...prevState.direntList, dirent] direntList: direntObject.type === 'dir' ? [dirent, ...prevState.direntList] : [...prevState.direntList, dirent]
})); }));
}
console.log('dev test: ', this.state.isTreePanelShown); if (this.state.isTreePanelShown) {
if (this.state.isTreePanelShown) { this.addNodeToTree(dirent.name, this.state.path, dirent.type);
this.addNodeToTree(dirent.name, this.state.path, dirent.type);
}
} }
}; };
@@ -2033,7 +2029,6 @@ class LibContentView extends React.Component {
}; };
addNodeToTree = (name, parentPath, type) => { addNodeToTree = (name, parentPath, type) => {
console.log(name, parentPath, type);
let node = this.createTreeNode(name, type); let node = this.createTreeNode(name, type);
let tree = treeHelper.addNodeToParentByPath(this.state.treeData, node, parentPath); let tree = treeHelper.addNodeToParentByPath(this.state.treeData, node, parentPath);
this.setState({ treeData: tree }); this.setState({ treeData: tree });