From 020ab8d8b858b62ec4fba8728fdacd970f714444 Mon Sep 17 00:00:00 2001
From: qiyu-xie <qiyu_xie@163.com>
Date: Tue, 13 Jul 2021 17:40:19 +0800
Subject: [PATCH] * Finish task#40010.

---
 module/execution/css/executionkanban.css      |  4 +-
 .../execution/view/executionkanban.html.php   | 50 ++++++++++---------
 2 files changed, 29 insertions(+), 25 deletions(-)

diff --git a/module/execution/css/executionkanban.css b/module/execution/css/executionkanban.css
index 1abc7ea4c7..3b4f33524a 100644
--- a/module/execution/css/executionkanban.css
+++ b/module/execution/css/executionkanban.css
@@ -1,8 +1,10 @@
 .main-table tbody > tr > td {border-bottom: 2px solid #fff;}
 .main-table .table {cursor: default;}
+
 .boards {display: table; table-layout: fixed; width: 100%; min-width: 140px;}
 .boards .board:not(:last-child), .board-project {border-right: 2px solid #fff;}
 .board {display: table-cell; width: 25%; padding: 10px; transition: background-color .2s, opacity .2s; vertical-align: top;}
+.board > div {max-height: 230px; overflow: auto;}
 .board-item {border: 1px solid #EBEBEB; padding: 5px 10px; cursor: default; border-radius: 2px; background-color: #fff;}
 .board-item.disabled {cursor: not-allowed;}
 .board-item:hover {border-color: #ccc;}
@@ -26,5 +28,5 @@
 .table-grouped > tbody > tr,
 .table-grouped > tbody > tr:hover {background: #fff !important;}
 
-.table-row .table-col:last-child {width: 30px;}
+.table-row .table-col:last-child, .c-progress {width: 30px;}
 .table-row .table-col:first-child {overflow: hidden; text-overflow: ellipsis; white-space: nowrap;}
diff --git a/module/execution/view/executionkanban.html.php b/module/execution/view/executionkanban.html.php
index 05a1b56400..5976288e21 100644
--- a/module/execution/view/executionkanban.html.php
+++ b/module/execution/view/executionkanban.html.php
@@ -36,35 +36,37 @@
             <div class="boards">
               <?php foreach($lang->execution->kanbanColType as $colStatus => $col):?>
               <div class="board s-<?php echo $colStatus?>" data-type="<?php echo $colStatus;?>">
-                <?php if(!empty($executionList[$colStatus])):?>
-                <?php foreach($executionList[$colStatus] as $execution):?>
-                <div class='board-item' data-id='<?php echo $execution->id?>' id='task-<?php echo $execution->id?>' data-type='execution' <?php if($execution->status == 'doing' and isset($execution->delay)) echo "style='border-left: 3px solid #ff0000';";?>>
-                  <div class='table-row'>
-                    <div class='table-col'>
-                      <?php
-                      if(common::hasPriv('execution', 'task'))
-                      {
-                          echo html::a($this->createLink('execution', 'task', "executionID=$execution->id"), $execution->name, '', 'class="title kanbaniframe" title="' . $execution->name . '"');
-                      }
-                      else
-                      {
-                          echo "<span class='title' title='{$execution->name}'>{$execution->name}</span>";
-                      }
-                      ?>
-                    </div>
-                    <div class='table-col'>
-                      <?php if($colStatus == 'doing'):?>
-                      <div class="c-progress">
-                        <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
-                          <div class='progress-info'><?php echo $execution->hours->progress;?></div>
+                <div>
+                  <?php if(!empty($executionList[$colStatus])):?>
+                  <?php foreach($executionList[$colStatus] as $execution):?>
+                  <div class='board-item' data-id='<?php echo $execution->id?>' id='task-<?php echo $execution->id?>' data-type='execution' <?php if($execution->status == 'doing' and isset($execution->delay)) echo "style='border-left: 3px solid #ff0000';";?>>
+                    <div class='table-row'>
+                      <div class='table-col'>
+                        <?php
+                        if(common::hasPriv('execution', 'task'))
+                        {
+                            echo html::a($this->createLink('execution', 'task', "executionID=$execution->id"), $execution->name, '', 'class="title kanbaniframe" title="' . $execution->name . '"');
+                        }
+                        else
+                        {
+                            echo "<span class='title' title='{$execution->name}'>{$execution->name}</span>";
+                        }
+                        ?>
+                      </div>
+                      <div class='table-col'>
+                        <?php if($colStatus == 'doing'):?>
+                        <div class="c-progress">
+                          <div class='progress-pie' data-doughnut-size='90' data-color='#00da88' data-value='<?php echo $execution->hours->progress;?>' data-width='24' data-height='24' data-back-color='#e8edf3'>
+                            <div class='progress-info'><?php echo $execution->hours->progress;?></div>
+                          </div>
                         </div>
+                        <?php endif?>
                       </div>
-                      <?php endif?>
                     </div>
                   </div>
+                  <?php endforeach?>
+                  <?php endif?>
                 </div>
-                <?php endforeach?>
-                <?php endif?>
               </div>
               <?php endforeach;?>
             </div>