diff --git a/lib/zin/wg/modulemenu/v1.php b/lib/zin/wg/modulemenu/v1.php index ccdb45901a..5d77cb4e3b 100644 --- a/lib/zin/wg/modulemenu/v1.php +++ b/lib/zin/wg/modulemenu/v1.php @@ -16,6 +16,7 @@ class moduleMenu extends wg 'showDisplay?: bool=true', 'allText?: string', 'title?: string', + 'titleShow?: bool=true', 'app?: string=""', 'checkbox?: bool', 'checkOnClick?: bool|string', @@ -173,7 +174,7 @@ class moduleMenu extends wg ( setID('moduleMenu'), setClass('shadow-sm rounded bg-canvas col rounded-sm'), - h::header + $this->prop('titleShow') ? h::header ( setClass('h-10 flex items-center pl-4 flex-none gap-3'), span @@ -182,7 +183,7 @@ class moduleMenu extends wg $title ), $this->buildCloseBtn() - ), + ) : null, zui::tree ( set::_tag('menu'), diff --git a/module/metric/css/browse.ui.css b/module/metric/css/browse.ui.css index f1fbdfdbf0..d0777aae46 100644 --- a/module/metric/css/browse.ui.css +++ b/module/metric/css/browse.ui.css @@ -11,7 +11,14 @@ .scope-menu > .is-caret::after {content: '\e936'; font-family: ZentaoIcon;} .btn-divider {background-color: var(--color-current); height: 1rem; margin-left: 20px; margin-right: 20px; opacity: .3; width: 1px;} +#dropmenu {padding-top: 10px; padding-bottom: 10px;} +#dropmenu button:hover {--skin-ghost-rgb: unset;} +#dropmenu button {--skin-ghost-rgb: unset; padding-left: 1rem; padding-right: 2rem;} +#dropmenu button span {font-size: 18px; font-weight: 700;} +#dropmenu button i {font-size: 18px;} +#dropmenu .icon-angle-right {left: unset; right: 0.5rem;} +.listitem.active {background-color: var(--color-primary-100);} .clear-gap {gap: 0 !important;} .dtable-cell-html {width: inherit;} .dtable-name-flex {display: flex; justify-content: space-between;} diff --git a/module/metric/ui/browse.html.php b/module/metric/ui/browse.html.php index b3ee1ae061..053a5dcab3 100755 --- a/module/metric/ui/browse.html.php +++ b/module/metric/ui/browse.html.php @@ -23,7 +23,6 @@ $fnGenerateScopeMenu = function() use ($scope, $scopeText, $scopeList) return dropmenu ( - set::_className('scope-menu btn'), set::defaultValue($scope), set::text($scopeText), set::caret(false), @@ -35,7 +34,6 @@ $fnGenerateScopeMenu = function() use ($scope, $scopeText, $scopeList) featureBar ( - to::before($fnGenerateScopeMenu($scope, $scopeText, $scopeList)), set::current($stage), set::linkParams("scope=$scope&status={key}¶m=$param&type=$type"), li(searchToggle(set::open($type == 'bysearch'), set::module('metric'))) @@ -66,13 +64,15 @@ toolbar sidebar ( - moduleMenu(set(array + moduleMenu ( - 'modules' => $metricTree, - 'activeKey' => $type == 'byTree' ? $param : 0, - 'closeLink' => $closeLink, - 'showDisplay' => false - ))) + to::before(div(setClass('bg-canvas'), $fnGenerateScopeMenu($scope, $scopeText, $scopeList))), + set::titleShow(false), + set::modules($metricTree), + set::activeKey($type == 'byTree' ? $param : 0), + set::closeLink($closeLink), + set::showDisplay(false) + ) ); $tableData = initTableData($metrics, $this->config->metric->dtable->definition->fieldList, $this->loadModel('metric'));