From 72d527448652535b644110d06b2df86e203aabb1 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 13 Nov 2023 11:25:35 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in block. --- module/block/ui/annualworkloadblock.html.php | 25 ++++++------ module/block/ui/assigntomeblock.html.php | 2 +- module/block/ui/common.ui.php | 6 +-- module/block/ui/create.html.php | 10 ++--- module/block/ui/docrecentupdateblock.html.php | 2 +- module/block/ui/downloadclient.html.php | 2 +- module/block/ui/downloadmobile.html.php | 2 +- module/block/ui/edit.html.php | 10 ++--- .../block/ui/executionstatisticblock.html.php | 2 +- module/block/ui/guideblock.html.php | 4 +- module/block/ui/productoverviewblock.html.php | 2 +- module/block/ui/projectdocblock.html.php | 4 +- .../block/ui/projectstatisticblock.html.php | 28 ++++++++------ module/block/ui/recentprojectblock.html.php | 4 +- module/block/ui/scrumlistblock.html.php | 2 +- module/block/ui/scrumoverviewblock.html.php | 14 +++---- module/block/ui/scrumtestblock.html.php | 2 +- .../block/ui/singlebugstatisticblock.html.php | 38 +++++++++---------- module/block/ui/singledynamicblock.html.php | 6 +-- .../ui/singlemonthlyprogressblock.html.php | 38 +++++++++---------- module/block/ui/singlestatisticblock.html.php | 4 +- module/block/ui/singlestoryblock.html.php | 4 +- module/block/ui/taskblock.html.php | 4 +- module/block/ui/themeswitch.html.php | 2 +- module/block/ui/welcomeblock.html.php | 2 +- 25 files changed, 111 insertions(+), 108 deletions(-) diff --git a/module/block/ui/annualworkloadblock.html.php b/module/block/ui/annualworkloadblock.html.php index f54a03ddde..caaec0f870 100644 --- a/module/block/ui/annualworkloadblock.html.php +++ b/module/block/ui/annualworkloadblock.html.php @@ -25,8 +25,8 @@ foreach($doneStoryEstimate as $productID => $storyEstimate) span ( set::title(zget($products, $productID)), - zget($products, $productID), - ), + zget($products, $productID) + ) ), cell ( @@ -37,14 +37,14 @@ foreach($doneStoryEstimate as $productID => $storyEstimate) width("calc(calc(100% - {$spanWidth}) * " . ($maxStoryEstimate ? $storyEstimate / $maxStoryEstimate : 0) . ')'), setClass('progress progress-bar h-2'), set('role', 'progressbar'), - setStyle(array('background' => 'var(--color-primary-300)')), + setStyle(array('background' => 'var(--color-primary-300)')) ), span ( setClass('pl-0.5'), $storyEstimate - ), - ), + ) + ) ); } @@ -62,7 +62,7 @@ foreach($doneStoryCount as $productID => $storyCount) span ( zget($products, $productID), - ), + ) ), cell ( @@ -79,8 +79,8 @@ foreach($doneStoryCount as $productID => $storyCount) ( setClass('pl-0.5'), $storyCount - ), - ), + ) + ) ); } @@ -95,10 +95,7 @@ foreach($resolvedBugCount as $productID => $bugCount) ( setClass('ellipsis overflow-hidden whitespace-nowrap mr-1 text-right'), set::width('50%'), - span - ( - zget($products, $productID), - ), + span(zget($products, $productID)) ), cell ( @@ -115,8 +112,8 @@ foreach($resolvedBugCount as $productID => $bugCount) ( setClass('pl-0.5'), $bugCount - ), - ), + ) + ) ); } diff --git a/module/block/ui/assigntomeblock.html.php b/module/block/ui/assigntomeblock.html.php index e5735eaaff..df5652eabf 100644 --- a/module/block/ui/assigntomeblock.html.php +++ b/module/block/ui/assigntomeblock.html.php @@ -113,7 +113,7 @@ foreach($hasViewPriv as $type => $bool) set::onRenderCell(jsRaw('window.renderCell')), set::cols(array_values($config->block->{$configType}->dtable->fieldList)), set::data(array_values($data)), - set::userMap($users), + set::userMap($users) ) ); } diff --git a/module/block/ui/common.ui.php b/module/block/ui/common.ui.php index cc499608db..9630ac70b8 100644 --- a/module/block/ui/common.ui.php +++ b/module/block/ui/common.ui.php @@ -29,10 +29,10 @@ function buildParamsRows(object $block = null, ?array $params = null, string $mo ( 'id' => "params$key", 'type' => $row['control'], - 'items' => isset($row['options']) ? $row['options'] : null, + 'items' => isset($row['options']) ? $row['options'] : null )), - set::required($row['control'] === 'picker'), - ), + set::required($row['control'] === 'picker') + ) ); } return $rows; diff --git a/module/block/ui/create.html.php b/module/block/ui/create.html.php index 59b34da1da..3bd6a2cd17 100644 --- a/module/block/ui/create.html.php +++ b/module/block/ui/create.html.php @@ -48,7 +48,7 @@ row formGroup ( set::name('module'), - set::value($app->tab == 'my' ? $module : $dashboard), + set::value($app->tab == 'my' ? $module : $dashboard) ) ), formRow @@ -83,7 +83,7 @@ row set::name('title'), set::value($blockTitle), set::control('input') - ), + ) ), buildParamsRows(), formRow @@ -97,8 +97,8 @@ row set::name('width'), set::items($widthOptions), set::value($defaultWidth), - set::required(true), - ), + set::required(true) + ) ) ), formRow @@ -107,7 +107,7 @@ row formGroup ( set::label($lang->block->lblHtml), - editor(set::name('html')), + editor(set::name('html')) ) ) ) diff --git a/module/block/ui/docrecentupdateblock.html.php b/module/block/ui/docrecentupdateblock.html.php index 48c9dae10c..323f1f6358 100644 --- a/module/block/ui/docrecentupdateblock.html.php +++ b/module/block/ui/docrecentupdateblock.html.php @@ -46,7 +46,7 @@ foreach($docList as $doc) span ( setClass('text-gray my-2 pl-2 pull-right'), - $editTip, + $editTip ), div ( diff --git a/module/block/ui/downloadclient.html.php b/module/block/ui/downloadclient.html.php index 28fb2cfbeb..dd638baefe 100644 --- a/module/block/ui/downloadclient.html.php +++ b/module/block/ui/downloadclient.html.php @@ -35,7 +35,7 @@ function printDownloadClient() set('class', 'avatar rounded-full flex-none size-sm has-img mr-2'), img(set('src', $config->webRoot . "theme/default/images/guide/edition_{$edition}.png"), set('class', 'inline p-1.5')) ), - span($editionName), + span($editionName) ) ); } diff --git a/module/block/ui/downloadmobile.html.php b/module/block/ui/downloadmobile.html.php index dfc595a681..4e45f4ebef 100644 --- a/module/block/ui/downloadmobile.html.php +++ b/module/block/ui/downloadmobile.html.php @@ -37,7 +37,7 @@ function printDownloadMobile() set('class', 'flex'), div(img(set('src', $config->webRoot . 'theme/default/images/guide/app_index.png')), set('class', 'flex-1 pr-2')), div(img(set('src', $config->webRoot . 'theme/default/images/guide/app_execution.png')), set('class', 'flex-1 pr-2')), - div(img(set('src', $config->webRoot . 'theme/default/images/guide/app_statistic.png')), set('class', 'flex-1 pr-2')), + div(img(set('src', $config->webRoot . 'theme/default/images/guide/app_statistic.png')), set('class', 'flex-1 pr-2')) ) ), cell diff --git a/module/block/ui/edit.html.php b/module/block/ui/edit.html.php index 2bb5154cfb..11cd58123e 100644 --- a/module/block/ui/edit.html.php +++ b/module/block/ui/edit.html.php @@ -48,7 +48,7 @@ row formGroup ( set::name('module'), - set::value($showModules ? $module : $dashboard), + set::value($showModules ? $module : $dashboard) ) ), formRow @@ -82,7 +82,7 @@ row set::name('title'), set::value($blockTitle), set::control('input') - ), + ) ), buildParamsRows($block, null, $module, $code), formRow @@ -96,8 +96,8 @@ row set::name('width'), set::items($widthOptions), set::value($code == $block->code ? $block->width : ''), - set::required(true), - ), + set::required(true) + ) ) ), formRow @@ -106,7 +106,7 @@ row formGroup ( set::label($lang->block->lblHtml), - editor(set::name('html'), html(zget($block->params, 'html'))), + editor(set::name('html'), html(zget($block->params, 'html'))) ) ) ) diff --git a/module/block/ui/executionstatisticblock.html.php b/module/block/ui/executionstatisticblock.html.php index 487f45ced4..e4d9e8d265 100644 --- a/module/block/ui/executionstatisticblock.html.php +++ b/module/block/ui/executionstatisticblock.html.php @@ -45,7 +45,7 @@ $burn = center div ( $longBlock ? set::className('pb-2') : null, - span(set::className('font-bold'), $lang->block->executionstatistic->burn), + span(set::className('font-bold'), $lang->block->executionstatistic->burn) ), div ( diff --git a/module/block/ui/guideblock.html.php b/module/block/ui/guideblock.html.php index d400d7cd66..76cc67cb0e 100644 --- a/module/block/ui/guideblock.html.php +++ b/module/block/ui/guideblock.html.php @@ -100,7 +100,7 @@ blockPanel array( 'href' => createLink('tutorial', 'start'), 'class' => 'btn btn-primary warning', - 'data-toggle' => 'modal', + 'data-toggle' => 'modal' ) ), $lang->block->tutorial @@ -117,7 +117,7 @@ blockPanel ( set('class', 'nav nav-tabs nav-stacked'), $getGuideTabs($blockNavCode) - ), + ) ), cell ( diff --git a/module/block/ui/productoverviewblock.html.php b/module/block/ui/productoverviewblock.html.php index 405e9ce9de..d9417a3e67 100644 --- a/module/block/ui/productoverviewblock.html.php +++ b/module/block/ui/productoverviewblock.html.php @@ -161,7 +161,7 @@ if($block->width == 3) set::type('ghost'), set::size('sm'), setClass('text-gray ml-4'), - $currentYear . $suffix, + $currentYear . $suffix ), set::placement('bottom-end'), set::menu(array('style' => array('minWidth' => 70, 'width' => 70))), diff --git a/module/block/ui/projectdocblock.html.php b/module/block/ui/projectdocblock.html.php index b7f759538b..97f76c5213 100644 --- a/module/block/ui/projectdocblock.html.php +++ b/module/block/ui/projectdocblock.html.php @@ -44,7 +44,7 @@ statisticBlock array('text' => $lang->project->involved, 'url' => createLink('block', 'printBlock', "blockID={$block->id}¶ms=" . helper::safe64Encode("type=involved")), 'data-load' => 'target', 'data-selector' => "#doc-projectdoc-{$block->id}", 'data-partial' => true), array('text' => $lang->project->all, 'url' => createLink('block', 'printBlock', "blockID={$block->id}¶ms=" . helper::safe64Encode("type=all")), 'data-load' => 'target', 'data-selector' => "#doc-projectdoc-{$block->id}", 'data-partial' => true)) ) - ), + ) ), set::block($block), set::active($active), @@ -58,7 +58,7 @@ statisticBlock set::horzScrollbarPos('inside'), set::cols(array_values($config->block->doc->dtable->fieldList)), set::data(!empty($docGroup) && !empty($docGroup[$project->id]) ? array_values($docGroup[$project->id]) : array()), - set::userMap($users), + set::userMap($users) ) ); diff --git a/module/block/ui/projectstatisticblock.html.php b/module/block/ui/projectstatisticblock.html.php index c6d704d310..2442b5580b 100644 --- a/module/block/ui/projectstatisticblock.html.php +++ b/module/block/ui/projectstatisticblock.html.php @@ -40,14 +40,14 @@ $projectOverview[] = cell span ( setClass('font-bold text-black px-1'), - abs($remainingDays), + abs($remainingDays) ), $lang->block->projectstatistic->day ) : span ( setClass('text-gray'), $project->status == 'closed' ? $lang->block->projectstatistic->projectClosed : $lang->block->projectstatistic->longTimeProject - ), + ) ); $projectOverview[] = $config->edition != 'open' ? cell ( @@ -89,11 +89,11 @@ $lastestExecution = !empty($project->executions) && $project->multiple ? cell setClass('pl-2'), set::href(helper::createLink('execution', 'task', "executionID={$project->executions[0]->id}")), set('title', $project->executions[0]->name), - $project->executions[0]->name, + $project->executions[0]->name ) : span ( setClass('pl-2'), - $project->executions[0]->name, + $project->executions[0]->name ) ) ) : null; @@ -134,7 +134,7 @@ if(in_array($project->model, array('scrum', 'kanban', 'agileplus'))) ( setClass('font-bold'), $lang->block->projectstatistic->{$module} - ), + ) ), tableData ( @@ -207,7 +207,8 @@ else ( toggle::tooltip(array('title' => '提示文本')), 'help' - ), ':' + ), + ':' ), h::td ( @@ -229,7 +230,8 @@ else ( toggle::tooltip(array('title' => '提示文本')), 'help' - ), ':' + ), + ':' ), h::td ( @@ -251,7 +253,8 @@ else ( toggle::tooltip(array('title' => '提示文本')), 'help' - ), ':' + ), + ':' ), h::td ( @@ -294,7 +297,8 @@ else ( toggle::tooltip(array('title' => '提示文本')), 'help' - ), ':' + ), + ':' ), h::td ( @@ -316,7 +320,8 @@ else ( toggle::tooltip(array('title' => '提示文本')), 'help' - ), ':' + ), + ':' ), h::td ( @@ -338,7 +343,8 @@ else ( toggle::tooltip(array('title' => '提示文本')), 'help' - ), ':' + ), + ':' ), h::td ( diff --git a/module/block/ui/recentprojectblock.html.php b/module/block/ui/recentprojectblock.html.php index 4df43f5631..227ea4b8cb 100644 --- a/module/block/ui/recentprojectblock.html.php +++ b/module/block/ui/recentprojectblock.html.php @@ -88,6 +88,6 @@ blockPanel !empty($cards) ? $cards : center ( setClass('text-gray flex-auto'), - $lang->noData, - ), + $lang->noData + ) ); diff --git a/module/block/ui/scrumlistblock.html.php b/module/block/ui/scrumlistblock.html.php index 00e22c3c22..1bb6033a6f 100644 --- a/module/block/ui/scrumlistblock.html.php +++ b/module/block/ui/scrumlistblock.html.php @@ -52,7 +52,7 @@ panel set::fixedLeftWidth($longBlock ? '0.33' : '0.5'), set::cols(array_values($config->block->scrum->dtable->fieldList)), set::data(array_values($executionStats)), - set::onRenderCell(jsRaw('window.onRenderScrumNameCell')), + set::onRenderCell(jsRaw('window.onRenderScrumNameCell')) ) ); diff --git a/module/block/ui/scrumoverviewblock.html.php b/module/block/ui/scrumoverviewblock.html.php index ef8daf68fb..b0a8aa9c69 100644 --- a/module/block/ui/scrumoverviewblock.html.php +++ b/module/block/ui/scrumoverviewblock.html.php @@ -45,13 +45,13 @@ foreach($config->block->projectstatistic->items as $module => $items) ( setClass('font-bold'), $lang->block->projectstatistic->{$module} - ), + ) ), tableData ( set::width('100%'), $cellItems - ), + ) ); } @@ -79,14 +79,14 @@ panel span ( setClass('font-bold text-black px-1'), - abs($remainingDays), + abs($remainingDays) ), $lang->block->projectstatistic->day ) : span ( setClass('text-gray'), $project->status == 'closed' ? $lang->block->projectstatistic->projectClosed : $lang->block->projectstatistic->longTimeProject - ), + ) ), $config->edition != 'open' ? cell ( @@ -126,11 +126,11 @@ panel setClass('pl-2'), set::href(helper::createLink('execution', 'task', "executionID={$project->executions[0]->id}")), set('title', $project->executions[0]->name), - $project->executions[0]->name, + $project->executions[0]->name ) : span ( setClass('pl-2'), - $project->executions[0]->name, + $project->executions[0]->name ) ) ) : null, @@ -138,7 +138,7 @@ panel div ( setClass('flex w-full' . (!$longBlock ? ' flex-wrap' : '')), - $cells, + $cells ) ) ); diff --git a/module/block/ui/scrumtestblock.html.php b/module/block/ui/scrumtestblock.html.php index ff7f13a4a5..d2224e4c4d 100644 --- a/module/block/ui/scrumtestblock.html.php +++ b/module/block/ui/scrumtestblock.html.php @@ -39,7 +39,7 @@ panel set::horzScrollbarPos('inside'), set::fixedLeftWidth($longBlock ? '0.33' : '0.5'), set::cols(array_values($config->block->testtask->dtable->fieldList)), - set::data(array_values($testtasks)), + set::data(array_values($testtasks)) ) ); diff --git a/module/block/ui/singlebugstatisticblock.html.php b/module/block/ui/singlebugstatisticblock.html.php index a0282208ed..a46d92f2dc 100644 --- a/module/block/ui/singlebugstatisticblock.html.php +++ b/module/block/ui/singlebugstatisticblock.html.php @@ -35,8 +35,8 @@ panel set('circleWidth', 6), set('text', $resolvedRate . '%'), set('textY', 50), - set('textStyle', 'font-size: 30px;'), - ), + set('textStyle', 'font-size: 30px;') + ) ), div ( @@ -50,8 +50,8 @@ panel setClass('pl-0.5'), toggle::tooltip(array('title' => '提示文本')), 'help' - ), - ), + ) + ) ), cell ( @@ -61,41 +61,41 @@ panel span ( setClass('flex justify-center'), - $totalBugs, + $totalBugs ), span ( setClass('text-sm text-gray'), $lang->block->bugstatistic->effective - ), + ) ), col ( span ( setClass('flex justify-center'), - $closedBugs, + $closedBugs ), span ( setClass('text-sm text-gray'), $lang->block->bugstatistic->fixed - ), + ) ), col ( span ( setClass('flex justify-center'), - $unresovledBugs, + $unresovledBugs ), span ( setClass('text-sm text-gray'), $lang->block->bugstatistic->activated - ), - ), - ), + ) + ) + ) ), cell ( @@ -121,26 +121,26 @@ panel 'barWidth' => '8', 'stack' => 'Ad', 'name' => $lang->bug->activate, - 'data' => array_values($activateBugs), + 'data' => array_values($activateBugs) ), array ( 'type' => 'bar', 'name' => $lang->bug->resolve, 'stack' => 'Ad', - 'data' => array_values($resolveBugs), + 'data' => array_values($resolveBugs) ), array ( 'type' => 'bar', 'name' => $lang->bug->close, 'stack' => 'Ad', - 'data' => array_values($closeBugs), - ), - ), - ), + 'data' => array_values($closeBugs) + ) + ) + ) )->size('100%', 200), - ), + ) ) ); diff --git a/module/block/ui/singledynamicblock.html.php b/module/block/ui/singledynamicblock.html.php index f06388e6cc..c1b12c579f 100644 --- a/module/block/ui/singledynamicblock.html.php +++ b/module/block/ui/singledynamicblock.html.php @@ -21,7 +21,7 @@ if(empty($actions)) ( setClass('text-gray'), $lang->action->noDynamic - ), + ) ); } else @@ -32,7 +32,7 @@ else dynamic ( set::dynamics($actions), - set::users($users), + set::users($users) ) ); } @@ -51,7 +51,7 @@ panel icon('caret-right') ) ), - $content, + $content ); render(); diff --git a/module/block/ui/singlemonthlyprogressblock.html.php b/module/block/ui/singlemonthlyprogressblock.html.php index 29aa0e734f..659ca635db 100644 --- a/module/block/ui/singlemonthlyprogressblock.html.php +++ b/module/block/ui/singlemonthlyprogressblock.html.php @@ -32,10 +32,10 @@ blockPanel array ( 'type' => 'line', - 'data' => array_values($doneStoryEstimate), - ), - ), - )->size('100%', 200), + 'data' => array_values($doneStoryEstimate) + ) + ) + )->size('100%', 200) ), cell ( @@ -57,17 +57,17 @@ blockPanel ( 'type' => 'line', 'name' => $lang->block->productstatistic->opened, - 'data' => array_values($createStoryCount), + 'data' => array_values($createStoryCount) ), array ( 'type' => 'line', 'name' => $lang->block->productstatistic->done, - 'data' => array_values($doneStoryCount), - ), - ), - ), - )->size('100%', 200), + 'data' => array_values($doneStoryCount) + ) + ) + ) + )->size('100%', 200) ), cell ( @@ -89,17 +89,17 @@ blockPanel ( 'type' => 'line', 'name' => $lang->block->productstatistic->opened, - 'data' => array_values($createBugCount), + 'data' => array_values($createBugCount) ), array ( 'type' => 'line', 'name' => $lang->bug->resolve, - 'data' => array_values($fixedBugCount), - ), - ), - ), - )->size('100%', 200), + 'data' => array_values($fixedBugCount) + ) + ) + ) + )->size('100%', 200) ), cell ( @@ -120,12 +120,12 @@ blockPanel ( 'type' => 'line', 'name' => $lang->product->releases, - 'data' => array_values($releaseCount), + 'data' => array_values($releaseCount) ) ) ) - )->size('100%', 200), - ), + )->size('100%', 200) + ) ) ); diff --git a/module/block/ui/singlestatisticblock.html.php b/module/block/ui/singlestatisticblock.html.php index 478efc37a8..d2c50a7a6f 100644 --- a/module/block/ui/singlestatisticblock.html.php +++ b/module/block/ui/singlestatisticblock.html.php @@ -87,7 +87,7 @@ panel ( 'help', setClass('text-light'), - toggle::tooltip(array('title' => '提示文本')), + toggle::tooltip(array('title' => '提示文本')) ) ) ) @@ -221,7 +221,7 @@ panel ) ) ) - )->size('100%', 170), + )->size('100%', 170) ) ) ) diff --git a/module/block/ui/singlestoryblock.html.php b/module/block/ui/singlestoryblock.html.php index faceff7ad5..52dfcf9569 100644 --- a/module/block/ui/singlestoryblock.html.php +++ b/module/block/ui/singlestoryblock.html.php @@ -40,9 +40,9 @@ panel setClass('ghost toolbar-item size-sm z-10'), set::url(createLink('my', $method, "mode=story&browseType={$block->params->type}")), $lang->more, - span(setClass('caret-right')), + span(setClass('caret-right')) ) - ) : '', + ) : '' ), dtable ( diff --git a/module/block/ui/taskblock.html.php b/module/block/ui/taskblock.html.php index ab5e2e3cee..eca6d0c0ee 100644 --- a/module/block/ui/taskblock.html.php +++ b/module/block/ui/taskblock.html.php @@ -27,8 +27,8 @@ blockPanel set::bordered(false), set::horzScrollbarPos('inside'), set::cols(array_values($config->block->task->dtable->fieldList)), - set::data(array_values($tasks)), - ), + set::data(array_values($tasks)) + ) ); render(); diff --git a/module/block/ui/themeswitch.html.php b/module/block/ui/themeswitch.html.php index 3a6ecdfe1f..5237748ce6 100644 --- a/module/block/ui/themeswitch.html.php +++ b/module/block/ui/themeswitch.html.php @@ -46,7 +46,7 @@ function printThemeSwitch() ( icon('check-circle mr-2 hidden'), $themeName - ), + ) ) ) ) diff --git a/module/block/ui/welcomeblock.html.php b/module/block/ui/welcomeblock.html.php index 45b12767b7..1fe3712001 100644 --- a/module/block/ui/welcomeblock.html.php +++ b/module/block/ui/welcomeblock.html.php @@ -52,7 +52,7 @@ panel ( set('width', '22%'), set('class', 'center'), - span($todaySummary), + span($todaySummary) ), cell