Design/EasySoft-ZenTaoPMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 30 Wiki Activity

Merge branch 'master_xieqiyu_56376' into 'master'

Browse Source 
* Finish task#56376.

See merge request easycorp/zentaopms!3859
This commit is contained in:
孙广明
2022-06-10 04:29:59 +00:00
parent 32aaa90fd0 3e4fd3aa0f
commit 23ae4cea1c
5 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
module/kanban/css/view.css
+1 -1
View File
@@ -52,7 +52,7 @@
.region .kanban-lane {position: relative; border-bottom: none!important; min-height: 200px !important}
.region .kanban-lane > .kanban-lane-name > .text {margin: auto 0; max-height: 150px; overflow: hidden; text-overflow: ellipsis}
.region .kanban-lane > .kanban-lane-name > .text {margin: auto 0;}
.region .kanban-lane > .kanban-lane-name > .actions {position: absolute; top: 0; left: 0; right: 0; opacity: 0;}
.region .kanban-lane > .kanban-lane-name > .actions > a {display: block; width: 20px; height: 20px; line-height: 20px; text-align: center; opacity: .7; color: #fff;}
.region .kanban-lane > .kanban-lane-name > .actions > a:hover {background-color: rgba(0,0,0,.2); opacity: 1;}
module/kanban/js/view.js
+5 -1
View File
@@ -1266,7 +1266,11 @@ function calcColHeight(col, lane, colCards, colHeight, kanban)
var options = kanban.options;
if(!options.displayCards) return colHeight;
var fontSize = 13;
var moreLabelHeight = 20;
var laneNameHeight = lane.name.length * fontSize;
if(!options.displayCards) return laneNameHeight > colHeight ? laneNameHeight + 2 * moreLabelHeight : colHeight;
var displayCards = +(options.displayCards || 2);
if (typeof displayCards !== 'number' || displayCards < 2) displayCards = 2;
module/kanban/lang/en.php
+1 -1
View File
@@ -318,7 +318,7 @@ $lang->kanbanlane->confirmDeleteTip = 'Are you sure to delete this lane? After d
$lang->kanbanlane->modeList['sameAsOther'] = 'Use the same Kanban column';
$lang->kanbanlane->modeList['independent'] = 'Independent Kanban column';
$lang->kanbanlane->heightTypeList['auto'] = 'Adaptive (Adaptive according to the card height)';
$lang->kanbanlane->heightTypeList['auto'] = 'Adaptive (Adaptive to card height and lane name height)';
$lang->kanbanlane->heightTypeList['custom'] = 'Custom (Customize lane height based on number of cards)';
$lang->kanbancolumn->fluidBoardList['0'] = 'Fixed';
module/kanban/lang/zh-cn.php
+1 -1
View File
@@ -318,7 +318,7 @@ $lang->kanbanlane->confirmDeleteTip = '您确认删除该泳道吗？删除泳
$lang->kanbanlane->modeList['sameAsOther'] = '与其他泳道使用相同看板列';
$lang->kanbanlane->modeList['independent'] = '采用独立的看板列';
$lang->kanbanlane->heightTypeList['auto'] = '自适应（根据卡片高度自适应）';
$lang->kanbanlane->heightTypeList['auto'] = '自适应（根据卡片高度和泳道名称高度自适应）';
$lang->kanbanlane->heightTypeList['custom'] = '自定义（根据卡片数量自定义泳道高度）';
$lang->kanbancolumn->fluidBoardList['0'] = '固定列宽';
module/kanban/model.php
+1 -1
View File
@@ -3071,7 +3071,7 @@ class kanbanModel extends model
if(common::hasPriv('kanban', 'setColumnWidth') and $CRKanban) $columnActions .= '<li>' . html::a(helper::createLink('kanban', 'setColumnWidth', "kanbanID=$kanban->id", '', true), '<i class="icon icon-size-width"></i>' . $this->lang->kanban->columnWidth, '', "class='iframe btn btn-link' data-width=400") . '</li>';
if($printSetHeightBtn and $CRKanban)
{
$width = $this->app->getClientLang() == 'en' ? '750' : '650';
$width = $this->app->getClientLang() == 'en' ? '920' : '770';
$columnActions .= '<li>' . html::a(helper::createLink('kanban', 'setLaneHeight', "kanbanID=$kanban->id", '', true), '<i class="icon icon-size-height"></i>' . $this->lang->kanban->laneHeight, '', "class='iframe btn btn-link' data-width='$width'") . '</li>';
}
$actions .= $columnActions;