From b68504a0ca4e3b1908cc96ac837d40596ea39f16 Mon Sep 17 00:00:00 2001 From: liumengyi Date: Mon, 13 Nov 2023 13:29:24 +0800 Subject: [PATCH] * Remove `,` at the end of row in the lastest children in testreport. --- module/testreport/ui/browse.html.php | 2 +- module/testreport/ui/create.html.php | 18 +++++++++--------- module/testreport/ui/edit.html.php | 22 +++++++++++----------- module/testreport/ui/view.html.php | 10 +++++----- 4 files changed, 26 insertions(+), 26 deletions(-) diff --git a/module/testreport/ui/browse.html.php b/module/testreport/ui/browse.html.php index f31291a977..ec61346879 100644 --- a/module/testreport/ui/browse.html.php +++ b/module/testreport/ui/browse.html.php @@ -29,7 +29,7 @@ featureBar set::module('testreport'), set::method('browse'), set::current('all'), - set::linkParams("objectID={$objectID}&objectType={$objectType}&extra={$extra}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}"), + set::linkParams("objectID={$objectID}&objectType={$objectType}&extra={$extra}&orderBy={$orderBy}&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}&pageID={$pager->pageID}") ); toolbar diff --git a/module/testreport/ui/create.html.php b/module/testreport/ui/create.html.php index aabf3519b6..0276ff1f36 100644 --- a/module/testreport/ui/create.html.php +++ b/module/testreport/ui/create.html.php @@ -29,7 +29,7 @@ formPanel set::control('picker'), set::name('selectTask'), set::items($taskPairs), - set::value($objectID), + set::value($objectID) ) ), formRow @@ -43,13 +43,13 @@ formPanel datePicker ( set::name('begin'), - set::value($begin), + set::value($begin) ), $lang->testtask->to, datePicker ( set::name('end'), - set::value($end), + set::value($end) ) ), input @@ -290,7 +290,7 @@ foreach($charts as $chartType => $chartOption) ) ) ) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -329,7 +329,7 @@ foreach($lang->bug->priList as $key => $value) h::td(label(set::className('label-dot mr-2'), set::style(array('background-color' => $color, '--tw-ring-color' => $color))), $label), h::td($generated), h::td($legacy), - h::td($resolved), + h::td($resolved) ); if(!next($colorList)) reset($colorList); } @@ -358,7 +358,7 @@ $bugStageChart = div ), set::yAxis(array('type' => 'value')), set::series($chartOption) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -406,7 +406,7 @@ for($time = $beginTime; $time <= $endTime; $time += 86400) h::td($date), h::td($generated), h::td($legacy), - h::td($resolved), + h::td($resolved) ); } $chartOption = array_values($chartOption); @@ -434,7 +434,7 @@ $bugHandleChart = div ), set::yAxis(array('type' => 'value')), set::series($chartOption) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -516,7 +516,7 @@ foreach($bugInfo as $infoKey => $infoValue) ) ) ) - )->size('100%', 300), + )->size('100%', 300) ), cell ( diff --git a/module/testreport/ui/edit.html.php b/module/testreport/ui/edit.html.php index 4365a4c98a..46b32cb830 100644 --- a/module/testreport/ui/edit.html.php +++ b/module/testreport/ui/edit.html.php @@ -29,13 +29,13 @@ formPanel datePicker ( set::name('begin'), - set::value($begin), + set::value($begin) ), $lang->testtask->to, datePicker ( set::name('end'), - set::value($end), + set::value($end) ) ), input @@ -79,7 +79,7 @@ formPanel set::className('hidden'), set::name('stories'), set::value(implode(',', array_keys($stories))) - ), + ) ), formGroup ( @@ -102,7 +102,7 @@ formPanel set::name('members[]'), set::items($users), set::value($report->members) - ), + ) ) ), formRow @@ -167,7 +167,7 @@ formPanel $report->files ? fileList ( set::files($report->files), - set::fieldset(false), + set::fieldset(false) ) : null, upload() ) @@ -273,7 +273,7 @@ foreach($charts as $chartType => $chartOption) ) ) ) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -312,7 +312,7 @@ foreach($lang->bug->priList as $key => $value) h::td(label(set::className('label-dot mr-2'), set::style(array('background-color' => $color, '--tw-ring-color' => $color))), $label), h::td($generated), h::td($legacy), - h::td($resolved), + h::td($resolved) ); if(!next($colorList)) reset($colorList); } @@ -341,7 +341,7 @@ $bugStageChart = div ), set::yAxis(array('type' => 'value')), set::series($chartOption) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -388,7 +388,7 @@ for($time = $beginTime; $time <= $endTime; $time += 86400) h::td($date), h::td($generated), h::td($legacy), - h::td($resolved), + h::td($resolved) ); } $chartOption = array_values($chartOption); @@ -416,7 +416,7 @@ $bugHandleChart = div ), set::yAxis(array('type' => 'value')), set::series($chartOption) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -498,7 +498,7 @@ foreach($bugInfo as $infoKey => $infoValue) ) ) ) - )->size('100%', 300), + )->size('100%', 300) ), cell ( diff --git a/module/testreport/ui/view.html.php b/module/testreport/ui/view.html.php index 8a4454723d..6940f5d024 100644 --- a/module/testreport/ui/view.html.php +++ b/module/testreport/ui/view.html.php @@ -115,7 +115,7 @@ foreach($lang->bug->priList as $key => $value) h::td(label(set::className('label-dot mr-2'), set::style(array('background-color' => $color, '--tw-ring-color' => $color))), $label), h::td($generated), h::td($legacy), - h::td($resolved), + h::td($resolved) ); if(!next($colorList)) reset($colorList); } @@ -144,7 +144,7 @@ $bugStageChart = div ), set::yAxis(array('type' => 'value')), set::series($chartOption) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -193,7 +193,7 @@ for($time = $beginTime; $time <= $endTime; $time += 86400) h::td($date), h::td($generated), h::td($legacy), - h::td($resolved), + h::td($resolved) ); } $chartOption = array_values($chartOption); @@ -221,7 +221,7 @@ $bugHandleChart = div ), set::yAxis(array('type' => 'value')), set::series($chartOption) - )->size('100%', 300), + )->size('100%', 300) ), cell ( @@ -303,7 +303,7 @@ foreach($bugInfo as $infoKey => $infoValue) ) ) ) - )->size('100%', 300), + )->size('100%', 300) ), cell (