haiwen/seahub
1
0
Fork 0
mirror of https://github.com/haiwen/seahub.git synced 2025-09-20 02:48:51 +00:00
Code Issues Releases Wiki Activity

Merge branch 'master' into 13.0

Browse Source
This commit is contained in:
Michael An
2025-02-25 12:01:46 +08:00
parent 669c423b07 ec68ff1bcd
commit 617a8fab72
12 changed files with 63 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/components/toolbar/dir-operation-toolbar.js
View File

@@ -203,11 +203,19 @@ class DirOperationToolbar extends React.Component {
render() {
let { path, repoName, userPerm } = this.props;
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
const isShowDropdownMenu = (userPerm === 'rw' || userPerm === 'admin' || userPerm === 'cloud-edit' || isCustomPermission);
if (!isShowDropdownMenu) {
return (
<div className="dir-operation dir-operation-no-dropdown">
{this.props.children}
</div>
);
}
let itemType = path === '/' ? 'library' : 'dir';
let itemName = path == '/' ? repoName : Utils.getFolderName(path);
const { isCustomPermission, customPermission } = Utils.getUserPermission(userPerm);
let canUpload = true;
let canCreate = true;
if (isCustomPermission) {
@@ -293,7 +301,8 @@ class DirOperationToolbar extends React.Component {
data-toggle="dropdown"
>
{this.props.children}
<i className="sf3-font-down sf3-font ml-1 path-item-dropdown-toggle"></i>
<i className="sf3-font-new sf3-font ml-2"></i>
<i className="sf3-font-down sf3-font path-item-dropdown-toggle"></i>
</DropdownToggle>
<DropdownMenu onMouseMove={this.onDropDownMouseMove} className='position-fixed'>
{opList.map((item, index) => {
@@ -351,7 +360,8 @@ class DirOperationToolbar extends React.Component {
className="path-item"
>
{this.props.children}
<i className="sf3-font-down sf3-font ml-1 path-item-dropdown-toggle"></i>
<i className="sf3-font-new sf3-font ml-2"></i>
<i className="sf3-font-down sf3-font path-item-dropdown-toggle"></i>
</DropdownToggle>
<DropdownMenu className='position-fixed'>
{canUpload && (
@@ -370,7 +380,7 @@ class DirOperationToolbar extends React.Component {
return (
<Fragment>
{(userPerm === 'rw' || userPerm === 'admin' || userPerm === 'cloud-edit' || isCustomPermission) && (
{isShowDropdownMenu && (
<div className="dir-operation">
{content}
</div>