haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-26 23:34:45 +00:00
Code Issues Releases Wiki Activity

fix delete searched item (#8054)

Browse Source
This commit is contained in:
Michael An
2025-07-17 15:45:50 +08:00
committed by GitHub
parent d80885fac5
commit ebc514a91d
3 changed files with 16 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
frontend/src/components/search/search-result-item.js
View File

@@ -41,13 +41,11 @@ class SearchResultItem extends React.Component {
deleteItem = (e) => { deleteItem = (e) => {
e.stopPropagation(); e.stopPropagation();
if (this.props.onDeleteItem) { this.props.onDeleteItem(this.props.item);
this.props.onDeleteItem(this.props.item);
}
}; };
render() { render() {
const { item, setRef = (() => {}) } = this.props; const { item, onDeleteItem, isHighlight, setRef = (() => {}) } = this.props;
let folderIconUrl = item.link_content ? Utils.getFolderIconUrl(false, 192) : Utils.getDefaultLibIconUrl(); let folderIconUrl = item.link_content ? Utils.getFolderIconUrl(false, 192) : Utils.getDefaultLibIconUrl();
let fileIconUrl = item.is_dir ? folderIconUrl : Utils.getFileIconUrl(item.name); let fileIconUrl = item.is_dir ? folderIconUrl : Utils.getFileIconUrl(item.name);
let showName = item.repo_name + '/' + item.link_content; let showName = item.repo_name + '/' + item.link_content;
@@ -59,7 +57,7 @@ class SearchResultItem extends React.Component {
return ( return (
<li <li
className={classnames('search-result-item', { 'search-result-item-highlight': this.props.isHighlight })} className={classnames('search-result-item', { 'search-result-item-highlight': isHighlight })}
onClick={this.onClickHandler} onClick={this.onClickHandler}
ref={ref => setRef(ref)} ref={ref => setRef(ref)}
onMouseEnter={this.onMouseEnter} onMouseEnter={this.onMouseEnter}
@@ -70,7 +68,7 @@ class SearchResultItem extends React.Component {
<div className="item-link ellipsis">{showName}</div> <div className="item-link ellipsis">{showName}</div>
<div className="item-text ellipsis" dangerouslySetInnerHTML={{ __html: item.content }}></div> <div className="item-text ellipsis" dangerouslySetInnerHTML={{ __html: item.content }}></div>
</div> </div>
{this.props.isHighlight && ( {isHighlight && onDeleteItem && (
<button <button
type="button" type="button"
className="search-icon-right sf3-font sf3-font-x-01" className="search-icon-right sf3-font sf3-font-x-01"

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

@@ -745,11 +745,11 @@ class Search extends Component {
this.setState({ highlightIndex: index }); this.setState({ highlightIndex: index });
}, 200); }, 200);
deleteItem = (item) => { deleteVisitedResult = (item) => {
const { visitedItems } = this.state; const { visitedItems } = this.state;
const update = visitedItems.filter(i => i.path !== item.path || i.repo_id !== item.repo_id); const newVisitedItems = visitedItems.filter(i => i.path !== item.path || i.repo_id !== item.repo_id);
this.setState({ visitedItems: update }); this.setState({ visitedItems: newVisitedItems });
localStorage.setItem(this.storeKey, JSON.stringify(update)); localStorage.setItem(this.storeKey, JSON.stringify(newVisitedItems));
}; };
renderResults = (resultItems, isVisited) => { renderResults = (resultItems, isVisited) => {
@@ -757,11 +757,11 @@ class Search extends Component {
const results = ( const results = (
<> <>
{isVisited ? ( {isVisited ?
<h4 className="visited-search-results-title">{gettext('Search results visited recently')}</h4> <h4 className="visited-search-results-title">{gettext('Search results visited recently')}</h4>
) : ( :
<h4 className="search-results-title">{gettext('Files')}</h4> <h4 className="search-results-title">{gettext('Files')}</h4>
)} }
<ul className="search-result-list" ref={this.searchResultListRef}> <ul className="search-result-list" ref={this.searchResultListRef}>
{resultItems.map((item, index) => { {resultItems.map((item, index) => {
const isHighlight = index === highlightIndex; const isHighlight = index === highlightIndex;
@@ -776,7 +776,7 @@ class Search extends Component {
onHighlightIndex={this.debounceHighlight} onHighlightIndex={this.debounceHighlight}
timer={this.timer} timer={this.timer}
onSetTimer={(timer) => {this.timer = timer;}} onSetTimer={(timer) => {this.timer = timer;}}
onDeleteItem={this.deleteItem} onDeleteItem={isVisited ? this.deleteVisitedResult : null}
/> />
); );
})} })}
@@ -787,9 +787,9 @@ class Search extends Component {
return ( return (
<> <>
<MediaQuery query="(min-width: 768px)"> <MediaQuery query="(min-width: 768px)">
<div className="search-result-sidepanel-wrapper d-flex"> <div className="search-result-side-panel-wrapper d-flex">
<div className="search-result-list-container" ref={this.searchResultListContainerRef}>{results}</div> <div className="search-result-list-container" ref={this.searchResultListContainerRef}>{results}</div>
<div className="search-result-container-sidepanel d-flex flex-column flex-grow-1"> <div className="search-result-container-side-panel d-flex flex-column flex-grow-1">
{this.renderDetails(resultItems)} {this.renderDetails(resultItems)}
</div> </div>
</div> </div>

4
frontend/src/css/search.css
View File

@@ -156,12 +156,12 @@
background-color: var(--bs-bg-secondary-color); background-color: var(--bs-bg-secondary-color);
} }
.search-result-container .search-result-container-sidepanel { .search-result-container .search-result-container-side-panel {
max-width: 300px; max-width: 300px;
max-height: 400px; max-height: 400px;
} }
.search-result-container .search-result-container-sidepanel .searched-item-details { .search-result-container .search-result-container-side-panel .searched-item-details {
height: 100%; height: 100%;
overflow: auto; overflow: auto;
} }