From f8447c98250eaa64071e6f88427b32bf625737bc Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 26 Oct 2021 11:46:33 +0800
Subject: [PATCH 1/6] * Correct Kanban data.

---
 module/common/lang/common.php |  1 -
 module/kanban/config.php      | 31 ++++++++++++++++++++++
 module/kanban/model.php       | 48 +++++++++++++++++++----------------
 3 files changed, 57 insertions(+), 23 deletions(-)

diff --git a/module/common/lang/common.php b/module/common/lang/common.php
index 137b14fb8e..57a3c16b1c 100644
--- a/module/common/lang/common.php
+++ b/module/common/lang/common.php
@@ -75,7 +75,6 @@ $lang->file        = new stdclass();
 $lang->misc        = new stdclass();
 $lang->acl         = new stdclass();
 $lang->curd        = new stdclass();
-$lang->kanban      = new stdclass();
 
 $lang->projectbuild   = new stdclass();
 $lang->projectrelease = new stdclass();
diff --git a/module/kanban/config.php b/module/kanban/config.php
index 7928dd1b39..e5b8241338 100644
--- a/module/kanban/config.php
+++ b/module/kanban/config.php
@@ -17,3 +17,34 @@ $config->kanban->default->task = new stdclass();
 $config->kanban->default->task->name  = $lang->task->common;
 $config->kanban->default->task->color = '#4169e1';
 $config->kanban->default->task->order = '15';
+
+$config->kanban->column = new stdclass();
+$config->kanban->column->status['story']['backlog']    = 'active';
+$config->kanban->column->status['story']['developing'] = 'active';
+$config->kanban->column->status['story']['developed']  = 'active';
+$config->kanban->column->status['story']['testing']    = 'active';
+$config->kanban->column->status['story']['tested']     = 'active';
+$config->kanban->column->status['story']['verified']   = 'active';
+$config->kanban->column->status['story']['released']   = 'active';
+$config->kanban->column->status['story']['closed']     = 'closed';
+
+$config->kanban->column->status['bug']['unconfirmed'] = 'active';
+$config->kanban->column->status['bug']['confirmed']   = 'active';
+$config->kanban->column->status['bug']['fixed']       = 'resolved';
+$config->kanban->column->status['bug']['closed']      = 'closed';
+
+$config->kanban->column->status['task']['developing'] = 'doing';
+$config->kanban->column->status['task']['developed']  = 'done';
+$config->kanban->column->status['task']['wait']       = 'wait';
+$config->kanban->column->status['task']['pause']      = 'pause';
+$config->kanban->column->status['task']['canceled']   = 'canceled';
+$config->kanban->column->status['task']['closed']     = 'closed';
+
+$config->kanban->column->stage['story']['backlog']    = 'active';
+$config->kanban->column->stage['story']['developing'] = 'developing';
+$config->kanban->column->stage['story']['developed']  = 'developed';
+$config->kanban->column->stage['story']['testing']    = 'testing';
+$config->kanban->column->stage['story']['tested']     = 'tested';
+$config->kanban->column->stage['story']['verified']   = 'verified';
+$config->kanban->column->stage['story']['released']   = 'released';
+$config->kanban->column->stage['story']['closed']     = 'closed';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 5b021797fa..0d5907c673 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -97,17 +97,16 @@ class kanbanModel extends model
                 $data->name  = $name;
                 $data->type  = $colType;
                 $data->cards = '';
+
                 if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID;
                 if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
                 if(strpos(',ready,develop,test,', $colType) === false)
                 {
+                    $storyStatus = $this->config->kanban->column->status['story'][$colType];
+                    $storyStage  = $this->config->kanban->column->stage['story'][$colType];
                     foreach($objects as $storyID => $story)
                     {
-                        if($colType == 'backlog' and $story->status == 'active' and $story->stage == 'projected') $data->cards .= $storyID . ',';
-
-                        if($colType == 'closed' and $story->status == 'closed' and $story->stage == 'closed') $data->cards .= $storyID . ',';
-
-                        if($story->stage == $colType and strpos(',backlog,closed,', $colType) === false and $story->status == 'active') $data->cards .= $storyID . ',';
+                        if($story->status == $storyStatus and $story->stage == $storyStage) $data->cards .= $storyID . ',';
                     }
                     if(!empty($data->cards)) $data->cards = ',' . $data->cards;
                 }
@@ -130,20 +129,27 @@ class kanbanModel extends model
                 if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
                 if(strpos(',resolving,fixing,test,testing,tested,', $colType) === false)
                 {
+                    $bugStatus = $this->config->kanban->column->status['bug'][$colType];
                     foreach($objects as $bugID => $bug)
                     {
-                        if($colType == 'unconfirmed' and $bug->status == 'active' and $bug->confirmed == 0) $data->cards .= $bugID . ',';
-
-                        if($colType == 'confirmed' and $bug->status == 'active' and $bug->confirmed == 1) $data->cards .= $bugID . ',';
-
-                        if($colType == 'fixed' and $bug->status == 'resolved') $data->cards .= $bugID . ',';
-
-                        if($colType == 'closed' and $bug->status == 'closed') $data->cards .= $bugID . ',';
+                        if($colType == 'unconfirmed' and $bug->status == $bugStatus and $bug->confirmed == 0)
+                        {
+                            $data->cards .= $bugID . ',';
+                        }
+                        elseif($colType == 'confirmed' and $bug->status == $bugStatus and $bug->confirmed == 1)
+                        {
+                            $data->cards .= $bugID . ',';
+                        }
+                        elseif($bug->status == $bugStatus)
+                        {
+                            $data->cards .= $bugID . ',';
+                        }
                     }
-                    $this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
-                    if($colType == 'resolving') $resolvingColumnID = $this->dao->lastInsertId();
-                    if($colType == 'test')      $testColumnID      = $this->dao->lastInsertId();
+                    if(!empty($data->cards)) $data->cards = ',' . $data->cards;
                 }
+                $this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
+                if($colType == 'resolving') $resolvingColumnID = $this->dao->lastInsertId();
+                if($colType == 'test')      $testColumnID      = $this->dao->lastInsertId();
             }
         }
         elseif($type == 'task')
@@ -158,18 +164,16 @@ class kanbanModel extends model
                 if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID;
                 if(strpos(',develop,', $colType) === false)
                 {
+                    $taskStatus = $this->config->kanban->column->status['task'][$colType];
                     foreach($objects as $taskID => $task)
                     {
-                        if($colType == 'developing' and $task->status == 'doing') $data->cards .= $taskID . ',';
+                        if($task->status == $taskStatus) $data->cards .= $taskID . ',';
 
-                        if($colType == 'developed' and $task->status == 'done') $data->cards .= $taskID . ',';
-
-                        if(strpos(',wait,pause,canceled,closed,', $colType) !== false and $task->status == $colType) $data->cards .= $taskID . ',';
                     }
-
-                    $this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
-                    if($colType == 'develop') $devColumnID = $this->dao->lastInsertId();
+                    if(!empty($data->cards)) $data->cards = ',' . $data->cards;
                 }
+                $this->dao->insert(TABLE_KANBANCOLUMN)->data($data)->exec();
+                if($colType == 'develop') $devColumnID = $this->dao->lastInsertId();
             }
         }
     }

From 83a1e66eabe6422933a2f2e3a2eec2bc377a39aa Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 26 Oct 2021 13:35:02 +0800
Subject: [PATCH 2/6] * Adjust code.

---
 module/kanban/config.php | 31 -------------------------------
 module/kanban/model.php  |  8 ++++----
 2 files changed, 4 insertions(+), 35 deletions(-)

diff --git a/module/kanban/config.php b/module/kanban/config.php
index e5b8241338..7928dd1b39 100644
--- a/module/kanban/config.php
+++ b/module/kanban/config.php
@@ -17,34 +17,3 @@ $config->kanban->default->task = new stdclass();
 $config->kanban->default->task->name  = $lang->task->common;
 $config->kanban->default->task->color = '#4169e1';
 $config->kanban->default->task->order = '15';
