Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix system-admin wechat and dingding department tree UI #7545

Merged
merged 1 commit into from
Mar 3, 2025
Merged

fix system-admin wechat and dingding department tree UI #7545

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 33 additions & 20 deletions frontend/src/css/dingtalk-departments.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.dir-content-nav {
position: absolute;
overflow: hidden;
width: 24%;
width: 25%;
}

.dir-content-nav:hover {
Expand All @@ -45,43 +45,45 @@
.tree-node-inner {
position: relative;
display: flex;
padding-right: 1rem;
padding-right: 0.5rem;
}

.tree-node-inner i {
.tree-node-inner .sf3-font-down {
position: absolute;
top: 20%;
top: 15%;
left: 0.3rem;
color: #999;
}

.tree-node-inner-hover {
background-color: #FFEFB2;
background-color: #f0f0f0;
border-radius: 0.25rem;
cursor: pointer;
}

.tree-node-hight-light {
color: #fff;
border-radius: 4px;
background-color: #feac74 !important;
}

.tree-node-hight-light i {
color: #fff;
background-color: #f5f5f5 !important;
}

.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-hight-light::before {
content: '';
position: absolute;
display: block;
width: 4px;
left: -8px;
top: 2px;
bottom: 2px;
border-radius: 2px;
background-color: #ff9800;
z-index: 0;
}

.tree-node-icon {
.tree-view .tree-node-icon {
padding-right: 1.5rem;
}

.tree-node-text {
.tree-view .tree-node-text {
width: calc(100% - 2.5rem);
font-size: 14px;
white-space: nowrap;
Expand All @@ -90,7 +92,18 @@
line-height: 24px;
}

.tree-view {
padding: 12px 12px 12px 0;
flex: 1 1;
.tree-view .dropdown .right-icon {
width: 20px;
height: 20px;
border-radius: 3px;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
color: #666;
margin-top: 2px;
}

.tree-view .dropdown .right-icon:hover {
background-color: #dbdbdb;
}
53 changes: 33 additions & 20 deletions frontend/src/css/work-weixin-departments.css
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
.dir-content-nav {
position: absolute;
overflow: hidden;
width: 24%;
width: 25%;
}

.dir-content-nav:hover {
Expand All @@ -45,43 +45,45 @@
.tree-node-inner {
position: relative;
display: flex;
padding-right: 1rem;
padding-right: 0.5rem;
}

.tree-node-inner i {
.tree-node-inner .sf3-font-down {
position: absolute;
top: 20%;
top: 15%;
left: 0.3rem;
color: #999;
}

.tree-node-inner-hover {
background-color: #FFEFB2;
background-color: #f0f0f0;
border-radius: 0.25rem;
cursor: pointer;
}

.tree-node-hight-light {
color: #fff;
border-radius: 4px;
background-color: #feac74 !important;
}

.tree-node-hight-light i {
color: #fff;
background-color: #f5f5f5 !important;
}

.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-hight-light::before {
content: '';
position: absolute;
display: block;
width: 4px;
left: -8px;
top: 2px;
bottom: 2px;
border-radius: 2px;
background-color: #ff9800;
z-index: 0;
}

.tree-node-icon {
.tree-view .tree-node-icon {
padding-right: 1.5rem;
}

.tree-node-text {
.tree-view .tree-node-text {
width: calc(100% - 2.5rem);
font-size: 14px;
white-space: nowrap;
Expand All @@ -90,7 +92,18 @@
line-height: 24px;
}

.tree-view {
padding: 12px 12px 12px 0;
flex: 1 1;
.tree-view .dropdown .right-icon {
width: 20px;
height: 20px;
border-radius: 3px;
cursor: pointer;
display: flex;
justify-content: center;
align-items: center;
color: #666;
margin-top: 2px;
}

.tree-view .dropdown .right-icon:hover {
background-color: #dbdbdb;
}
6 changes: 5 additions & 1 deletion frontend/src/pages/sys-admin/dingtalk-departments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,10 @@ class DingtalkDepartments extends Component {

getDingtalkDepartmentsList = (departmentID) => {
systemAdminAPI.sysAdminListDingtalkDepartments(departmentID).then((res) => {
if (!res.data.department && res.data.errmsg) {
toaster.danger(res.data.errmsg);
return;
}
if (!departmentID) {
let departmentsTree = this.getDepartmentsTree(res.data.department);
this.setState({
Expand Down Expand Up @@ -302,7 +306,7 @@ class DingtalkDepartments extends Component {
<div className="cur-view-path">
<h3 className="sf-heading">{'钉钉集成'}</h3>
</div>
<div className="cur-view-content d-flex flex-row">
<div className="cur-view-content d-flex flex-row p-0">
<DingtalkDepartmentsTreePanel
departmentsTree={this.state.departmentsTree}
isTreeLoading={this.state.isTreeLoading}
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/sys-admin/dingtalk/dingtalk-departments-tree-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,14 @@ class DingtalkDepartmentsTreeNode extends Component {
style={this.state.active ? {} : { opacity: 0 }}
>
<DropdownToggle
tag='i'
className='sf3-font sf3-font-more-vertical cursor-pointer attr-action-icon'
tag='span'
className='cursor-pointer right-icon'
title={gettext('More operations')}
aria-label={gettext('More operations')}
data-toggle="dropdown"
aria-expanded={this.state.dropdownOpen}
>
<i className="sf3-font sf3-font-more"></i>
</DropdownToggle>
<DropdownMenu className="drop-list" right={true}>
<DropdownItem
Expand Down
11 changes: 3 additions & 8 deletions frontend/src/pages/sys-admin/dingtalk/dingtalk-departments-tree-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,14 @@ const DingtalkDepartmentsTreePanelPropTypes = {
};

class DingtalkDepartmentsTreePanel extends Component {

constructor(props) {
super(props);
}

render() {
const { departmentsTree } = this.props;
return (
<div className="dir-content-nav">
<div className="tree-view tree">
<div className="tree-view p-4">
{this.props.isTreeLoading ?
<Loading/> :
<div className="tree-node">
<>
{departmentsTree.length > 0 && departmentsTree.map((department, index) => {
return (
<DingtalkDepartmentsTreeNode
Expand All @@ -38,7 +33,7 @@ class DingtalkDepartmentsTreePanel extends Component {
/>
);
})}
</div>
</>
}
</div>
</div>
Expand Down
6 changes: 5 additions & 1 deletion frontend/src/pages/sys-admin/work-weixin-departments.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,10 @@ class WorkWeixinDepartments extends Component {

getWorkWeixinDepartmentsList = (departmentID) => {
systemAdminAPI.sysAdminListWorkWeixinDepartments(departmentID).then((res) => {
if (!res.data.department && res.data.errmsg) {
toaster.danger(res.data.errmsg);
return;
}
if (!departmentID) {
let departmentsTree = this.getDepartmentsTree(res.data.department);
this.setState({
Expand Down Expand Up @@ -302,7 +306,7 @@ class WorkWeixinDepartments extends Component {
<div className="cur-view-path">
<h3 className="sf-heading">{'企业微信集成'}</h3>
</div>
<div className="cur-view-content d-flex flex-row">
<div className="cur-view-content d-flex flex-row p-0">
<WorkWeixinDepartmentsTreePanel
departmentsTree={this.state.departmentsTree}
isTreeLoading={this.state.isTreeLoading}
Expand Down
5 changes: 3 additions & 2 deletions frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-node.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,13 +115,14 @@ class WorkWeixinDepartmentsTreeNode extends Component {
style={this.state.active ? {} : { opacity: 0 }}
>
<DropdownToggle
tag='i'
className='sf3-font sf3-font-more-vertical cursor-pointer attr-action-icon'
tag='span'
className='cursor-pointer right-icon'
title={gettext('More operations')}
aria-label={gettext('More operations')}
data-toggle="dropdown"
aria-expanded={this.state.dropdownOpen}
>
<i className="sf3-font sf3-font-more"></i>
</DropdownToggle>
<DropdownMenu className="drop-list" right={true}>
<DropdownItem
Expand Down
11 changes: 3 additions & 8 deletions frontend/src/pages/sys-admin/work-weixin/work-weixin-departments-tree-panel.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,19 +12,14 @@ const WorkWeixinDepartmentsTreePanelPropTypes = {
};

class WorkWeixinDepartmentsTreePanel extends Component {

constructor(props) {
super(props);
}

render() {
const { departmentsTree } = this.props;
return (
<div className="dir-content-nav">
<div className="tree-view tree">
<div className="tree-view p-4">
{this.props.isTreeLoading ?
<Loading/> :
<div className="tree-node">
<>
{departmentsTree.length > 0 && departmentsTree.map((department, index) => {
return (
<WorkWeixinDepartmentsTreeNode
Expand All @@ -38,7 +33,7 @@ class WorkWeixinDepartmentsTreePanel extends Component {
/>
);
})}
</div>
</>
}
</div>
</div>
Expand Down