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

optimized code

Browse Source
This commit is contained in:
shanshuirenjia
2019-04-22 12:18:35 +08:00
parent ddb7ec369e
commit 2f0ea56aa8
6 changed files with 45 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
frontend/src/components/dirent-list-view/dirent-list-item.js
View File

@@ -24,8 +24,8 @@ const propTypes = {
showShareBtn: PropTypes.bool.isRequired,
dirent: PropTypes.object.isRequired,
onItemClick: PropTypes.func.isRequired,
onFreezedItem: PropTypes.func.isRequired,
onUnfreezedItem: PropTypes.func.isRequired,
freezeItem: PropTypes.func.isRequired,
unfreezeItem: PropTypes.func.isRequired,
onItemRenameToggle: PropTypes.func.isRequired,
onItemSelected: PropTypes.func.isRequired,
onItemDelete: PropTypes.func.isRequired,
@@ -110,12 +110,12 @@ class DirentListItem extends React.Component {
this.setState({isDragTipShow: false});
}
onUnfreezedItem = () => {
unfreezeItem = () => {
this.setState({
highlight: false,
isOperationShow: false,
});
this.props.onUnfreezedItem();
this.props.unfreezeItem();
}
//buiness handler
@@ -248,7 +248,7 @@ class DirentListItem extends React.Component {
onRenameCancel = () => {
this.setState({isRenameing: false});
this.onUnfreezedItem();
this.unfreezeItem();
}
onItemMoveToggle = () => {
@@ -433,10 +433,10 @@ class DirentListItem extends React.Component {
opItem={this.props.dirent}
menuClass={'sf2-icon-caret-down'}
isHandleContextMenuEvent={true}
getOpItemMenuList={this.props.getDirentItemMenuList}
getMenuList={this.props.getDirentItemMenuList}
onMenuItemClick={this.onMenuItemClick}
onUnfreezedItem={this.onUnfreezedItem}
onFreezedItem={this.props.onFreezedItem}
unfreezeItem={this.unfreezeItem}
freezeItem={this.props.freezeItem}
/>
</li>
</ul>
@@ -461,13 +461,12 @@ class DirentListItem extends React.Component {
<li className="operation-group-item">
<ItemDropDownMenu
opItem={this.props.dirent}
menuType={'pc'}
menuClass={'sf2-icon-caret-down'}
isHandleContextMenuEvent={true}
getOpItemMenuList={this.props.getDirentItemMenuList}
getMenuList={this.props.getDirentItemMenuList}
onMenuItemClick={this.onMenuItemClick}
onUnfreezedItem={this.onUnfreezedItem}
onFreezedItem={this.props.onFreezedItem}
unfreezeItem={this.unfreezeItem}
freezeItem={this.props.freezeItem}
/>
</li>
</ul>

14
frontend/src/components/dirent-list-view/dirent-list-view.js
View File

@@ -78,11 +78,11 @@ class DirentListView extends React.Component {
this.zipToken = null;
}
onFreezedItem = () => {
freezeItem = () => {
this.setState({isItemFreezed: true});
}
onUnfreezedItem = () => {
unfreezeItem = () => {
this.setState({isItemFreezed: false});
}
@@ -100,7 +100,7 @@ class DirentListView extends React.Component {
}
onItemRenameToggle = () => {
this.onFreezedItem();
this.freezeItem();
}
onItemSelected = (dirent) => {
@@ -425,11 +425,11 @@ class DirentListView extends React.Component {
}
onShowMenu = (e) => {
this.onFreezedItem();
this.freezeItem();
}
onHideMenu = (e) => {
this.onUnfreezedItem();
this.unfreezeItem();
}
// contextmenu utils
@@ -575,8 +575,8 @@ class DirentListView extends React.Component {
onItemCopy={this.props.onItemCopy}
updateDirent={this.props.updateDirent}
isItemFreezed={this.state.isItemFreezed}
onFreezedItem={this.onFreezedItem}
onUnfreezedItem={this.onUnfreezedItem}
freezeItem={this.freezeItem}
unfreezeItem={this.unfreezeItem}
onDirentClick={this.onDirentClick}
showImagePopup={this.showImagePopup}
onItemMouseDown={this.onItemMouseDown}

22
frontend/src/components/dropdown-menu/item-dropdown-menu.js
View File

@@ -9,10 +9,10 @@ const propTypes = {
opItem: PropTypes.object.isRequired,
menuClass: PropTypes.string,
isHandleContextMenuEvent: PropTypes.bool,
getOpItemMenuList: PropTypes.func.isRequired,
getMenuList: PropTypes.func.isRequired,
onMenuItemClick: PropTypes.func.isRequired,
onFrezeedItem: PropTypes.func,
onUnfrezeedItem: PropTypes.func,
freezeItem: PropTypes.func,
unfreezeItem: PropTypes.func,
};
class ItemDropDownMenu extends React.Component {
@@ -35,14 +35,14 @@ class ItemDropDownMenu extends React.Component {
this.listenerId = listener.register(this.onShowMenu, this.onHideMenu);
}
let { opItem } = this.props;
let menuList = this.props.getOpItemMenuList(opItem);
let menuList = this.props.getMenuList(opItem);
this.setState({menuList: menuList});
}
componentWillReceiveProps(nextProps) { // for toolbar opItem operation
let { opItem } = nextProps;
if (opItem.name !== this.props.opItem.name) {
let menuList = this.props.getOpItemMenuList(opItem);
let menuList = this.props.getMenuList(opItem);
this.setState({menuList: menuList});
}
}
@@ -60,8 +60,8 @@ class ItemDropDownMenu extends React.Component {
onHideMenu = () => {
if (this.state.isItemMenuShow) {
this.setState({isItemMenuShow: false});
if (typeof(this.props.onUnfreezedItem) === 'function') {
this.props.onUnfreezedItem();
if (typeof(this.props.unfreezeItem) === 'function') {
this.props.unfreezeItem();
}
}
}
@@ -77,10 +77,10 @@ class ItemDropDownMenu extends React.Component {
this.setState(
{isItemMenuShow: !this.state.isItemMenuShow},
() => {
if (this.state.isItemMenuShow && typeof(this.props.onFreezedItem) === 'function') {
this.props.onFreezedItem();
} else if (!this.state.isItemMenuShow && typeof(this.props.onUnfreezedItem) === 'function') {
this.props.onUnfreezedItem();
if (this.state.isItemMenuShow && typeof(this.props.freezeItem) === 'function') {
this.props.freezeItem();
} else if (!this.state.isItemMenuShow && typeof(this.props.unfreezeItem) === 'function') {
this.props.unfreezeItem();
}
}
);

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

@@ -287,7 +287,7 @@ class MutipleDirOperationToolbar extends React.Component {
opItem={this.props.selectedDirentList[0]}
menuClass={'fas fa-ellipsis-v dirents-more-menu'}
onMenuItemClick={this.onMenuItemClick}
getOpItemMenuList={this.getDirentMenuList}
getMenuList={this.getDirentMenuList}
/>
}
</ButtonGroup>

18
frontend/src/components/tree-view/tree-node-view.js
View File

@@ -15,8 +15,8 @@ const propTypes = {
onNodeExpanded: PropTypes.func.isRequired,
onNodeCollapse: PropTypes.func.isRequired,
onNodeDragStart: PropTypes.func.isRequired,
onFreezedItem: PropTypes.func.isRequired,
onUnfreezedItem: PropTypes.func.isRequired,
freezeItem: PropTypes.func.isRequired,
unfreezeItem: PropTypes.func.isRequired,
onMenuItemClick: PropTypes.func,
registerHandlers: PropTypes.func,
unregisterHandlers: PropTypes.func,
@@ -113,9 +113,9 @@ class TreeNodeView extends React.Component {
this.props.onNodeDrop(e, this.props.node);
}
onUnfreezedItem = () => {
unfreezeItem = () => {
this.setState({isShowOperationMenu: false});
this.props.onUnfreezedItem();
this.props.unfreezeItem();
}
onMenuItemClick = (operation, event, node) => {
@@ -199,9 +199,9 @@ class TreeNodeView extends React.Component {
onNodeClick={this.props.onNodeClick}
onNodeCollapse={this.props.onNodeCollapse}
onNodeExpanded={this.props.onNodeExpanded}
onFreezedItem={this.props.onFreezedItem}
freezeItem={this.props.freezeItem}
onMenuItemClick={this.props.onMenuItemClick}
onUnfreezedItem={this.onUnfreezedItem}
unfreezeItem={this.unfreezeItem}
onNodeChanged={this.props.onNodeChanged}
registerHandlers={this.props.registerHandlers}
unregisterHandlers={this.props.unregisterHandlers}
@@ -256,10 +256,10 @@ class TreeNodeView extends React.Component {
<ItemDropDownMenu
opItem={this.props.node}
menuClass={'fas fa-ellipsis-v'}
getOpItemMenuList={this.caculateMenuList}
getMenuList={this.caculateMenuList}
onMenuItemClick={this.onMenuItemClick}
onFreezedItem={this.props.onFreezedItem}
onUnfreezedItem={this.onUnfreezedItem}
freezeItem={this.props.freezeItem}
unfreezeItem={this.unfreezeItem}
/>
)}
</div>

12
frontend/src/components/tree-view/tree-view.js
View File

@@ -112,11 +112,11 @@ class TreeView extends React.Component {
this.onItemMove(this.props.currentRepoInfo, nodeDirent, dropNodeData.path, nodeParentPath);
}
onFreezedItem = () => {
freezeItem = () => {
this.setState({isItemFreezed: true});
}
onUnfreezedItem = () => {
unfreezeItem = () => {
this.setState({isItemFreezed: false});
}
@@ -194,11 +194,11 @@ class TreeView extends React.Component {
}
onShowMenu = () => {
this.onFreezedItem();
this.freezeItem();
}
onHideMenu = () => {
this.onUnfreezedItem();
this.unfreezeItem();
}
render() {
@@ -223,8 +223,8 @@ class TreeView extends React.Component {
onNodeExpanded={this.props.onNodeExpanded}
onNodeCollapse={this.props.onNodeCollapse}
onNodeDragStart={this.onNodeDragStart}
onFreezedItem={this.onFreezedItem}
onUnfreezedItem={this.onUnfreezedItem}
freezeItem={this.freezeItem}
unfreezeItem={this.unfreezeItem}
onNodeDragMove={this.onNodeDragMove}
onNodeDrop={this.onNodeDrop}
onNodeDragEnter={this.onNodeDragEnter}