From b544a554d705784b25bbeb583cf67796c5e7fb62 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Fri, 14 Apr 2023 09:39:44 +0800
Subject: [PATCH] * Fix bug of manage priv.

---
 module/group/css/managepriv.css | 12 ++++++------
 module/group/js/managepriv.js   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/module/group/css/managepriv.css b/module/group/css/managepriv.css
index 06fb897684..7dc5ec24c5 100644
--- a/module/group/css/managepriv.css
+++ b/module/group/css/managepriv.css
@@ -2,7 +2,7 @@
 #mainContainer {display: flex; gap: 16px; height: calc(100vh - 165px);}
 #mainContainer > .main {flex: 1 1 75%; overflow-y: auto; padding: 0px; border: 1px solid #FFF; box-sizing: content-box;}
 #mainContainer > .side {flex: 1 1 25%;}
-#mainContainer .main .btn-group {position: absolute; visibility: hidden; top: 2px; display: inline-block;}
+#mainContainer .main .btn-group {position: absolute; visibility: hidden; top: 2px; display: inline-block; z-index: 12;}
 .priv-panel {background: #fff; padding: 10px 16px; box-shadow: 0 1px 1px rgb(0 0 0 / 5%), 0 2px 6px 0 rgb(0 0 0 / 5%);}
 .priv-panel {height: 40%;}
 .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;}
@@ -65,18 +65,18 @@ main#main {padding-bottom: 0px;}
 
 #privPackageList th.module {width: 112px; min-width: 112px; max-width: 112px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px; border-color: #FFF;}
 #privPackageList .module label {padding-left: 0; overflow: visible;}
-#privPackageList td.package-column {padding: 10px 16px; background-color: #FFF;}
+#privPackageList td.package-column {padding: 20px 16px; background-color: #FFF;}
 #privPackageList div.package {display: inline-block; width: calc(25% - 5px); padding: 10px 0;}
 #privPackageList .package + .package {padding: 0;}
-#privPackageList .package .check-all {display: inline-block;}
-#privPackageList .package input {margin-left: 0px; left: 0px;}
+#privPackageList .package .check-all {display: inline-block; height: 20px;}
+#privPackageList .package input {margin-left: 0px; left: 0px; height: 20px;}
 #privPackageList .package label {padding-left: 0; display: inline-block;}
-#privPackageList .package .list-toggle {width: 20px; font-size: 14px; line-height: 22px; color: #cbd0db; text-align: center; cursor: pointer; -webkit-transition: all .2s; -o-transition: all .2s; transition: all .2s; vertical-align: top;}
+#privPackageList .package .list-toggle {width: 20px; font-size: 14px; line-height: 20px; color: #cbd0db; text-align: center; cursor: pointer; -webkit-transition: all .2s; -o-transition: all .2s; transition: all .2s; vertical-align: top;}
 #privPackageList .package .list-toggle:before {content: "\f0da";}
 #privPackageList .package.open .list-toggle {transform: rotate(90deg);}
 #privPackageList .package.open .list-toggle:before {transform: rotate(90deg);}
 #privPackageList .group-item {display: inline-block; width: 158px; margin-bottom: 15px;}
-#privPackageList .privs {padding: 20px 20px 0 20px; border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px; z-index: 1;}
+#privPackageList .privs {padding: 20px 20px 0 20px; margin: 10px 0px;border: 1px solid #F5F6F8; background-color: #F9FAFB; position: relative; display: block; max-width: unset; box-shadow: unset; margin-top: 0px; z-index: 1;}
 #privPackageList .popover .popover-content {display: inline-block; padding: 0;}
 #privPackageList .popover .arrow {border-bottom-color: #F5F6F8; top: -10px;}
 #privPackageList .popover .arrow:after {border-bottom-color: #F9FAFB;}
diff --git a/module/group/js/managepriv.js b/module/group/js/managepriv.js
index 24274acf22..514253d1bf 100644
--- a/module/group/js/managepriv.js
+++ b/module/group/js/managepriv.js
@@ -343,7 +343,7 @@ function recommendChange($item, checked)
         $actionItem.removeAttr('checked');
     }
     var moduleName = $actionItem.closest('tr').find('.package').attr('data-module');
-    var packageID  = $actionItem.closest('tr').find('.package').attr('data-package');
+    var packageID  = $('#privList').length > 0 ? $actionItem.closest('tr').find('.package').attr('data-package') : $actionItem.closest('.privs').attr('data-package');
     changeParentChecked($actionItem, moduleName, packageID);
 
     var $parentItem       = $item.closest('ul').closest('li').find('input[data-has-children="true"]');