From 2f0ea56aa8256770565829735a0e18fba6ef51de Mon Sep 17 00:00:00 2001 From: shanshuirenjia <978987373@qq.com> Date: Mon, 22 Apr 2019 12:18:35 +0800 Subject: [PATCH] optimized code --- .../dirent-list-view/dirent-list-item.js | 23 +++++++++---------- .../dirent-list-view/dirent-list-view.js | 14 +++++------ .../dropdown-menu/item-dropdown-menu.js | 22 +++++++++--------- .../toolbar/mutilple-dir-operation-toolbar.js | 2 +- .../components/tree-view/tree-node-view.js | 18 +++++++-------- .../src/components/tree-view/tree-view.js | 12 +++++----- 6 files changed, 45 insertions(+), 46 deletions(-) diff --git a/frontend/src/components/dirent-list-view/dirent-list-item.js b/frontend/src/components/dirent-list-view/dirent-list-item.js index d826d52beb..a6a56372db 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-item.js +++ b/frontend/src/components/dirent-list-view/dirent-list-item.js @@ -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} /> @@ -461,13 +461,12 @@ class DirentListItem extends React.Component {
    • diff --git a/frontend/src/components/dirent-list-view/dirent-list-view.js b/frontend/src/components/dirent-list-view/dirent-list-view.js index 6c1402f193..5b28016eb6 100644 --- a/frontend/src/components/dirent-list-view/dirent-list-view.js +++ b/frontend/src/components/dirent-list-view/dirent-list-view.js @@ -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} diff --git a/frontend/src/components/dropdown-menu/item-dropdown-menu.js b/frontend/src/components/dropdown-menu/item-dropdown-menu.js index 9dce191322..c2ae297e36 100644 --- a/frontend/src/components/dropdown-menu/item-dropdown-menu.js +++ b/frontend/src/components/dropdown-menu/item-dropdown-menu.js @@ -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(); } } ); diff --git a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js index 4c45159761..4fb2007b99 100644 --- a/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js +++ b/frontend/src/components/toolbar/mutilple-dir-operation-toolbar.js @@ -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} /> } diff --git a/frontend/src/components/tree-view/tree-node-view.js b/frontend/src/components/tree-view/tree-node-view.js index 8cae098e07..3b41bb4e7e 100644 --- a/frontend/src/components/tree-view/tree-node-view.js +++ b/frontend/src/components/tree-view/tree-node-view.js @@ -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 { )} diff --git a/frontend/src/components/tree-view/tree-view.js b/frontend/src/components/tree-view/tree-view.js index c0a3ab3b55..4d906173bc 100644 --- a/frontend/src/components/tree-view/tree-view.js +++ b/frontend/src/components/tree-view/tree-view.js @@ -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}