* Finish task #62416,#62417.

This commit is contained in:
liyuchun
2022-07-28 02:27:16 +00:00
parent 3717158870
commit adac1d8ad0
12 changed files with 96 additions and 21 deletions
+21 -19
View File
@@ -968,6 +968,7 @@ $lang->resource->testcase->batchCreate = 'batchCreate';
$lang->resource->testcase->createBug = 'createBug';
$lang->resource->testcase->view = 'view';
$lang->resource->testcase->edit = 'edit';
$lang->resource->testcase->showScript = 'showScript';
$lang->resource->testcase->linkCases = 'linkCases';
$lang->resource->testcase->linkBugs = 'linkBugs';
$lang->resource->testcase->batchEdit = 'batchEdit';
@@ -1000,25 +1001,26 @@ $lang->testcase->methodOrder[25] = 'createBug';
$lang->testcase->methodOrder[30] = 'view';
$lang->testcase->methodOrder[35] = 'edit';
$lang->testcase->methodOrder[40] = 'delete';
$lang->testcase->methodOrder[45] = 'export';
$lang->testcase->methodOrder[50] = 'confirmChange';
$lang->testcase->methodOrder[55] = 'confirmStoryChange';
$lang->testcase->methodOrder[60] = 'batchEdit';
$lang->testcase->methodOrder[65] = 'batchDelete';
$lang->testcase->methodOrder[70] = 'batchChangeModule';
$lang->testcase->methodOrder[75] = 'batchChangeBranch';
$lang->testcase->methodOrder[80] = 'linkCases';
$lang->testcase->methodOrder[82] = 'linkBugs';
$lang->testcase->methodOrder[90] = 'bugs';
$lang->testcase->methodOrder[95] = 'review';
$lang->testcase->methodOrder[100] = 'batchReview';
$lang->testcase->methodOrder[105] = 'batchConfirmStoryChange';
$lang->testcase->methodOrder[110] = 'importFromLib';
$lang->testcase->methodOrder[115] = 'batchCaseTypeChange';
$lang->testcase->methodOrder[120] = 'confirmLibcaseChange';
$lang->testcase->methodOrder[125] = 'ignoreLibcaseChange';
$lang->testcase->methodOrder[130] = 'batchConfirmStoryChange';
$lang->testcase->methodOrder[135] = 'importToLib';
$lang->testcase->methodOrder[45] = 'showScript';
$lang->testcase->methodOrder[50] = 'export';
$lang->testcase->methodOrder[55] = 'confirmChange';
$lang->testcase->methodOrder[60] = 'confirmStoryChange';
$lang->testcase->methodOrder[65] = 'batchEdit';
$lang->testcase->methodOrder[70] = 'batchDelete';
$lang->testcase->methodOrder[75] = 'batchChangeModule';
$lang->testcase->methodOrder[80] = 'batchChangeBranch';
$lang->testcase->methodOrder[85] = 'linkCases';
$lang->testcase->methodOrder[90] = 'linkBugs';
$lang->testcase->methodOrder[95] = 'bugs';
$lang->testcase->methodOrder[100] = 'review';
$lang->testcase->methodOrder[105] = 'batchReview';
$lang->testcase->methodOrder[110] = 'batchConfirmStoryChange';
$lang->testcase->methodOrder[115] = 'importFromLib';
$lang->testcase->methodOrder[120] = 'batchCaseTypeChange';
$lang->testcase->methodOrder[125] = 'confirmLibcaseChange';
$lang->testcase->methodOrder[130] = 'ignoreLibcaseChange';
$lang->testcase->methodOrder[135] = 'batchConfirmStoryChange';
$lang->testcase->methodOrder[140] = 'importToLib';
/* Test task. */
$lang->resource->testtask = new stdclass();
+1 -1
View File
@@ -216,6 +216,6 @@ $config->testcase->datatable->fieldList['stepNumber']['name'] = $lang->testc
$config->testcase->datatable->fieldList['actions']['title'] = 'actions';
$config->testcase->datatable->fieldList['actions']['fixed'] = 'right';
$config->testcase->datatable->fieldList['actions']['width'] = '150';
$config->testcase->datatable->fieldList['actions']['width'] = '180';
$config->testcase->datatable->fieldList['actions']['required'] = 'yes';
$config->testcase->datatable->fieldList['actions']['sort'] = 'no';
+13
View File
@@ -2231,6 +2231,19 @@ class testcase extends control
$this->display();
}
/**
* Show script.
*
* @param int $caseID
* @access public
* @return void
*/
public function showScript($caseID)
{
$this->view->case = $this->testcase->getByID($caseID);
$this->display();
}
/**
* Export case getModuleByStory
*
+3
View File
@@ -0,0 +1,3 @@
.repoCode pre {margin: 0; padding: 0; background: white; border: none;}
.repoCode pre > table > tbody > tr > th, .repoCode pre > table > tbody > tr > td {padding: 1px 3px;}
.repoCode pre > table > tbody > tr > th {border-right: 1px solid #E4E4E4; background: #fafafa; color: #999; width: 40px; text-align: right; vertical-align: top;}
+20
View File
@@ -0,0 +1,20 @@
$(document).ready(function()
{
var $pre = $('.repoCode .content pre');
var rowTip = '';
if($('#rowTip').length > 0) rowTip = $('#rowTip').html();
if($pre.length)
{
hljs.initHighlightingOnLoad();
var content = hljs.highlight($pre.attr('class'), $pre.text());
var code = '', line;
var arr = content.value.split(/\r\n|[\n\v\f\r\x85\u2028\u2029]/);
for(var i = 0 ; i < arr.length ; i++)
{
line = i + 1;
code += "<tr data-line='" + line +"'><th id='L" + line + "'><div class='comment-btn view'></div>" + line + "</th><td>" + (arr[i] || '&nbsp;') + rowTip + "</td></tr>";
}
$pre.html("<table><tbody>" + code + "</tbody></table>");
}
});
+1
View File
@@ -144,6 +144,7 @@ $lang->testcase->step = 'Schritt';
$lang->testcase->stepChild = 'Teilschritt';
$lang->testcase->viewAll = 'Alle anziegen';
$lang->testcase->importToLib = "Import To Library";
$lang->testcase->showScript = 'Show Script';
$lang->testcase->new = 'Neu';
+1
View File
@@ -144,6 +144,7 @@ $lang->testcase->step = 'Steps';
$lang->testcase->stepChild = 'Child Steps';
$lang->testcase->viewAll = 'All Cases';
$lang->testcase->importToLib = "Import To Library";
$lang->testcase->showScript = 'Show Script';
$lang->testcase->new = 'New';
+1
View File
@@ -144,6 +144,7 @@ $lang->testcase->step = 'Etapes';
$lang->testcase->stepChild = 'Sous-Etapes';
$lang->testcase->viewAll = 'Tous les CasTests';
$lang->testcase->importToLib = "Import To Library";
$lang->testcase->showScript = 'Show Script';
$lang->testcase->new = 'Nouveau';
+1
View File
@@ -123,6 +123,7 @@ $lang->testcase->groupName = 'Tên nhóm';
$lang->testcase->step = 'Các bước';
$lang->testcase->stepChild = 'Các bước con';
$lang->testcase->viewAll = 'Tất cả tình huống';
$lang->testcase->showScript = 'Show Script';
$lang->testcase->new = 'Mới';
+2 -1
View File
@@ -143,7 +143,8 @@ $lang->testcase->groupName = '分组名称';
$lang->testcase->step = '步骤';
$lang->testcase->stepChild = '子步骤';
$lang->testcase->viewAll = '查看所有';
$lang->testcase->importToLib = "导入用例库";
$lang->testcase->importToLib = '导入用例库';
$lang->testcase->showScript = '查看自动化脚本';
$lang->testcase->new = '新增';
+1
View File
@@ -2484,6 +2484,7 @@ class testcaseModel extends model
$menu .= $this->buildMenu('testtask', 'results', "runID=0&$params", $case, 'browse', '', '', 'iframe', true, "data-width='95%'");
$menu .= $this->buildMenu('testtask', 'runCase', "runID=0&$params&version=$case->version", $case, 'browse', 'play', '', 'runCase iframe', false, "data-width='95%'");
if($case->auto == 'auto') $menu .= $this->buildMenu('testcase', 'showScript', $params, $case, 'browse', 'file-code', '', 'runCase iframe', false);
$editParams = $params;
if($this->app->tab == 'project') $editParams .= "&comment=false&projectID={$this->session->project}";
+31
View File
@@ -0,0 +1,31 @@
<?php
/**
* The show script view file of testcase of ZenTaoPMS.
*
* @copyright Copyright 2009-2022 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
* @license ZPL(http://zpl.pub/page/zplv12.html) or AGPL(https://www.gnu.org/licenses/agpl-3.0.en.html)
* @author Yuchun Li <liyuchun@easycorp.ltd>
* @package testcase
* @version $Id: showscript.html.php 4723 2022-07-28 08:47:29Z chencongzhi520@gmail.com $
* @link http://www.zentao.net
*/
?>
<?php
include '../../common/view/header.lite.html.php';
css::import($jsRoot . 'misc/highlight/styles/code.css');
js::import($jsRoot . 'misc/highlight/highlight.pack.js');
?>
<div id='mainContent' class='main-content'>
<div class='main-header'>
<h2>
<span class='label label-id'><?php echo $case->id;?></span>
<span title='<?php echo $case->title?>'><?php echo $case->title;?></span>
</h2>
</div>
<div class="main-col repoCode main">
<div class="content panel">
<pre class="cpp"><?php echo trim(htmlSpecialString($case->script, defined('ENT_SUBSTITUTE') ? ENT_QUOTES | ENT_SUBSTITUTE : ENT_QUOTES));?></pre>
</div>
</div>
</div>
<?php include '../../common/view/footer.lite.html.php';?>