From 40863edf0e70c2355df8356e12db40dd97d74c2d Mon Sep 17 00:00:00 2001 From: sunguangming Date: Tue, 11 Jul 2023 16:33:48 +0800 Subject: [PATCH] * Code for product menu link. --- lib/zin/wg/productmenu/css/v1.css | 1 + module/testcase/ui/header.html.php | 13 ++----------- 2 files changed, 3 insertions(+), 11 deletions(-) diff --git a/lib/zin/wg/productmenu/css/v1.css b/lib/zin/wg/productmenu/css/v1.css index 0f7ccbc783..c130b2a8d4 100644 --- a/lib/zin/wg/productmenu/css/v1.css +++ b/lib/zin/wg/productmenu/css/v1.css @@ -4,6 +4,7 @@ .product-menu.is-open > .icon.is-leading {color: var(--color-canvas); background: var(--color-primary-500); transform: rotate(-90deg);} .product-menu > .is-caret {width: 20px; margin-right: -8px; transition: background-color .2s; border-radius: var(--radius)} .product-menu[data-value=""] > .is-caret, +.product-menu[data-value="all"] > .is-caret, .product-menu[data-value="0"] > .is-caret {display: none;} .product-menu > .is-caret:hover {color: var(--color-primary-500); background: var(--color-primary-100);} .product-menu > .is-caret > .caret {display: none;} diff --git a/module/testcase/ui/header.html.php b/module/testcase/ui/header.html.php index 3e50366edc..9ed49e4505 100644 --- a/module/testcase/ui/header.html.php +++ b/module/testcase/ui/header.html.php @@ -101,15 +101,6 @@ if($canDisplaySuite) $linkParams = $projectParam . "productID=$productID&branch=$branch&browseType={key}¶m=0&caseType={$caseType}"; $browseLink = createLink('testcase', 'browse', $linkParams); if($rawMethod == 'browseunits') $browseLink = createLink('testtask', 'browseUnits', "productID=$productID&browseType={key}"); -$productMenuLink = createLink( - $this->app->rawModule, - $this->app->rawMethod, - array( - 'productID' => $projectID, - 'branch' => $branch, - 'browseType' => '{key}', - ) -); featureBar ( set::linkParams($rawMethod == 'zerocase' || $rawMethod == 'browseunits' ? null : $linkParams), @@ -121,8 +112,8 @@ featureBar ( set::title($currentTypeName), set::items($caseTypeItems), - set::activeKey($browseType), - set::link($productMenuLink), + set::activeKey($caseType), + set::link($this->createLink('testcase', 'browse', "productID=$productID&branch=$branch&browseType=$browseType¶m=$param")), set::closeLink('#'), ) ) : null,