diff --git a/module/compile/js/browse.ui.js b/module/compile/js/browse.ui.js index 6e1c9bfcd4..9097a1a926 100644 --- a/module/compile/js/browse.ui.js +++ b/module/compile/js/browse.ui.js @@ -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; }; \ No newline at end of file diff --git a/module/job/js/view.ui.js b/module/job/js/view.ui.js new file mode 100644 index 0000000000..4ba46c14bf --- /dev/null +++ b/module/job/js/view.ui.js @@ -0,0 +1,10 @@ +$('#jobCases').html(""); +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); \ No newline at end of file diff --git a/module/job/ui/view.html.php b/module/job/ui/view.html.php index b4592be06c..e33d85f2cd 100644 --- a/module/job/ui/view.html.php +++ b/module/job/ui/view.html.php @@ -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 ( diff --git a/module/space/ui/createapplication.html.php b/module/space/ui/createapplication.html.php index b76788e326..f1274f095f 100644 --- a/module/space/ui/createapplication.html.php +++ b/module/space/ui/createapplication.html.php @@ -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'), ), diff --git a/module/store/ui/browse.html.php b/module/store/ui/browse.html.php index 9a7c83378f..54ac6722e8 100644 --- a/module/store/ui/browse.html.php +++ b/module/store/ui/browse.html.php @@ -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)),