* Refactor testcase::importFromLib.

This commit is contained in:
liumengyi
2023-09-05 14:33:10 +08:00
parent faf1210a53
commit 09e1edaf64
7 changed files with 219 additions and 109 deletions
+9 -5
View File
@@ -50,27 +50,30 @@ div
);
$config->testcase->importfromlib->dtable->fieldList['fromModule']['map'] = $libModules;
$config->testcase->importfromlib->dtable->fieldList['branch']['controlItems'] = array();
$config->testcase->importfromlib->dtable->fieldList['module']['controlItems'] = array();
if($product->type == 'normal') unset($config->testcase->importfromlib->dtable->fieldList['branch']);
foreach($cases as $case)
{
$case->fromModule = $case->module;
$caseBranches = $branches;
$caseBranches = array();
$caseBranch = ($branch == 'all' || empty($branch)) ? 0 : $branch;
foreach($caseBranches as $branchID => $branchName)
foreach($branches as $branchID => $branchName)
{
if(empty($canImportModules[$branchID][$case->id]))
{
unset($caseBranches[$branchID]);
if($caseBranch == $branchID) $caseBranch = key($caseBranches);
continue;
}
$caseBranches[] = array('text' => $branchName, 'value' => $branchID);
}
$case->moduleItems = $canImportModules[$caseBranch][$case->id];
$case->branchItems = $caseBranches;
$case->branch = $caseBranch;
if($case->id != key($cases)) $case->module = 'ditto';
}
$footToolbar = array('items' => array(array('text' => $lang->testcase->import, 'btnType' => 'secondary', 'className' => 'import-btn')));
@@ -81,7 +84,6 @@ formBase
set::action(createLink('testcase', 'importFromLib', "product={$productID}&branch={$branch}&libID={$libID}")),
set::actions(array()),
on::change('[name*=branch]', 'updateModules'),
dtable
(
set::cols($config->testcase->importfromlib->dtable->fieldList),
@@ -90,6 +92,7 @@ formBase
set::checkable(true),
set::footToolbar($footToolbar),
set::footPager(usePager()),
set::plugins(array('form')),
)
);
@@ -101,6 +104,7 @@ div
(
zui::width('176px'),
set::name('branch[]'),
set::items($branches),
)
);