* Add test task result of job view page.

This commit is contained in:
zhaoke
2023-09-25 10:47:43 +08:00
parent 4f75876dc2
commit ec16f53c40
5 changed files with 33 additions and 17 deletions
+7
View File
@@ -18,5 +18,12 @@ window.renderCell = function(result, {col, row})
return result;
}
if(col.name === 'name')
{
if(row.data.testtask) result[0].props['data-size'] = 'lg';
return result;
}
return result;
};
+10
View File
@@ -0,0 +1,10 @@
$('#jobCases').html("<iframe id='jobTaskResult' src='" + $.createLink('testtask', 'unitCases', 'taskID=' + $('#jobCases').data('task') + '&orderBy=id_desc&onlybody=yes') + "' width='100%' height='0' scrolling='no'></iframe>");
setTimeout(() => {
var height = $('#jobTaskResult').contents().find(".main-table").height();
$('#jobTaskResult').contents().find("#main").css('min-width', 'auto');
$('#jobTaskResult').css('background', 'white');
$('#jobTaskResult').contents().find("#mainMenu").css('display', 'none');
$('#jobTaskResult').contents().find("a").attr('target', '__blank');
$('#jobTaskResult').contents().find(".main-table").css('padding-top', '0');
$('#jobTaskResult').css('height', height + 40 + 'px');
}, 1000);
+1 -5
View File
@@ -117,11 +117,7 @@ detailBody
set::key('job-result'),
set::title($lang->compile->result),
set::active(true),
tableData
(
//TODO;
div('等待 testtask/view/unitgroup.html.php 重构完成,直接替换')
)
div(setID('jobCases'), setData('task', $compile->testtask))
) : '',
$hasLog ? tabPane
(
+14 -12
View File
@@ -14,6 +14,8 @@ $showVersion = getenv('ALLOW_SELECT_VERSION') && (strtolower(getenv('ALLOW_SELEC
$dbTypeItems = array();
foreach($lang->instance->dbTypes as $type => $db) $dbTypeItems[] = array('text' => $db, 'value' => $type);
$colWidth = isInModal() ? 'full' : '2/3';
jsVar('gitlabUrlTips', $lang->gitlab->placeholder->url);
jsVar('gitlabTokenTips', $lang->gitlab->placeholder->token);
jsVar('sonarqubeUrlTips', $lang->sonarqube->placeholder->url);
@@ -43,7 +45,7 @@ if($config->inQuickon)
setStyle('display', $appID ? 'none' : 'block'),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->app->common),
set::name('storeAppType'),
set::items($apps),
@@ -73,7 +75,7 @@ if($config->inQuickon)
setStyle('display', 'block'),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->instance->name),
set::name('customName'),
set::control('input'),
@@ -83,7 +85,7 @@ if($config->inQuickon)
),
$showVersion ? formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->instance->version),
set::name('version'),
set::required(true),
@@ -91,7 +93,7 @@ if($config->inQuickon)
set::items($versionList)
) : formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->instance->version),
set::name('app_version'),
set::required(true),
@@ -106,7 +108,7 @@ if($config->inQuickon)
(
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->instance->domain),
set::required(true),
inputGroup
@@ -148,7 +150,7 @@ if($config->inQuickon)
setClass('dbType dbService'),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->space->instanceType),
set::name('dbService'),
set::items(array()),
@@ -167,7 +169,7 @@ formPanel
set::actionsClass('w-2/3'),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->app->common),
set::name('appType'),
set::items($lang->space->appType),
@@ -186,14 +188,14 @@ formPanel
) : null,
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->gitlab->name),
set::name('name'),
set::required(true),
),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->gitlab->url),
set::name('url'),
set::required(true),
@@ -204,7 +206,7 @@ formPanel
setClass('jenkins sonarqube hidden'),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->user->account),
set::name('account'),
set::required(true),
@@ -215,7 +217,7 @@ formPanel
setClass('token'),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->gitlab->token),
set::name('token'),
set::placeholder($lang->gitlab->placeholder->token),
@@ -227,7 +229,7 @@ formPanel
setClass('jenkins sonarqube password hidden'),
formGroup
(
set::width('2/3'),
set::width($colWidth),
set::label($lang->user->password),
set::name('password'),
),
+1
View File
@@ -72,6 +72,7 @@ foreach ($cloudApps as $group)
setClass('primary btn size-sm install-btn'),
setData('prevent', true),
setData('toggle', 'modal'),
setData('size', 'sm'),
in_array($cloudApp->id, $installedApps) ? setData('confirm', $lang->store->alreadyInstalled) : null,
setData('url', $this->createLink('space', 'createApplication', "id={$cloudApp->id}")),
on::click('installApp', array('stop' => true)),