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

* Fix bug #44531, modify picker menu in preference.

Browse Source
This commit is contained in:
liumengyi
2024-02-22 10:31:57 +08:00
parent f3b9aaaabd
commit d424929aa0
4 changed files with 23 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/block/css/guideblock.ui.css
+8 -4
View File
@@ -32,8 +32,12 @@
.guide-block .block:hover {box-shadow: 0 0 14px rgba(0, 0, 0, 0.12);}
.guide-block .block.active {box-shadow: 0 0 0 2px #2E7FFF; border-radius: 2px;}
.guide-block .preference-menu.picker-menu-list .menu-item>a.active, .guide-block .picker-menu-list .menu-item>a.hover, .guide-block .picker-menu-list .menu-item>a:hover{background: unset}
.guide-block .preference-menu.picker-menu-list .menu-item>a.active .preference-box{background: var(--menu-active-bg); color: var(--menu-active-color)}
.guide-block .preference-menu.picker-menu-list .menu-item>a:hover .preference-box, .guide-block .picker-menu-list .menu-item>a.hover .preference-box{background: var(--menu-active-bg); color: var(--menu-active-color); box-shadow: 0px 0px 1px 1px #2E7FFF;}
.guide-block .preference-menu.picker-menu-list .menu-item>a.active .preference-box .label, .guide-block .picker-menu-list .menu-item>a:hover .preference-box .label, .guide-block .picker-menu-list .menu-item>a.hover .preference-box .label{background: var(--menu-active-bg); color: var(--menu-active-color);}
.preference-menu.picker-menu-list {padding: 0.25rem;}
.preference-menu.picker-menu-list .menu-item {padding: 0.25rem;}
.preference-menu.picker-menu-list .menu-item > a {padding: 0; border-width: 1px;}
.preference-menu.picker-menu-list .menu-item>a.active, .picker-menu-list .menu-item>a.hover, .picker-menu-list .menu-item>a:hover{background: unset; border-color: var(--color-primary-500);}
.preference-menu.picker-menu-list .menu-item>a:hover:before {opacity: 0;}
.preference-menu.picker-menu-list .menu-item>a.active .preference-box {background: var(--color-primary-50); color: var(--color-primary-500);}
.preference-menu.picker-menu-list .menu-item>a:hover .preference-box, .picker-menu-list .menu-item>a.hover .preference-box{background: var(--color-primary-50); color: var(--color-primary-500); box-shadow: 0px 0px 1px 1px #2E7FFF;}
.preference-menu.picker-menu-list .menu-item>a.active .preference-box .label, .picker-menu-list .menu-item>a:hover .preference-box .label, .picker-menu-list .menu-item>a.hover .preference-box .label{background: var(--menu-active-bg); color: var(--color-primary-500);}
.ursr-menu > li{width: 50%;}
module/block/ui/preference.html.php
+1 -1
View File
@@ -42,7 +42,7 @@ function printPreference(array $URSRList)
$URSRItems = array();
foreach($URSRList as $URSRKey => $URSRValue)
{
$contentHtml = "<div class=''><span class='label light-pale circle mr-4'>{$URSRKey}</span>{$URSRValue}</div>";
$contentHtml = "<div class=''><span class='inline-block primary-pale circle mr-4 text-center h-5 w-5'><p class='leading-5'>{$URSRKey}</p></span>{$URSRValue}</div>";
$URSRItems[] = array('value' => $URSRKey, 'text' => $URSRValue, 'content' => array('html' => $contentHtml, 'class' => 'flex w-full border p-4 preference-box'));
}
module/my/css/preference.ui.css
+8 -4
View File
@@ -1,5 +1,9 @@
.picker-menu-list .menu-item>a.active, .picker-menu-list .menu-item>a.hover, .picker-menu-list .menu-item>a:hover{background: unset}
.picker-menu-list .menu-item>a.active .preference-box{background: var(--menu-active-bg); color: var(--menu-active-color)}
.picker-menu-list .menu-item>a:hover .preference-box, .picker-menu-list .menu-item>a.hover .preference-box{background: var(--menu-active-bg); color: var(--menu-active-color); box-shadow: 0px 0px 1px 1px #2E7FFF;}
.picker-menu-list .menu-item>a.active .preference-box .label, .picker-menu-list .menu-item>a:hover .preference-box .label, .picker-menu-list .menu-item>a.hover .preference-box .label{background: var(--menu-active-bg); color: var(--menu-active-color);}
.preference-menu.picker-menu-list {padding: 0.25rem;}
.preference-menu.picker-menu-list .menu-item {padding: 0.25rem;}
.preference-menu.picker-menu-list .menu-item > a {padding: 0; border-width: 1px;}
.preference-menu.picker-menu-list .menu-item>a.active, .picker-menu-list .menu-item>a.hover, .picker-menu-list .menu-item>a:hover{background: unset; border-color: var(--color-primary-500);}
.preference-menu.picker-menu-list .menu-item>a:hover:before {opacity: 0;}
.preference-menu.picker-menu-list .menu-item>a.active .preference-box {background: var(--color-primary-50); color: var(--color-primary-500);}
.preference-menu.picker-menu-list .menu-item>a:hover .preference-box, .picker-menu-list .menu-item>a.hover .preference-box{background: var(--color-primary-50); color: var(--color-primary-500); box-shadow: 0px 0px 1px 1px #2E7FFF;}
.preference-menu.picker-menu-list .menu-item>a.active .preference-box .label, .picker-menu-list .menu-item>a:hover .preference-box .label, .picker-menu-list .menu-item>a.hover .preference-box .label{background: var(--menu-active-bg); color: var(--color-primary-500);}
.ursr-menu > li{width: 50%;}
module/my/ui/preference.html.php
+6 -2
View File
@@ -35,7 +35,7 @@ $imageList['execution-executionkanban'] = 'kanban';
$URSRItems = array();
foreach($URSRList as $URSRKey => $URSRValue)
{
$contentHtml = "<div class=''><span class='label light-pale circle mr-4'>{$URSRKey}</span>{$URSRValue}</div>";
$contentHtml = "<div class=''><span class='inline-block primary-pale circle mr-4 text-center h-5 w-5'><p class='leading-5'>{$URSRKey}</p></span>{$URSRValue}</div>";
$URSRItems[] = array('value' => $URSRKey, 'text' => $URSRValue, 'content' => array('html' => $contentHtml, 'class' => 'flex w-full border p-4 preference-box'));
}
@@ -62,7 +62,7 @@ formPanel
set::label($lang->my->storyConcept),
picker
(
set('menu', array('class' => 'menu picker-menu-list no-nested-items menu-nested flex flex-wrap content-between ursr-menu')),
set('menu', array('class' => 'menu picker-menu-list no-nested-items menu-nested flex flex-wrap content-between ursr-menu preference-menu')),
set::name('URSR'),
set::required(true),
set::items($URSRItems),
@@ -74,6 +74,7 @@ formPanel
set::label($lang->my->programLink),
picker
(
set('menu', array('class' => 'preference-menu')),
set::name('programLink'),
set::required(true),
set::items($programItems),
@@ -85,6 +86,7 @@ formPanel
set::label($lang->my->productLink),
picker
(
set('menu', array('class' => 'preference-menu')),
set::name('productLink'),
set::required(true),
set::items($productItems),
@@ -96,6 +98,7 @@ formPanel
set::label($lang->my->projectLink),
picker
(
set('menu', array('class' => 'preference-menu')),
set::name('projectLink'),
set::required(true),
set::items($projectItems),
@@ -107,6 +110,7 @@ formPanel
set::label($lang->my->executionLink),
picker
(
set('menu', array('class' => 'preference-menu')),
set::name('executionLink'),
set::required(true),
set::items($executionItems),