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

* Refactor the showImport function.

Browse Source
This commit is contained in:
daitingting
2023-09-21 02:44:45 +00:00
parent bce6eaa17c
commit 4f118eb7c1
3 changed files with 304 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/caselib/control.php
+33 -214
View File
@@ -373,7 +373,7 @@ class caselib extends control
$fields = $this->testcase->getImportFields();
$fields = array_flip($fields);
list($header, $columns) = $this->caselibZen->getImportHeaderAndColumns($fileName);
list($header, $columns) = $this->caselibZen->getImportHeaderAndColumns($fileName, $fields);
if(count($columns) != count($header) || $this->post->encode != 'utf-8')
{
@@ -382,7 +382,7 @@ class caselib extends control
$fc = helper::convertEncoding($fc, $encode, 'utf-8');
file_put_contents($fileName, $fc);
list($header, $colums) = $this->caseZen->getImportHeaderAndColumns($fileName);
list($header, $columns) = $this->caselibZen->getImportHeaderAndColumns($fileName, $fields);
if(count($columns) != count($header)) return $this->send(array('result' => 'fail', 'message' => $this->lang->testcase->errorEncode));
}
@@ -395,16 +395,17 @@ class caselib extends control
}
/**
* 展示导入的用例记录。
* Show import case.
*
* @param int $libID
* @param int $pagerID
* @param int $pageID
* @param int $maxImport
* @param string|int $insert 0 is covered old, 1 is insert new.
* @access public
* @return void
*/
public function showImport($libID, $pagerID = 1, $maxImport = 0, $insert = '')
public function showImport(int $libID, int $pageID = 1, int $maxImport = 0, string|int $insert = '')
{
$this->loadModel('testcase');
@@ -415,15 +416,11 @@ class caselib extends control
if($_POST)
{
$this->caselib->createFromImport($libID);
if($this->post->isEndPage)
{
@unlink($tmpFile);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => inlink('browse', "libID=$libID")));
}
else
{
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => inlink('showImport', "libID=$libID&pagerID=" . ((int)$this->post->pagerID + 1) . "&maxImport=$maxImport&insert=" . zget($_POST, 'insert', ''))));
}
if(!$this->post->isEndPage) return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => inlink('showImport', "libID=$libID&pageID=" . ((int)$this->post->pageID + 1) . "&maxImport=$maxImport&insert=" . zget($_POST, 'insert', ''))));
@unlink($tmpFile);
return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'load' => inlink('browse', "libID=$libID")));
}
$libraries = $this->caselib->getLibraries();
@@ -431,211 +428,33 @@ class caselib extends control
$this->caselib->setLibMenu($libraries, $libID);
$caseLang = $this->lang->testcase;
$caseConfig = $this->config->testcase;
$modules = $this->loadModel('tree')->getOptionMenu($libID, $viewType = 'caselib', $startModuleID = 0);
$fields = $this->caselibZen->getFieldsForImport();
$fields = explode(',', $caseConfig->exportFields);
foreach($fields as $key => $fieldName)
list($caseData, $stepData, $stepVars) = $this->caselibZen->getDataForImport($maxImport, $tmpFile, $fields);
if(empty($maxImport) || !file_exists($tmpFile)) $pageID = 1;
$this->caselibZen->responseAfterShowImport($libID, $caseData, $maxImport, $pageID, $stepVars);
$totalPages = 1;
$totalAmount = count($caseData);
if($totalAmount > $this->config->file->maxImport && $maxImport)
{
$fieldName = trim($fieldName);
$fields[$fieldName] = isset($caseLang->$fieldName) ? $caseLang->$fieldName : $fieldName;
unset($fields[$key]);
$totalPages = ceil($totalAmount / $maxImport);
$caseData = array_slice($caseData, ($pageID - 1) * $maxImport, $maxImport, true);
}
$fields = array_flip($fields);
if(!empty($maxImport) and file_exists($tmpFile))
{
$data = unserialize(file_get_contents($tmpFile));
$caseData = $data['caseData'];
$stepData = $data['stepData'];
}
else
{
$pagerID = 1;
$rows = $this->loadModel('file')->parseCSV($file);
$header = array();
foreach($rows[0] as $i => $rowValue)
{
if(empty($rowValue)) break;
$header[$i] = $rowValue;
}
unset($rows[0]);
foreach($header as $title)
{
if(!isset($fields[$title])) continue;
$columnKey[] = $fields[$title];
}
$endField = end($fields);
$caseData = array();
$stepData = array();
$stepVars = 0;
foreach($rows as $row => $data)
{
$case = new stdclass();
foreach($columnKey as $key => $field)
{
if(!isset($data[$key])) continue;
$cellValue = $data[$key];
if($field == 'module')
{
$case->$field = 0;
if(strrpos($cellValue, '(#') !== false)
{
$id = trim(substr($cellValue, strrpos($cellValue,'(#') + 2), ')');
$case->$field = $id;
}
}
elseif(in_array($field, $caseConfig->export->listFields))
{
if($field == 'stage')
{
$stages = explode("\n", $cellValue);
foreach($stages as $stage) $case->stage[] = array_search($stage, $caseLang->{$field . 'List'});
$case->stage = join(',', $case->stage);
}
else
{
$case->$field = array_search($cellValue, $caseLang->{$field . 'List'});
}
}
elseif($field != 'stepDesc' and $field != 'stepExpect')
{
$case->$field = $cellValue;
}
else
{
$steps = (array)$cellValue;
if(strpos($cellValue, "\n"))
{
$steps = explode("\n", $cellValue);
}
elseif(strpos($cellValue, "\r"))
{
$steps = explode("\r", $cellValue);
}
$stepKey = str_replace('step', '', strtolower($field));
$caseStep = array();
foreach($steps as $step)
{
$step = trim($step);
if(empty($step)) continue;
if(preg_match('/^(([0-9]+)\.[0-9]+)([.、]{1})/U', $step, $out))
{
$num = $out[1];
$parent = $out[2];
$sign = $out[3];
$signbit = $sign == '.' ? 1 : 3;
$step = trim(substr($step, strlen($num) + $signbit));
if(!empty($step))
{
$caseStep[$num]['content'] = $step;
$caseStep[$num]['number'] = $num;
}
$caseStep[$num]['type'] = 'item';
$caseStep[$parent]['type'] = 'group';
}
elseif(preg_match('/^([0-9]+)([.、]{1})/U', $step, $out))
{
$num = $out[1];
$sign = $out[2];
$signbit = $sign == '.' ? 1 : 3;
$step = trim(substr($step, strlen($num) + $signbit));
if(!empty($step))
{
$caseStep[$num]['content'] = $step;
$caseStep[$num]['number'] = $num;
}
$caseStep[$num]['type'] = 'step';
}
elseif(isset($num))
{
if(!isset($caseStep[$num]['content'])) $caseStep[$num]['content'] = '';
$caseStep[$num]['content'] .= "\n" . $step;
}
else
{
if($field == 'stepDesc')
{
$num = 1;
$caseStep[$num]['content'] = $step;
$caseStep[$num]['type'] = 'step';
$caseStep[$num]['number'] = $num;
}
if($field == 'stepExpect' and isset($stepData[$row]['desc']))
{
end($stepData[$row]['desc']);
$num = key($stepData[$row]['desc']);
$caseStep[$num]['content'] = $step;
$caseStep[$num]['number'] = $num;
}
}
}
unset($num);
unset($sign);
$stepVars += count($caseStep, COUNT_RECURSIVE) - count($caseStep);
$stepData[$row][$stepKey] = array_values($caseStep);
}
}
if(empty($case->title)) continue;
$caseData[$row] = $case;
unset($case);
}
$data['caseData'] = $caseData;
$data['stepData'] = $stepData;
file_put_contents($tmpFile, serialize($data));
}
if(empty($caseData))
{
unlink($this->session->fileImport);
unset($_SESSION['fileImport']);
echo js::alert($this->lang->error->noData);
return print(js::locate($this->createLink('caselib', 'browse', "libID=$libID")));
}
$allCount = count($caseData);
$allPager = 1;
if($allCount > $this->config->file->maxImport)
{
if(empty($maxImport))
{
$this->view->allCount = $allCount;
$this->view->maxImport = $maxImport;
$this->view->libID = $libID;
return print($this->display());
}
$allPager = ceil($allCount / $maxImport);
$caseData = array_slice($caseData, ($pagerID - 1) * $maxImport, $maxImport, true);
}
if(empty($caseData)) return print(js::locate(inlink('browse', "libID=$libID")));
/* Judge whether the items is too large and set session. */
$countInputVars = count($caseData) * 9 + (isset($stepVars) ? $stepVars : 0);
$showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
if($showSuhosinInfo) $this->view->suhosinInfo = extension_loaded('suhosin') ? sprintf($this->lang->suhosinInfo, $countInputVars) : sprintf($this->lang->maxVarsInfo, $countInputVars);
$this->view->title = $this->lang->caselib->common . $this->lang->colon . $this->lang->testcase->showImport;
$this->view->modules = $modules;
$this->view->cases = $this->dao->select('id,module,stage,status,pri,type')->from(TABLE_CASE)->where('lib')->eq($libID)->andWhere('deleted')->eq(0)->andWhere('product')->eq(0)->fetchAll('id');
$this->view->caseData = $caseData;
$this->view->stepData = $stepData;
$this->view->libID = $libID;
$this->view->isEndPage = $pagerID >= $allPager;
$this->view->allCount = $allCount;
$this->view->allPager = $allPager;
$this->view->pagerID = $pagerID;
$this->view->maxImport = $maxImport;
$this->view->dataInsert = $insert;
$this->view->title = $this->lang->caselib->common . $this->lang->colon . $this->lang->testcase->showImport;
$this->view->cases = $this->dao->select('id,module,stage,status,pri,type')->from(TABLE_CASE)->where('lib')->eq($libID)->andWhere('deleted')->eq(0)->andWhere('product')->eq(0)->fetchAll('id');
$this->view->modules = $this->loadModel('tree')->getOptionMenu($libID, $viewType = 'caselib', $startModuleID = 0);
$this->view->caseData = $caseData;
$this->view->stepData = $stepData;
$this->view->libID = $libID;
$this->view->isEndPage = $pageID >= $totalPages;
$this->view->totalAmount = $totalAmount;
$this->view->totalPages = $totalPages;
$this->view->pageID = $pageID;
$this->view->maxImport = $maxImport;
$this->view->dataInsert = $insert;
$this->display();
}
}
module/caselib/ui/showimport.html.php
+6 -1
View File
@@ -93,6 +93,11 @@ $items[] = array
'width' => '320px'
);
foreach($caseData as $case)
{
if(empty($case->id) || !isset($cases[$case->id])) $case->id = 0;
}
formBatchPanel
(
set::title($lang->caselib->import),
@@ -102,7 +107,7 @@ formBatchPanel
set::actionsText(false),
set::onRenderRow(jsRaw('handleRenderRow')),
input(set::className('hidden'), set::name('isEndPage'), set::value($isEndPage ? '1' : '0')),
input(set::className('hidden'), set::name('pagerID'), set::value($pagerID)),
input(set::className('hidden'), set::name('pageID'), set::value($pageID)),
$dataInsert !== '' ? input(set::className('hidden'), set::name('insert'), set::value($dataInsert)) : null
);
module/caselib/zen.php
+265 -3
View File
@@ -237,7 +237,7 @@ class caselibZen extends caselib
* @access protected
* @return array
*/
protected function getRowsForExportTemplate(int $num = 0, array $modules): array
protected function getRowsForExportTemplate(int $num, array $modules): array
{
$rows = array();
for($i = 0; $i < $num; $i++)
@@ -266,11 +266,12 @@ class caselibZen extends caselib
* 获取导入文件的表头字段和列。
* Get header and columns from import file.
*
* @param string $fileName
* @param string $fileName
* @param array $fields
* @access protected
* @return array
*/
protected function getImportHeaderAndColumns(string $fileName): array
protected function getImportHeaderAndColumns(string $fileName, array $fields): array
{
$rows = $this->loadModel('file')->parseCSV($fileName);
@@ -290,4 +291,265 @@ class caselibZen extends caselib
return array($header, $columns);
}
/**
* 获得用例的步骤和预期结果。
* Get steps and expects from import file.
*
* @param string $field
* @param int $row
* @param string $cellValue
* @access protected
* @return array
*/
protected function getStepsAndExpectsFromImportFile(string $field, int $row, string $cellValue): array
{
if(strpos($cellValue, "\n")) $steps = explode("\n", $cellValue);
if(strpos($cellValue, "\r")) $steps = explode("\r", $cellValue);
$caseStep = array();
foreach($steps as $step)
{
$step = trim($step);
if(empty($step)) continue;
if(preg_match('/^(([0-9]+)\.[0-9]+)([.、]{1})/U', $step, $out))
{
$num = $out[1];
$parent = $out[2];
$sign = $out[3] == '.' ? 1 : 3;
$step = trim(substr($step, strlen($num) + $sign));
if(!empty($step))
{
$caseStep[$num]['content'] = $step;
$caseStep[$num]['number'] = $num;
}
$caseStep[$num]['type'] = 'item';
$caseStep[$parent]['type'] = 'group';
}
elseif(preg_match('/^([0-9]+)([.、]{1})/U', $step, $out))
{
$num = $out[1];
$sign = $out[2] == '.' ? 1 : 3;
$step = trim(substr($step, strlen($num) + $sign));
if(!empty($step))
{
$caseStep[$num]['content'] = $step;
$caseStep[$num]['number'] = $num;
}
$caseStep[$num]['type'] = 'step';
}
elseif(isset($num))
{
if(!isset($caseStep[$num]['content'])) $caseStep[$num]['content'] = '';
$caseStep[$num]['content'] .= "\n" . $step;
}
else
{
if($field == 'stepDesc')
{
$num = 1;
$caseStep[$num]['content'] = $step;
$caseStep[$num]['type'] = 'step';
$caseStep[$num]['number'] = $num;
}
if($field == 'stepExpect' && isset($stepData[$row]['desc']))
{
end($stepData[$row]['desc']);
$num = key($stepData[$row]['desc']);
$caseStep[$num]['content'] = $step;
$caseStep[$num]['number'] = $num;
}
}
}
unset($num);
unset($sign);
return $caseStep;
}
/**
* 获取导入用例的字段。
* Get fields for import test case.
*
* @access protected
* @return array
*/
protected function getFieldsForImport(): array
{
$fields = explode(',', $this->config->testcase->exportFields);
foreach($fields as $key => $fieldName)
{
$fieldName = trim($fieldName);
$fields[$fieldName] = zget($this->lang->testcase, $fieldName);
unset($fields[$key]);
}
return array_flip($fields);
}
/**
* 获取展示导入用例的列。
* Get columns for show import.
*
* @param array $firstRow
* @param array $fields
* @access protected
* @return array
*/
protected function getColumnsForShowImport(array $firstRow, array $fields): array
{
/* 获取表头和列。*/
$header = array();
foreach($firstRow as $i => $rowValue)
{
if(empty($rowValue)) break;
$header[$i] = $rowValue;
}
$columns = array();
foreach($header as $title)
{
if(!isset($fields[$title])) continue;
$columns[] = $fields[$title];
}
return $columns;
}
/**
* 获取导入用例的数据。
* Get data for import testcase.
*
* @param int $maxImport
* @param string $tmpFile
* @param array $fields
* @access protected
* @return array
*/
protected function getDataForImport(int $maxImport, string $tmpFile, array $fields): array
{
$stepVars = 0;
if(!empty($maxImport) && file_exists($tmpFile))
{
$data = unserialize(file_get_contents($tmpFile));
return array($data['caseData'], $data['stepData'], $stepVars);
}
$rows = $this->loadModel('file')->parseCSV($this->session->fileImport);
$columns = $this->getColumnsForShowImport($rows[0],$fields);
unset($rows[0]);
$caseData = array();
$stepData = array();
foreach($rows as $row => $data)
{
$case = new stdclass();
foreach($columns as $key => $field)
{
if(!isset($data[$key])) continue;
$cellValue = $data[$key];
$case->$field = $cellValue;
if($field == 'module') $case->$field = strrpos($cellValue, '(#') !== false ? trim(substr($cellValue, strrpos($cellValue, '(#') + 2), ')') : 0;
if(in_array($field, $this->config->testcase->export->listFields))
{
if($field == 'stage')
{
$stages = explode("\n", $cellValue);
$case->stage = array();
foreach($stages as $stage) $case->stage[] = array_search($stage, $this->lang->testcase->stageList);
$case->stage = join(',', $case->stage);
}
else
{
$case->$field = array_search($cellValue, $this->lang->testcase->{$field . 'List'});
}
}
if($field == 'stepDesc' || $field == 'stepExpect')
{
$caseStep = $this->getStepsAndExpectsFromImportFile($field, $row, $cellValue);
$stepKey = str_replace('step', '', strtolower($field));
$stepData[$row][$stepKey] = array_values($caseStep);
$stepVars += count($caseStep, COUNT_RECURSIVE) - count($caseStep);
unset($case->$field);
}
}
if(empty($case->title)) continue;
$caseData[$row] = $case;
}
$data = array('caseData' => $caseData, 'stepData' => $stepData);
file_put_contents($tmpFile, serialize($data));
return array($caseData, $stepData, $stepVars);
}
/**
* 导入用例的返回。
* Response after show import.
*
* @param int $libID
* @param array $caseData
* @param int $maxImport
* @param int $pageID
* @param int $stepVars
* @access protected
* @return bool
*/
protected function responseAfterShowImport(int $libID, array $caseData, int $maxImport, int $pageID, int $stepVars)
{
/* 如果没有用例数据时返回。*/
/* Response when there is no case. */
if(empty($caseData))
{
unlink($this->session->fileImport);
unset($_SESSION['fileImport']);
return $this->send(array('result'=>'fail', 'message' => $this->lang->error->noData, 'load' => $this->createLink('caselib', 'browse', "libID=$libID")));
}
/* 如果导入的用例多余设置的最大导入数。*/
/* If the total amount of the import case is more than the max import. */
$totalAmount = count($caseData);
if($totalAmount > $this->config->file->maxImport)
{
/* 如果没有限制每页的导入数量，按照默认最大导入数分页导入。*/
/* If there is no limit for import, limit as the max import in config. */
if(empty($maxImport))
{
$this->view->totalAmount = $totalAmount;
$this->view->maxImport = $maxImport;
$this->view->libID = $libID;
return print($this->display());
}
$caseData = array_slice($caseData, ($pageID - 1) * $maxImport, $maxImport, true);
}
if(empty($caseData)) return $this->send(array('result'=>'success', 'load' => $this->createLink('caselib', 'browse', "libID=$libID")));
$countInputVars = count($caseData) * 9 + (isset($stepVars) ? $stepVars : 0);
$showSuhosinInfo = common::judgeSuhosinSetting($countInputVars);
if($showSuhosinInfo)
{
$this->view->suhosinInfo = sprintf((extension_loaded('suhosin') ? $this->lang->suhosinInfo : $this->lang->maxVarsInfo), $countInputVars);
return $this->display();
}
return true;
}
}