Merge branch 'sprint/168_sunhao/improve_kanban' into 'master'

* Support for using kanban in old browsers without CSS flex.

See merge request easycorp/zentaopms!757

module/common/view/kanban.html.php

@@ -22,7 +22,7 @@
 #kanbanList .kanban-card {display: grid;}
 #kanbanList .kanban-card > .title {white-space: nowrap; overflow: hidden; text-overflow: ellipsis;}
 #kanbanList .kanban-card.has-progress {padding-right: 40px; position: relative;}
-#kanbanList .kanban-card.has-progress > .progress-pie {position: absolute; right: 7px; top: 7px}
+#kanbanList .kanban-card.has-progress > .progress-pie {position: absolute; right: 7px; top: 7px; width: 24px; height: 24px;}
 #kanbanList .kanban-card.has-left-border {border-left: 2px solid #838a9d;}
 #kanbanList .kanban-card.has-left-border.border-left-green {border-left-color: #0bd986;}
 #kanbanList .kanban-card.has-left-border.border-left-red {border-left-color: #ff5d5d;}

module/execution/css/executionkanban.css

@@ -5,3 +5,4 @@
 #kanbanList .kanban-col[data-type="project"] .kanban-lane-items {height: 100%; display: flex; flex-direction: column; justify-content: center;}
 #kanbanList .kanban-lane-name > .text {display: none;}
 #kanbanList .kanban-item.link-block > a {cursor: move;}
+#kanbanList .kanban-lane + .kanban-lane {margin-top: 2px!important;}

module/execution/css/kanban.css

@@ -32,7 +32,7 @@
 #kanbanContainer {margin: 0;}
 #kanbanContainer > .panel-body {overflow: auto;}
 #kanbans .kanban {min-height: initial;}
-#kanbans .kanban-lane {min-height: 150px;}
+#kanbans .kanban-lane {min-height: 150px; margin-top: 2px;}
 #kanbans .kanban-affixed > .kanban-header {top: 100px;}
 #kanbans .kanban-card[data-scale-size="4"] {padding: 8px;}
 #kanbans .kanban-card[data-scale-size="3"] {padding: 3px 4px;}

module/execution/js/executionkanban.js

@@ -159,13 +159,13 @@ $(function()
     {
         data:          processKanbanData(),
         laneNameWidth: 5,
+        virtualize:    true,
         droppable:
         {
             selector:     '.kanban-item:not(.kanban-item-span)',
             target:       findDropColumns,
             finish:       handleFinishDrop,
             mouseButton: 'left'
-        },
-        virtualize: true
+        }
     });
 });

module/execution/js/kanban.js

@@ -880,7 +880,7 @@ $(function()
         var menuCreator = window.menuCreators[menuType];
         if(!menuCreator) return;
 
-        var options = $.extend({event, $trigger: $trigger}, $trigger.data());
+        var options = $.extend({event: event, $trigger: $trigger}, $trigger.data());
         var items   = menuCreator(options);
         if(!items || !items.length) return;
 

module/program/js/kanban.js

@@ -115,6 +115,13 @@ function processKanbanData(key, programsData)
     return {id: kanbanId, columns: columns, lanes: lanes};
 }
 
+/** Calculate column height */
+function calcColHeight(col, lane, colCards, colHeight)
+{
+    if (col.type !== 'doingProject') return colHeight;
+    return colCards.length * 62;
+}
+
 $(function()
 {
     /* Init all kanbans */
@@ -122,6 +129,11 @@ $(function()
     {
         var $kanban = $('#kanban-' + key);
         if(!$kanban.length) return;
-        $kanban.kanban({data: processKanbanData(key, programsData), virtualize: true});
+        $kanban.kanban(
+        {
+            data:          processKanbanData(key, programsData),
+            virtualize:    true,
+            calcColHeight: calcColHeight
+        });
     });
 });