haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-04-27 11:01:14 +00:00
Code Issues Releases Wiki Activity

Merge pull request #7743 from haiwen/fix/dirent_selection

Browse Source 
fix dirent state in grid view
This commit is contained in:
Michael An 2025-04-21 10:42:14 +08:00 committed by GitHub
commit 0b8aa00f4d
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
4 changed files with 48 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
frontend/src/components/dirent-grid-view/dirent-grid-item.js
View File

@ -72,6 +72,23 @@ class DirentGridItem extends React.Component {
}
}
componentDidUpdate(prevProps) {
if (prevProps.dirent !== this.props.dirent) {
this.setState({ dirent: this.props.dirent });
}
const { repoID, path } = this.props;
const { dirent } = this.state;
if (this.checkGenerateThumbnail(dirent) && !this.isGeneratingThumbnail) {
this.isGeneratingThumbnail = true;
this.thumbnailCenter.createThumbnail({
repoID,
path: [path, dirent.name].join('/'),
callback: this.updateDirentThumbnail,
});
}
}
componentWillUnmount() {
if (this.clickTimeout) {
clearTimeout(this.clickTimeout);

2
frontend/src/models/dirent.js
View File

@ -17,7 +17,7 @@ class Dirent {
this.mtime_relative = dayjs.unix(json.mtime).fromNow();
}
this.permission = json.permission || 'rw';
this.isSelected = false; // is check or not
this.isSelected = json.isSelected || false; // is check or not
this.starred = json.starred || false;
if (json.type === 'dir') {
this.has_been_shared_out = false;

1
frontend/src/pages/excalidraw-editor/index.js
View File

@ -25,6 +25,7 @@ const ExcaliEditor = () => {
setIsFetching(false);
});
onSetFavicon();
// eslint-disable-next-line react-hooks/exhaustive-deps
}, []);
const saveSceneContent = useCallback(async () => {

46
frontend/src/pages/lib-content-view/lib-content-view.js
View File

@ -1543,35 +1543,47 @@ class LibContentView extends React.Component {
newSelectedDirentList = [clickedDirent];
}
this.setState({
direntList: direntList.map(dirent => {
dirent.isSelected = newSelectedDirentList.some(selectedDirent => selectedDirent.name === dirent.name);
return dirent;
}),
isDirentSelected: newSelectedDirentList.length > 0,
isAllDirentSelected: newSelectedDirentList.length === direntList.length,
selectedDirentList: newSelectedDirentList,
lastSelectedIndex: clickedIndex,
this.setState(prevState => {
const newDirentList = prevState.direntList.map(dirent => {
const isSelected = newSelectedDirentList.some(selected => selected.name === dirent.name);
return new Dirent({
...dirent,
isSelected: isSelected,
});
});
const updatedSelectedDirents = newSelectedDirentList.map(selected =>
newDirentList.find(dirent => dirent.name === selected.name)
);
return {
direntList: newDirentList,
isDirentSelected: updatedSelectedDirents.length > 0,
isAllDirentSelected: updatedSelectedDirents.length === newDirentList.length,
selectedDirentList: updatedSelectedDirents,
lastSelectedIndex: clickedIndex,
};
});
} else {
this.setState({
direntList: direntList.map(dirent => {
dirent.isSelected = false;
return dirent;
}),
this.setState(prevState => ({
direntList: prevState.direntList.map(dirent => new Dirent({ ...dirent, isSelected: false })),
isDirentSelected: false,
isAllDirentSelected: false,
selectedDirentList: [],
lastSelectedIndex: null,
});
}));
}
};
onSelectedDirentListUpdate = (newSelectedDirentList, lastSelectedIndex = null) => {
this.setState({
direntList: this.state.direntList.map(dirent => {
dirent.isSelected = newSelectedDirentList.some(selectedDirent => selectedDirent.name === dirent.name);
return dirent;
return new Dirent({
...dirent,
isSelected: newSelectedDirentList.some(
selected => selected.name === dirent.name
)
});
}),
isDirentSelected: newSelectedDirentList.length > 0,
selectedDirentList: newSelectedDirentList,