diff --git a/module/group/css/editmanagepriv.css b/module/group/css/editmanagepriv.css index d31496b93d..d29218a30d 100644 --- a/module/group/css/editmanagepriv.css +++ b/module/group/css/editmanagepriv.css @@ -2,7 +2,7 @@ .flex-center {display: flex; justify-content: center; align-items: center;} .flex-space-center {display: flex; justify-content: space-between; align-items: center;} #mainContent {display: flex; gap: 16px; height: calc(100vh - 120px)} -#mainContent > .main {flex: 1 1 75%; overflow-y: auto;} +#mainContent > .main {flex: 1 1 75%; overflow-y: auto; min-height: 480px;} #mainContent > .side {flex: 1 1 25%;} .priv-panel {background: #fff; padding: 10px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);} @@ -10,9 +10,9 @@ .priv-panel > .panel-bottom {padding-top: 20px;} /* permission-table */ -/* .permission-head {padding-right: 20px;}*/ #permissionEditForm tr {display: flex;} .flex-sm {flex: 1 1 15%;} +.flex-md {flex: 1 1 30%;} .flex-content {flex: 1 1 70%;} .sorter-group {display: flex; flex-wrap: wrap;} .sorter-group > .group-item {flex: 0 0 25%; overflow: hidden;} diff --git a/module/group/js/editmanagepriv.js b/module/group/js/editmanagepriv.js index ba5030c125..498b033c82 100644 --- a/module/group/js/editmanagepriv.js +++ b/module/group/js/editmanagepriv.js @@ -51,9 +51,23 @@ function initDependTree(data) function updatePrivTree(objTree) { $(".menuTree.depend").data('zui.tree').reload(objTree.dependData || [] ); - if(objTree.dependData && objTree.dependData.length) $(".menuTree.depend + .empty-tip").addClass('hidden'); + if(objTree.dependData && objTree.dependData.length) + { + $(".menuTree.depend + .empty-tip").addClass('hidden'); + } + else + { + $(".menuTree.depend + .empty-tip").removeClass('hidden'); + } $(".menuTree.recommend").data('zui.tree').reload(objTree.recommendData || []); - if(objTree.recommendData && objTree.recommendData.length) $(".menuTree.recommend + .empty-tip").addClass('hidden'); + if(objTree.recommendData && objTree.recommendData.length) + { + $(".menuTree.recommend + .empty-tip").addClass('hidden'); + } + else + { + $(".menuTree.recommend + .empty-tip").removeClass('hidden'); + } }; $(function()