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

- [refac] remove unused code because the onlyScene function has been seperated into the browseScene method.

Browse Source
This commit is contained in:
liugang
2025-07-10 14:36:33 +08:00
parent 87884af7f8
commit 139dfb3ee9
1 changed files with 3 additions and 45 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/testcase/zen.php
+3 -45
View File
@@ -452,11 +452,10 @@ class testcaseZen extends testcase
* @param int $recTotal
* @param int $recPerPage
* @param int $pageID
* @param string $from
* @access protected
* @return void
*/
protected function assignCasesAndScenesForBrowse(int $productID, string $branch, string $browseType, int $queryID, int $moduleID, string $caseType, string $orderBy, int $recTotal, int $recPerPage, int $pageID, string $from = 'testcase'): void
protected function assignCasesAndScenesForBrowse(int $productID, string $branch, string $browseType, int $queryID, int $moduleID, string $caseType, string $orderBy, int $recTotal, int $recPerPage, int $pageID): void
{
$this->app->loadClass('pager', $static = true);
$pager = new pager($recTotal, $recPerPage, $pageID);
@@ -465,49 +464,8 @@ class testcaseZen extends testcase
$scenes = array();
$sort = common::appendOrder($orderBy);
if(strpos($sort, 'caseID') !== false) $sort = str_replace('caseID', 'id', $sort);
if($browseType == 'all' || $browseType == 'onlyscene')
{
$pager->pageID = $pageID; // 场景和用例混排，$pageID 可能大于场景分页后的总页数。在 pager 构造函数中会被设为 1，这里要重新赋值。
$scenes = $this->testcase->getSceneGroups($productID, $branch, $browseType, $moduleID, $caseType, $sort, $pager); // 获取包含子场景和用例的顶级场景树。
if($browseType == 'all')
{
$recPerPage = $pager->recPerPage;
$sceneTotal = $pager->recTotal;
$sceneCount = count($scenes);
/* 场景条数小于每页记录数，继续获取用例。 */
if($sceneCount < $recPerPage)
{
/* 重置 $pager 属性，只获取需要的用例条数。*/
$pager->recTotal = 0;
$pager->recPerPage = $recPerPage - $sceneCount;
if($sceneCount > 0) $pager->pageID = 1; // 查询用例时的分页起始偏移量单独计算，每次查询的页码都设为 1 即可，后面会重新设置页码。
if($sceneCount == 0) $pager->offset = - $sceneTotal; // 场景数为 0 表示本页查询只显示用例，需要计算用例分页的起始偏移量。
$cases = $this->testcase->getTestCases($productID, $branch, $browseType, $queryID, $moduleID, $caseType, $auto = 'no', $sort, $pager, $from);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
}
else
{
/* 场景和用例混排，总记录数需要合并后显示，这里是为了获取用例的总记录数。*/
$cases = $this->testcase->getTestCases($productID, $branch, $browseType, $queryID, $moduleID, $caseType, $auto = 'no', $sort, $pager);
$cases = array();
}
/* 合并场景和用例的总记录数，并重新计算总页数和当前页码。*/
$pager->recTotal += $sceneTotal;
$pager->recPerPage = $recPerPage;
$pager->pageTotal = ceil($pager->recTotal / $recPerPage);
$pager->pageID = $pageID;
}
}
else
{
$cases = $this->testcase->getTestCases($productID, $branch, $browseType, $queryID, $moduleID, $caseType, $auto = 'no', $sort, $pager);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
}
$cases = $this->testcase->getTestCases($productID, $branch, $browseType, $queryID, $moduleID, $caseType, $auto = 'no', $sort, $pager);
$this->loadModel('common')->saveQueryCondition($this->dao->get(), 'testcase', false);
$sceneCount = count($scenes);
$caseCount = count($cases);