Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

+ Add priv tree and actions.

Browse Source
This commit is contained in:
tianshujie
2023-07-25 13:37:16 +08:00
parent 253480dc7c
commit 39ce69603e
4 changed files with 66 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/group/control.php
+1 -2
View File
@@ -305,7 +305,6 @@ class group extends control
}
$excludePrivsIdList = array_diff(array_keys($groupPrivsIdList), $selectedPrivIdList);
$relatedPrivData = $this->group->getRelatedPrivs($selectedPrivIdList, '', $excludePrivsIdList);
unset($privList['index']);
@@ -314,7 +313,7 @@ class group extends control
$this->view->selectPrivs = $selectPrivs;
$this->view->privPackages = $this->group->getPrivManagerPairs('package');
$this->view->selectedPrivIdList = $selectedPrivIdList;
$this->view->relatedPrivData = $relatedPrivData;
$this->view->relatedPrivData = $this->group->getRelatedPrivs($selectedPrivIdList, '', $excludePrivsIdList);
$this->view->excludePrivsIdList = $excludePrivsIdList;
}
elseif($type == 'byModule')
module/group/css/managepriv.ui.css
+18 -11
View File
@@ -4,24 +4,31 @@
#featureBar > .menu {background: unset;}
#versionSelect {flex: 0 1 12%;}
.container #mainContent {padding-top: 0.5rem;}
/* Manage priv by package. */
#mainContainer {gap: 16px; height: calc(100vh - 165px);}
#mainContainer {gap: 16px; height: calc(100vh - 165px); margin: 0;}
#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; z-index: 2;}
#mainContainer .main .btn-group .switchBtn {padding: 6px 10px;}
#mainContainer .main .btn-group .switchBtn:first-child {border-radius: 4px 0px 0px 4px;}
#mainContainer .main .btn-group .switchBtn:last-child {border-radius: 0px 4px 4px 0px;}
.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;}
.priv-panel + .priv-panel .table-empty-tip {padding: calc(30% - 20px) 10px;}
.priv-panel + .priv-panel {margin-top: 16px; height: calc(60% - 16px);}
.priv-panel > .panel-content {height: calc(100% - 25px); overflow-y: auto; padding-left: 4px; margin-top: 10px;}
.priv-panel > .panel-bottom {padding-top: 20px;}
.priv-panel > .panel-title {position: relative;}
.icon-help + .popover {font-weight: 400;}
.menuTree li.has-list:not(:first-child) {margin-top: 20px;}
.side .priv-panel {padding: 16px;}
.side .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%);}
.side .priv-panel {height: 40%;}
.side .priv-panel .table-empty-tip {padding: calc(15% - 10px) 10px;}
.side .priv-panel + .priv-panel .table-empty-tip {padding: calc(30% - 20px) 10px;}
.side .priv-panel + .priv-panel {margin-top: 16px; height: calc(60% - 16px);}
.side .priv-panel > .panel-content {height: calc(100% - 25px); overflow-y: auto; padding-left: 4px; margin-top: 10px;}
.side .priv-panel > .panel-bottom {padding-top: 20px;}
.side .priv-panel > .panel-title {position: relative;}
.side .icon-help + .popover {font-weight: 400;}
.side .menuTree .checkbox-group + .checkbox-group {margin-top: 20px;}
.side .menuTree .checkbox-group ul > li {padding: 5px 0; white-space: nowrap; overflow: hidden;}
.form-actions.priv-footer {padding: 14px; z-index: 11; box-shadow: inset 0 0px 0px rgb(0 0 0 / 10%), 0 0 5px rgb(0 0 0 / 10%); position: relative; min-height: 40px; background: #fff; border-radius: 0 0 4px 4px; margin: 0 !important; margin-bottom: 10px;}
.form-actions.priv-footer button[type=submit] {margin: 0px 20px;}
#main {padding-bottom: 0px;}
#privPackageList tr {border-bottom-width: 0;}
#privPackageList th.module {width: 142px; min-width: 142px; max-width: 142px; background-color: #EDEEF28C; font-weight: 600; padding-left: 20px; border-color: #FFF;}
module/group/model.php
+8 -1
View File
@@ -2389,7 +2389,14 @@ class groupModel extends model
if(!isset($privList[$relatedPriv->type][$module])) $privList[$relatedPriv->type][$module] = array();
$privList[$relatedPriv->type][$module]['title'] = $modulePairs[$module];
$privList[$relatedPriv->type][$module]['id'] = $relatedPriv->parent;
$privList[$relatedPriv->type][$module]['children'][] = array('title' => $relatedPriv->name, 'relationPriv' => $relatedPriv->relationPriv, 'parent' => $relatedPriv->parent, 'module' => $relatedPriv->module, 'method' => $relatedPriv->method);
if($relatedPriv->type == 'recommend')
{
$privList[$relatedPriv->type][$module]['children'][] = array('data-type' => 'recommend', 'text' => $relatedPriv->name, 'id' => "recommendPrivs[{$relatedPriv->module}]{$relatedPriv->method}", 'name' => 'recommendPrivs[]', 'value' => $relatedPriv->relationPriv, 'data-relationPriv' => $relatedPriv->relationPriv, 'parent' => $relatedPriv->parent, 'data-module' => $relatedPriv->module, 'data-method' => $relatedPriv->method, 'data-has-children' => false);
}
else
{
$privList[$relatedPriv->type][$module]['children'][] = array('data-type' => 'depend', 'text' => $relatedPriv->name, 'id' => "dependPrivs[{$relatedPriv->module}]{$relatedPriv->method}", 'name' => 'dependPrivs[]', 'value' => $relatedPriv->relationPriv, 'data-relationPriv' => $relatedPriv->relationPriv, 'parent' => $relatedPriv->parent, 'data-module' => $relatedPriv->module, 'data-method' => $relatedPriv->method, 'data-has-children' => false, 'disabled' => true, 'checked' => true);
}
}
if(empty($type) or $type == 'depend') $privList['depend'] = array_values($privList['depend']);
module/group/ui/privbypackage.html.php
+39
View File
@@ -258,6 +258,26 @@ else
);
}
$dependTree = null;
foreach($relatedPrivData['depend'] as $dependPrivs)
{
$dependTree[] = checkboxGroup
(
set::title(array('text' => $dependPrivs['title'], 'id' => "dependPrivs[{$dependPrivs['id']}]", 'name' => 'dependPrivs[]', 'data-id' => $dependPrivs['id'], 'data-has-children' => !empty($dependPrivs['children']), 'disabled' => true, 'checked' => true)),
!empty($dependPrivs['children']) ? set::items($dependPrivs['children']) : null,
);
}
$recommendTree = null;
foreach($relatedPrivData['recommend'] as $recommendPrivs)
{
$recommendTree[] = checkboxGroup
(
set::title(array('text' => $recommendPrivs['title'], 'id' => "recommendPrivs[{$recommendPrivs['id']}]", 'name' => 'recommendPrivs[]', 'data-id' => $recommendPrivs['id'], 'data-has-children' => !empty($recommendPrivs['children']))),
!empty($recommendPrivs['children']) ? set::items($recommendPrivs['children']) : null,
);
}
div
(
setID('featureBar'),
@@ -315,6 +335,9 @@ else
form
(
setID('managePrivForm'),
formHidden('actions[][]', ''),
formHidden('noChecked', 1),
set::actions(array()),
div
(
setID('mainContainer'),
@@ -391,6 +414,8 @@ else
div
(
setClass('menuTree depend menu-active-primary menu-hover-primary'),
setClass(count($relatedPrivData['depend']) == 0 ? 'hidden' : ''),
$dependTree
),
div
(
@@ -428,6 +453,8 @@ else
div
(
setClass('menuTree recommend menu-active-primary menu-hover-primary'),
setClass(count($relatedPrivData['recommend']) == 0 ? 'hidden' : ''),
$recommendTree
),
div
(
@@ -443,6 +470,18 @@ else
)
)
),
toolbar
(
setClass('form-actions priv-footer'),
checkbox
(
setID('allChecker'),
set::rootClass('check-all'),
set::text($lang->selectAll),
),
btn(set(array('text' => $lang->save, 'btnType' => 'submit', 'type' => 'primary'))),
btn(set(array('text' => $lang->goback, 'url' => createLink('group', 'browse'), 'back' => true))),
),
);
}