diff --git a/frontend/src/css/work-weixin-departments.css b/frontend/src/css/work-weixin-departments.css index 9a0d08d6fa..ad2ab6b92b 100644 --- a/frontend/src/css/work-weixin-departments.css +++ b/frontend/src/css/work-weixin-departments.css @@ -50,8 +50,9 @@ position: absolute; top: 20%; left: 0.3rem; + color: silver; } -.tree-node-inner:hover { +.tree-node-inner-hover { background-color: #FFEFB2; border-radius: 0.25rem; cursor: pointer; @@ -61,6 +62,14 @@ border-radius: 4px; background-color: #feac74 !important; } +.tree-node-hight-light i { + color: #fff; +} +.tree-node-hight-light .attr-action-icon, +.tree-node-hight-light .attr-action-icon:focus, +.tree-node-hight-light .attr-action-icon:hover { + color: #fff !important; +} .tree-node-text { padding-left: 1.3rem; width: calc(100% - 1.3rem); diff --git a/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js b/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js index 9f2f0e1971..9d1b9c751b 100644 --- a/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js +++ b/frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js @@ -32,7 +32,8 @@ class WorkWeixinDepartmentsTreeNode extends Component { }); }; - dropdownToggle = () => { + dropdownToggle = (e) => { + e.stopPropagation(); this.setState({ dropdownOpen: !this.state.dropdownOpen }); }; @@ -41,9 +42,15 @@ class WorkWeixinDepartmentsTreeNode extends Component { }; onMouseLeave = () => { + if (this.state.dropdownOpen) return; this.setState({ active: false }); }; + importDepartmentDialogToggle = (depart) => { + this.setState({ active: false }); + this.props.importDepartmentDialogToggle(depart); + } + componentDidMount() { if (this.props.index === 0) { this.setState({ isChildrenShow: true }); @@ -61,7 +68,7 @@ class WorkWeixinDepartmentsTreeNode extends Component { isChildrenShow={this.state.isChildrenShow} onChangeDepartment={this.props.onChangeDepartment} checkedDepartmentId={this.props.checkedDepartmentId} - importDepartmentDialogToggle={this.props.importDepartmentDialogToggle} + importDepartmentDialogToggle={this.importDepartmentDialogToggle} /> ); }); @@ -76,6 +83,7 @@ class WorkWeixinDepartmentsTreeNode extends Component { }); let nodeInnerClass = classNames({ 'tree-node-inner': true, + 'tree-node-inner-hover': this.state.active, 'tree-node-hight-light': checkedDepartmentId === department.id }); return ( @@ -92,7 +100,7 @@ class WorkWeixinDepartmentsTreeNode extends Component { {isPro && this.dropdownToggle(e)} direction="down" style={this.state.active ? {} : { opacity: 0 }} > @@ -106,7 +114,7 @@ class WorkWeixinDepartmentsTreeNode extends Component { {'导入部门'}