-
-$config->kanban->column = new stdclass();
-$config->kanban->column->status['story']['backlog']    = 'active';
-$config->kanban->column->status['story']['developing'] = 'active';
-$config->kanban->column->status['story']['developed']  = 'active';
-$config->kanban->column->status['story']['testing']    = 'active';
-$config->kanban->column->status['story']['tested']     = 'active';
-$config->kanban->column->status['story']['verified']   = 'active';
-$config->kanban->column->status['story']['released']   = 'active';
-$config->kanban->column->status['story']['closed']     = 'closed';
-
-$config->kanban->column->status['bug']['unconfirmed'] = 'active';
-$config->kanban->column->status['bug']['confirmed']   = 'active';
-$config->kanban->column->status['bug']['fixed']       = 'resolved';
-$config->kanban->column->status['bug']['closed']      = 'closed';
-
-$config->kanban->column->status['task']['developing'] = 'doing';
-$config->kanban->column->status['task']['developed']  = 'done';
-$config->kanban->column->status['task']['wait']       = 'wait';
-$config->kanban->column->status['task']['pause']      = 'pause';
-$config->kanban->column->status['task']['canceled']   = 'canceled';
-$config->kanban->column->status['task']['closed']     = 'closed';
-
-$config->kanban->column->stage['story']['backlog']    = 'active';
-$config->kanban->column->stage['story']['developing'] = 'developing';
-$config->kanban->column->stage['story']['developed']  = 'developed';
-$config->kanban->column->stage['story']['testing']    = 'testing';
-$config->kanban->column->stage['story']['tested']     = 'tested';
-$config->kanban->column->stage['story']['verified']   = 'verified';
-$config->kanban->column->stage['story']['released']   = 'released';
-$config->kanban->column->stage['story']['closed']     = 'closed';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 0d5907c673..b6955b7b68 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -102,8 +102,8 @@ class kanbanModel extends model
                 if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
                 if(strpos(',ready,develop,test,', $colType) === false)
                 {
-                    $storyStatus = $this->config->kanban->column->status['story'][$colType];
-                    $storyStage  = $this->config->kanban->column->stage['story'][$colType];
+                    $storyStatus = $this->config->kanban->storyColumnStatusList[$colType];
+                    $storyStage  = $this->config->kanban->storyColumnStageList[$colType];
                     foreach($objects as $storyID => $story)
                     {
                         if($story->status == $storyStatus and $story->stage == $storyStage) $data->cards .= $storyID . ',';
@@ -129,7 +129,7 @@ class kanbanModel extends model
                 if(strpos(',testing,tested,', $colType) !== false) $data->parent = $testColumnID;
                 if(strpos(',resolving,fixing,test,testing,tested,', $colType) === false)
                 {
-                    $bugStatus = $this->config->kanban->column->status['bug'][$colType];
+                    $bugStatus = $this->config->kanban->bugColumnStatusList[$colType];
                     foreach($objects as $bugID => $bug)
                     {
                         if($colType == 'unconfirmed' and $bug->status == $bugStatus and $bug->confirmed == 0)
@@ -164,7 +164,7 @@ class kanbanModel extends model
                 if(strpos(',developing,developed,', $colType) !== false) $data->parent = $devColumnID;
                 if(strpos(',develop,', $colType) === false)
                 {
-                    $taskStatus = $this->config->kanban->column->status['task'][$colType];
+                    $taskStatus = $this->config->kanban->taskColumnStatusList[$colType];
                     foreach($objects as $taskID => $task)
                     {
                         if($task->status == $taskStatus) $data->cards .= $taskID . ',';

From 4d09ade9cb0fe6b9a99c47dd9013b6a60d66283f Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie@easycorp.ltd>
Date: Tue, 26 Oct 2021 14:37:39 +0800
Subject: [PATCH 3/6] * Get card data of kanban column.

---
 module/execution/control.php |  6 +++++-
 module/kanban/lang/en.php    | 35 +++++++++++++++++++++++++++++++++++
 module/kanban/model.php      | 12 ++++++++++++
 3 files changed, 52 insertions(+), 1 deletion(-)
 create mode 100644 module/kanban/lang/en.php

diff --git a/module/execution/control.php b/module/execution/control.php
index 11c7079776..1d33689ac7 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1841,7 +1841,11 @@ class execution extends control
         if(strpos($this->server->http_user_agent, 'MSIE 8.0') !== false) header("X-UA-Compatible: IE=EmulateIE7");
 
         $kanban = $this->loadModel('kanban')->getExecutionKanban($executionID);
-        if(empty($kanban)) $this->kanban->createLanes($executionID);
+        if(empty($kanban))
+        {
+            $this->kanban->createLanes($executionID);
+            $kanban = $this->kanban->getExecutionKanban($executionID);
+        }
 
         $this->execution->setMenu($executionID);
         $execution = $this->loadModel('execution')->getById($executionID);
diff --git a/module/kanban/lang/en.php b/module/kanban/lang/en.php
new file mode 100644
index 0000000000..091db93088
--- /dev/null
+++ b/module/kanban/lang/en.php
@@ -0,0 +1,35 @@
+<?php
+$lang->kanban = new stdClass();
+
+$lang->kanban->storyColumn = array();
+$lang->kanban->storyColumn['backlog']    = 'Backlog';
+$lang->kanban->storyColumn['ready']      = 'Ready';
+$lang->kanban->storyColumn['develop']    = 'Development';
+$lang->kanban->storyColumn['developing'] = 'Doing';
+$lang->kanban->storyColumn['developed']  = 'Done';
+$lang->kanban->storyColumn['test']       = 'Testing';
+$lang->kanban->storyColumn['testing']    = 'Doing';
+$lang->kanban->storyColumn['tested']     = 'Done';
+$lang->kanban->storyColumn['verified']   = 'Verified';
+$lang->kanban->storyColumn['released']   = 'Released';
+$lang->kanban->storyColumn['closed']     = 'Closed';
+
+$lang->kanban->bugColumn = array();
+$lang->kanban->bugColumn['unconfirmed'] = 'Unconfirmed';
+$lang->kanban->bugColumn['confirmed']   = 'Confirmed';
+$lang->kanban->bugColumn['resolving']   = 'Resolving';
+$lang->kanban->bugColumn['fixing']      = 'Doing';
+$lang->kanban->bugColumn['fixed']       = 'Done';
+$lang->kanban->bugColumn['test']        = 'Test';
+$lang->kanban->bugColumn['testing']     = 'Doing';
+$lang->kanban->bugColumn['tested']      = 'Done';
+$lang->kanban->bugColumn['closed']      = 'Closed';
+
+$lang->kanban->taskColumn = array();
+$lang->kanban->taskColumn['wait']       = 'Wait';
+$lang->kanban->taskColumn['develop']    = 'Develop';
+$lang->kanban->taskColumn['developing'] = 'Developing';
+$lang->kanban->taskColumn['developed']  = 'Developed';
+$lang->kanban->taskColumn['pause']      = 'Pause';
+$lang->kanban->taskColumn['canceled']   = 'Canceled';
+$lang->kanban->taskColumn['closed']     = 'Closed';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index b6955b7b68..97844906f5 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -35,10 +35,22 @@ class kanbanModel extends model
             ->andWhere('lane')->in(array_keys($lanes))
             ->fetchGroup('lane', 'id');
 
+        if($objectType == 'story' or $objectType == 'all') $stories = $this->loadModel('story')->getExecutionStories($executionID);
+        if($objectType == 'bug' or $objectType == 'all')   $bugs    = $this->loadModel('bug')->getExecutionBugs($executionID);
+        if($objectType == 'task' or $objectType == 'all')  $tasks   = $this->loadModel('execution')->getKanbanTasks($executionID, "id");
         foreach($columns as $laneID => $cols)
         {
+            $laneType = $lanes[$laneID]->type;
             foreach($cols as $colID => $col)
             {
+                $cardIdList = array_filter(explode(',', $col->cards));
+                $col->cards = array();
+                foreach($cardIdList as $objectID)
+                {
+                    if($laneType == 'story') $col->cards[$objectID] = zget($stories, $objectID, '');
+                    if($laneType == 'bug')   $col->cards[$objectID] = zget($bugs,    $objectID, '');
+                    if($laneType == 'task')  $col->cards[$objectID] = zget($tasks,   $objectID, '');
+                }
                 if($col->parent > 0)
                 {
                     $cols[$col->parent]->childs[$colID] = $col;

From 0dc857f2bb207624b45b8f74de3a57a9a5778344 Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Tue, 26 Oct 2021 14:38:00 +0800
Subject: [PATCH 4/6]  * Code for task #43519.

---
 module/kanban/config.php           | 49 ++++++++++++++++++++++
 module/kanban/control.php          | 46 ++++++++++++++++++++
 module/kanban/js/setwip.js         | 28 +++++++++++++
 module/kanban/lang/zh-cn.php       |  7 ++++
 module/kanban/model.php            | 47 +++++++++++++++++++++
 module/kanban/view/setwip.html.php | 67 ++++++++++++++++++++++++++++++
 6 files changed, 244 insertions(+)
 create mode 100644 module/kanban/control.php
 create mode 100644 module/kanban/js/setwip.js
 create mode 100644 module/kanban/view/setwip.html.php

diff --git a/module/kanban/config.php b/module/kanban/config.php
index 7928dd1b39..bbb2528cdb 100644
--- a/module/kanban/config.php
+++ b/module/kanban/config.php
@@ -2,6 +2,9 @@
 global $lang;
 $config->kanban = new stdclass();
 
+$config->kanban->setwip = new stdclass();
+$config->kanban->setwip->requiredFields = 'limit';
+
 $config->kanban->default = new stdclass();
 $config->kanban->default->story  = new stdclass();
 $config->kanban->default->story->name  = $lang->SRCommon;
@@ -17,3 +20,49 @@ $config->kanban->default->task = new stdclass();
 $config->kanban->default->task->name  = $lang->task->common;
 $config->kanban->default->task->color = '#4169e1';
 $config->kanban->default->task->order = '15';
+
+$config->kanban->storyColumnStageList = array();
+$config->kanban->storyColumnStageList['backlog']    = 'projected';
+$config->kanban->storyColumnStageList['ready']      = 'projected';
+$config->kanban->storyColumnStageList['develop']    = 'developing';
+$config->kanban->storyColumnStageList['developing'] = 'developing';
+$config->kanban->storyColumnStageList['developed']  = 'developed';
+$config->kanban->storyColumnStageList['test']       = 'testing';
+$config->kanban->storyColumnStageList['testing']    = 'testing';
+$config->kanban->storyColumnStageList['tested']     = 'tested';
+$config->kanban->storyColumnStageList['verified']   = 'verified';
+$config->kanban->storyColumnStageList['released']   = 'released';
+$config->kanban->storyColumnStageList['closed']     = 'closed';
+
+$config->kanban->storyColumnStatusList = array();
+$config->kanban->storyColumnStatusList['backlog']    = 'active';
+$config->kanban->storyColumnStatusList['ready']      = 'active';
+$config->kanban->storyColumnStatusList['develop']    = 'active';
+$config->kanban->storyColumnStatusList['developing'] = 'active';
+$config->kanban->storyColumnStatusList['developed']  = 'active';
+$config->kanban->storyColumnStatusList['test']       = 'active';
+$config->kanban->storyColumnStatusList['testing']    = 'active';
+$config->kanban->storyColumnStatusList['tested']     = 'active';
+$config->kanban->storyColumnStatusList['verified']   = 'active';
+$config->kanban->storyColumnStatusList['released']   = 'active';
+$config->kanban->storyColumnStatusList['closed']     = 'closed';
+
+$config->kanban->bugColumnStatusList = array();
+$config->kanban->bugColumnStatusList['unconfirmed'] = 'active';
+$config->kanban->bugColumnStatusList['confirmed']   = 'active';
+$config->kanban->bugColumnStatusList['resolving']   = 'active';
+$config->kanban->bugColumnStatusList['fixing']      = 'active';
+$config->kanban->bugColumnStatusList['fixed']       = 'resolved';
+$config->kanban->bugColumnStatusList['test']        = 'resolved';
+$config->kanban->bugColumnStatusList['testing']     = 'resolved';
+$config->kanban->bugColumnStatusList['tested']      = 'resolved';
+$config->kanban->bugColumnStatusList['closed']      = 'closed';
+
+$config->kanban->taskColumnStatusList = array();
+$config->kanban->taskColumnStatusList['wait']       = 'wait';
+$config->kanban->taskColumnStatusList['develop']    = 'wait';
+$config->kanban->taskColumnStatusList['developing'] = 'doing';
+$config->kanban->taskColumnStatusList['developed']  = 'done';
+$config->kanban->taskColumnStatusList['pause']      = 'pause';
+$config->kanban->taskColumnStatusList['canceled']   = 'cancel';
+$config->kanban->taskColumnStatusList['closed']     = 'closed';
diff --git a/module/kanban/control.php b/module/kanban/control.php
new file mode 100644
index 0000000000..94c1b179ca
--- /dev/null
+++ b/module/kanban/control.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * The control file of kanban module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@easycorp.ltd>
+ * @package     kanban
+ * @version     $Id: control.php 4460 2021-10-26 11:03:02Z chencongzhi520@gmail.com $
+ * @link        https://www.zentao.net
+ */
+class kanban extends control
+{
+    /**
+     * Set WIP.
+     *
+     * @param  int    $columnID
+     * @param  int    $executionID
+     * @access public
+     * @return void
+     */
+    public function setWIP($columnID, $executionID = 0)
+    {
+        if($_POST)
+        {
+            $this->kanban->setWIP($columnID);
+            if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
+
+            $this->loadModel('action')->create('wip', $columnID, 'Edited');
+            die(js::reload('parent.parent'));
+        }
+
+        $this->app->loadLang('story');
+
+        $column = $this->kanban->getColumnById($columnID);
+        if(!$column) die(js::error($this->lang->notFound) . js::locate($this->createLink('execution', 'kanban', "executionID=$executionID")));
+
+        $status = zget($this->config->kanban->{$column->laneType . 'ColumnStatusList'}, $column->type);
+        $title  = isset($column->parentName) ? $column->parentName . '/' . $column->name : $column->name;
+
+        $this->view->title  = $title . $this->lang->colon . $this->lang->kanban->setWIP . '(' . $this->lang->kanban->WIP . ')';
+        $this->view->column = $column;
+        $this->view->status = $status;
+        $this->display();
+    }
+}
diff --git a/module/kanban/js/setwip.js b/module/kanban/js/setwip.js
new file mode 100644
index 0000000000..cf7b4a0563
--- /dev/null
+++ b/module/kanban/js/setwip.js
@@ -0,0 +1,28 @@
+$(function()
+{
+    $('#noLimit').click(function()
+    {
+        if($(this).attr('checked') == 'checked')
+        {
+            $('#WIPCount').attr('disabled', true);
+        }
+        else
+        {
+            $('#WIPCount').removeAttr('disabled');
+        }
+    })
+})
+
+/**
+ * Set WIP count.
+ *
+ * @access public
+ * @return void
+ */
+function setWIPLimit()
+{
+    var count = $('#WIPCount').val();
+    if($('#noLimit').attr('checked') == 'checked') count = -1;;
+
+    $('#limit').val(count);
+}
diff --git a/module/kanban/lang/zh-cn.php b/module/kanban/lang/zh-cn.php
index f61ea60e52..598b428eea 100644
--- a/module/kanban/lang/zh-cn.php
+++ b/module/kanban/lang/zh-cn.php
@@ -1,6 +1,13 @@
 <?php
 $lang->kanban = new stdClass();
 
+$lang->kanban->WIP       = 'WIP';
+$lang->kanban->setWIP    = '在制品设置';
+$lang->kanban->WIPStatus = '在制品状态';
+$lang->kanban->WIPStage  = '在制品阶段';
+$lang->kanban->WIPCount  = '在制品数量';
+$lang->kanban->noLimit   = '不限制∞';
+
 $lang->kanban->storyColumn = array();
 $lang->kanban->storyColumn['backlog']    = 'Backlog';
 $lang->kanban->storyColumn['ready']      = '准备好';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 5b021797fa..d4cf5e496b 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -265,4 +265,51 @@ class kanbanModel extends model
             }
         }
     }
+
+    /**
+     ** Get column by id.
+     **
+     ** @param  int    $columnID
+     ** @access public
+     ** @return object
+     **/
+    public function getColumnById($columnID)
+    {
+        $column = $this->dao->select('t1.*, t2.type as laneType')->from(TABLE_KANBANCOLUMN)->alias('t1')
+            ->leftjoin(TABLE_KANBANLANE)->alias('t2')->on('t1.lane=t2.id')
+            ->where('t1.id')->eq($columnID)
+            ->andWhere('t1.deleted')->eq(0)
+            ->fetch();
+
+        if(!empty($column->parent)) $column->parentName = $this->dao->findById($column->parent)->from(TABLE_KANBANCOLUMN)->fetch('name');
+
+        return $column;
+    }
+
+    /**
+     * Set WIP limit.
+     *
+     * @param  int    $columnID
+     * @access public
+     * @return bool
+     */
+    public function setWIP($columnID)
+    {
+        $column = $this->getColumnById($columnID);
+        $data   = fixer::input('post')
+            ->remove('WIPCount,noLimit')
+            ->get();
+
+        $this->lang->kanbancolumn = new stdclass();
+        $this->lang->kanbancolumn->limit = $this->lang->kanban->WIPCount;
+
+        $this->dao->update(TABLE_KANBANCOLUMN)->data($data)
+            ->autoCheck()
+            ->check(is_numeric($data->limit), 'limit', 'gt', 0)
+            ->batchcheck($this->config->kanban->setwip->requiredFields, 'notempty')
+            ->where('id')->eq($columnID)
+            ->exec();
+
+        return dao::isError();
+    }
 }
diff --git a/module/kanban/view/setwip.html.php b/module/kanban/view/setwip.html.php
new file mode 100644
index 0000000000..2cca3105b1
--- /dev/null
+++ b/module/kanban/view/setwip.html.php
@@ -0,0 +1,67 @@
+<?php
+/**
+ * The set WIP file of task module of ZenTaoPMS.
+ *
+ * @copyright   Copyright 2009-2021 青岛易软天创网络科技有限公司(QingDao Nature Easy Soft Network Technology Co,LTD, www.cnezsoft.com)
+ * @license     ZPL (http://zpl.pub/page/zplv12.html)
+ * @author      Yuchun Li <liyuchun@easycorp.ltd>
+ * @package     kanban
+ * @version     $Id: setwip.html.php 935 2021-10-25 10:56:24Z liyuchun@easycorp.ltd $
+ * @link        https://www.zentao.net
+ */
+?>
+
+<?php include '../../common/view/header.lite.html.php';?>
+<div id='mainContent' class='main-content'>
+  <div class='center-block'>
+    <div class='main-header'>
+      <h2>
+        <?php echo "<span title='$title'>" . $title . '</span>';?>
+      </h2>
+    </div>
+    <form method='post' target='hiddenwin' onsubmit='return setWIPLimit();'>
+      <table align='center' class='table table-form'>
+        <tr>
+          <th><?php echo $lang->kanban->WIPStatus;?></th>
+          <td colspan='2'>
+            <?php echo html::input('WIPStatus', zget($lang->kanban->{$column->laneType . 'Column'}, $column->type, ''), "class='form-control' disabled");?>
+          </td>
+          <td></td>
+        </tr>
+        <?php if($column->laneType == 'story'):?>
+        <tr>
+          <th><?php echo $lang->kanban->WIPStage;?></th>
+          <td colspan='2'>
+            <?php $stage = zget($config->kanban->storyColumnStageList, $column->type);?>
+            <?php echo html::input('WIPStage', zget($lang->story->stageList, $stage), "class='form-control' disabled");?>
+          </td>
+        </tr>
+        <?php endif;?>
+        <tr>
+          <th><?php echo $lang->kanban->WIPCount;?></th>
+          <td colspan='2'>
+            <?php echo html::hidden('limit', $column->limit, "class='form-control'");?>
+            <div class="table-col">
+              <?php $attr = $column->limit == -1 ? 'disabled' : '';?>
+              <?php echo html::input('WIPCount', $column->limit != -1 ? $column->limit : '', "class='form-control' $attr");?>
+            </div>
+            <div class="table-col w-50px">
+              <span class="input-group-addon" style="border: 1px solid #dcdcdc; border-left-width: 0px;">
+                <div class='checkbox-primary'>
+                  <input id='noLimit' name='noLimit' value='-1' type='checkbox' class='no-margin' <?php echo $column->limit == -1 ? 'checked' : '';?>/>
+                  <label for='needNotReview'><?php echo $lang->kanban->noLimit;?></label>
+                </div>
+              </span>
+            </div>
+          </td>
+        </tr>
+        <tr>
+          <td colspan='3' class='text-center form-actions'>
+            <?php echo html::submitButton();?>
+          </td>
+        </tr>
+      </table>
+    </form>
+  </div>
+</div>
+<?php include '../../common/view/footer.html.php';?>

From ad05f1d4cfa0b4a427c9bd50ce537e5d588b69f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=99=E5=B9=BF=E6=98=8E?= <sunguangming@cnezsoft.com>
Date: Tue, 26 Oct 2021 15:03:27 +0800
Subject: [PATCH 5/6] * Add kanban view.

---
 module/execution/control.php          |  12 -
 module/execution/js/kanban.js         | 786 ++++++++++++++++++--------
 module/execution/view/kanban.html.php | 195 +------
 module/kanban/model.php               |  10 +-
 4 files changed, 560 insertions(+), 443 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 11c7079776..0d6e2c3dce 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -1845,20 +1845,13 @@ class execution extends control
 
         $this->execution->setMenu($executionID);
         $execution = $this->loadModel('execution')->getById($executionID);
-        $tasks     = $this->execution->getKanbanTasks($executionID, "id");
-        $bugs      = $this->loadModel('bug')->getExecutionBugs($executionID);
-        $stories   = $this->loadModel('story')->getExecutionStories($executionID);
 
         /* Determines whether an object is editable. */
         $canBeChanged = common::canModify('execution', $execution);
 
-        $kanbanGroup   = $this->execution->getKanbanGroupData($stories, $tasks, $bugs, $type);
-        $kanbanSetting = $this->execution->getKanbanSetting();
-
         $this->view->title         = $this->lang->execution->kanban;
         $this->view->position[]    = html::a($this->createLink('execution', 'browse', "executionID=$executionID"), $execution->name);
         $this->view->position[]    = $this->lang->execution->kanban;
-        $this->view->stories       = $stories;
         $this->view->realnames     = $this->loadModel('user')->getPairs('noletter');
         $this->view->storyOrder    = $orderBy;
         $this->view->orderBy       = 'id_asc';
@@ -1866,11 +1859,6 @@ class execution extends control
         $this->view->browseType    = '';
         $this->view->execution     = $execution;
         $this->view->type          = $type;
-        $this->view->kanbanGroup   = $kanbanGroup;
-        $this->view->kanbanColumns = $this->execution->getKanbanColumns($kanbanSetting);
-        $this->view->statusMap     = $canBeChanged ? $this->execution->getKanbanStatusMap($kanbanSetting) : array();
-        $this->view->statusList    = $this->execution->getKanbanStatusList($kanbanSetting);
-        $this->view->colorList     = $this->execution->getKanbanColorList($kanbanSetting);
         $this->view->canBeChanged  = $canBeChanged;
 
         $this->display();
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 001ec4c5df..d5c2ba7f21 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1,253 +1,549 @@
+/**
+ * Get story demo kanban data
+ * 获取“软件需求”看板演示数据
+ * @returns {Object} Kanban data
+ * @todo 该方法作为演示，应该在最终版本中移除
+ */
+function getStoryKanbanDemoData()
+{
+    /* Define kanban columns  定义看板列 */
+    var columns =
+    [
+        /* 看板列定义数据结构：
+           id:         列 ID（确保在页面上唯一）,
+           type:       类型,
+           name:       显示的名称,
+           color:      列名称颜色,
+           parentType: 所属的父级列类型
+           asParent:   是否作为父级列
+           itemType:   看板条目类型，例如：'story'（需求）
+           maxCount:   最大数目，该列上允许展示的条目最大数目，如果为 0 表示无限制 */
+        {id: 'story-blacklog',   type: 'blacklog',   name: 'Blacklog', color: '', maxCount: 0},
+        {id: 'story-ready',      type: 'ready',      name: '准备好',    color: '', maxCount: 4},
+        {id: 'story-dev',        type: 'dev',        name: '开发',      color: '', maxCount: 4, asParent: true},
+        {id: 'story-dev-doing',  type: 'dev-doing',  name: '进行中',    color: '#126eed', maxCount: 2, parentType: 'dev'},
+        {id: 'story-dev-done',   type: 'dev-done',   name: '完成',      color: '#2fab8e', maxCount: 2, parentType: 'dev'},
+        {id: 'story-test',        type: 'test',       name: '测试',     color: '', maxCount: 4, asParent: true},
+        {id: 'story-test-doing', type: 'test-doing', name: '进行中',    color: '#126eed', maxCount: 2, parentType: 'test'},
+        {id: 'story-test-done',  type: 'test-done',  name: '完成',      color: '#2fab8e', maxCount: 2, parentType: 'test'},
+        {id: 'story-accepted',   type: 'accepted',   name: '已验收',    color: '', maxCount: 0},
+        {id: 'story-published',  type: 'published',  name: '已发布',    color: '', maxCount: 0},
+    ];
+
+    /* Define items in blacklog column  定义 Blacklog 列上的条目 */
+    var blacklogColItems =
+    [
+        /* 需求数据结构：
+           id:          ID，通常为需求 ID,
+           title:        名称,
+           order:       显示顺序，如果指定为 0，则按 ID 倒序排序,
+           pri:         优先级,
+           estimate:    预估时间,
+           assignedTo:  指派给,
+           deadline:    截止日期 */
+        {id: 10010, title: '第一条 Blacklog',     order: 1, pri: 1, estimate: 2,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10011, title: '文档模块的实现',        order: 2, pri: 2,  estimate: 0,  assignedTo: 'sunhao'},
+        {id: 10012, title: '实现软件需求看板视图中不同分组条件的看板展示方式', order: 3, pri: 3, estimate: 10, assignedTo: 'admin'},
+        {id: 10013, title: 'Blacklog 3',         order: 4, pri: 0, estimate: 0,  assignedTo: 'sunhao'},
+        {id: 10014, title: '实现泳道的更多操作菜单', order: 5, pri: 0, estimate: 0,  assignedTo: 'sunhao'},
+    ];
+    /* Define items in ready column  定义 准备好 列上的条目 */
+    var readyColItems =
+    [
+        /* 需求数据结构参见 blacklogColItems 定义 */
+        {id: 10020, title: '在看板列中实现创建任务功能', order: 10, pri: 1, estimate: 2,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10021, title: '实现泳道的上下移动',       order: 11, pri: 2,  estimate: 0,  assignedTo: 'sunhao'},
+        {id: 10024, title: '实现泳道的更多操作菜单',    order: 15, pri: 0, estimate: 0,  assignedTo: 'sunhao'},
+    ];
+    var devDoingColItems = /* Define items in dev/doing column  定义 开发/进行中 列上的条目 */
+    [
+        /* 需求数据结构参见 blacklogColItems 定义 */
+        {id: 10030, title: '实现看板的更多操作菜单', order: 10, pri: 3, estimate: 0,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10031, title: '实现卡片拖动效果功能',  order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+    ];
+    var devDoneColItems = /* Define items in dev/done column  定义 开发/完成 列上的条目 */
+    [
+        /* 需求数据结构参见 blacklogColItems 定义 */
+        {id: 10040, title: '实现看板列卡片排序功能',  order: 10, pri: 1, estimate: 4,  assignedTo: 'admin', deadline: '2021-10-30'},
+    ];
+    var testDoingColItems = /* Define items in test/doing column  定义 测试/进行中 列上的条目 */
+    [
+        /* 需求数据结构参见 blacklogColItems 定义 */
+        {id: 10050, title: '实现看板列的更多操作菜单',  order: 10, pri: 3, estimate: 0,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10051, title: '实现Bug卡片的更多操作功能', order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+    ];
+    var testDoneColItems = /* Define items in test/done column  定义 测试/完成 列上的条目 */
+    [
+        /* 需求数据结构参见 blacklogColItems 定义 */
+        {id: 10060, title: '实现任务卡片的更多操作功能', order: 10, pri: 1, estimate: 4,  assignedTo: 'admin', deadline: '2021-10-30'},
+    ];
+    var acceptedColItems =
+    [
+        /* 需求数据结构参见 blacklogColItems 定义 */
+        {id: 10070, title: '实现执行看板的新建按钮组功能',  order: 10, pri: 3, estimate: 12,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10071, title: '在看板列中实现提交Bug功能', order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+        {id: 10072, title: '在看板列中实现需求的添加和关联功能',  order: 10, pri: 3, estimate: 10,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10073, title: '实现任务看板视图中不同分组条件的看板展示方式', order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+    ];
+    var publishedColItems =
+    [
+        /* 需求数据结构参见 blacklogColItems 定义 */
+        {id: 10080, title: '实现任务看板视图中泳道分组下拉菜单功能',  order: 10, pri: 3, estimate: 2,  assignedTo: 'admin'},
+    ];
+
+    /* Define kanban items in lane  定义看板泳道内每一列的条目，属性名为看板列类型，属性值为条目列表 */
+    var items =
+    {
+        /* 看板列类型:  条目列表 */
+        blacklog:     blacklogColItems,
+        ready:        readyColItems,
+        'dev-doing':  devDoingColItems,
+        'dev-done':   devDoneColItems,
+        'test-doing': testDoingColItems,
+        'test-done':  testDoneColItems,
+        accepted:     acceptedColItems,
+        published:    publishedColItems,
+    };
+
+    /* Define kanban lanes  定义看板泳道 */
+    var lanes =
+    [
+        /* 泳道数据结构：
+           id:              泳道 ID，确保页面上唯一，可以为数字或字符串,
+           name:            名称,
+           items:           定义每列上的条目
+           color:           泳道名称背景色
+           defaultItemType: 看板泳道上的条目默认类型，例如：'story'（需求） */
+        {id: 'story', name: '软件需求', items: items, color: '#3dc6fc', defaultItemType: 'story'},
+    ]
+
+    /* Return kanban data  返回看板数据 */
+    /* 看板数据结构：
+       id:       ID，确保页面上唯一，可以为数字或字符串,
+       columns:  定义看板上的所有列,
+       lanes:    定义看板上的所有泳道
+       defaultItemType: 看板上的条目默认类型，例如：'story'（需求） */
+    return {id: 'story', columns: columns, lanes: lanes, defaultItemType: 'story'};
+}
+
+/**
+ * Get bug demo kanban data
+ * 获取“Bug”看板演示数据
+ * @returns {Object} Kanban data
+ * @todo 该方法作为演示，应该在最终版本中移除
+ */
+function getBugKanbanDemoData()
+{
+    /* Define kanban columns  定义看板列 */
+    var columns =
+    [
+        /* 看板列定义数据结构：
+        id:         列 ID（确保在页面上唯一）,
+        type:       类型,
+        name:       显示的名称,
+        color:      列名称颜色,
+        parentType: 所属的父级列类型
+        asParent:   是否作为父级列
+        itemType:   看板条目类型，例如：'story'（需求）
+        maxCount:   最大数目，该列上允许展示的条目最大数目，如果为 0 表示无限制 */
+        {id: 'bug-wait',            type: 'wait',            name: '待确认',  color: '', maxCount: 0},
+        {id: 'bug-confirmed',       type: 'confirmed',      name: '已确认',  color: '', maxCount: 4},
+        {id: 'bug-resolving',       type: 'resolving',      name: '解决中',  color: '', maxCount: 4, asParent: true},
+        {id: 'bug-resolving-doing', type: 'resolving-doing',name: '进行中',  color: '#126eed', maxCount: 2, parentType: 'resolving'},
+        {id: 'bug-resolving-done',  type: 'resolving-done', name: '完成',    color: '#2fab8e', maxCount: 2, parentType: 'resolving'},
+        {id: 'bug-test',            type: 'test',           name: '测试',    color: '', maxCount: 4, asParent: true},
+        {id: 'bug-test-doing',      type: 'test-doing',     name: '测试中',  color: '#126eed', maxCount: 2, parentType: 'test'},
+        {id: 'bug-test-done',       type: 'test-done',      name: '测试完毕', color: '#2fab8e', maxCount: 2, parentType: 'test'},
+        {id: 'bug-closed',          type: 'closed',         name: '已关闭',   color: '', maxCount: 0},
+    ];
+
+    /* Define items in wait column  定义 待确认 列上的条目 */
+    var waitColItems =
+    [
+        /* bug 数据结构：
+        id:          ID，通常为 Bug ID,
+        title:       名称,
+        order:       显示顺序，如果指定为 0，则按 ID 倒序排序,
+        pri:         优先级,
+        severity:    紧急程度,
+        assignedTo:  指派给 */
+        {id: 10010, title: '在看板列中实现创建任务功能', order: 10, pri: 1, severity: 2,  assignedTo: 'admin'},
+        {id: 10011, title: '实现泳道的上下移动',       order: 11, pri: 2,  severity: 1,  assignedTo: 'sunhao'},
+        {id: 10014, title: '实现泳道的更多操作菜单',    order: 15, pri: 0, severity: 1,  assignedTo: 'sunhao'},
+    ];
+    /* Define items in confirmed column  定义 已确认 列上的条目 */
+    var confirmedColItems =
+    [
+        /* Bug 数据结构参见 waitColItems 定义 */
+        {id: 10020, title: '在看板列中实现创建任务功能', order: 10, pri: 1, severity: 2,  assignedTo: 'admin'},
+        {id: 10021, title: '实现泳道的上下移动',       order: 11, pri: 2,  severity: 1,  assignedTo: 'sunhao'},
+        {id: 10024, title: '实现泳道的更多操作菜单',    order: 15, pri: 0, severity: 1,  assignedTo: 'sunhao'},
+    ];
+    var resolvingDoingColItems = /* Define items in resolving/doing column  定义 开发/进行中 列上的条目 */
+    [
+        /* Bug 数据结构参见 waitColItems 定义 */
+        {id: 10030, title: '实现看板的更多操作菜单', order: 10, pri: 3, severity: 1,  assignedTo: 'admin'},
+        {id: 10031, title: '实现卡片拖动效果功能',  order: 11, pri: 2,  severity: 2,  assignedTo: 'sunhao'},
+    ];
+    var resolvingDoneColItems = /* Define items in resolving/done column  定义 开发/完成 列上的条目 */
+    [
+        /* Bug 数据结构参见 waitColItems 定义 */
+        {id: 10040, title: '实现看板列卡片排序功能',  order: 10, pri: 1, severity: 4,  assignedTo: 'admin'},
+    ];
+    var testDoingColItems = /* Define items in test/doing column  定义 测试/进行中 列上的条目 */
+    [
+        /* Bug 数据结构参见 waitColItems 定义 */
+        {id: 10050, title: '实现看板列的更多操作菜单',  order: 10, pri: 3, severity: 3,  assignedTo: 'admin'},
+        {id: 10051, title: '实现Bug卡片的更多操作功能', order: 11, pri: 2,  severity: 2,  assignedTo: 'sunhao'},
+    ];
+    var testDoneColItems = /* Define items in test/done column  定义 测试/完成 列上的条目 */
+    [
+        /* Bug 数据结构参见 waitColItems 定义 */
+        {id: 10060, title: '实现任务卡片的更多操作功能', order: 10, pri: 1, severity: 4,  assignedTo: 'admin'},
+    ];
+    var closedColItems =
+    [
+        /* Bug 数据结构参见 waitColItems 定义 */
+        {id: 10070, title: '实现执行看板的新建按钮组功能',  order: 10, pri: 3, severity: 3,  assignedTo: 'admin'},
+        {id: 10071, title: '在看板列中实现提交Bug功能', order: 11, pri: 2,  severity: 2,  assignedTo: 'sunhao'},
+        {id: 10072, title: '在看板列中实现需求的添加和关联功能',  order: 10, pri: 3, severity: 3,  assignedTo: 'admin'},
+        {id: 10073, title: '实现任务看板视图中不同分组条件的看板展示方式', order: 11, pri: 2,  severity: 2,  assignedTo: 'sunhao'},
+    ];
+
+    /* Define kanban items in lane  定义看板泳道内每一列的条目，属性名为看板列类型，属性值为条目列表 */
+    var items =
+    {
+        /* 看板列类型:  条目列表 */
+        wait:              waitColItems,
+        confirmed:         confirmedColItems,
+        'resolving-doing': resolvingDoingColItems,
+        'resolving-done':  resolvingDoneColItems,
+        'test-doing':      testDoingColItems,
+        'test-done':       testDoneColItems,
+        closed:            closedColItems,
+    };
+
+    /* Define kanban lanes  定义看板泳道 */
+    var lanes =
+    [
+        /* 泳道数据结构：
+        id:              泳道 ID，确保页面上唯一，可以为数字或字符串,
+        name:            名称,
+        items:           定义每列上的条目
+        color:           泳道名称背景色
+        defaultItemType: 看板泳道上的条目默认类型，例如：'bug'（Bug） */
+        {id: 'bug', name: 'Bug', items: items, color: '#9c30b0', defaultItemType: 'bug'},
+    ]
+
+    /* Return kanban data  返回看板数据 */
+    /* 看板数据结构：
+    id:       ID，确保页面上唯一，可以为数字或字符串,
+    columns:  定义看板上的所有列,
+    lanes:    定义看板上的所有泳道
+    defaultItemType: 看板上的条目默认类型，例如：'bug'（Bug） */
+    return {id: 'bug', columns: columns, lanes: lanes, defaultItemType: 'bug'};
+}
+
+/**
+ * Get task demo kanban data
+ * 获取“任务”看板演示数据
+ * @returns {Object} Kanban data
+ * @todo 该方法作为演示，应该在最终版本中移除
+ */
+function getTaskKanbanDemoData()
+{
+    /* Define kanban columns  定义看板列 */
+    var columns =
+    [
+        /* 看板列定义数据结构：
+        id:         列 ID（确保在页面上唯一）,
+        type:       类型,
+        name:       显示的名称,
+        color:      列名称颜色,
+        parentType: 所属的父级列类型
+        asParent:   是否作为父级列
+        itemType:   看板条目类型，例如：'task'（任务）
+        maxCount:   最大数目，该列上允许展示的条目最大数目，如果为 0 表示无限制 */
+        {id: 'task-wait',      type: 'wait',      name: '未开始',   color: '', maxCount: 0},
+        {id: 'task-dev',       type: 'dev',       name: '开发',     color: '', maxCount: 4, asParent: true},
+        {id: 'task-dev-doing', type: 'dev-doing', name: '研发中',   color: '#126eed', maxCount: 2, parentType: 'dev'},
+        {id: 'task-dev-done',  type: 'dev-done',  name: '研发完成', color: '#2fab8e', maxCount: 2, parentType: 'dev'},
+        {id: 'task-pause',     type: 'pause',     name: '已暂停',   color: '', maxCount: 0},
+        {id: 'task-cancel',    type: 'cancel',    name: '已取消',   color: '', maxCount: 0},
+        {id: 'task-closed',    type: 'closed',    name: '已关闭',   color: '', maxCount: 0},
+    ];
+
+    /* Define items in wait column  定义 未开始 列上的条目 */
+    var waitColItems =
+    [
+        /* 任务数据结构：
+        id:          ID，通常为任务 ID,
+        name:       名称,
+        order:       显示顺序，如果指定为 0，则按 ID 倒序排序,
+        pri:         优先级,
+        estimate:    预估时间,
+        assignedTo:  指派给,
+        deadline:    截止日期 */
+        {id: 10020, name: '在看板列中实现创建任务功能', order: 10, pri: 1, estimate: 2,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10021, name: '实现泳道的上下移动',       order: 11, pri: 2,  estimate: 0,  assignedTo: 'sunhao', deadline: '2021-10-22'},
+        {id: 10024, name: '实现泳道的更多操作菜单',    order: 15, pri: 0, estimate: 0,  assignedTo: 'sunhao'},
+    ];
+    var devDoingColItems = /* Define items in dev/doing column  定义 开发/进行中 列上的条目 */
+    [
+        /* 任务数据结构参见 waitColItems 定义 */
+        {id: 10030, name: '实现看板的更多操作菜单', order: 10, pri: 3, estimate: 0,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10031, name: '实现卡片拖动效果功能',  order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+    ];
+    var devDoneColItems = /* Define items in dev/done column  定义 开发/完成 列上的条目 */
+    [
+        /* 任务数据结构参见 waitColItems 定义 */
+        {id: 10040, name: '实现看板列卡片排序功能',  order: 10, pri: 1, estimate: 4,  assignedTo: 'admin', deadline: '2021-10-30'},
+    ];
+    var pauseColItems = /* Define items in pause column  定义 已暂停 列上的条目 */
+    [
+        /* 任务数据结构参见 waitColItems 定义 */
+        {id: 10050, name: '实现看板列的更多操作菜单',  order: 10, pri: 3, estimate: 0,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10051, name: '实现Bug卡片的更多操作功能', order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+    ];
+    var cancelColItems = /* Define items in cancel column  定义 已取消 列上的条目 */
+    [
+        /* 任务数据结构参见 waitColItems 定义 */
+        {id: 10060, name: '实现任务卡片的更多操作功能', order: 10, pri: 1, estimate: 4,  assignedTo: 'admin', deadline: '2021-10-30'},
+    ];
+    var closedColItems =
+    [
+        /* 任务数据结构参见 waitColItems 定义 */
+        {id: 10070, name: '实现执行看板的新建按钮组功能',  order: 10, pri: 3, estimate: 12,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10071, name: '在看板列中实现提交Bug功能', order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+        {id: 10072, name: '在看板列中实现任务的添加和关联功能',  order: 10, pri: 3, estimate: 10,  assignedTo: 'admin', deadline: '2021-10-30'},
+        {id: 10073, name: '实现任务看板视图中不同分组条件的看板展示方式', order: 11, pri: 2,  estimate: 2,  assignedTo: 'sunhao'},
+    ];
+
+    /* Define kanban items in lane  定义看板泳道内每一列的条目，属性名为看板列类型，属性值为条目列表 */
+    var items =
+    {
+        /* 看板列类型:  条目列表 */
+        wait:        waitColItems,
+        'dev-doing': devDoingColItems,
+        'dev-done':  devDoneColItems,
+        pause:       pauseColItems,
+        cancel:      cancelColItems,
+        closed:      closedColItems,
+    };
+
+    /* Define kanban lanes  定义看板泳道 */
+    var lanes =
+    [
+        /* 泳道数据结构：
+        id:              泳道 ID，确保页面上唯一，可以为数字或字符串,
+        name:            名称,
+        items:           定义每列上的条目
+        color:           泳道名称背景色
+        defaultItemType: 看板泳道上的条目默认类型，例如：'task'（任务） */
+        {id: 'task', name: '任务', items: items, color: '#126eed', defaultItemType: 'task'},
+    ]
+
+    /* Return kanban data  返回看板数据 */
+    /* 看板数据结构：
+    id:       ID，确保页面上唯一，可以为数字或字符串,
+    columns:  定义看板上的所有列,
+    lanes:    定义看板上的所有泳道
+    defaultItemType: 看板上的条目默认类型，例如：'task'（任务） */
+    return {id: 'task', columns: columns, lanes: lanes, defaultItemType: 'task'};
+}
+
+
+/**
+ * Render user account
+ * @param {String} userAccount User account
+ * @returns {string}
+ */
+function renderUserAvatar(userAccount)
+{
+    var hue = $.zui.strCode(userAccount) * 43 / 360;
+    return ('<div class="avatar has-text avatar-sm avatar-circle" style="background: hsl(' + hue + ', 40%, 60%);"><span>'
+        + userAccount[0].toUpperCase()
+        + '</span></div>');
+}
+
+/**
+ * Render story item  提供方法渲染看板中的需求条目
+ * @param {Object} item  Story item object
+ * @param {JQuery} $item Kanban item element
+ * @param {Object} col   Column object
+ * @returns {JQuery} $item Kanban item element
+ */
+function renderStoryItem(item, $item, col)
+{
+    var $title = $item.find('.title');
+    if(!$title.length)
+    {
+        $title = $('<a class="title iframe"><i class="icon icon-lightbulb text-muted"></i> <span class="text"></span></a>')
+                .attr('href', $.createLink('story', 'view', 'storyID=' + item.id));
+        $title.appendTo($item);
+    }
+    $title.attr('title', item.title).find('.text').text(item.title);
+
+    var $infos = $item.find('.infos');
+    if(!$infos.length)
+    {
+        $infos = $('<div class="infos"></div>').appendTo($item);
+    }
+    $infos.html(
+    [
+        '<span class="info info-id text-muted">#' + item.id + '</span>',
+        '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>',
+        item.estimate ? '<span class="info info-estimate text-muted">' + item.estimate + 'h</span>' : '',
+        item.assignedTo ? renderUserAvatar(item.assignedTo) : '',
+    ].join(''));
+
+    $item.attr('data-type', 'story').addClass('kanban-item-story');
+
+    return $item;
+}
+
+
+/**
+ * Render bug item  提供方法渲染看板中的 Bug 条目
+ * @param {Object} item  Bug item object
+ * @param {JQuery} $item Kanban item element
+ * @param {Object} col   Column object
+ * @returns {JQuery} $item Kanban item element
+ */
+function renderBugItem(item, $item, col)
+{
+    var $title = $item.find('.title');
+    if(!$title.length)
+    {
+        $title = $('<a class="title iframe"><i class="icon icon-bug text-muted"></i> <span class="text"></span></a>')
+                .attr('href', $.createLink('bug', 'view', 'bugID=' + item.id));
+        $title.appendTo($item);
+    }
+    $title.attr('title', item.title).find('.text').text(item.title);
+
+    var $infos = $item.find('.infos');
+    if(!$infos.length)
+    {
+        $infos = $('<div class="infos"></div>').appendTo($item);
+    }
+    $infos.html(
+    [
+        '<span class="info info-id text-muted">#' + item.id + '</span>',
+        '<span class="info info-severity label-severity" data-severity="' + item.severity + '" title="' + item.severity + '"></span>',
+        '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>',
+        item.assignedTo ? renderUserAvatar(item.assignedTo) : '',
+    ].join(''));
+
+    $item.attr('data-type', 'bug').addClass('kanban-item-bug');
+
+    return $item;
+}
+
+/**
+ * Render task item  提供方法渲染看板中的任务条目
+ * @param {Object} item  Task item object
+ * @param {JQuery} $item Kanban item element
+ * @param {Object} col   Column object
+ * @returns {JQuery} $item Kanban item element
+ */
+function renderTaskItem(item, $item, col)
+{
+    var $title = $item.find('.title');
+    if(!$title.length)
+    {
+        $title = $('<a class="title iframe"><i class="icon icon-lightbulb text-muted"></i> <span class="text"></span></a>')
+                .attr('href', $.createLink('task', 'view', 'taskID=' + item.id));
+        $title.appendTo($item);
+    }
+    $title.attr('title', item.name).find('.text').text(item.name);
+
+    var $infos = $item.find('.infos');
+    if(!$infos.length)
+    {
+        $infos = $('<div class="infos"></div>').appendTo($item);
+    }
+    $infos.html(
+    [
+        '<span class="info info-id text-muted">#' + item.id + '</span>',
+        '<span class="info info-pri label-pri label-pri-' + item.pri + '" title="' + item.pri + '">' + item.pri + '</span>',
+        item.estimate ? '<span class="info info-estimate text-muted">' + item.estimate + 'h</span>' : '',
+        item.assignedTo ? renderUserAvatar(item.assignedTo) : '',
+    ].join(''));
+
+    $item.attr('data-type', 'task').addClass('kanban-item-task');
+
+    return $item;
+}
+
+
+/* Add column renderer/  添加特定列类型或列条目类型渲染方法 */
+addColumnRenderer('story', renderStoryItem);
+addColumnRenderer('bug', renderBugItem);
+addColumnRenderer('task', renderTaskItem);
+
+/**
+ * Render column count 渲染看板列头上的条目数目
+ * @param {JQuery} $count Kanban count element
+ * @param {number} count  Column items count
+ * @param {number} col    Column object
+ * @param {Object} kanban Kanban intance
+ */
+function renderColumnCount($count, count, col)
+{
+    var text = count + '/' + (!col.maxCount ? '<i class="icon icon-infinite"></i>' : '');
+    $count.html(text + '<i class="icon icon-arrow-up"></i>');
+}
+
+/**
+ * Updata kanban data
+ * 更新看板上的数据
+ * @param {string} kanbanID Kanban id   看板 ID
+ * @param {Object} data     Kanban data 看板数据
+ */
+function updateKanban(kanbanID, data)
+{
+    var $kanban = $('#kanban-' + kanbanID);
+    if(!$kanban.length) return;
+
+    $kanban.data('zui.kanban').render(data);
+}
+
+/**
+ * Create kanban in page
+ * 在界面上创建一个看板界面
+ * @param {string} kanbanID Kanban id      看板 ID
+ * @param {Object} data     Kanban data    看板数据
+ * @param {Object} options  Kanban options 组件初始化数据 看板名称
+ */
+function createKanban(kanbanID, data, options)
+{
+    var $kanban = $('#kanban-' + kanbanID);
+    if($kanban.length) return updateKanban(kanbanID, data);
+
+    $kanban = $('<div id="kanban-' + kanbanID + '"></div>').appendTo('#kanbans');
+    $kanban.kanban($.extend({data: data}, options));
+}
+
+/* Example code: */
 $(function()
 {
-    var isFirefox = $.zui.browser.firefox;
-    var adjustBoardsHeight = function()
+    /* Common options 用于初始化看板的通用选项 */　
+    var commonOptions =
     {
-        var $cBoards = $('.c-boards');
-        var viewHeight = $(window).height() - $('#header').height() - $('#footer').height() - 111;
-        if ($cBoards.length === 1)
-        {
-            var $boardsWrapper = $cBoards.find('.boards-wrapper');
-            $boardsWrapper.css('min-height', viewHeight);
-            if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
-            {
-                $boardsWrapper.find('.boards').css(isFirefox ? 'height' : 'min-height', $boardsWrapper.height() - 1);
-            }
-            return
-        }
-
-        $cBoards.each(function()
-        {
-            var $theBoards = $(this);
-
-            var $boardsWrapper = $theBoards.find('.boards-wrapper');
-            var minHeight = Math.min($theBoards.prev().find('.board-story').outerHeight() + 4, viewHeight);
-            $boardsWrapper.css({maxHeight: viewHeight, minHeight: minHeight});
-            if($boardsWrapper.height() > $boardsWrapper.find('.boards').height())
-            {
-                var $boards = $boardsWrapper.find('.boards');
-                $boards.css({maxHeight: $theBoards.height(), minHeight: minHeight});
-                if ($boards.outerHeight() < minHeight) $boards.css('height', minHeight);
-            }
-        });
-    };
-    adjustBoardsHeight();
-
-    var boardID  = '';
-    var onlybody = config.requestType == 'GET' ? "&onlybody=yes" : "?onlybody=yes";
-    $.cookie('selfClose', 0, {expires:config.cookieLife, path:config.webRoot});
-    var $kanban = $('#kanban');
-
-    // Get scrollbar width
-    var getScrollbarWidth = function ()
-    {
-        var outer = document.createElement("div");
-        outer.style.visibility = "hidden";
-        outer.style.width = "100px";
-        outer.style.msOverflowStyle = "scrollbar"; // needed for WinJS apps
-
-        document.body.appendChild(outer);
-
-        var widthNoScroll = outer.offsetWidth;
-        // force scrollbars
-        outer.style.overflow = "scroll";
-
-        // add innerdiv
-        var inner = document.createElement("div");
-        inner.style.width = "100%";
-        outer.appendChild(inner);
-
-        var widthWithScroll = inner.offsetWidth;
-
-        // remove divs
-        outer.parentNode.removeChild(outer);
-
-        return widthNoScroll - widthWithScroll;
+        maxColHeight:  'auto',
+        minColWidth:    240,
+        dropable:       true,
+        showCount:      true,
+        showZeroCount:  true,
+        countRender:    renderColumnCount
     };
 
-    var scrollbarWidth = getScrollbarWidth();
-    var fixBoardWidth = function()
-    {
-        var $table = $kanban.children('.table:first');
-        var kanbanWidth = $table.width();
-        var $cBoards = $table.find('thead>tr>th.c-board:not(.c-side)');
-        var boardCount = $cBoards.length;
-        var $cSide = $table.find('thead>tr>th.c-board.c-side');
-        var totalWidth = kanbanWidth - scrollbarWidth - 1;
-        if ($cSide.length) totalWidth = totalWidth - ($cSide.outerWidth() + 5);
-        var cBoardWidth = Math.floor(totalWidth/boardCount);
-        $cBoards.not(':last').width(cBoardWidth);
-        if ($cSide.length) $cBoards.first().width(cBoardWidth + (isFirefox ? 0 : 5));
-        $kanban.find('.boards > .board').width(cBoardWidth - (isFirefox ? 21 : 22));
-    };
-    fixBoardWidth();
+    /* Create story kanban 创建需求看板 */
+    createKanban('story', getStoryKanbanDemoData(), commonOptions);
 
-    var updateUI = function()
-    {
-        fixBoardWidth();
-        adjustBoardsHeight();
-        $kanban.data('zui.table').updateFixUI();
-    };
+    /* Create bug kanban 创建 Bug 看板 */
+    createKanban('bug', getBugKanbanDemoData(), commonOptions);
 
-    $(window).on('resize', updateUI);
-
-    var refresh = function(force)
-    {
-        var selfClose = $.cookie('selfClose');
-        $.cookie('selfClose', 0, {expires:config.cookieLife, path:config.webRoot});
-        if(selfClose == 1 || force)
-        {
-            $kanban.load(location.href + ' #kanban>*', updateUI);
-        }
-    };
-    window.refreshKanban = refresh;
-
-    var kanbanModalTrigger = new $.zui.ModalTrigger({type: 'iframe', width: 800});
-    var dropTo = function(id, from, to, type)
-    {
-        if(statusMap[type][from] && statusMap[type][from][to])
-        {
-            var method = statusMap[type][from][to];
-            var link   = $.createLink(type, method, 'id=' + id + '&subStatus=' + to);
-            if(method == 'ajaxChangeSubStatus')
-            {
-                $.getJSON(link, function(response)
-                {
-                    if(response.result == 'fail' && response.message)
-                    {
-                        bootAlert(response.message);
-                        setTimeout(function(){location.reload();}, 1000);
-                    }
-                });
-            }
-            else
-            {
-                kanbanModalTrigger.show(
-                {
-                    url: link + onlybody,
-                    shown:  function(){$('.modal-iframe').addClass('with-titlebar').data('cancel-reload', true)},
-                    width: 900,
-                    hidden: refresh
-                });
-            }
-        }
-
-        /* Keep the draged element stay in the new place. */
-        return true;
-    };
-
-    $kanban.droppable(
-    {
-        selector: '.board-item:not(.disabled)',
-        target: function($ele)
-        {
-            var itemType = $ele.data('type');
-            var $board = $ele.closest('.board');
-            var type = $board.data('type');
-            return $board.siblings('.board').filter(function()
-            {
-                var typeMap = statusMap[itemType];
-                var actionMap = typeMap && typeMap[type];
-                return !!actionMap && actionMap[$(this).data('type')];
-            });
-        },
-        start: function(e)
-        {
-            $kanban.addClass('dragging');
-            e.targets.addClass('can-drop-in');
-            var $item = $(e.element).addClass('dragging');
-            $item.closest('.boards').addClass('dragging');
-        },
-        drag: function(e)
-        {
-            var $item   = $(e.element);
-            var $target = $(e.target);
-            var $holder = $target.find('.board-drag-holder');
-            if (!$holder.length) $holder = $('<div class="board-drag-holder"></div>').appendTo($target);
-            $kanban.find('.c-board.dragging').removeClass('dragging');
-            $kanban.find('.c-board.s-' + $target.data('type')).addClass('dragging');
-            $holder.height($item.outerHeight());
-        },
-        drop: function(e)
-        {
-            var result = dropTo(e.element.data('id'), e.element.closest('.board').data('type'), e.target.data('type'), e.element.data('type'));
-            if(result !== false)
-            {
-                e.element.insertBefore(e.target.find('.board-drag-holder'));
-            }
-        },
-        finish: function()
-        {
-            $kanban.removeClass('dragging').find('.can-drop-in').removeClass('can-drop-in');
-            $kanban.find('.dragging').removeClass('dragging');
-        }
-    });
-
-    $kanban.on('click', '.kanbaniframe', function(e)
-    {
-        var $link = $(this);
-        kanbanModalTrigger.show(
-        {
-            url: $link.attr('href'),
-            shown:  function(){$('.modal-iframe').addClass('with-titlebar').data('cancel-reload', true)},
-            hidden: refresh,
-            width: $(this).is('.task-assignedTo,.bug-assignedTo') ? 800 : 1100
-        });
-        return false;
-    });
-
-    fixKanbanSide($kanban);
+    /* Create task kanban 创建 任务 看板 */
+    createKanban('task', getTaskKanbanDemoData(), commonOptions);
 });
-
-function fixKanbanSide($kanban)
-{
-    if($kanban.length == 0) return false;
-
-    fixSideInit();
-    $kanban.scroll(fixSide);//Fix kanban side when scrolling.
-
-    var tableWidth, kanbanOffset, fixedSide, $fixedSide;
-    function fixSide()
-    {
-        kanbanOffset = $kanban.offset().left;
-        $fixedSide   = $kanban.parent().find('.fixedSide');
-        if($fixedSide.length <= 0 && kanbanOffset < $kanban.scrollLeft())
-        {
-            var $th = $kanban.find('table thead tr th:first');
-
-            tableWidth = $th.width();
-
-            fixedSide  = "<table class='table table-bordered fixedSide'><thead><tr><th class='c-board c-side has-btn'>" + $th.html()+ '</th></tr></thead><tbody>';
-            $kanban.find('table tbody tr').each(function()
-            {
-                var $td = $(this).find('td:first');
-                fixedSide = fixedSide + "<tr><td class='c-side text-left'>" + $td.html() + '</td></tr>';
-            });
-            fixedSide = fixedSide + '</tbody></table>';
-
-            $kanban.before(fixedSide);
-
-            $('.fixedSide').width(tableWidth);
-            $('.fixedSide').css('top', $kanban.offset());
-
-            /* Reset height. */
-            var index = 1;
-            $('.fixedSide tbody tr').each(function()
-            {
-                var $td = $kanban.find('table tbody tr:nth-child(' + index + ') td:first');
-
-                if($(this).find('td:first div:first').length == 0) $(this).find('td:first').html('<div></div>');
-                $(this).find('td:first div:first').height($td.height());
-
-                index++;
-            })
-        }
-        if($fixedSide.length > 0 && kanbanOffset >= $kanban.scrollLeft()) $fixedSide.remove();
-    }
-    function fixSideInit()
-    {
-        $fixedSide = $kanban.parent().find('.fixedSide');
-        if($fixedSide.length > 0) $fixedSide.remove();
-        fixSide();
-    }
-}
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index 5db8444efb..1b12366872 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -9,7 +9,8 @@
  */
 ?>
 <?php include '../../common/view/header.html.php';?>
-<?php js::set('statusMap', $statusMap);?>
+<?php include '../../common/view/kanban.html.php';?>
+
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-right'>
     <?php echo html::a($this->createLink('execution', 'ajaxKanbanSetting', "executionID=$executionID"), "<i class='icon-cog muted'></i> " . $lang->execution->kanbanSetting, '', "class='iframe btn btn-link'");?>
@@ -46,189 +47,15 @@
     <?php endif;?>
   </div>
 </div>
-<style>
-<?php foreach($colorList as $status => $color):?>
-<?php echo "#kanban .c-board.s-$status{border-color: " . ($color ? $color : '#000') . ";}\n"?>
-<?php endforeach?>
-</style>
-<div id="kanban" class="main-table fade auto-fade-in" data-ride="table" data-checkable="false" data-group="true">
-  <?php
-  $hasTask = false;
-  foreach($kanbanGroup as $group)
-  {
-      if(count(get_object_vars($group)) > 0)
-      {
-          $hasTask = true;
-          break;
-      }
-  }
-  ?>
-  <?php if(!$hasTask):?>
-  <div class="table-empty-tip">
-    <p>
-      <span class="text-muted"><?php echo $lang->task->noTask;?></span>
-      <?php if($canBeChanged and common::hasPriv('task', 'create', $checkObject)):?>
-      <?php echo html::a($this->createLink('task', 'create', "execution=$executionID" . (isset($moduleID) ? "&storyID=&moduleID=$moduleID" : '')), "<i class='icon icon-plus'></i> " . $lang->task->create, '', "class='btn btn-info'");?>
-      <?php endif;?>
-    </p>
+
+<div class='panel'>
+  <div class='panel-heading'>
+    <strong>Section</strong>
+  </div>
+  <div class='panel-body'>
+    <div id='kanbans'></div>
   </div>
-  <?php else:?>
-  <table class="table no-margin table-grouped text-center">
-    <thead>
-      <tr>
-        <th class="c-board c-side has-btn">
-          <div class="dropdown">
-            <?php $dropTitle = $type == 'story' ? $lang->execution->orderList[$storyOrder] : $lang->task->$type;?>
-            <button type="button" data-toggle="dropdown" class="btn btn-block btn-link"><?php echo $dropTitle;?> <span class="caret"></span></button>
-            <ul class='dropdown-menu text-left'>
-              <?php foreach($lang->execution->orderList as $key => $value):?>
-              <li <?php echo ($type == 'story' and $storyOrder == $key) ? " class='active'" : '' ?>>
-                <?php echo html::a($this->createLink('execution', 'kanban', "executionID=$executionID&type=story&orderBy=$key"), $value);?>
-              </li>
-              <?php endforeach;?>
-              <?php echo "<li" . ($type == 'assignedTo' ? " class='active'" : '') . ">" . html::a(inlink('kanban', "execution=$executionID&type=assignedTo"), $lang->execution->groups['assignedTo']) . "</li>";?>
-              <?php echo "<li" . ($type == 'finishedBy' ? " class='active'" : '') . ">" . html::a(inlink('kanban', "execution=$executionID&type=finishedBy"), $lang->execution->groups['finishedBy']) . "</li>";?>
-            </ul>
-          </div>
-        </th>
-        <?php foreach($kanbanColumns as $col):?>
-        <th class='c-board s-<?php echo $col?>'><?php echo zget($statusList, $col);?></th>
-        <?php endforeach;?>
-      </tr>
-    </thead>
-    <tbody>
-      <?php $rowIndex = 0; ?>
-      <?php foreach($kanbanGroup as $groupKey => $group):?>
-      <?php if(count(get_object_vars($group)) == 0) continue;?>
-      <tr data-id='<?php echo $rowIndex++?>'>
-        <td class='c-side text-left'>
-          <?php if($groupKey != 'nokey'):?>
-          <?php if($type == 'story'):?>
-          <?php $story = $group;?>
-          <div class='board-story' data-id='<?php echo $story->id;?>'>
-            <div class='board-title'>
-              <?php
-              if(common::hasPriv('story', 'view'))
-              {
-                  echo html::a($this->createLink('story', 'view', "storyID=$story->id", '', true), $story->title, '', 'class="kanbaniframe group-title" title="' . $story->title . '"');
-              }
-              else
-              {
-                  echo "<span class='group-title' title='{$story->title}'>{$story->title}</span>";
-              }
-              ?>
-              <?php if($canBeChanged):?>
-              <nav class='board-actions nav nav-default'>
-                <li class='dropdown'>
-                  <a href='javascript:;' data-toggle='dropdown' class='panel-action'><i class='icon icon-ellipsis-v'></i></a>
-                  <ul class='dropdown-menu pull-right'>
-                    <?php
-                    $misc = "data-toggle='modal' data-type='iframe' data-width='95%'";
-                    echo (common::hasPriv('task', 'create'))         ? '<li>' . html::a($this->createLink('task', 'create', "executionID=$executionID&storyID=$story->id&moduleID=$story->module", '', true), $lang->execution->wbs, '', $misc) : '' . '</li>';
-                    echo (common::hasPriv('task', 'batchCreate'))    ? '<li>' . html::a($this->createLink('task', 'batchCreate', "executionID=$executionID&storyID=$story->id&moduleID=0&taskID=0&iframe=true", '', true), $lang->execution->batchWBS, '', $misc) : '' . '</li>';
-                    echo (common::hasPriv('execution', 'unlinkStory')) ? '<li>' . html::a($this->createLink('execution', 'unlinkStory', "executionID=$executionID&storyID=$story->story&confirm=no", '', true), $lang->execution->unlinkStory, 'hiddenwin') : '' . '</li>';
-                    $misc = "data-toggle='modal' data-type='iframe'";
-                    echo (common::hasPriv('story', 'close'))         ? '<li>' . html::a($this->createLink('story', 'close', "storyID=$story->id", '', true), $lang->story->close, '', $misc) : '' . '</li>';
-                    ?>
-                  </ul>
-                </li>
-              </nav>
-              <?php endif;?>
-            </div>
-            <div class="small group-info">
-              <span class='story-id board-id' title='<?php echo $lang->story->id?>'>#<?php echo $story->id?></span>
-              <span class='label-pri label-pri-<?php echo $story->pri?>' title='<?php echo $lang->story->pri?>'><?php echo zget($lang->story->priList, $story->pri);?></span>
-              <span class='story-stage' title='<?php echo $lang->story->stage?>'><span class="label label-dot"></span> <?php echo $lang->story->stageList[$story->stage];?></span>
-              <div class='pull-right text-muted story-estimate' title='<?php echo $lang->story->estimate?>'><?php echo $story->estimate . 'h ';?></div>
-            </div>
-          </div>
-          <?php else:?>
-          <div class='board-story' data-id='<?php echo $groupKey?>'><?php echo zget($realnames, $groupKey);?></div>
-          <?php endif;?>
-          <?php endif;?>
-        </td>
-        <td class="c-boards no-padding text-left" colspan="<?php echo count($kanbanColumns);?>">
-          <div class="boards-wrapper">
-            <div class="boards">
-              <?php foreach($kanbanColumns as $col):?>
-              <div class="board" data-type="<?php echo $col;?>">
-                <?php if(!empty($group->tasks[$col])):?>
-                <?php foreach($group->tasks[$col] as $task):?>
-                <?php $disabled = common::hasDBPriv($task, 'task') ? '' : 'disabled';?>
-                <div class='board-item <?php echo $disabled;?>' data-id='<?php echo $task->id?>' id='task-<?php echo $task->id?>' data-type='task'>
-                  <?php
-                  $childrenAB = $task->parent > 0 ? "<span class='label label-light label-badge'>" . $lang->task->childrenAB . '</span> ' : '';
-                  if(common::hasPriv('task', 'view'))
-                  {
-                      echo html::a($this->createLink('task', 'view', "taskID=$task->id", '', true), "{$childrenAB}{$task->name}", '', 'class="title kanbaniframe" title="' . $task->name . '"');
-                  }
-                  else
-                  {
-                      echo "<span class='title' title='{$task->name}'>{$childrenAB}{$task->name}</span>";
-                  }
-                  ?>
-                  <div class='info'>
-                    <?php
-                    $assignedToRealName = "<span>" . zget($realnames, $task->assignedTo) . "</span>";
-                    if(empty($task->assignedTo)) $assignedToRealName = "<span class='text-primary'>{$lang->task->noAssigned}</span>";
-                    if(common::hasPriv('task', 'assignTo', $task))
-                    {
-                        echo html::a($this->createLink('task', 'assignTo', "executionID={$task->execution}&taskID={$task->id}", '', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe task-assignedTo"');
-                    }
-                    else
-                    {
-                        echo "<span class='btn btn-icon-left task-assignedTo disabled'><i class='icon icon-hand-right'></i> {$assignedToRealName}</span>";
-                    }
-                    ?>
-                    <?php if(isset($task->delay)):?>
-                    <span class="status-task status-delayed"> <?php echo $lang->task->delayed;?></span>
-                    <?php endif;?>
-                    <small class="task-left" title='<?php echo $lang->task->left?>'><?php echo $task->left;?>h</small>
-                  </div>
-                </div>
-                <?php endforeach?>
-                <?php endif?>
-                <?php if(!empty($group->bugs[$col])):?>
-                <?php foreach($group->bugs[$col] as $bug):?>
-                <div class='board-item' data-id='<?php echo $bug->id?>' id='bug-<?php echo $bug->id?>' data-type='bug'>
-                  <?php
-                    if(common::hasPriv('bug', 'view'))
-                    {
-                        echo html::a($this->createLink('bug', 'view', "bugID=$bug->id", '', true), "<i class='icon icon-sm icon-bug text-red'></i> #{$bug->id}{$bug->title}", '', 'class="title kanbaniframe" title="' . $bug->title . '"');
-                    }
-                    else
-                    {
-                        echo "<span class='title' title='{$bug->title}'><i class='icon icon-sm icon-bug text-red'></i> #{$bug->id}{$bug->title}</span>";
-                    }
-                    ?>
-                  <div class='info'>
-                    <?php
-                    $assignedToRealName = "<span>" . zget($realnames, $bug->assignedTo) . "</span>";
-                    if(empty($bug->assignedTo)) $assignedToRealName = "<span class='text-primary'>{$lang->task->noAssigned}</span>";
-                    if(common::hasPriv('bug', 'assignTo', $bug))
-                    {
-                        echo html::a($this->createLink('bug', 'assignTo', "bugID={$bug->id}", '', true), '<i class="icon icon-hand-right"></i> ' . $assignedToRealName, '', 'class="btn btn-icon-left kanbaniframe bug-assignedTo"');
-                    }
-                    else
-                    {
-                        echo "<span class='btn btn-icon-left bug-assignedTo disabled'><i class='icon icon-hand-right'></i> {$assignedToRealName}</span>";
-                    }
-                    ?>
-                    <span class='status-bug status-<?php echo $bug->status;?>' title='<?php echo $lang->bug->status?>'><span class="label label-dot"></span> <?php echo zget($lang->bug->statusList, $bug->status);?></span>
-                  </div>
-                </div>
-                <?php endforeach?>
-                <?php endif?>
-              </div>
-              <?php endforeach;?>
-            </div>
-          </div>
-        </td>
-      </tr>
-      <?php endforeach;?>
-    </tbody>
-  </table>
-  <?php endif;?>
 </div>
-<?php echo js::set('executionID', $executionID);?>
+<?php js::set('executionID', $executionID);?>
+<?php //js::set('statusMap', $statusMap);?>
 <?php include '../../common/view/footer.html.php';?>
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 5b021797fa..13fe2bf507 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -47,8 +47,14 @@ class kanbanModel extends model
             }
         }
 
-        foreach($lanes as $laneID => $lane) $lane->columns = $columns[$laneID];
-        return $lanes;
+        $kanban = array();
+        foreach($lanes as $laneID => $lane) 
+        {
+            $lane->columns = $columns[$laneID];
+            $kanban[$lane->type] = $lane;
+        }
+
+        return $kanban;
     }
 
     /**

From c45866a3a32dca367fad01a4c91fb6959262a8dd Mon Sep 17 00:00:00 2001
From: liyuchun <liyuchun@easycorp.ltd>
Date: Tue, 26 Oct 2021 15:24:09 +0800
Subject: [PATCH 6/6]  * Code for task #43519.

---
 module/kanban/config.php           | 12 +++++-------
 module/kanban/model.php            | 12 ++++++------
 module/kanban/view/setwip.html.php |  2 ++
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/module/kanban/config.php b/module/kanban/config.php
index bbb2528cdb..573728094d 100644
--- a/module/kanban/config.php
+++ b/module/kanban/config.php
@@ -21,13 +21,16 @@ $config->kanban->default->task->name  = $lang->task->common;
 $config->kanban->default->task->color = '#4169e1';
 $config->kanban->default->task->order = '15';
 
+$config->kanban->parentColumn = array();
+$config->kanban->parentColumn['story'] = array('develop', 'test');
+$config->kanban->parentColumn['bug']   = array('resolving', 'test');
+$config->kanban->parentColumn['task']  = array('develop');
+
 $config->kanban->storyColumnStageList = array();
 $config->kanban->storyColumnStageList['backlog']    = 'projected';
 $config->kanban->storyColumnStageList['ready']      = 'projected';
-$config->kanban->storyColumnStageList['develop']    = 'developing';
 $config->kanban->storyColumnStageList['developing'] = 'developing';
 $config->kanban->storyColumnStageList['developed']  = 'developed';
-$config->kanban->storyColumnStageList['test']       = 'testing';
 $config->kanban->storyColumnStageList['testing']    = 'testing';
 $config->kanban->storyColumnStageList['tested']     = 'tested';
 $config->kanban->storyColumnStageList['verified']   = 'verified';
@@ -37,10 +40,8 @@ $config->kanban->storyColumnStageList['closed']     = 'closed';
 $config->kanban->storyColumnStatusList = array();
 $config->kanban->storyColumnStatusList['backlog']    = 'active';
 $config->kanban->storyColumnStatusList['ready']      = 'active';
-$config->kanban->storyColumnStatusList['develop']    = 'active';
 $config->kanban->storyColumnStatusList['developing'] = 'active';
 $config->kanban->storyColumnStatusList['developed']  = 'active';
-$config->kanban->storyColumnStatusList['test']       = 'active';
 $config->kanban->storyColumnStatusList['testing']    = 'active';
 $config->kanban->storyColumnStatusList['tested']     = 'active';
 $config->kanban->storyColumnStatusList['verified']   = 'active';
@@ -50,17 +51,14 @@ $config->kanban->storyColumnStatusList['closed']     = 'closed';
 $config->kanban->bugColumnStatusList = array();
 $config->kanban->bugColumnStatusList['unconfirmed'] = 'active';
 $config->kanban->bugColumnStatusList['confirmed']   = 'active';
-$config->kanban->bugColumnStatusList['resolving']   = 'active';
 $config->kanban->bugColumnStatusList['fixing']      = 'active';
 $config->kanban->bugColumnStatusList['fixed']       = 'resolved';
-$config->kanban->bugColumnStatusList['test']        = 'resolved';
 $config->kanban->bugColumnStatusList['testing']     = 'resolved';
 $config->kanban->bugColumnStatusList['tested']      = 'resolved';
 $config->kanban->bugColumnStatusList['closed']      = 'closed';
 
 $config->kanban->taskColumnStatusList = array();
 $config->kanban->taskColumnStatusList['wait']       = 'wait';
-$config->kanban->taskColumnStatusList['develop']    = 'wait';
 $config->kanban->taskColumnStatusList['developing'] = 'doing';
 $config->kanban->taskColumnStatusList['developed']  = 'done';
 $config->kanban->taskColumnStatusList['pause']      = 'pause';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index d4cf5e496b..f485bdfd1e 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -267,12 +267,12 @@ class kanbanModel extends model
     }
 
     /**
-     ** Get column by id.
-     **
-     ** @param  int    $columnID
-     ** @access public
-     ** @return object
-     **/
+     * Get column by id.
+     *
+     * @param  int    $columnID
+     * @access public
+     * @return object
+     */
     public function getColumnById($columnID)
     {
         $column = $this->dao->select('t1.*, t2.type as laneType')->from(TABLE_KANBANCOLUMN)->alias('t1')
diff --git a/module/kanban/view/setwip.html.php b/module/kanban/view/setwip.html.php
index 2cca3105b1..df3c066d53 100644
--- a/module/kanban/view/setwip.html.php
+++ b/module/kanban/view/setwip.html.php
@@ -21,6 +21,7 @@
     </div>
     <form method='post' target='hiddenwin' onsubmit='return setWIPLimit();'>
       <table align='center' class='table table-form'>
+        <?php if(!in_array($column->type, $config->kanban->parentColumn[$column->laneType])):?>
         <tr>
           <th><?php echo $lang->kanban->WIPStatus;?></th>
           <td colspan='2'>
@@ -37,6 +38,7 @@
           </td>
         </tr>
         <?php endif;?>
+        <?php endif;?>
         <tr>
           <th><?php echo $lang->kanban->WIPCount;?></th>
           <td colspan='2'>