1
0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-01 15:09:14 +00:00

change move dirent search file style (#7022)

This commit is contained in:
Michael An
2024-11-11 12:31:12 +08:00
committed by GitHub
parent 9bdfdaa747
commit 0f777e04de
5 changed files with 58 additions and 43 deletions

View File

@@ -265,7 +265,11 @@ class MoveDirent extends React.Component {
return ( return (
<Modal className='custom-modal' isOpen={true} toggle={this.toggle}> <Modal className='custom-modal' isOpen={true} toggle={this.toggle}>
<ModalHeader toggle={this.toggle}> <ModalHeader toggle={this.toggle} close={
<div className="header-close-list">
<span aria-hidden="true" className="sf3-font sf3-font-x-01 comment-close-icon" onClick={this.toggle}></span>
</div>
}>
{isMultipleOperation ? this.renderTitle() : <div dangerouslySetInnerHTML={{ __html: this.renderTitle() }} className='d-flex'></div>} {isMultipleOperation ? this.renderTitle() : <div dangerouslySetInnerHTML={{ __html: this.renderTitle() }} className='d-flex'></div>}
{isPro && ( {isPro && (
showSearchBar ? ( showSearchBar ? (

View File

@@ -0,0 +1,23 @@
.searched-list-item {
height: 40px;
border-radius: 3px;
cursor: pointer;
}
.searched-list-item:hover {
background-color: #f5f5f5;
}
.searched-list-item.searched-dir td {
padding: 0;
height: 40px;
border-bottom: none;
}
.searched-list-item .searched-item-icon {
border-radius: 3px 0 0 3px;
}
.searched-list-item .searched-item-link {
border-radius: 0 3px 3px 0;
}

View File

@@ -2,6 +2,7 @@ import React from 'react';
import PropTypes from 'prop-types'; import PropTypes from 'prop-types';
import classnames from 'classnames'; import classnames from 'classnames';
import { Utils } from '../../utils/utils'; import { Utils } from '../../utils/utils';
import './searched-list-item.css';
const propTypes = { const propTypes = {
currentItem: PropTypes.object, currentItem: PropTypes.object,
@@ -12,30 +13,12 @@ const propTypes = {
class SearchedListItem extends React.Component { class SearchedListItem extends React.Component {
constructor(props) {
super(props);
this.state = {
highlight: false,
};
}
onMouseEnter = () => {
this.setState({ highlight: true });
};
onMouseLeave = () => {
this.setState({ highlight: false });
};
onClick = () => { onClick = () => {
let item = this.props.item; this.props.onItemClick(this.props.item);
this.props.onItemClick(item);
}; };
searchItemDoubleClick = (e) => { searchItemDoubleClick = () => {
let item = this.props.item; this.props.onSearchedItemDoubleClick(this.props.item);
this.props.onSearchedItemDoubleClick(item);
}; };
render() { render() {
@@ -43,17 +26,18 @@ class SearchedListItem extends React.Component {
return ( return (
<tr <tr
className={classnames('searched-list-item', { className={classnames('searched-list-item', {
'tr-highlight': this.state.highlight,
'tr-active': currentItem && item.repo_id === currentItem.repo_id && item.path === currentItem.path, 'tr-active': currentItem && item.repo_id === currentItem.repo_id && item.path === currentItem.path,
'searched-dir': item.is_dir, 'searched-dir': item.is_dir,
})} })}
onClick={this.onClick} onClick={this.onClick}
onMouseEnter={this.onMouseEnter}
onMouseLeave={this.onMouseLeave}
onDoubleClick={this.searchItemDoubleClick} onDoubleClick={this.searchItemDoubleClick}
> >
<td className="text-center searched-item-icon"> <td className="text-center searched-item-icon">
{item.is_dir ? <span className="icon sf3-font sf3-font-folder tree-node-icon"></span> : <img className="item-img" src={Utils.getFileIconUrl(item.name)} alt="" width="24"/>} {item.is_dir ?
<span className="icon sf3-font sf3-font-folder tree-node-icon"></span>
:
<img className="item-img" src={Utils.getFileIconUrl(item.name)} alt="" width="24"/>
}
</td> </td>
<td className='searched-item-link'> <td className='searched-item-link'>
<span className="item-link">{item.repo_name}/{item.link_content}</span> <span className="item-link">{item.repo_name}/{item.link_content}</span>

View File

@@ -42,15 +42,3 @@
flex-direction: column; flex-direction: column;
gap: 0.5rem; gap: 0.5rem;
} }
.file-chooser-search-results-popover .search-results-popover-body .searched-list-item.searched-dir td {
padding: 0;
}
.file-chooser-search-results-popover .search-results-popover-body .searched-item-icon {
border-radius: 3px 0 0 3px;
}
.file-chooser-search-results-popover .search-results-popover-body .searched-item-link {
border-radius: 0 3px 3px 0;
}

View File

@@ -320,7 +320,8 @@
position: absolute; position: absolute;
top: 16px; top: 16px;
right: 48px; right: 48px;
color: #666; color: #000;
opacity: 0.5;
} }
.custom-modal .modal-header .close { .custom-modal .modal-header .close {
@@ -341,13 +342,11 @@
.custom-modal .modal-header .search:hover, .custom-modal .modal-header .search:hover,
.custom-modal .modal-header .close:hover { .custom-modal .modal-header .close:hover {
cursor: pointer; cursor: pointer;
background-color: #f0f0f0;
border-radius: 3px; border-radius: 3px;
color: #666 !important; opacity: 0.75;
opacity: 1;
} }
.custom-modal .modal-header .close span{ .custom-modal .modal-header .close span {
width: 16px; width: 16px;
height: 16px; height: 16px;
} }
@@ -484,3 +483,20 @@
flex-shrink: 0; flex-shrink: 0;
margin-left: 10px; margin-left: 10px;
} }
.comment-close-icon {
height: 24px;
width: 24px;
text-align: center;
}
.comment-close-icon {
cursor: pointer;
color: #000;
opacity: 0.5;
font-weight: 700;
}
.comment-close-icon:hover {
opacity: 0.75;
}