* Finish task #112809.

This commit is contained in:
songchenxuan
2024-03-04 15:45:24 +08:00
parent 0ffa6823d3
commit 01aa5e90db
3 changed files with 18 additions and 10 deletions
+3 -2
View File
@@ -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'),
+7
View File
@@ -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;}
+8 -8
View File
@@ -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}&param=$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'));