diff --git a/config/config.php b/config/config.php index 4bd3e3bddc..b15a83e4cf 100644 --- a/config/config.php +++ b/config/config.php @@ -97,7 +97,7 @@ $config->CSPs[] = "form-action 'self';connect-src 'self'"; /* Config for kanban col setting */ $config->colWidth = 264; -$config->minColWidth = 200; +$config->minColWidth = 264; $config->maxColWidth = 384; /* 系统框架配置。Framework settings. */ diff --git a/module/kanban/ui/create.html.php b/module/kanban/ui/create.html.php index 5602c1b5e9..c4fb4eb8e8 100644 --- a/module/kanban/ui/create.html.php +++ b/module/kanban/ui/create.html.php @@ -148,7 +148,7 @@ formPanel set::className('flex items-center ml-8 py-1'), set::style(array('padding-left' => '1px')), span($lang->kanban->colWidth), - input(set::type('number'), set::min('200'), set::name('colWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->colWidth ? $kanban->colWidth : 200)), + input(set::type('number'), set::min($config->colWidth), set::name('colWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->colWidth ? $kanban->colWidth : $config->colWidth)), span('px') ) ) @@ -171,10 +171,10 @@ formPanel ( set::className('flex items-center ml-5 py-1'), span($lang->kanban->colWidth), - input(set::type('number'), set::min('264'), set::name('minColWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->minColWidth ? $kanban->minColWidth : 264)), + input(set::type('number'), set::min($config->minColWidth), set::name('minColWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->minColWidth ? $kanban->minColWidth : $config->minColWidth)), span('px'), span('~', set::className('mx-1')), - input(set::type('number'), set::min('240'), set::name('maxColWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->maxColWidth ? $kanban->maxColWidth : 384)), + input(set::type('number'), set::min($config->maxColWidth), set::name('maxColWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->maxColWidth ? $kanban->maxColWidth : $config->maxColWidth)), span('px') ) ) diff --git a/module/kanban/ui/setting.html.php b/module/kanban/ui/setting.html.php new file mode 100644 index 0000000000..a17fa7fdc0 --- /dev/null +++ b/module/kanban/ui/setting.html.php @@ -0,0 +1,150 @@ + + * @package kanban + * @link https://www.zentao.net + */ +namespace zin; + +modalHeader(); +formPanel +( + formRow + ( + set::id('WIPCountBox'), + formGroup + ( + set::label($lang->kanban->WIPCount), + radioList + ( + set::name('showWIP'), + set::items($lang->kanban->showWIPList), + set::inline(true), + set::value($kanban->showWIP) + ) + ) + ), + formRow + ( + formGroup + ( + set::label($lang->kanban->columnWidth), + radioList + ( + set::name('fluidBoard'), + set::items(array('0' => $lang->kanbancolumn->fluidBoardList[0])), + set::value($kanban->fluidBoard) + ), + div + ( + set::className('flex items-center ml-8 py-1'), + set::style(array('padding-left' => '1px')), + span($lang->kanban->colWidth), + input(set::type('number'), set::min($config->colWidth), set::name('colWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->colWidth ? $kanban->colWidth : $config->colWidth)), + span('px') + ) + ) + + ), + formRow + ( + set::style(array('margin-top' => '0px')), + formGroup + ( + set::label(''), + radioList + ( + set::name('fluidBoard'), + set::items(array(1 => $lang->kanbancolumn->fluidBoardList[1])), + set::value(isset($copyKanban->fluidBoard) ? $copyKanban->fluidBoard : 0) + ), + div + ( + set::className('flex items-center ml-5 py-1'), + span($lang->kanban->colWidth), + input(set::type('number'), set::min($config->minColWidth), set::name('minColWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->minColWidth ? $kanban->minColWidth : $config->minColWidth)), + span('px'), + span('~', set::className('mx-1')), + input(set::type('number'), set::min($config->maxColWidth), set::name('maxColWidth'), set::className('w-16 size-sm mx-1'), set::value($kanban->maxColWidth ? $kanban->maxColWidth : $config->maxColWidth)), + span('px') + ) + ) + ), + formRow + ( + formGroup + ( + set::label($lang->kanban->import), + radioList + ( + set::name('import'), + set::items($lang->kanban->importList), + set::inline(true), + set::value($enableImport) + ) + ) + ), + formRow + ( + set::style(array('margin-top' => '0px')), + formGroup + ( + set::label(''), + checkList + ( + set::name('importObjectList[]'), + set::items($lang->kanban->importObjectList), + set::inline(true), + set::value($importObjects) + ) + ) + ), + formRow + ( + formGroup + ( + set::label($lang->kanban->archive), + radioList + ( + set::name('archived'), + set::items($lang->kanban->archiveList), + set::inline(true), + set::value($kanban->archived) + ) + ) + ), + formRow + ( + formGroup + ( + set::label($lang->kanban->manageProgress), + radioList + ( + set::name('performable'), + set::items($lang->kanban->enableList), + set::inline(true), + set::value($kanban->performable) + ) + ) + ), + formRow + ( + formGroup + ( + set::label($lang->kanban->alignment), + radioList + ( + set::name('alignment'), + set::items($lang->kanban->alignmentList), + set::inline(true), + set::value($kanban->alignment) + ) + ) + ) +); + +render();