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

conflict fixed

Browse Source
This commit is contained in:
shanshuirenjia
2020-04-01 11:19:09 +08:00
parent 6181619f0e 54621adb8a
commit e9f3f8ed2e
25 changed files with 369 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

53
frontend/src/components/search/search.js
View File

@@ -94,29 +94,52 @@ class Search extends Component {
sendRequest(queryData, cancelToken) {
var _this = this;
let isPublic = this.props.isPublic;
seafileAPI.searchFiles(queryData, cancelToken).then(res => {
if (!res.data.total) {
if (isPublic) {
seafileAPI.searchFilesInPublishedRepo(queryData.search_repo, queryData.q).then(res => {
if (!res.data.total) {
_this.setState({
resultItems: [],
isResultGetted: true
});
_this.source = null;
return;
}
let items = _this.formatResultItems(res.data.results);
_this.setState({
resultItems: [],
resultItems: items,
isResultGetted: true
});
_this.source = null;
return;
}
let items = _this.formatResultItems(res.data.results);
_this.setState({
total: res.data.total,
resultItems: items,
isResultGetted: true
}).catch(error => {
let errMessage = Utils.getErrorMsg(error);
toaster.danger(errMessage);
});
_this.source = null;
}).catch(res => {
/* eslint-disable */
} else {
editorUtilities.searchFiles(queryData,cancelToken).then(res => {
if (!res.data.total) {
_this.setState({
resultItems: [],
isResultGetted: true
});
_this.source = null;
return;
}
let items = _this.formatResultItems(res.data.results);
_this.setState({
resultItems: items,
isResultGetted: true
});
_this.source = null;
}).catch(res => {
/* eslint-disable */
console.log(res);
/* eslint-enable */
});
});
}
}
cancelRequest() {