From e661948d675737b7f131e89be2c15a36ac8b2a65 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 31 May 2022 09:21:05 +0800
Subject: [PATCH 01/24] * Finish story #32879,#32887,#32935,#32934.

---
 module/common/lang/menu.php | 12 +++++++++---
 module/execution/model.php  |  3 +++
 module/project/model.php    |  9 ++++++++-
 3 files changed, 20 insertions(+), 4 deletions(-)

diff --git a/module/common/lang/menu.php b/module/common/lang/menu.php
index f0027aabb1..a5effd5d81 100644
--- a/module/common/lang/menu.php
+++ b/module/common/lang/menu.php
@@ -291,9 +291,15 @@ $lang->waterfall->menu->design['subMenu']->ads      = array('link' => "{$lang->d
 $lang->waterfall->menu->design['subMenu']->bysearch = array('link' => '<a href="javascript:;" class="querybox-toggle"><i class="icon-search icon"></i> ' . $lang->searchAB . '</a>');
 
 /* Kanban project menu. */
-$lang->kanban->menu        = new stdclass();
-$lang->kanban->menuOrder   = array();
-$lang->kanban->dividerMenu = '';
+$lang->kanbanProject              = new stdclass();
+$lang->kanbanProject->menu        = new stdclass();
+$lang->kanbanProject->menu->index = array('link' => "{$lang->kanban->common}|project|index|project=%s");
+$lang->kanbanProject->menu->build = array('link' => "{$lang->build->common}|project|build|project=%s");
+
+$lang->kanbanProject->menuOrder   = array();
+$lang->kanbanProject->menuOrder[5] = 'index';
+$lang->kanbanProject->menuOrder[10] = 'build';
+$lang->kanbanProject->dividerMenu = '';
 
 /* Execution menu. */
 $lang->execution->homeMenu      = new stdclass();
diff --git a/module/execution/model.php b/module/execution/model.php
index 5f8e1727b2..482348b260 100644
--- a/module/execution/model.php
+++ b/module/execution/model.php
@@ -67,6 +67,9 @@ class executionModel extends model
         if($execution and $execution->type == 'kanban')
         {
             $this->lang->execution->menu         = new stdclass();
+            $this->lang->execution->menu->kanban = array('link' => "{$this->lang->kanban->common}|execution|kanban|executionID=%s");
+            $this->lang->execution->menu->build  = array('link' => "{$this->lang->build->common}|execution|build|executionID=%s");
+            $this->lang->execution->dividerMenu  = '';
             $this->lang->execution->accessDenied = str_replace($this->lang->executionCommon, $this->lang->execution->kanban, $this->lang->execution->accessDenied);
         }
 
diff --git a/module/project/model.php b/module/project/model.php
index 86027b4422..4e2373a169 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2483,7 +2483,14 @@ class projectModel extends model
         $project = $this->getByID($objectID);
 
         $model = 'scrum';
-        if($project) $model = $project->model;
+        if($project and $project->model == 'waterfall') $model = $project->model;
+        if($project and $project->model == 'kanban')
+        {
+            $model = $project->model . 'Project';
+
+            global $lang;
+            $lang->executionCommon = $lang->project->kanban;
+        }
 
         if(isset($lang->$model))
         {

From 6c2e9532ffd4603a06ad141fd5e6d51493905400 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 31 May 2022 13:07:14 +0800
Subject: [PATCH 02/24] * Fixed the bug of the project to which the bug belongs
 when merging data.

---
 module/upgrade/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/upgrade/model.php b/module/upgrade/model.php
index ba8eb07128..4f20f43d42 100644
--- a/module/upgrade/model.php
+++ b/module/upgrade/model.php
@@ -4831,7 +4831,7 @@ class upgradeModel extends model
         /* Project linked objects. */
         $this->dao->update(TABLE_TASK)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->exec();
         $this->dao->update(TABLE_BUILD)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->andWhere('project')->eq(0)->exec();
-        $this->dao->update(TABLE_BUG)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->andWhere('project')->eq(0)->exec();
+        $this->dao->update(TABLE_BUG)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->exec();
         $this->dao->update(TABLE_DOC)->set('project')->eq($projectID)->set('type')->eq('execution')->where("lib IN(SELECT id from " . TABLE_DOCLIB . " WHERE type = 'project' and execution " . helper::dbIN($sprintIdList) . ')')->exec();
         $this->dao->update(TABLE_DOCLIB)->set('project')->eq($projectID)->where('type')->eq('execution')->andWhere('execution')->in($sprintIdList)->exec();
         $this->dao->update(TABLE_TESTTASK)->set('project')->eq($projectID)->where('execution')->in($sprintIdList)->exec();

From d58008d99c1feb5b2f7b2d527cb700f1c25cc746 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 31 May 2022 13:28:52 +0800
Subject: [PATCH 03/24] * Finish task #55684.

---
 module/build/model.php | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/module/build/model.php b/module/build/model.php
index 3283ec5786..b43b55adfb 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -544,10 +544,12 @@ class buildModel extends model
         if($type == 'browse')
         {
             $executionID = $tab == 'execution' ? $extraParams['executionID'] : $build->execution;
+            $execution   = $this->loadModel('execution')->getByID($executionID);
+            $testtaskApp = (!empty($execution->type) and $execution->type == 'kanban') ? 'data-app="qa"' : "data-app='{$tab}'";
 
             if(common::hasPriv('build', 'linkstory') and common::canBeChanged('build', $build)) $menu .= $this->buildMenu('build', 'view', "{$params}&type=story&link=true", $build, $type, 'link', '', '', '', "data-app={$tab}", $this->lang->build->linkStory);
 
-            $menu .= $this->buildMenu('testtask', 'create', "product=$build->product&execution={$executionID}&build=$build->id", $build, $type, 'bullhorn', '', '', '', "data-app='{$tab}'");
+            $menu .= $this->buildMenu('testtask', 'create', "product=$build->product&execution={$executionID}&build=$build->id", $build, $type, 'bullhorn', '', '', '', $testtaskApp);
 
             if($tab == 'execution') $menu .= $this->buildMenu('execution', 'bug', "execution={$extraParams['executionID']}&productID={$extraParams['productID']}&orderBy=status&build=$build->id", $build, $type, '', '', '', '', $this->lang->execution->viewBug);
             if($tab == 'project')   $menu .= $this->buildMenu('build', 'view', "{$params}&type=generatedBug", $build, $type, 'bug', '', '', '', "data-app='project'", $this->lang->project->bug);

From 04d79592c4882f73a667b1de416955954f8ab62d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 31 May 2022 13:44:05 +0800
Subject: [PATCH 04/24] * Finish task #55684.

---
 module/testtask/control.php | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/module/testtask/control.php b/module/testtask/control.php
index d295f3639d..6130e64327 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -248,6 +248,13 @@ class testtask extends control
         $executions = empty($productID) ? array() : $this->loadModel('product')->getExecutionPairsByProduct($productID, '', 'id_desc', $projectID);
         $builds     = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk');
 
+        $execution = $this->loadModel('execution')->getByID($executionID);
+        if(!empty($execution) and $execution->type == 'kanban')
+        {
+            global $lang;
+            $this->lang->testtask->execution = str_replace($lang->execution->common, $lang->kanban->common, $this->lang->testtask->execution);
+        }
+
         /* Set menu. */
         $productID = $this->product->saveState($productID, $this->products);
 

From 1b89018e2f19389c0d27b1fafa9112be9db9fa92 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 31 May 2022 13:55:59 +0800
Subject: [PATCH 05/24] * Optimized code for task #55684, #55683.

---
 module/project/model.php    | 4 +---
 module/testtask/control.php | 6 +-----
 2 files changed, 2 insertions(+), 8 deletions(-)

diff --git a/module/project/model.php b/module/project/model.php
index 4e2373a169..6f00881165 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2486,9 +2486,7 @@ class projectModel extends model
         if($project and $project->model == 'waterfall') $model = $project->model;
         if($project and $project->model == 'kanban')
         {
-            $model = $project->model . 'Project';
-
-            global $lang;
+            $model                 = $project->model . 'Project';
             $lang->executionCommon = $lang->project->kanban;
         }
 
diff --git a/module/testtask/control.php b/module/testtask/control.php
index 6130e64327..8d29af46bc 100644
--- a/module/testtask/control.php
+++ b/module/testtask/control.php
@@ -249,11 +249,7 @@ class testtask extends control
         $builds     = empty($productID) ? array() : $this->loadModel('build')->getBuildPairs($productID, 'all', 'notrunk');
 
         $execution = $this->loadModel('execution')->getByID($executionID);
-        if(!empty($execution) and $execution->type == 'kanban')
-        {
-            global $lang;
-            $this->lang->testtask->execution = str_replace($lang->execution->common, $lang->kanban->common, $this->lang->testtask->execution);
-        }
+        if(!empty($execution) and $execution->type == 'kanban') $this->lang->testtask->execution = str_replace($this->lang->execution->common, $this->lang->kanban->common, $this->lang->testtask->execution);
 
         /* Set menu. */
         $productID = $this->product->saveState($productID, $this->products);

From ad8459599203928325558cc0428bb398580ddd80 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Tue, 31 May 2022 14:00:13 +0800
Subject: [PATCH 06/24] * Optimized code for task #55683.

---
 module/project/model.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/module/project/model.php b/module/project/model.php
index 6f00881165..54e445c67c 100644
--- a/module/project/model.php
+++ b/module/project/model.php
@@ -2486,7 +2486,8 @@ class projectModel extends model
         if($project and $project->model == 'waterfall') $model = $project->model;
         if($project and $project->model == 'kanban')
         {
-            $model                 = $project->model . 'Project';
+            $model = $project->model . 'Project';
+
             $lang->executionCommon = $lang->project->kanban;
         }
 

From 18ef850d706f783ad240b5b93c7e7d2181acf47f Mon Sep 17 00:00:00 2001
From: liyuchun <563917701@qq.com>
Date: Tue, 31 May 2022 06:08:29 +0000
Subject: [PATCH 07/24]  * Fix bug #21565.

---
 module/install/lang/de.php    | 2 +-
 module/install/lang/en.php    | 2 +-
 module/install/lang/fr.php    | 2 +-
 module/install/lang/vi.php    | 2 +-
 module/install/lang/zh-cn.php | 2 +-
 module/install/lang/zh-tw.php | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/install/lang/de.php b/module/install/lang/de.php
index 0b5cbc09de..3c5d313576 100644
--- a/module/install/lang/de.php
+++ b/module/install/lang/de.php
@@ -87,7 +87,7 @@ $lang->install->sessionFail  = 'Bearbeiten Sie die PHP ini Datei um den session.
 $lang->install->mkdirWin     = '<p>%s Verzeichnis muss erstellt werden.<br /> Befehl <code>mkdir %s</code> zur Erstellung.</p>';
 $lang->install->chmodWin     = ' "%s" Berechtigung muss geändert werden.';
 $lang->install->mkdirLinux   = '<p>%s Verzeichnis muss erstellt werden.<br /> Befehl <code>mkdir -p %s</code> zur Erstellung.</p>';
-$lang->install->chmodLinux   = ' "%s" Berechtigung muss geändert werden.<br /> Befehl <code>chmod o=rwx -R %s</code> für die Anpassung.';
+$lang->install->chmodLinux   = ' "%s" Berechtigung muss geändert werden.<br /> Befehl <code>chmod 777 -R %s</code> für die Anpassung.';
 
 $lang->install->timezone       = 'Set Timezone';
 $lang->install->defaultLang    = 'Standard Sprache';
diff --git a/module/install/lang/en.php b/module/install/lang/en.php
index 05fd01f835..ece915f469 100644
--- a/module/install/lang/en.php
+++ b/module/install/lang/en.php
@@ -116,7 +116,7 @@ $lang->install->sessionFail  = 'Edit the php.ini file to set session.save_path.'
 $lang->install->mkdirWin     = '<p>%s directory has to be created.<br /> Run <code>mkdir %s</code> to create it.</p>';
 $lang->install->chmodWin     = ' "%s" privilege has to be changed.';
 $lang->install->mkdirLinux   = '<p>%s directory has to be created.<br /> Run <code>mkdir -p %s</code> to create it.</p>';
-$lang->install->chmodLinux   = ' "%s" permison has to be changed.<br /> Run <code>chmod o=rwx -R %s</code> to change it.';
+$lang->install->chmodLinux   = ' "%s" permison has to be changed.<br /> Run <code>chmod 777 -R %s</code> to change it.';
 
 $lang->install->timezone       = 'Set Timezone';
 $lang->install->defaultLang    = 'Default Language';
diff --git a/module/install/lang/fr.php b/module/install/lang/fr.php
index d84676a8bc..2ff0d5a146 100644
--- a/module/install/lang/fr.php
+++ b/module/install/lang/fr.php
@@ -87,7 +87,7 @@ $lang->install->sessionFail  = 'Editez le fichier php.ini pour définier session
 $lang->install->mkdirWin     = '<p>Le répertoire %s doit être créé.<br /> Exécutez <code>mkdir %s</code> pour le créer.</p>';
 $lang->install->chmodWin     = ' "%s" privilege has to be changed.';
 $lang->install->mkdirLinux   = '<p>Le répertoire %s doit être créé.<br /> Exécutez <code>mkdir -p %s</code> pour le créer.</p>';
-$lang->install->chmodLinux   = 'Les permission de "%s" doivent être modifiées.<br /> Exécutez <code>chmod o=rwx -R %s</code> pour les changer.';
+$lang->install->chmodLinux   = 'Les permission de "%s" doivent être modifiées.<br /> Exécutez <code>chmod 777 -R %s</code> pour les changer.';
 
 $lang->install->timezone       = 'Set Timezone';
 $lang->install->defaultLang    = 'Langue par défaut';
diff --git a/module/install/lang/vi.php b/module/install/lang/vi.php
index 839e17700f..18d3343e75 100644
--- a/module/install/lang/vi.php
+++ b/module/install/lang/vi.php
@@ -87,7 +87,7 @@ $lang->install->sessionFail  = 'Sửa the php.ini file to set session.save_path.
 $lang->install->mkdirWin     = '<p>%s directory has to be created.<br /> Run <code>mkdir %s</code> to create it.</p>';
 $lang->install->chmodWin     = ' "%s" privilege has to be changed.';
 $lang->install->mkdirLinux   = '<p>%s directory has to be created.<br /> Run <code>mkdir -p %s</code> to create it.</p>';
-$lang->install->chmodLinux   = ' "%s" permison has to be changed.<br /> Run <code>chmod o=rwx -R %s</code> to change it.';
+$lang->install->chmodLinux   = ' "%s" permison has to be changed.<br /> Run <code>chmod 777 -R %s</code> to change it.';
 
 $lang->install->timezone       = 'Thiết lập Timezone';
 $lang->install->defaultLang    = 'Ngôn ngữ mặc định';
diff --git a/module/install/lang/zh-cn.php b/module/install/lang/zh-cn.php
index 0830887beb..41978c0ac3 100644
--- a/module/install/lang/zh-cn.php
+++ b/module/install/lang/zh-cn.php
@@ -116,7 +116,7 @@ $lang->install->sessionFail  = '修改PHP配置文件，设置session.save_path
 $lang->install->mkdirWin     = '<p>需要创建目录%s。命令为：<br /> mkdir %s</p>';
 $lang->install->chmodWin     = '需要修改目录 "%s" 的权限。';
 $lang->install->mkdirLinux   = '<p>需要创建目录%s。<br /> 命令为：<br /> mkdir -p %s</p>';
-$lang->install->chmodLinux   = '需要修改目录 "%s" 的权限。<br />命令为：<br />chmod o=rwx -R %s';
+$lang->install->chmodLinux   = '需要修改目录 "%s" 的权限。<br />命令为：<br />chmod 777 -R %s';
 
 $lang->install->timezone       = '时区设置';
 $lang->install->defaultLang    = '默认语言';
diff --git a/module/install/lang/zh-tw.php b/module/install/lang/zh-tw.php
index 13f8f4288f..8203e2fe47 100644
--- a/module/install/lang/zh-tw.php
+++ b/module/install/lang/zh-tw.php
@@ -116,7 +116,7 @@ $lang->install->sessionFail  = '修改PHP配置檔案，設置session.save_path
 $lang->install->mkdirWin     = '<p>需要創建目錄%s。命令為：<br /> mkdir %s</p>';
 $lang->install->chmodWin     = '需要修改目錄 "%s" 的權限。';
 $lang->install->mkdirLinux   = '<p>需要創建目錄%s。<br /> 命令為：<br /> mkdir -p %s</p>';
-$lang->install->chmodLinux   = '需要修改目錄 "%s" 的權限。<br />命令為：<br />chmod o=rwx -R %s';
+$lang->install->chmodLinux   = '需要修改目錄 "%s" 的權限。<br />命令為：<br />chmod 777 -R %s';
 
 $lang->install->timezone       = '時區設置';
 $lang->install->defaultLang    = '預設語言';

From 0665817eb8a59a42295efe9bddd17875c94835dd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Tue, 31 May 2022 17:20:22 +0800
Subject: [PATCH 08/24] * Finish task #55675.

---
 module/execution/control.php          | 17 ++++++++++++-----
 module/execution/js/kanban.js         | 21 +++++++++++----------
 module/execution/js/taskkanban.js     |  3 ++-
 module/execution/view/kanban.html.php |  8 ++++++--
 module/kanban/control.php             | 16 ++++++++++------
 module/kanban/model.php               | 19 ++++++++++++++++++-
 module/story/control.php              | 27 ++++++++++++++++-----------
 7 files changed, 75 insertions(+), 36 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index dd82569951..2c228fe1ba 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2115,8 +2115,10 @@ class execution extends control
         $this->loadModel('story');
 
         if(empty($groupBy)) $groupBy = 'default';
+
         /* Set Session. */
         $this->session->set('execLaneType', $browseType);
+        $this->session->set('execGroupBy', $groupBy);
         $this->session->set('storyList', $this->app->getURI(true), 'execution');
 
         $this->lang->execution->menu = new stdclass();
@@ -2853,8 +2855,10 @@ class execution extends control
             {
                 if($this->app->tab == 'execution' and $object->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($objectID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($objectID, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent', '', "parent.updateKanban($kanbanData)"));
                 }
@@ -3656,10 +3660,11 @@ class execution extends control
      * @param  int    $productID
      * @param  string $fromMethod
      * @param  string $extra
+     * @param  string $param
      * @access public
      * @return void
      */
-    public function importPlanStories($executionID, $planID, $productID = 0, $fromMethod = 'story', $extra = '')
+    public function importPlanStories($executionID, $planID, $productID = 0, $fromMethod = 'story', $extra = '', $param = '')
     {
         $planStories = $planProducts = array();
         $planStory   = $this->loadModel('story')->getPlanStories($planID);
@@ -3687,7 +3692,8 @@ class execution extends control
         }
 
         $moduleName = 'execution';
-        $param      = "executionID=$executionID";
+        if(empty($param)) $param = "executionID=$executionID";
+        if(!empty($param)) $param = str_replace(array(',', ' '), array('&', ''), $param);
         if($execution->type == 'project')
         {
             $moduleName = 'projectstory';
@@ -3700,7 +3706,8 @@ class execution extends control
             $lang->executionCommon = $lang->execution->kanban;
             include $this->app->getModulePath('', 'execution') . 'lang/' . $this->app->getClientLang() . '.php';
         }
-        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate($this->createLink($moduleName, in_array($execution->type, array('sprint','project')) ? 'story' : 'kanban', $param));
+
+        if($count != 0) echo js::alert(sprintf($this->lang->execution->haveDraft, $count)) . js::locate($this->createLink($moduleName, $fromMethod, $param));
         return print(js::locate(helper::createLink($moduleName, $fromMethod, $param)));
     }
 
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index d15df83a39..f3cf82656a 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -180,7 +180,7 @@ function changeKanbanScaleSize(newScaleSize)
     }
     else
     {
-        var kanban = $('#kanban').data('zui.kanban');
+        var kanban = $('#kanban' + executionID).data('zui.kanban');
         if(!kanban) return;
         kanban.setOptions({cardsPerRow: newScaleSize, cardHeight: getCardHeight()});
     }
@@ -272,7 +272,7 @@ function createColumnCreateMenu(options)
     var col      = $col.data('col');
     var items    = [];
     var laneID   = col.$kanbanData.lanes[0].id ? col.$kanbanData.lanes[0].id : 0;
-    var regionID = col.$kanbanData.region;
+    var regionID = col.$kanbanData.region == undefined ? 0 : col.$kanbanData.region;
 
     if(col.type == 'backlog')
     {
@@ -690,8 +690,6 @@ function renderCount($count, count, column)
  */
 function renderHeaderCol($column, column, $header, kanbanData)
 {
-    if(groupBy != 'default') return;
-
     /* Render group header. */
     var privs       = kanbanData.actions;
     var columnPrivs = kanbanData.columns[0].actions;
@@ -703,7 +701,7 @@ function renderHeaderCol($column, column, $header, kanbanData)
         $actions = $column.children('.actions');
     }
 
-    if(privs.includes('sortGroup'))
+    if(groupBy == 'default' && privs.includes('sortGroup'))
     {
         var groups = regions[column.region].groups;
         if($header.closest('.kanban').data('zui.kanban'))
@@ -784,7 +782,8 @@ function updateRegion(regionID, regionData = [])
     if(!$region.length) return false;
     if(!regionData) regionData = regions[regionID];
 
-    $region.data('zui.kanban').render(regionData.groups);
+    var data = groupBy == 'default' ? regionData.groups : regionData;
+    $region.data('zui.kanban').render(data);
     resetRegionHeight('open');
     return true;
 }
@@ -1053,7 +1052,7 @@ function updateKanban(kanbanData, regionID = 0)
     setTimeout(function()
     {
         $.zui.closeModal();
-        if(regionID)
+        if(regionID && groupBy == 'default')
         {
             updateRegion(regionID, kanbanData[regionID]);
         }
@@ -1062,7 +1061,8 @@ function updateKanban(kanbanData, regionID = 0)
             $('#kanban').children('.region').children("div[id^='kanban']").each(function()
             {
                 var regionID = $(this).attr('data-id');
-                updateRegion(regionID, kanbanData[regionID]);
+                var data     = groupBy == 'default' ? kanbanData[regionID] : kanbanData[groupBy]
+                updateRegion(regionID, data);
             });
         }
     }, 200);
@@ -1317,8 +1317,9 @@ $(function()
         var planID = $('#plan').val();
         if(planID)
         {
-            var vars = $('.linkStoryByPlanButton').data('lane') != null ? '&extra=laneID='+ $('.linkStoryByPlanButton').data('lane') + ',columnID=' + $('.linkStoryByPlanButton').data('col') : '';
-            location.href = createLink('execution', 'importPlanStories', 'executionID=' + executionID + '&planID=' + planID + '&productID=0&fromMethod=kanban' + vars);
+            var vars  = $('.linkStoryByPlanButton').data('lane') != null ? '&extra=laneID='+ $('.linkStoryByPlanButton').data('lane') + ',columnID=' + $('.linkStoryByPlanButton').data('col') : '';
+            var param = "&param=executionID=" + executionID + ",browseType=" + browseType + ",orderBy=id_asc,groupBy=" + groupBy;
+            location.href = createLink('execution', 'importPlanStories', 'executionID=' + executionID + '&planID=' + planID + '&productID=0&fromMethod=kanban' + vars + param);
             $.closeModal();
         }
     });
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index e952b470f0..5d8211a1a6 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -1141,7 +1141,8 @@ $(function()
         var planID = $('#plan').val();
         if(planID)
         {
-            location.href = createLink('execution', 'importPlanStories', 'executionID=' + executionID + '&planID=' + planID + '&productID=0&fromMethod=kanban');
+            var param = "&param=executionID=" + executionID + ",browseType=" + browseType + ",orderBy=id_asc,groupBy=" + groupBy;
+            location.href = createLink('execution', 'importPlanStories', 'executionID=' + executionID + '&planID=' + planID + '&productID=0&fromMethod=taskKanban&extra=' + param);
         }
     });
 
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index ec45f38420..dc1becccfa 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -232,8 +232,12 @@ js::set('hasTaskButton', $hasTaskButton);
 </div>
 <?php else:?>
 <div class='panel' id='kanbanContainer'>
-  <div class='panel-body region'>
-    <div id='kanban' class='kanban'></div>
+  <div class='panel-body'>
+    <div id='kanban'>
+      <div class='region'>
+        <div id='kanban<?php echo $execution->id;?>' data-id='<?php echo $execution->id;?>' class='kanban'></div>
+      </div>
+    </div>
   </div>
 </div>
 <?php endif;?>
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 782af7f301..da91c5fb76 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1508,9 +1508,11 @@ class kanban extends control
             if($from == 'RDKanban')
             {
                 if(dao::isError()) return $this->sendError(dao::getError());
-                $regionID   = $column->region;
-                $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                $kanbanData = json_encode($kanbanData);
+                $regionID     = $column->region;
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                $kanbanData   = json_encode($kanbanData);
 
                 return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, $regionID)"));
             }
@@ -1589,9 +1591,11 @@ class kanban extends control
             if($from == 'RDKanban')
             {
                 if(dao::isError()) return $this->sendError(dao::getError());
-                $regionID   = $column->region;
-                $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                $kanbanData = json_encode($kanbanData);
+                $regionID     = $column->region;
+                $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                $kanbanData   = json_encode($kanbanData);
 
                 return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, $regionID)"));
             }
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 6ab2b71c5c..e28cbb4dfc 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1454,13 +1454,21 @@ class kanbanModel extends model
         $lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList);
         if(empty($lanes)) return array();
 
-        $columns = $this->dao->select('t1.*, t2.`type` as columnType, t2.limit, t2.name as columnName, t2.color')->from(TABLE_KANBANCELL)->alias('t1')
+        $columns = $this->dao->select('t1.*, GROUP_CONCAT(t1.cards) as cards, t2.`type` as columnType, t2.limit, t2.name as columnName, t2.color')->from(TABLE_KANBANCELL)->alias('t1')
             ->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.`column` = t2.id')
+            ->leftJoin(TABLE_KANBANLANE)->alias('t3')->on('t2.group = t3.group')
+            ->leftJoin(TABLE_KANBANREGION)->alias('t4')->on('t1.kanban = t4.kanban')
             ->where('t1.kanban')->eq($executionID)
             ->andWhere('t1.`type`')->eq($browseType)
+            ->andWhere('t3.deleted')->eq(0)
+            ->andWhere('t4.deleted')->eq(0)
+            ->groupBy('columnType')
+            ->orderBy('column_asc')
             ->fetchAll('columnType');
 
         $cardGroup = array();
+        $actions   = array('setColumn', 'setWIP');
+
         foreach($columns as $column)
         {
             if(empty($column->cards)) continue;
@@ -1492,6 +1500,14 @@ class kanbanModel extends model
                 if(in_array($column->columnType, array('testing', 'tested')))       $parentColumn = 'test';
                 if(in_array($column->columnType, array('fixing', 'fixed')))         $parentColumn = 'resolving';
 
+                /* Judge column action priv. */
+                $column->actions = array();
+                foreach($actions as $action)
+                {
+                    if($this->isClickable($column, $action)) $column->actions[] = $action;
+                }
+
+
                 $columnData[$column->column]['id']         = $column->column;
                 $columnData[$column->column]['type']       = $column->columnType;
                 $columnData[$column->column]['name']       = $column->columnName;
@@ -1500,6 +1516,7 @@ class kanbanModel extends model
                 $columnData[$column->column]['laneType']   = $browseType;
                 $columnData[$column->column]['asParent']   = in_array($column->columnType, array('develop', 'test', 'resolving')) ? true : false;
                 $columnData[$column->column]['parentType'] = $parentColumn;
+                $columnData[$column->column]['actions']    = $column->actions;
 
                 $cardOrder = 1;
                 $objects   = zget($cardGroup, $column->columnType, array());
diff --git a/module/story/control.php b/module/story/control.php
index a191e64875..bb5c1ceac5 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -80,7 +80,7 @@ class story extends control
             {
                 $this->loadModel('kanban');
                 $regionPairs = $this->kanban->getRegionPairs($execution->id, 0, 'execution');
-                $regionID    = isset($output['regionID']) ? $output['regionID'] : key($regionPairs);
+                $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
                 $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'story');
                 $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
@@ -680,9 +680,9 @@ class story extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($this->session->execution);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban' and $kanbanGroup == 'default')
+                if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
                     $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
@@ -1052,10 +1052,12 @@ class story extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($this->session->execution);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban' and $this->app->tab == 'execution')
+                if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
@@ -1358,8 +1360,10 @@ class story extends control
                 if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
                     $this->loadModel('kanban')->updateLane($this->session->execution, 'story', $storyID);
-                    $kanbanData = $this->kanban->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
@@ -1707,10 +1711,11 @@ class story extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($this->session->execution);
-                if($this->app->tab == 'execution' and $execution->type == 'kanban' and $kanbanGroup == 'default')
+                if($this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($this->session->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($this->session->execution, $execLaneType, 'id_desc', 0, $kanbanGroup);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }

From c3af29cbee8083b4d935d8f302f15ff1f761adfc Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Jun 2022 10:47:20 +0800
Subject: [PATCH 09/24] * Fix bug #23124.

---
 module/build/model.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/module/build/model.php b/module/build/model.php
index b43b55adfb..b84a606a5f 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -551,8 +551,8 @@ class buildModel extends model
 
             $menu .= $this->buildMenu('testtask', 'create', "product=$build->product&execution={$executionID}&build=$build->id", $build, $type, 'bullhorn', '', '', '', $testtaskApp);
 
-            if($tab == 'execution') $menu .= $this->buildMenu('execution', 'bug', "execution={$extraParams['executionID']}&productID={$extraParams['productID']}&orderBy=status&build=$build->id", $build, $type, '', '', '', '', $this->lang->execution->viewBug);
-            if($tab == 'project')   $menu .= $this->buildMenu('build', 'view', "{$params}&type=generatedBug", $build, $type, 'bug', '', '', '', "data-app='project'", $this->lang->project->bug);
+            if($tab == 'execution' and !empty($execution->type) and $execution->type != 'kanban') $menu .= $this->buildMenu('execution', 'bug', "execution={$extraParams['executionID']}&productID={$extraParams['productID']}&orderBy=status&build=$build->id", $build, $type, '', '', '', '', $this->lang->execution->viewBug);
+            if($tab == 'project' or empty($execution->type) or $execution->type == 'kanban') $menu .= $this->buildMenu('build', 'view', "{$params}&type=generatedBug", $build, $type, 'bug', '', '', '', "data-app='$tab'", $this->lang->project->bug);
 
             $menu .= $this->buildMenu('build', 'edit',   $params, $build, $type);
             $menu .= $this->buildMenu('build', 'delete', $params, $build, $type, 'trash', 'hiddenwin');

From 2f1b1fc74ff1d2d61d81b14e0e5f215863c4d140 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Jun 2022 10:48:30 +0800
Subject: [PATCH 10/24] * Fix bug #23124.

---
 module/build/model.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/build/model.php b/module/build/model.php
index b84a606a5f..a0e965c109 100644
--- a/module/build/model.php
+++ b/module/build/model.php
@@ -552,7 +552,7 @@ class buildModel extends model
             $menu .= $this->buildMenu('testtask', 'create', "product=$build->product&execution={$executionID}&build=$build->id", $build, $type, 'bullhorn', '', '', '', $testtaskApp);
 
             if($tab == 'execution' and !empty($execution->type) and $execution->type != 'kanban') $menu .= $this->buildMenu('execution', 'bug', "execution={$extraParams['executionID']}&productID={$extraParams['productID']}&orderBy=status&build=$build->id", $build, $type, '', '', '', '', $this->lang->execution->viewBug);
-            if($tab == 'project' or empty($execution->type) or $execution->type == 'kanban') $menu .= $this->buildMenu('build', 'view', "{$params}&type=generatedBug", $build, $type, 'bug', '', '', '', "data-app='$tab'", $this->lang->project->bug);
+            if($tab == 'project' or empty($execution->type) or $execution->type == 'kanban')      $menu .= $this->buildMenu('build', 'view', "{$params}&type=generatedBug", $build, $type, 'bug', '', '', '', "data-app='$tab'", $this->lang->project->bug);
 
             $menu .= $this->buildMenu('build', 'edit',   $params, $build, $type);
             $menu .= $this->buildMenu('build', 'delete', $params, $build, $type, 'trash', 'hiddenwin');

From 2fb1cc00323612de7d294ea37c83ca458ae0145e Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 10:57:07 +0800
Subject: [PATCH 11/24] * Finish task #55675.

---
 module/execution/js/kanban.js | 14 +++---
 module/kanban/control.php     | 19 ++++++--
 module/kanban/model.php       | 24 ++++++++--
 module/task/control.php       | 86 +++++++++++++++++++++--------------
 4 files changed, 97 insertions(+), 46 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index f3cf82656a..95fee6f6f1 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -816,7 +816,7 @@ function handleDropTask($element, event, kanban)
     var cardID      = $card.data().id;
     var fromColType = $oldCol.data('type');
     var toColType   = $newCol.data('type');
-    var regionID    = $card.closest('.region').data().id;
+    var regionID    = groupBy == 'default' ? $card.closest('.region').data().id : executionID;
 
     changeCardColType(cardID, oldCol.id, newCol.id, oldLane.id, newLane.id, cardType, fromColType, toColType, regionID);
 }
@@ -831,8 +831,6 @@ var kanbanActionHandlers =
  */
 function handleKanbanAction(action, $element, event, kanban)
 {
-    if(groupBy && groupBy != 'default') return false;
-
     $('.kanban').attr('data-action-enabled', action);
     var handler = kanbanActionHandlers[action];
     if(handler) handler($element, event, kanban);
@@ -988,7 +986,8 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
                 url:       link,
                 success: function(data)
                 {
-                    updateRegion(regionID, data[regionID]);
+                    data = groupBy == 'default' ? data[regionID] : data[groupBy];
+                    updateRegion(regionID, data);
                 },
                 error: function(xhr, status, error)
                 {
@@ -1017,6 +1016,8 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
 function deleteCard(objectType, objectID, regionID)
 {
     $.zui.ContextMenu.hide();
+
+    regionID = regionID ? regionID : 0;
     setTimeout(function()
     {
         var objectLang = objectType + 'Lang';
@@ -1033,7 +1034,8 @@ function deleteCard(objectType, objectID, regionID)
             url:      url,
             success: function(data)
             {
-                updateRegion(regionID, data[regionID]);
+                data = groupBy == 'default' ? data[regionID] : data[groupBy];
+                updateRegion(regionID, data);
             }
         });
     }, 200)
@@ -1230,7 +1232,7 @@ function initKanban($kanban)
         onRenderLaneName:  renderLaneName,
         onRenderHeaderCol: renderHeaderCol,
         onRenderCount:     renderCount,
-        droppable:         groupBy == 'default' ? {target: findDropColumns, finish:handleFinishDrop} : false,
+        droppable:         {target: findDropColumns, finish:handleFinishDrop},
         virtualize:        true,
         virtualCardList:   true
     });
diff --git a/module/kanban/control.php b/module/kanban/control.php
index da91c5fb76..6654116088 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1479,9 +1479,10 @@ class kanban extends control
         $this->loadModel($objectType)->delete(constant($table), $objectID);
         if(dao::isError()) return $this->send(array('result' => 'fail', 'message' => dao::getError()));
 
-        $kanbanID    = $this->kanban->getKanbanIDByregion($regionID);
+        $kanbanID    = $regionID ? $this->kanban->getKanbanIDByregion($regionID) : $this->session->execution;
         $browseType  = $this->config->vision == 'lite' ? 'task' : $this->session->execLaneType;
-        $kanbanGroup = $this->kanban->getRDKanban($kanbanID, $browseType);
+        $groupBy     = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+        $kanbanGroup = $this->kanban->getRDKanban($kanbanID, $browseType, 'id_desc', 0, $groupBy);
 
         return print(json_encode($kanbanGroup));
     }
@@ -1715,12 +1716,22 @@ class kanban extends control
      */
     public function ajaxMoveCard($cardID = 0, $fromColID = 0, $toColID = 0, $fromLaneID = 0, $toLaneID = 0, $executionID = 0, $browseType = 'all', $groupBy = '', $regionID = 0, $orderBy = '')
     {
-        $fromCell = $this->dao->select('id, cards')->from(TABLE_KANBANCELL)
+        $fromCell = $this->dao->select('id, cards, lane')->from(TABLE_KANBANCELL)
             ->where('kanban')->eq($executionID)
-            ->andWhere('lane')->eq($fromLaneID)
             ->andWhere('`column`')->eq($fromColID)
+            ->beginIF(!$groupBy or $groupBy == 'default')->andWhere('lane')->eq($fromLaneID)->fi()
+            ->beginIF($groupBy and $groupBy != 'default')
+            ->andWhere('type')->eq($browseType)
+            ->andWhere('cards')->like("%,$cardID,%")
+            ->fi()
             ->fetch();
 
+        if($groupBy and $groupBy != 'default')
+        {
+            $fromLaneID = $fromCell->lane;
+            $toLaneID   = $fromCell->lane;
+        }
+
         $toCell = $this->dao->select('id, cards')->from(TABLE_KANBANCELL)
             ->where('kanban')->eq($executionID)
             ->andWhere('lane')->eq($toLaneID)
diff --git a/module/kanban/model.php b/module/kanban/model.php
index e28cbb4dfc..05a625e814 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1456,7 +1456,7 @@ class kanbanModel extends model
 
         $columns = $this->dao->select('t1.*, GROUP_CONCAT(t1.cards) as cards, t2.`type` as columnType, t2.limit, t2.name as columnName, t2.color')->from(TABLE_KANBANCELL)->alias('t1')
             ->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.`column` = t2.id')
-            ->leftJoin(TABLE_KANBANLANE)->alias('t3')->on('t2.group = t3.group')
+            ->leftJoin(TABLE_KANBANLANE)->alias('t3')->on('t1.lane = t3.id')
             ->leftJoin(TABLE_KANBANREGION)->alias('t4')->on('t1.kanban = t4.kanban')
             ->where('t1.kanban')->eq($executionID)
             ->andWhere('t1.`type`')->eq($browseType)
@@ -1490,6 +1490,7 @@ class kanbanModel extends model
             $laneData['name']            = (($groupBy == 'pri' or $groupBy == 'severity') and $laneID) ? $this->lang->$browseType->$groupBy . ':' . $lane->name : $lane->name;
             $laneData['color']           = $lane->color;
             $laneData['order']           = $lane->order;
+            $laneData['type']            = $browseType;
             $laneData['defaultCardType'] = $browseType;
 
             /* Construct kanban column data. */
@@ -1507,7 +1508,6 @@ class kanbanModel extends model
                     if($this->isClickable($column, $action)) $column->actions[] = $action;
                 }
 
-
                 $columnData[$column->column]['id']         = $column->column;
                 $columnData[$column->column]['type']       = $column->columnType;
                 $columnData[$column->column]['name']       = $column->columnName;
@@ -1621,6 +1621,7 @@ class kanbanModel extends model
         foreach($objectPairs as $objectID => $objectName)
         {
             if(!isset($groupByList[$objectID]) and $objectID) continue;
+            if($browseType == 'task' and $groupBy == 'type' and !$objectID) continue;
 
             $lane = new stdclass();
             $lane->id        = $groupBy . $objectID;
@@ -3132,7 +3133,24 @@ class kanbanModel extends model
      */
     public function moveCard($cardID, $fromColID, $toColID, $fromLaneID, $toLaneID, $kanbanID = 0)
     {
-        $fromCellCards = $this->dao->select('cards')->from(TABLE_KANBANCELL)->where('lane')->eq($fromLaneID)->andWhere('`column`')->eq($fromColID)->fetch('cards');
+        $groupBy = $this->session->execGroupBy ? $this->session->execGroupBy : '';
+
+        $fromCell = $this->dao->select('cards, lane')->from(TABLE_KANBANCELL)
+            ->where('`column`')->eq($fromColID)
+            ->beginIF(!$groupBy or $groupBy == 'default')->andWhere('lane')->eq($fromLaneID)->fi()
+            ->beginIF($groupBy and $groupBy != 'default')
+            ->andWhere('type')->eq($this->session->execLaneType)
+            ->andWhere('cards')->like("%,$cardID,%")
+            ->fi()
+            ->fetch();
+
+        if($groupBy and $groupBy != 'default')
+        {
+            $fromLaneID = $fromCell->lane;
+            $toLaneID   = $fromCell->lane;
+        }
+
+        $fromCellCards = $fromCell->cards;
         $toCell        = $this->dao->select('*')->from(TABLE_KANBANCELL)->where('lane')->eq($toLaneID)->andWhere('`column`')->eq($toColID)->fetch();
         $toCellCards   = $this->dao->select('cards')->from(TABLE_KANBANCELL)->where('lane')->eq($toLaneID)->andWhere('`column`')->eq($toColID)->fetch('cards');
 
diff --git a/module/task/control.php b/module/task/control.php
index 387200148c..babc3b8ff2 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -90,7 +90,7 @@ class task extends control
         if($execution->type == 'kanban')
         {
             $regionPairs = $this->kanban->getRegionPairs($execution->id, 0, 'execution');
-            $regionID    = isset($output['regionID']) ? $output['regionID'] : key($regionPairs);
+            $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
             $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'task');
             $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
@@ -139,7 +139,7 @@ class task extends control
                 /* if status is exists then this task has exists not new create. */
                 if($taskID['status'] == 'exists') continue;
 
-                $taskID   = $taskID['id'];
+                $taskID = $taskID['id'];
                 $this->action->create('task', $taskID, 'Opened', '');
             }
 
@@ -173,8 +173,10 @@ class task extends control
             {
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->kanban->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                 }
@@ -347,8 +349,10 @@ class task extends control
             {
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, 0)"));
                 }
@@ -397,7 +401,7 @@ class task extends control
 
             $this->loadModel('kanban');
             $regionPairs = $this->kanban->getRegionPairs($executionID, 0, 'execution');
-            $regionID    = isset($output['regionID']) ? $output['regionID'] : key($regionPairs);
+            $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
             $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'task');
             $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
@@ -503,9 +507,9 @@ class task extends control
             if(isonlybody())
             {
                 $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution' and $kanbanGroup == 'default')
+                if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
                     $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
@@ -738,9 +742,9 @@ class task extends control
             {
                 $task      = $this->task->getById($taskID);
                 $execution = $this->execution->getByID($task->execution);
-                if($execution->type == 'kanban' and $this->app->tab == 'execution' and $kanbanGroup == 'default')
+                if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
                     $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
@@ -988,9 +992,11 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = isset($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1050,8 +1056,10 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
@@ -1184,9 +1192,11 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1272,9 +1282,11 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1328,8 +1340,10 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
@@ -1399,9 +1413,11 @@ class task extends control
 
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1562,9 +1578,11 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1618,9 +1636,11 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($task->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }

From b9a37d04a2302e0e30a7f80af1cd75ed10b2d633 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 11:08:51 +0800
Subject: [PATCH 12/24] * Finish task #55675.

---
 module/execution/control.php | 6 +++---
 module/kanban/model.php      | 4 ++++
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index 2c228fe1ba..eb95a9f98a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -2199,16 +2199,16 @@ class execution extends control
      * @access public
      * @return void
      */
-    public function taskKanban($executionID, $browseType = '', $orderBy = 'order_asc', $groupBy = '')
+    public function taskKanban($executionID, $browseType = 'all', $orderBy = 'order_asc', $groupBy = '')
     {
-        if(empty($browseType)) $browseType = $this->session->kanbanType ? $this->session->kanbanType : 'all';
         if(empty($groupBy)) $groupBy = 'default';
 
         /* Save to session. */
         $uri = $this->app->getURI(true);
         $this->app->session->set('taskList', $uri, 'execution');
         $this->app->session->set('bugList',  $uri, 'qa');
-        $this->app->session->set('kanbanType', $browseType, 'execution');
+        $this->app->session->set('execLaneType', $browseType);
+        $this->app->session->set('execGroupBy', $groupBy);
 
         /* Load language. */
         $this->app->loadLang('task');
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 05a625e814..afff540da2 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1454,14 +1454,18 @@ class kanbanModel extends model
         $lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList);
         if(empty($lanes)) return array();
 
+        $execution = $this->loadModel('execution')->getByID($executionID);
+
         $columns = $this->dao->select('t1.*, GROUP_CONCAT(t1.cards) as cards, t2.`type` as columnType, t2.limit, t2.name as columnName, t2.color')->from(TABLE_KANBANCELL)->alias('t1')
             ->leftJoin(TABLE_KANBANCOLUMN)->alias('t2')->on('t1.`column` = t2.id')
             ->leftJoin(TABLE_KANBANLANE)->alias('t3')->on('t1.lane = t3.id')
             ->leftJoin(TABLE_KANBANREGION)->alias('t4')->on('t1.kanban = t4.kanban')
             ->where('t1.kanban')->eq($executionID)
             ->andWhere('t1.`type`')->eq($browseType)
+            ->beginIF(isset($execution->type) and $execution->type == 'kanban')
             ->andWhere('t3.deleted')->eq(0)
             ->andWhere('t4.deleted')->eq(0)
+            ->fi()
             ->groupBy('columnType')
             ->orderBy('column_asc')
             ->fetchAll('columnType');

From 5d62ed59009ab0e83b4d00af8f93c37b9d303afd Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 13:06:26 +0800
Subject: [PATCH 13/24] * Finish task #55675.

---
 module/execution/js/kanban.js         | 16 ++++++++++------
 module/execution/view/kanban.html.php |  7 ++++---
 module/kanban/model.php               |  2 +-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 95fee6f6f1..ae5b282606 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -370,19 +370,22 @@ function findDropColumns($element, $root)
 
     if(!kanbanRules) return $root.find('.kanban-lane-col:not([data-type="' + col.type + '"])');
 
-    var colRules = kanbanRules[col.type];
-    var groupID  = $col.closest('.kanban-board').data().id;
+    var colRules  = kanbanRules[col.type];
+    var groupID   = $col.closest('.kanban-board').data().id;
+    var oldLaneID = $col.closest('.kanban-lane').data().id;
     return $root.find('.kanban-lane-col').filter(function()
     {
         if(!colRules) return false;
         if(colRules === true) return true;
         if($.cookie('isFullScreen') == 1) return false;
 
-        var $newCol = $(this);
-        var newCol = $newCol.data();
-        var newGroupID =  $newCol.closest('.kanban-board').data().id;
+        var $newCol    = $(this);
+        var newCol     = $newCol.data();
+        var newGroupID = $newCol.closest('.kanban-board').data().id;
+        var newLaneID  = $newCol.closest('.kanban-lane').data().id;
 
         var canDropHere = colRules.indexOf(newCol.type) > -1 && newGroupID === groupID;
+        if(groupBy && groupBy != 'default' && canDropHere) canDropHere = oldLaneID === newLaneID;
         if(canDropHere) $newCol.addClass('can-drop-here');
         return canDropHere;
     });
@@ -1034,7 +1037,8 @@ function deleteCard(objectType, objectID, regionID)
             url:      url,
             success: function(data)
             {
-                data = groupBy == 'default' ? data[regionID] : data[groupBy];
+                data     = groupBy == 'default' ? data[regionID] : data[groupBy];
+                regionID = groupBy == 'default' ? regionID : executionID;
                 updateRegion(regionID, data);
             }
         });
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index dc1becccfa..81d1ddb848 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -138,15 +138,16 @@ js::set('hasTaskButton', $hasTaskButton);
   <div class='btn-toolbar pull-right'>
     <?php
     echo html::a('javascript:fullScreen()', "<i class='icon-fullscreen muted'></i> " . $lang->kanban->fullScreen, '', "class='btn btn-link'");
-    $actions = '';
-    $printSettingBtn = (common::hasPriv('kanban', 'createRegion') or (common::hasPriv('kanban', 'setLaneHeight')) or (common::hasPriv('kanban', 'setColumnWidth')) or common::hasPriv('execution', 'edit') or common::hasPriv('execution', 'close') or common::hasPriv('execution', 'delete') or !empty($executionActions));
+    $actions           = '';
+    $printCreateRegion = (common::hasPriv('kanban', 'createRegion') and $groupBy == 'default');
+    $printSettingBtn   = ($printCreateRegion or (common::hasPriv('kanban', 'setLaneHeight')) or (common::hasPriv('kanban', 'setColumnWidth')) or common::hasPriv('execution', 'edit') or common::hasPriv('execution', 'close') or common::hasPriv('execution', 'delete') or !empty($executionActions));
 
     if($printSettingBtn)
     {
         $actions .= html::a('javascript:;', "<i class='icon icon-cog-outline'></i>" . $lang->kanban->setting, '', "data-toggle='dropdown' class='btn btn-link'");
         $actions .= "<ul id='kanbanActionMenu' class='dropdown-menu pull-right'>";
         $width    = $this->app->getClientLang() == 'en' ? '750' : '650';
-        if(common::hasPriv('kanban', 'createRegion')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-plus"></i>' . $lang->kanban->createRegion, '', "class='iframe btn btn-link text-left'") . '</li>';
+        if($printCreateRegion) $actions .= '<li>' . html::a(helper::createLink('kanban', 'createRegion', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-plus"></i>' . $lang->kanban->createRegion, '', "class='iframe btn btn-link text-left'") . '</li>';
         if(common::hasPriv('kanban', 'setLaneHeight')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'setLaneHeight', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-size-height"></i>' . $lang->kanban->laneHeight, '', "class='iframe btn btn-link text-left' data-width=$width") . '</li>';
         if(common::hasPriv('kanban', 'setColumnWidth')) $actions .= '<li>' . html::a(helper::createLink('kanban', 'setColumnWidth', "kanbanID=$execution->id&from=execution", '', true), '<i class="icon icon-size-width"></i>' . $lang->kanban->columnWidth, '', "class='iframe btn btn-link text-left' data-width='400'") . '</li>';
         $kanbanActions = '';
diff --git a/module/kanban/model.php b/module/kanban/model.php
index afff540da2..74d0ed5037 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3137,7 +3137,7 @@ class kanbanModel extends model
      */
     public function moveCard($cardID, $fromColID, $toColID, $fromLaneID, $toLaneID, $kanbanID = 0)
     {
-        $groupBy = $this->session->execGroupBy ? $this->session->execGroupBy : '';
+        $groupBy = ($this->session->execGroupBy and $this->app->tab == 'execution') ? $this->session->execGroupBy : '';
 
         $fromCell = $this->dao->select('cards, lane')->from(TABLE_KANBANCELL)
             ->where('`column`')->eq($fromColID)

From b076635c7952cd5e07dd12ec5c556f2063e9dc52 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 13:32:34 +0800
Subject: [PATCH 14/24] * Finish task #55675.

---
 module/bug/control.php        | 56 +++++++++++++++++++++--------------
 module/execution/js/kanban.js |  3 +-
 2 files changed, 36 insertions(+), 23 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 33c4542722..21ce252e8b 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -329,7 +329,7 @@ class bug extends control
             {
                 $this->loadModel('kanban');
                 $regionPairs = $this->kanban->getRegionPairs($execution->id, 0, 'execution');
-                $regionID    = isset($output['regionID']) ? $output['regionID'] : key($regionPairs);
+                $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
                 $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'bug');
                 $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
@@ -411,8 +411,10 @@ class bug extends control
                 $execution   = $this->loadModel('execution')->getByID($executionID);
                 if($executionID == $output['executionID'] and $this->app->tab == 'execution' and $execution->type == 'kanban')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
                     return $this->send(array('result' => 'success', 'message' => $this->lang->saveSuccess, 'closeModal' => true, 'callback' => "parent.updateKanban($kanbanData, 0)"));
                 }
                 else
@@ -707,8 +709,10 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($executionID);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($executionID, $this->session->execLaneType ? $this->session->execLaneType : 'all');
-                    $kanbanData = json_encode($kanbanData);
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', 0, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
                 }
                 else
@@ -736,7 +740,7 @@ class bug extends control
             {
                 $this->loadModel('kanban');
                 $regionPairs = $this->kanban->getRegionPairs($executionID, 0, 'execution');
-                $regionID    = isset($output['regionID']) ? $output['regionID'] : key($regionPairs);
+                $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
                 $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'bug');
                 $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
@@ -957,9 +961,9 @@ class bug extends control
             if(isonlybody())
             {
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
-                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution' and $kanbanGroup == 'default')
+                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
                     $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
@@ -1271,9 +1275,9 @@ class bug extends control
             {
                 $bug       = $this->bug->getById($bugID);
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
-                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution' and $kanbanGroup == 'default')
+                if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all');
+                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', 0, $kanbanGroup);
                     $kanbanData = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData)"));
@@ -1480,9 +1484,11 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1572,9 +1578,11 @@ class bug extends control
             {
                 if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1671,9 +1679,11 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
@@ -1729,9 +1739,11 @@ class bug extends control
                 $execution = $this->loadModel('execution')->getByID($bug->execution);
                 if(isset($execution->type) and $execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID   = isset($output['regionID']) ? $output['regionID'] : 0;
-                    $kanbanData = $this->loadModel('kanban')->getRDKanban($bug->execution, $this->session->execLaneType ? $this->session->execLaneType : 'all', 'id_desc', $regionID);
-                    $kanbanData = json_encode($kanbanData);
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
+                    $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
+                    $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                    $kanbanData   = $this->loadModel('kanban')->getRDKanban($bug->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);
+                    $kanbanData   = json_encode($kanbanData);
 
                     return print(js::closeModal('parent.parent', '', "parent.parent.updateKanban($kanbanData, $regionID)"));
                 }
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index ae5b282606..48ea77dc3e 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1097,7 +1097,8 @@ function shiftCard(objectID, fromColID, toColID, fromLaneID, toLaneID, regionID)
         url:       link,
         success: function(data)
         {
-            updateRegion(regionID, data[regionID]);
+            data = groupBy == 'default' ? data[regionID] : data[groupBy];
+            updateRegion(regionID, data);
         },
         error: function(xhr, status, error)
         {

From 384240bb75136db3b6991f23dafc20c51117e44d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Wed, 1 Jun 2022 13:47:27 +0800
Subject: [PATCH 15/24] * Finish task #55681.

---
 module/execution/js/taskkanban.js | 3 ---
 module/kanban/model.php           | 9 +++++++++
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index 5d8211a1a6..aab7dd0783 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -783,7 +783,6 @@ var kanbanActionHandlers =
  */
 function handleKanbanAction(action, $element, event, kanban)
 {
-    if(groupBy && groupBy != 'default') return false;
     $('.kanban').attr('data-action-enabled', action);
     var handler = kanbanActionHandlers[action];
     if(handler) handler($element, event, kanban);
@@ -1074,8 +1073,6 @@ $(function()
         onRenderCount:     renderColumnCount
     };
 
-    if(groupBy != 'default') commonOptions.droppable = false;
-
     /* Create kanban */
     if(groupBy == 'default')
     {
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 74d0ed5037..f32cc03910 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1451,6 +1451,11 @@ class kanbanModel extends model
         if($browseType == 'bug')   $cardList = $this->loadModel('bug')->getExecutionBugs($executionID);
         if($browseType == 'task')  $cardList = $this->loadModel('execution')->getKanbanTasks($executionID, "id");
 
+        /* Get objects cards menus. */
+        if($browseType == 'story') $storyCardMenu = $this->getKanbanCardMenu($executionID, $cardList, 'story');
+        if($browseType == 'bug')   $bugCardMenu   = $this->getKanbanCardMenu($executionID, $cardList, 'bug');
+        if($browseType == 'task')  $taskCardMenu  = $this->getKanbanCardMenu($executionID, $cardList, 'task');
+
         $lanes = $this->getLanes4Group($executionID, $browseType, $groupBy, $cardList);
         if(empty($lanes)) return array();
 
@@ -1540,6 +1545,10 @@ class kanbanModel extends model
                     $cardData['deadline']   = $browseType == 'story' ? '' : $object->deadline;
                     $cardData['severity']   = $browseType == 'bug' ? $object->severity : '';
 
+                    if($lane->type == 'story') $cardData['menus'] = $storyCardMenu[$object->id];
+                    if($lane->type == 'bug')   $cardData['menus'] = $bugCardMenu[$object->id];
+                    if($lane->type == 'task')  $cardData['menus'] = $taskCardMenu[$object->id];
+
                     if($browseType == 'task')
                     {
                         $cardData['name']   = $object->name;

From 7a70ae84811237ed1a58c4499cdeb3d70a41d242 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 13:50:53 +0800
Subject: [PATCH 16/24] * Finish task #55675.

---
 module/execution/control.php  | 2 +-
 module/execution/js/kanban.js | 9 ++++++---
 module/kanban/control.php     | 2 +-
 module/task/control.php       | 2 +-
 4 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/module/execution/control.php b/module/execution/control.php
index eb95a9f98a..b1e1f773e7 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3692,7 +3692,7 @@ class execution extends control
         }
 
         $moduleName = 'execution';
-        if(empty($param)) $param = "executionID=$executionID";
+        if(empty($param))  $param = "executionID=$executionID";
         if(!empty($param)) $param = str_replace(array(',', ' '), array('&', ''), $param);
         if($execution->type == 'project')
         {
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 48ea77dc3e..6ee94cc322 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -778,6 +778,8 @@ function renderLaneName($lane, lane, $kanban, columns, kanban)
  */
 function updateRegion(regionID, regionData = [])
 {
+    if(groupBy != 'default') regionID = executionID;
+
     if(!regionID) return false;
 
     var $region = $('#kanban'+ regionID).kanban();
@@ -819,7 +821,7 @@ function handleDropTask($element, event, kanban)
     var cardID      = $card.data().id;
     var fromColType = $oldCol.data('type');
     var toColType   = $newCol.data('type');
-    var regionID    = groupBy == 'default' ? $card.closest('.region').data().id : executionID;
+    var regionID    = $card.closest('.region').data().id;
 
     changeCardColType(cardID, oldCol.id, newCol.id, oldLane.id, newLane.id, cardType, fromColType, toColType, regionID);
 }
@@ -860,6 +862,8 @@ function changeCardColType(cardID, fromColID, toColID, fromLaneID, toLaneID, car
     var showIframe = false;
     var moveCard   = false;
 
+    regionID = regionID ? regionID : 0;
+
     /* Task lane. */
     if(cardType == 'task')
     {
@@ -1037,8 +1041,7 @@ function deleteCard(objectType, objectID, regionID)
             url:      url,
             success: function(data)
             {
-                data     = groupBy == 'default' ? data[regionID] : data[groupBy];
-                regionID = groupBy == 'default' ? regionID : executionID;
+                data = groupBy == 'default' ? data[regionID] : data[groupBy];
                 updateRegion(regionID, data);
             }
         });
diff --git a/module/kanban/control.php b/module/kanban/control.php
index 6654116088..3b29d84cc4 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1592,9 +1592,9 @@ class kanban extends control
             if($from == 'RDKanban')
             {
                 if(dao::isError()) return $this->sendError(dao::getError());
-                $regionID     = $column->region;
                 $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                 $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
+                $regionID     = $execGroupBy == 'default' ? $column->region : 0;
                 $kanbanData   = $this->loadModel('kanban')->getRDKanban($executionID, $execLaneType, 'id_desc', $regionID, $execGroupBy);
                 $kanbanData   = json_encode($kanbanData);
 
diff --git a/module/task/control.php b/module/task/control.php
index babc3b8ff2..b64a1bcd4e 100755
--- a/module/task/control.php
+++ b/module/task/control.php
@@ -992,7 +992,7 @@ class task extends control
                 $execution = $this->execution->getByID($task->execution);
                 if($execution->type == 'kanban' and $this->app->tab == 'execution')
                 {
-                    $regionID     = isset($output['regionID']) ? $output['regionID'] : 0;
+                    $regionID     = !empty($output['regionID']) ? $output['regionID'] : 0;
                     $execLaneType = $this->session->execLaneType ? $this->session->execLaneType : 'all';
                     $execGroupBy  = $this->session->execGroupBy ? $this->session->execGroupBy : 'default';
                     $kanbanData   = $this->loadModel('kanban')->getRDKanban($task->execution, $execLaneType, 'id_desc', $regionID, $execGroupBy);

From 3e10f3d0c9316e8bf766de329ae6afb451bee761 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 14:25:44 +0800
Subject: [PATCH 17/24] * Finish task #55675.

---
 module/bug/control.php   | 4 ++--
 module/kanban/model.php  | 1 -
 module/story/control.php | 9 ++++++---
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/module/bug/control.php b/module/bug/control.php
index 21ce252e8b..7d17f8f261 100755
--- a/module/bug/control.php
+++ b/module/bug/control.php
@@ -324,7 +324,7 @@ class bug extends control
         if($this->app->tab == 'execution')
         {
             if(isset($output['executionID'])) $this->loadModel('execution')->setMenu($output['executionID']);
-            $execution = $this->dao->findById((int)$output['executionID'])->from(TABLE_EXECUTION)->fetch();
+            $execution = $this->dao->findById($this->session->execution)->from(TABLE_EXECUTION)->fetch();
             if($execution->type == 'kanban')
             {
                 $this->loadModel('kanban');
@@ -742,7 +742,7 @@ class bug extends control
                 $regionPairs = $this->kanban->getRegionPairs($executionID, 0, 'execution');
                 $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
                 $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'bug');
-                $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
+                $laneID      = !empty($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
                 $this->view->executionType = $execution->type;
                 $this->view->regionID      = $regionID;
diff --git a/module/kanban/model.php b/module/kanban/model.php
index f32cc03910..7875cbd317 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -1634,7 +1634,6 @@ class kanbanModel extends model
         foreach($objectPairs as $objectID => $objectName)
         {
             if(!isset($groupByList[$objectID]) and $objectID) continue;
-            if($browseType == 'task' and $groupBy == 'type' and !$objectID) continue;
 
             $lane = new stdclass();
             $lane->id        = $groupBy . $objectID;
diff --git a/module/story/control.php b/module/story/control.php
index bb5c1ceac5..8090fd4bf8 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -82,7 +82,7 @@ class story extends control
                 $regionPairs = $this->kanban->getRegionPairs($execution->id, 0, 'execution');
                 $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
                 $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'story');
-                $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
+                $laneID      = !empty($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
                 $this->view->executionType = $execution->type;
                 $this->view->regionID      = $regionID;
@@ -407,10 +407,13 @@ class story extends control
                 if($execution->type == 'kanban')
                 {
                     $this->loadModel('kanban');
+                    $extra = str_replace(array(',', ' '), array('&', ''), $extra);
+                    parse_str($extra, $output);
+
                     $regionPairs = $this->kanban->getRegionPairs($executionID, 0, 'execution');
-                    $regionID    = isset($output['regionID']) ? $output['regionID'] : key($regionPairs);
+                    $regionID    = !empty($output['regionID']) ? $output['regionID'] : key($regionPairs);
                     $lanePairs   = $this->kanban->getLanePairsByRegion($regionID, 'story');
-                    $laneID      = isset($output['laneID']) ? $output['laneID'] : key($lanePairs);
+                    $laneID      = !empty($output['laneID']) ? $output['laneID'] : key($lanePairs);
 
                     $this->view->regionID    = $regionID;
                     $this->view->laneID      = $laneID;

From aec74869fed801ed8d951bb79cca6e992f64a384 Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 14:47:21 +0800
Subject: [PATCH 18/24] * Finish task #55675.

---
 module/kanban/control.php | 6 +-----
 module/kanban/model.php   | 6 +-----
 2 files changed, 2 insertions(+), 10 deletions(-)

diff --git a/module/kanban/control.php b/module/kanban/control.php
index 3b29d84cc4..04e357b827 100644
--- a/module/kanban/control.php
+++ b/module/kanban/control.php
@@ -1726,11 +1726,7 @@ class kanban extends control
             ->fi()
             ->fetch();
 
-        if($groupBy and $groupBy != 'default')
-        {
-            $fromLaneID = $fromCell->lane;
-            $toLaneID   = $fromCell->lane;
-        }
+        if($groupBy and $groupBy != 'default') $fromLaneID = $toLaneID = $fromCell->lane;
 
         $toCell = $this->dao->select('id, cards')->from(TABLE_KANBANCELL)
             ->where('kanban')->eq($executionID)
diff --git a/module/kanban/model.php b/module/kanban/model.php
index 7875cbd317..e2f3151aa1 100644
--- a/module/kanban/model.php
+++ b/module/kanban/model.php
@@ -3156,11 +3156,7 @@ class kanbanModel extends model
             ->fi()
             ->fetch();
 
-        if($groupBy and $groupBy != 'default')
-        {
-            $fromLaneID = $fromCell->lane;
-            $toLaneID   = $fromCell->lane;
-        }
+        if($groupBy and $groupBy != 'default') $fromLaneID = $toLaneID = $fromCell->lane;
 
         $fromCellCards = $fromCell->cards;
         $toCell        = $this->dao->select('*')->from(TABLE_KANBANCELL)->where('lane')->eq($toLaneID)->andWhere('`column`')->eq($toColID)->fetch();

From 095c9b550151096b68474b027f5900df7202ca5a Mon Sep 17 00:00:00 2001
From: tianshujie <tianshujie0123@163.com>
Date: Wed, 1 Jun 2022 15:07:35 +0800
Subject: [PATCH 19/24] * Finish task #55681.

---
 module/execution/js/kanban.js     | 3 ++-
 module/execution/js/taskkanban.js | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 6ee94cc322..8f682edcf7 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -432,7 +432,8 @@ function renderUserAvatar(user, objectType, objectID, size, objectStatus)
     if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar;
     if(objectType == 'bug'   && !priv.canAssignBug)   return $noPrivAvatar;
 
-    return objectStatus == 'closed' ? '' : $('<a class="avatar has-text ' + avatarSizeClass + ' avatar-circle iframe" title="' + user.realname + '" href="' + link + '"/>').avatar({user: user}).attr('data-toggle', 'modal').attr('data-width', '80%');
+    var realname = user.realname ? user.realname : user.account;
+    return objectStatus == 'closed' ? '' : $('<a class="avatar has-text ' + avatarSizeClass + ' avatar-circle iframe" title="' + realname + '" href="' + link + '"/>').avatar({user: user}).attr('data-toggle', 'modal').attr('data-width', '80%');
 }
 
 /**
diff --git a/module/execution/js/taskkanban.js b/module/execution/js/taskkanban.js
index aab7dd0783..aced711e19 100644
--- a/module/execution/js/taskkanban.js
+++ b/module/execution/js/taskkanban.js
@@ -45,7 +45,8 @@ function renderUserAvatar(user, objectType, objectID, size, objectStatus)
     if(objectType == 'story' && !priv.canAssignStory) return $noPrivAvatar;
     if(objectType == 'bug'   && !priv.canAssignBug)   return $noPrivAvatar;
 
-    return objectStatus == 'closed' ? '' : $('<a class="avatar has-text ' + avatarSizeClass + ' avatar-circle iframe" title="' + user.realname + '" href="' + link + '"/>').avatar({user: user});
+    var realname = user.realname ? user.realname : user.account;
+    return objectStatus == 'closed' ? '' : $('<a class="avatar has-text ' + avatarSizeClass + ' avatar-circle iframe" title="' + realname + '" href="' + link + '"/>').avatar({user: user});
 }
 
 /**

From bc803e56c8f288467ca2e975f2b57a817d871f5e Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 1 Jun 2022 07:34:04 +0000
Subject: [PATCH 20/24] * Finish task #55676.

---
 module/datatable/config.php          |   1 +
 module/execution/control.php         |   1 +
 module/execution/view/story.html.php |  84 +++++++++++++------
 module/story/config.php              |  21 ++++-
 module/story/lang/en.php             |   1 +
 module/story/lang/zh-cn.php          |   1 +
 module/story/model.php               | 116 ++++++++++++++++++++++++---
 7 files changed, 187 insertions(+), 38 deletions(-)

diff --git a/module/datatable/config.php b/module/datatable/config.php
index fb535f0f36..0c2c0fdbb0 100644
--- a/module/datatable/config.php
+++ b/module/datatable/config.php
@@ -1,5 +1,6 @@
 <?php
 $config->datatable->moduleAlias['product-browse']     = 'story';
+$config->datatable->moduleAlias['execution-story']    = 'story';
 $config->datatable->moduleAlias['execution-task']     = 'task';
 $config->datatable->moduleAlias['testtask-cases']     = 'testcase';
 $config->datatable->moduleAlias['program-project']    = 'project';
diff --git a/module/execution/control.php b/module/execution/control.php
index dd82569951..cee16e5a2d 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -855,6 +855,7 @@ class execution extends control
         $this->view->branchGroups      = $branchGroups;
         $this->view->canBeChanged      = common::canModify('execution', $execution); // Determines whether an object is editable.
         $this->view->showBranch        = $showBranch;
+        $this->view->storyStages     = $this->product->batchGetStoryStage($stories);
 
         $this->display();
     }
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index f0018a653a..3b1286ae7e 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -161,6 +161,9 @@
   </div>
   <div class="main-col">
     <div id='queryBox' data-module='executionStory' class='cell <?php if($type =='bysearch') echo 'show';?>'></div>
+      <div class="table-header fixed-right">
+        <nav class="btn-toolbar pull-right setting"></nav>
+      </div>
     <?php if(empty($stories)):?>
     <div class="table-empty-tip">
       <p>
@@ -172,25 +175,44 @@
     </div>
     <?php else:?>
     <form class='main-table table-story skip-iframe-modal' method='post' id='executionStoryForm'>
-      <div class="table-header fixed-right">
-        <nav class="btn-toolbar pull-right"></nav>
-      </div>
-      <table class='table tablesorter has-sort-head' id='storyList'>
+      <?php
+      $datatableId  = $this->moduleName . ucfirst($this->methodName);
+      $useDatatable = (isset($config->datatable->$datatableId->mode) and $config->datatable->$datatableId->mode == 'datatable');
+      $vars = "executionID={$execution->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}";
+
+      if($useDatatable) include '../../common/view/datatable.html.php';
+      $setting = $this->datatable->getSetting('execution');
+      $widths  = $this->datatable->setFixedFieldWidth($setting);
+      $columns = 0;
+
+      $checkObject = new stdclass();
+      $checkObject->execution = $execution->id;
+
+      $totalEstimate       = 0;
+      $canBatchEdit        = common::hasPriv('story', 'batchEdit');
+      $canBatchClose       = common::hasPriv('story', 'batchClose');
+      $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
+      $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
+      $canBatchToTask      = common::hasPriv('story', 'batchToTask', $checkObject);
+      $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+      ?>
+      <?php if(!$useDatatable) echo '<div class="table-responsive">';?>
+      <table class='table tablesorter has-sort-head<?php if($useDatatable) echo ' datatable';?>' id='storyList' data-fixed-left-width='<?php echo $widths['leftWidth']?>' data-fixed-right-width='<?php echo $widths['rightWidth']?>'>
         <thead>
           <tr>
           <?php
-          $checkObject = new stdclass();
-          $checkObject->execution = $execution->id;
-
-          $totalEstimate       = 0;
-          $canBatchEdit        = common::hasPriv('story', 'batchEdit');
-          $canBatchClose       = common::hasPriv('story', 'batchClose');
-          $canBatchChangeStage = common::hasPriv('story', 'batchChangeStage');
-          $canBatchUnlink      = common::hasPriv('execution', 'batchUnlinkStory');
-          $canBatchToTask      = common::hasPriv('story', 'batchToTask', $checkObject);
-          $canBatchAction      = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+          foreach($setting as $key => $value)
+          {
+              if($value->show)
+              {
+                  $this->datatable->printHead($value, $orderBy, $vars, $canBatchAction);
+                  $columns ++;
+              }
+          }
           ?>
-          <?php $vars = "executionID={$execution->id}&orderBy=%s&type=$type&param=$param&recTotal={$pager->recTotal}&recPerPage={$pager->recPerPage}"; ?>
+          </tr>
+<!--
+          <tr>
             <th class='c-id {sorter:false}'>
               <?php if($canBatchAction):?>
               <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
@@ -200,21 +222,22 @@
               <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
             </th>
             <?php if($canOrder):?>
-            <th class='c-sort {sorter:false}'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
+            <th class='c-sort'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
             <?php endif;?>
-            <th class='c-pri {sorter:false}' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-            <th class='c-name {sorter:false}'><?php common::printOrderLink('title', $orderBy, $vars, $lang->execution->storyTitle);?></th>
-            <th class='c-category {sorter:false}'><?php common::printOrderLink('category', $orderBy, $vars, $lang->story->category);?></th>
-            <th class='c-user {sorter:false}'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-            <th class='c-assignedTo {sorter:false} text-center'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-            <th class='c-estimate {sorter:false} text-right'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-            <th class='c-status {sorter:false}'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-            <th class='c-stage {sorter:false}'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
+            <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
+            <th class='c-name'><?php common::printOrderLink('title', $orderBy, $vars, $lang->execution->storyTitle);?></th>
+            <th class='c-category'><?php common::printOrderLink('category', $orderBy, $vars, $lang->story->category);?></th>
+            <th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
+            <th class='c-assignedTo text-center'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
+            <th class='c-estimate text-right'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
+            <th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
+            <th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
             <th title='<?php echo $lang->story->taskCount?>' class='c-count'><?php echo $lang->story->taskCountAB;?></th>
             <th title='<?php echo $lang->story->bugCount?>'  class='c-count'><?php echo $lang->story->bugCountAB;?></th>
             <th title='<?php echo $lang->story->caseCount?>' class='c-count'><?php echo $lang->story->caseCountAB;?></th>
-            <th class='c-actions-7 text-center {sorter:false}'><?php echo $lang->actions;?></th>
+            <th class='c-actions-7 text-center'><?php echo $lang->actions;?></th>
           </tr>
+-->
         </thead>
         <tbody id='storyTableList' class='sortable'>
           <?php foreach($stories as $key => $story):?>
@@ -223,6 +246,12 @@
           $totalEstimate += $story->estimate;
           ?>
           <tr id="story<?php echo $story->id;?>" data-id='<?php echo $story->id;?>' data-order='<?php echo $story->order ?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0)?>'>
+          <?php foreach($setting as $key => $value)
+          {
+              $this->story->printCell($value, $story, $users, '', $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', '', $execution, $showBranch, $productID);
+          }
+          ?>
+<!--
             <td class='cell-id'>
               <?php if($canBatchAction):?>
               <?php echo html::checkbox('storyIdList', array($story->id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$execution->id"), sprintf('%03d', $story->id), null, "data-app='execution'");?>
@@ -322,11 +351,13 @@
                   }
               }
               ?>
+-->
             </td>
           </tr>
           <?php endforeach;?>
         </tbody>
       </table>
+      <?php if(!$useDatatable) echo '</div>';?>
       <div class='table-footer'>
         <?php if($canBatchAction):?>
         <div class="checkbox-primary check-all"><label><?php echo $lang->selectAll?></label></div>
@@ -491,6 +522,9 @@ function handleLinkButtonClick()
   var xxcUrl = "xxc:openInApp/zentao-integrated/" + encodeURIComponent(window.location.href.replace(/.display=card/, '').replace(/\.xhtml/, '.html'));
   window.open(xxcUrl);
 }
+<?php if(!empty($useDatatable)):?>
+$(function(){$('#executionStoryForm').table();})
+<?php endif;?>
 </script>
 <?php if(commonModel::isTutorialMode()): ?>
 <style>
diff --git a/module/story/config.php b/module/story/config.php
index b3a7816cc3..13992a4a8c 100644
--- a/module/story/config.php
+++ b/module/story/config.php
@@ -50,14 +50,32 @@ $config->story->custom->createFields      = $config->story->list->customCreateFi
 $config->story->custom->batchCreateFields = 'module,plan,spec,pri,estimate,review,%s';
 $config->story->custom->batchEditFields   = 'branch,module,plan,estimate,pri,source,stage,closedBy,closedReason';
 
+global $lang, $app;
 $config->story->datatable = new stdclass();
-$config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
+if($app->tab == 'execution')
+{
+    $config->story->datatable->defaultField = array('id','order', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
+}
+else
+{
+    $config->story->datatable->defaultField = array('id', 'pri', 'title', 'plan', 'openedBy', 'assignedTo', 'estimate', 'status', 'stage', 'taskCount', 'actions');
+}
 
 $config->story->datatable->fieldList['id']['title']    = 'idAB';
 $config->story->datatable->fieldList['id']['fixed']    = 'left';
 $config->story->datatable->fieldList['id']['width']    = '60';
 $config->story->datatable->fieldList['id']['required'] = 'yes';
 
+if($app->tab == 'execution')
+{
+    $config->story->datatable->fieldList['order']['title']    = 'order';
+    $config->story->datatable->fieldList['order']['fixed']    = 'left';
+    $config->story->datatable->fieldList['order']['width']    = '60';
+    $config->story->datatable->fieldList['order']['sort']     = 'no';
+    $config->story->datatable->fieldList['order']['required'] = 'no';
+    $config->story->datatable->fieldList['order']['name']     = $this->lang->story->order;
+}
+
 $config->story->datatable->fieldList['pri']['title']    = 'priAB';
 $config->story->datatable->fieldList['pri']['fixed']    = 'left';
 $config->story->datatable->fieldList['pri']['width']    = '50';
@@ -194,7 +212,6 @@ $config->story->datatable->fieldList['version']['fixed']    = 'no';
 $config->story->datatable->fieldList['version']['width']    = '60';
 $config->story->datatable->fieldList['version']['required'] = 'no';
 
-global $lang, $app;
 $config->story->datatable->fieldList['taskCount']['title']    = 'T';
 $config->story->datatable->fieldList['taskCount']['fixed']    = 'no';
 $config->story->datatable->fieldList['taskCount']['width']    = '30';
diff --git a/module/story/lang/en.php b/module/story/lang/en.php
index a1230ac20a..77f3a2789a 100644
--- a/module/story/lang/en.php
+++ b/module/story/lang/en.php
@@ -67,6 +67,7 @@ $lang->story->toTask             = 'Convert to Task';
 $lang->story->batchToTask        = 'Batch Convert to Task';
 $lang->story->convertRelations   = 'Convert Relations';
 $lang->story->undetermined       = 'undetermined';
+$lang->story->order              = 'Order';
 
 $lang->story->editAction      = "Edit {$lang->SRCommon}";
 $lang->story->changeAction    = "Change {$lang->SRCommon}";
diff --git a/module/story/lang/zh-cn.php b/module/story/lang/zh-cn.php
index e93141a2b5..ce3c57d13f 100644
--- a/module/story/lang/zh-cn.php
+++ b/module/story/lang/zh-cn.php
@@ -67,6 +67,7 @@ $lang->story->toTask             = '转任务';
 $lang->story->batchToTask        = '批量转任务';
 $lang->story->convertRelations   = '换算关系';
 $lang->story->undetermined       = '待定';
+$lang->story->order              = '排序';
 
 $lang->story->editAction      = "编辑{$lang->SRCommon}";
 $lang->story->changeAction    = "变更{$lang->SRCommon}";
diff --git a/module/story/model.php b/module/story/model.php
index 5cab21203e..4c62d40a89 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3806,7 +3806,7 @@ class storyModel extends model
      * @access public
      * @return string
      */
-    public function buildOperateMenu($story, $type = 'view')
+    public function buildOperateMenu($story, $type = 'view', $execution = '', $productID = 0)
     {
         $menu   = '';
         $params = "storyID=$story->id";
@@ -3884,6 +3884,63 @@ class storyModel extends model
             $menu .= $this->buildMenu('story', 'delete', $params, $story, 'button', 'trash', 'hiddenwin', 'showinonlybody', true);
         }
 
+        if($type == 'execution')
+        {
+            $hasDBPriv    = common::hasDBPriv($execution, 'execution');
+            $canBeChanged = common::canModify('execution', $execution);
+            if($canBeChanged)
+            {
+                $param = "executionID={$execution->id}&story={$story->id}&moduleID={$story->module}";
+
+                $story->reviewer  = isset($story->reviewer)  ? $story->reviewer  : array();
+                $story->notReview = isset($story->notReview) ? $story->notReview : array();
+
+                if(common::hasPriv('story', 'review'))
+                {
+                    $reviewDisabled = in_array($this->app->user->account, $story->notReview) and ($story->status == 'draft' or $story->status == 'changed') ? '' : 'disabled';
+                    $story->from = 'execution';
+                    $menu .= common::printIcon('story', 'review', "story={$story->id}&from=story", $story, 'list', 'search', '', $reviewDisabled, false, "data-group=execution");
+                }
+
+                if(common::hasPriv('story', 'recall'))
+                {
+                    $recallDisabled = empty($story->reviewedBy) and strpos('draft,changed', $story->status) !== false and !empty($story->reviewer) ? '' : 'disabled';
+                    $menu .= common::printIcon('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $this->lang->story->recall);
+                }
+
+                $this->lang->task->create = $this->lang->execution->wbs;
+                $toTaskDisabled = strpos('draft,closed', $story->status) !== false ? 'disabled' : '';
+                if(commonModel::isTutorialMode())
+                {
+                    $wizardParams = helper::safe64Encode($param);
+                    $menu .=  html::a(helper::createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-plus'></i>",'', "class='btn btn-task-create' title='{$this->lang->execution->wbs}' data-app='execution'");
+                }
+                else
+                {
+                    if($hasDBPriv) $menu .= common::printIcon('task', 'create', $param, '', 'list', 'plus', '', 'btn-task-create ' . $toTaskDisabled);
+                }
+
+                $this->lang->task->batchCreate = $this->lang->execution->batchWBS;
+                if($hasDBPriv) $menu .= common::printIcon('task', 'batchCreate', "executionID={$execution->id}&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
+
+                $this->lang->testcase->batchCreate = $this->lang->testcase->create;
+                if($productID and $hasDBPriv and common::hasPriv('testcase', 'create'))
+                {
+                    $menu .= html::a(helper::createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&form=&param=0&storyID=$story->id"), '<i class="icon-testcase-create icon-sitemap"></i>', '', "class='btn' title='{$this->lang->testcase->create}' data-app='qa'");
+                }
+
+                if($canBeChanged and common::hasPriv('execution', 'storyEstimate', $execution))
+                {
+                    $menu .= common::printIcon('execution', 'storyEstimate', "executionID=$execution->id&storyID=$story->id", '', 'list', 'estimate', '', 'iframe', true, "data-width='600px'");
+                }
+
+                if($canBeChanged and common::hasPriv('execution', 'unlinkStory', $execution))
+                {
+                    $menu .= common::printIcon('execution', 'unlinkStory', "executionID=$execution->id&storyID=$story->id&confirm=no", '', 'list', 'unlink', 'hiddenwin');
+                }
+            }
+        }
+
         return $menu;
     }
 
@@ -4047,10 +4104,17 @@ class storyModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story')
+    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story', $execution = '', $isShowBranch = '', $productID = 0)
     {
+        $module    = $this->app->rawModule == 'product' ? 'story' : $this->app->rawModule;
+        $canView   = common::hasPriv($module, 'view');
+        $tab       = $this->app->tab;
+        $storyLink = $tab == 'execution' ? helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$execution->id") : helper::createLink($module, 'view', "storyID=$story->id");
+        $account   = $this->app->user->account;
+
         /* Check the product is closed. */
         $canBeChanged = common::canBeChanged('story', $story);
+        $canOrder     = common::hasPriv('execution', 'storySort');
 
         $canBatchEdit         = common::hasPriv('story',        'batchEdit');
         $canBatchClose        = common::hasPriv('story',        'batchClose');
@@ -4061,15 +4125,25 @@ class storyModel extends model
         $canBatchChangePlan   = common::hasPriv('story',        'batchChangePlan');
         $canBatchAssignTo     = common::hasPriv('story',        'batchAssignTo');
         $canBatchUnlinkStory  = common::hasPriv('projectstory', 'batchUnlinkStory');
+        $canBatchUnlink       = common::hasPriv('execution',    'batchUnlinkStory');
 
-        $canBatchAction       = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlinkStory);
+        if($tab == 'execution')
+        {
+            $checkObject = new stdclass();
+            $checkObject->execution = $execution->id;
+            $canBatchToTask       = common::hasPriv('story', 'batchToTask', $checkObject);
+        }
 
-        $module    = $this->app->rawModule == 'projectstory' ? 'projectstory' : 'story';
-        $canView   = common::hasPriv($module, 'view');
-        $tab       = $this->app->rawModule == 'projectstory' ? 'project' : 'product';
-        $storyLink = helper::createLink($module, 'view', "storyID=$story->id");
-        $account   = $this->app->user->account;
-        $id        = $col->id;
+        if($tab == 'execution')
+        {
+            $canBatchAction = ($canBeChanged and ($canBatchEdit or $canBatchClose or $canBatchChangeStage or $canBatchUnlink or $canBatchToTask));
+        }
+        else
+        {
+            $canBatchAction = ($canBatchEdit or $canBatchClose or $canBatchReview or $canBatchChangeStage or $canBatchChangeBranch or $canBatchChangeModule or $canBatchChangePlan or $canBatchAssignTo or $canBatchUnlinkStory);
+        }
+
+        $id = $col->id;
         if($col->show)
         {
             $class = "c-{$id}";
@@ -4140,6 +4214,10 @@ class storyModel extends model
             {
                 $class .= ' text-center';
             }
+            elseif($id == 'order')
+            {
+                $class = 'sort-handler c-sort';
+            }
 
             echo "<td class='" . $class . "' title='$title' style='$style'>";
             if($this->config->edition != 'open') $this->loadModel('flow')->printFlowCell('story', $story, $id);
@@ -4155,16 +4233,23 @@ class storyModel extends model
                     printf('%03d', $story->id);
                 }
                 break;
+            case 'order':
+                echo "<i class='icon-move'>";
+                break;
             case 'pri':
                 echo "<span class='label-pri label-pri-" . $story->pri . "' title='" . zget($this->lang->story->priList, $story->pri, $story->pri) . "'>";
                 echo zget($this->lang->story->priList, $story->pri, $story->pri);
                 echo "</span>";
                 break;
             case 'title':
-                if($this->app->tab == 'project')
+                if($tab == 'project')
                 {
                     $showBranch = isset($this->config->projectstory->story->showBranch) ? $this->config->projectstory->story->showBranch : 1;
                 }
+                elseif($tab == 'execution')
+                {
+                    if($isShowBranch) $showBranch = isset($this->config->execution->story->showBranch) ? $this->config->execution->story->showBranch : 1;
+                }
                 else
                 {
                     $showBranch = isset($this->config->product->browse->showBranch) ? $this->config->product->browse->showBranch : 1;
@@ -4291,7 +4376,16 @@ class storyModel extends model
                 echo $story->version;
                 break;
             case 'actions':
-                echo $this->buildOperateMenu($story, 'browse');
+                if($tab == 'execution')
+                {
+                    $menuType = 'execution';
+                }
+                else
+                {
+                    $menuType = 'browse';
+                    $execution = '';
+                }
+                echo $this->buildOperateMenu($story, $menuType, $execution, $productID);
                 break;
             }
             echo '</td>';

From 2fcd623c6210caf01fa85bf3c27901003c812fda Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 1 Jun 2022 07:48:32 +0000
Subject: [PATCH 21/24] * Adjust code.

---
 module/execution/js/story.js         |   2 +
 module/execution/view/story.html.php | 129 ---------------------------
 2 files changed, 2 insertions(+), 129 deletions(-)

diff --git a/module/execution/js/story.js b/module/execution/js/story.js
index d7d80f5096..53f1cab73d 100644
--- a/module/execution/js/story.js
+++ b/module/execution/js/story.js
@@ -1,5 +1,7 @@
 $(function()
 {
+    if($('#storyList thead th.c-title').width() < 150) $('#storyList thead th.c-title').width(150);
+
     $('#storyList').on('sort.sortable', function(e, data)
     {
         var list = '';
diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 3b1286ae7e..52375ac0d4 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -211,33 +211,6 @@
           }
           ?>
           </tr>
-<!--
-          <tr>
-            <th class='c-id {sorter:false}'>
-              <?php if($canBatchAction):?>
-              <div class="checkbox-primary check-all" title="<?php echo $lang->selectAll?>">
-                <label></label>
-              </div>
-              <?php endif;?>
-              <?php common::printOrderLink('id', $orderBy, $vars, $lang->idAB);?>
-            </th>
-            <?php if($canOrder):?>
-            <th class='c-sort'><?php common::printOrderLink('order', $orderBy, $vars, $lang->execution->orderAB);?></th>
-            <?php endif;?>
-            <th class='c-pri' title=<?php echo $lang->execution->pri;?>><?php common::printOrderLink('pri', $orderBy, $vars, $lang->priAB);?></th>
-            <th class='c-name'><?php common::printOrderLink('title', $orderBy, $vars, $lang->execution->storyTitle);?></th>
-            <th class='c-category'><?php common::printOrderLink('category', $orderBy, $vars, $lang->story->category);?></th>
-            <th class='c-user'> <?php common::printOrderLink('openedBy', $orderBy, $vars, $lang->openedByAB);?></th>
-            <th class='c-assignedTo text-center'> <?php common::printOrderLink('assignedTo', $orderBy, $vars, $lang->assignedToAB);?></th>
-            <th class='c-estimate text-right'> <?php common::printOrderLink('estimate', $orderBy, $vars, $lang->story->estimateAB);?></th>
-            <th class='c-status'> <?php common::printOrderLink('status', $orderBy, $vars, $lang->statusAB);?></th>
-            <th class='c-stage'> <?php common::printOrderLink('stage', $orderBy, $vars, $lang->story->stageAB);?></th>
-            <th title='<?php echo $lang->story->taskCount?>' class='c-count'><?php echo $lang->story->taskCountAB;?></th>
-            <th title='<?php echo $lang->story->bugCount?>'  class='c-count'><?php echo $lang->story->bugCountAB;?></th>
-            <th title='<?php echo $lang->story->caseCount?>' class='c-count'><?php echo $lang->story->caseCountAB;?></th>
-            <th class='c-actions-7 text-center'><?php echo $lang->actions;?></th>
-          </tr>
--->
         </thead>
         <tbody id='storyTableList' class='sortable'>
           <?php foreach($stories as $key => $story):?>
@@ -251,108 +224,6 @@
               $this->story->printCell($value, $story, $users, '', $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', '', $execution, $showBranch, $productID);
           }
           ?>
-<!--
-            <td class='cell-id'>
-              <?php if($canBatchAction):?>
-              <?php echo html::checkbox('storyIdList', array($story->id => '')) . html::a(helper::createLink('story', 'view', "storyID=$story->id&version=$story->version&from=execution&param=$execution->id"), sprintf('%03d', $story->id), null, "data-app='execution'");?>
-              <?php else:?>
-              <?php printf('%03d', $story->id);?>
-              <?php endif;?>
-            </td>
-            <?php if($canOrder):?>
-            <td class='sort-handler c-sort'><i class='icon-move'></i></td>
-            <?php endif;?>
-            <td class='c-pri'><span class='label-pri <?php echo 'label-pri-' . $story->pri?>' title='<?php echo zget($lang->story->priList, $story->pri, $story->pri);?>'><?php echo zget($lang->story->priList, $story->pri, $story->pri);?></span></td>
-            <td class='c-name' title="<?php echo $story->title?>">
-              <?php if($showBranch) $showBranch = isset($this->config->execution->story->showBranch) ? $this->config->execution->story->showBranch : 1;?>
-              <?php if(isset($branchGroups[$story->product][$story->branch]) and $showBranch) echo "<span class='label label-outline label-badge' title={$branchGroups[$story->product][$story->branch]}>" . $branchGroups[$story->product][$story->branch] . '</span>';?>
-              <?php if(!empty($story->module) and isset($modulePairs[$story->module])) echo "<span class='label label-gray label-badge'>{$modulePairs[$story->module]}</span> ";?>
-              <?php if($story->parent > 0) echo "<span class='label'>{$lang->story->childrenAB}</span>";?>
-              <?php echo html::a($storyLink,$story->title, null, "style='color: $story->color' data-app='execution'");?>
-            </td>
-            <td class='c-category' title='<?php echo zget($lang->story->categoryList, $story->category);?>'><?php echo zget($lang->story->categoryList, $story->category);?></td>
-            <td class='c-user' title='<?php echo zget($users, $story->openedBy);?>'><?php echo zget($users, $story->openedBy);?></td>
-            <td class='c-assignedTo <?php if(zget($users, $story->assignedTo) == 'Closed') echo 'closed-story'?> text-center' title='<?php echo zget($users, $story->assignedTo);?>'><?php $this->loadModel('story')->printAssignedHtml($story,$users);?></td>
-            <td class='c-estimate text-right' title="<?php echo $story->estimate . ' ' . $lang->hourCommon;?>"><?php echo $story->estimate . $config->hourUnit;?></td>
-            <?php $status = $this->processStatus('story', $story);?>
-            <td class='c-status' title='<?php echo $status;?>'>
-              <span class='status-story status-<?php echo $story->status;?>'><?php echo $status;?></span>
-            </td>
-            <td class='c-stage'><?php echo $lang->story->stageList[$story->stage];?></td>
-            <td class='linkbox c-count'>
-              <?php
-              $tasksLink = $this->createLink('story', 'tasks', "storyID=$story->id&executionID=$execution->id");
-              $storyTasks[$story->id] > 0 ? print(html::a($tasksLink, $storyTasks[$story->id], '', 'class="iframe"')) : print(0);
-              ?>
-            <td class='c-count'>
-              <?php
-              $bugsLink = $this->createLink('story', 'bugs', "storyID=$story->id&executionID=$execution->id");
-              $storyBugs[$story->id] > 0 ? print(html::a($bugsLink, $storyBugs[$story->id], '', 'class="iframe"')) : print(0);
-              ?>
-            </td>
-            <td class='c-count'>
-              <?php
-              $casesLink = $this->createLink('story', 'cases', "storyID=$story->id&executionID=$execution->id");
-              $storyCases[$story->id] > 0 ? print(html::a($casesLink, $storyCases[$story->id], '', 'class="iframe"')) : print(0);
-              ?>
-            </td>
-            <td class='c-actions'>
-              <?php
-              $hasDBPriv = common::hasDBPriv($execution, 'execution');
-              if($canBeChanged)
-              {
-                  $param = "executionID={$execution->id}&story={$story->id}&moduleID={$story->module}";
-
-                  $story->reviewer  = isset($story->reviewer)  ? $story->reviewer  : array();
-                  $story->notReview = isset($story->notReview) ? $story->notReview : array();
-
-                  if(common::hasPriv('story', 'review'))
-                  {
-                      $reviewDisabled = in_array($app->user->account, $story->notReview) and ($story->status == 'draft' or $story->status == 'changed') ? '' : 'disabled';
-                      $story->from = 'execution';
-                      common::printIcon('story', 'review', "story={$story->id}&from=story", $story, 'list', 'search', '', $reviewDisabled, false, "data-group=execution");
-                  }
-
-                  if(common::hasPriv('story', 'recall'))
-                  {
-                      $recallDisabled = empty($story->reviewedBy) and strpos('draft,changed', $story->status) !== false and !empty($story->reviewer) ? '' : 'disabled';
-                      common::printIcon('story', 'recall', "story={$story->id}", $story, 'list', 'undo', 'hiddenwin', $recallDisabled, '', '', $lang->story->recall);
-                  }
-
-                  $lang->task->create = $lang->execution->wbs;
-                  $toTaskDisabled = strpos('draft,closed', $story->status) !== false ? 'disabled' : '';
-                  if(commonModel::isTutorialMode())
-                  {
-                      $wizardParams = helper::safe64Encode($param);
-                      echo html::a($this->createLink('tutorial', 'wizard', "module=task&method=create&params=$wizardParams"), "<i class='icon-plus'></i>",'', "class='btn btn-task-create' title='{$lang->execution->wbs}' data-app='execution'");
-                  }
-                  else
-                  {
-                      if($hasDBPriv) common::printIcon('task', 'create', $param, '', 'list', 'plus', '', 'btn-task-create ' . $toTaskDisabled);
-                  }
-
-                  $lang->task->batchCreate = $lang->execution->batchWBS;
-                  if($hasDBPriv) common::printIcon('task', 'batchCreate', "executionID={$execution->id}&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
-
-                  $lang->testcase->batchCreate = $lang->testcase->create;
-                  if($productID and $hasDBPriv and common::hasPriv('testcase', 'create'))
-                  {
-                      echo html::a($this->createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&form=&param=0&storyID=$story->id"), '<i class="icon-testcase-create icon-sitemap"></i>', '', "class='btn' title='{$lang->testcase->create}' data-app='qa'");
-                  }
-
-                  if($canBeChanged and common::hasPriv('execution', 'storyEstimate', $execution))
-                  {
-                      common::printIcon('execution', 'storyEstimate', "executionID=$execution->id&storyID=$story->id", '', 'list', 'estimate', '', 'iframe', true, "data-width='600px'");
-                  }
-
-                  if($canBeChanged and common::hasPriv('execution', 'unlinkStory', $execution))
-                  {
-                      common::printIcon('execution', 'unlinkStory', "executionID=$execution->id&storyID=$story->id&confirm=no", '', 'list', 'unlink', 'hiddenwin');
-                  }
-              }
-              ?>
--->
-            </td>
           </tr>
           <?php endforeach;?>
         </tbody>

From cda4d7e809aa0d2be3c60903a7a3ef790167d7f5 Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 1 Jun 2022 08:56:49 +0000
Subject: [PATCH 22/24] * Adjust code.

---
 module/execution/view/story.html.php | 2 +-
 module/story/model.php               | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/module/execution/view/story.html.php b/module/execution/view/story.html.php
index 52375ac0d4..8f92741b8c 100644
--- a/module/execution/view/story.html.php
+++ b/module/execution/view/story.html.php
@@ -221,7 +221,7 @@
           <tr id="story<?php echo $story->id;?>" data-id='<?php echo $story->id;?>' data-order='<?php echo $story->order ?>' data-estimate='<?php echo $story->estimate?>' data-cases='<?php echo zget($storyCases, $story->id, 0)?>'>
           <?php foreach($setting as $key => $value)
           {
-              $this->story->printCell($value, $story, $users, '', $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', '', $execution, $showBranch, $productID);
+              $this->story->printCell($value, $story, $users, '', $storyStages, $modulePairs, $storyTasks, $storyBugs, $storyCases, $useDatatable ? 'datatable' : 'table', '', $execution, $showBranch);
           }
           ?>
           </tr>
diff --git a/module/story/model.php b/module/story/model.php
index 4c62d40a89..6a19820dbd 100644
--- a/module/story/model.php
+++ b/module/story/model.php
@@ -3806,7 +3806,7 @@ class storyModel extends model
      * @access public
      * @return string
      */
-    public function buildOperateMenu($story, $type = 'view', $execution = '', $productID = 0)
+    public function buildOperateMenu($story, $type = 'view', $execution = '')
     {
         $menu   = '';
         $params = "storyID=$story->id";
@@ -3924,7 +3924,7 @@ class storyModel extends model
                 if($hasDBPriv) $menu .= common::printIcon('task', 'batchCreate', "executionID={$execution->id}&story={$story->id}", '', 'list', 'pluses', '', $toTaskDisabled);
 
                 $this->lang->testcase->batchCreate = $this->lang->testcase->create;
-                if($productID and $hasDBPriv and common::hasPriv('testcase', 'create'))
+                if($hasDBPriv and common::hasPriv('testcase', 'create'))
                 {
                     $menu .= html::a(helper::createLink('testcase', 'create', "productID=$story->product&branch=$story->branch&moduleID=$story->module&form=&param=0&storyID=$story->id"), '<i class="icon-testcase-create icon-sitemap"></i>', '', "class='btn' title='{$this->lang->testcase->create}' data-app='qa'");
                 }
@@ -4104,7 +4104,7 @@ class storyModel extends model
      * @access public
      * @return void
      */
-    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story', $execution = '', $isShowBranch = '', $productID = 0)
+    public function printCell($col, $story, $users, $branches, $storyStages, $modulePairs = array(), $storyTasks = array(), $storyBugs = array(), $storyCases = array(), $mode = 'datatable', $storyType = 'story', $execution = '', $isShowBranch = '')
     {
         $module    = $this->app->rawModule == 'product' ? 'story' : $this->app->rawModule;
         $canView   = common::hasPriv($module, 'view');
@@ -4385,7 +4385,7 @@ class storyModel extends model
                     $menuType = 'browse';
                     $execution = '';
                 }
-                echo $this->buildOperateMenu($story, $menuType, $execution, $productID);
+                echo $this->buildOperateMenu($story, $menuType, $execution);
                 break;
             }
             echo '</td>';

From fd6fe986ad4ebd1e4d5d0c7d71d0ce1c9c498ccc Mon Sep 17 00:00:00 2001
From: zhouxin <zhouxin@easycorp.ltd>
Date: Wed, 1 Jun 2022 09:14:08 +0000
Subject: [PATCH 23/24] * Fix bug #23168.

---
 module/story/control.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/story/control.php b/module/story/control.php
index 8090fd4bf8..06f78c29c3 100644
--- a/module/story/control.php
+++ b/module/story/control.php
@@ -276,7 +276,7 @@ class story extends control
             $title     = $oldBug->title;
             $keywords  = $oldBug->keywords;
             $spec      = $oldBug->steps;
-            $pri       = $oldBug->pri;
+            $pri       = !empty($oldBug->pri) ? $oldBug->pri : '3';
             if(strpos($oldBug->mailto, $oldBug->openedBy) === false)
             {
                 $mailto = $oldBug->mailto . $oldBug->openedBy . ',';

From d20d2b15bc9cf5dbc823e2ece861e6aba331140d Mon Sep 17 00:00:00 2001
From: Hao Sun <sunhao@easycorp.ltd>
Date: Wed, 1 Jun 2022 09:44:58 +0000
Subject: [PATCH 24/24] * fix kanban virtual render not work as expected.

---
 www/js/zui/kanban/min.css | 2 +-
 www/js/zui/kanban/min.js  | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/www/js/zui/kanban/min.css b/www/js/zui/kanban/min.css
index 52876d016c..513469b196 100644
--- a/www/js/zui/kanban/min.css
+++ b/www/js/zui/kanban/min.css
@@ -1,5 +1,5 @@
 /*!
- * ZUI: ZUI Kanban View - v1.10.0 - 2022-05-19
+ * ZUI: ZUI Kanban View - v1.10.0 - 2022-06-01
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2022 cnezsoft.com; Licensed MIT
diff --git a/www/js/zui/kanban/min.js b/www/js/zui/kanban/min.js
index 4efa3edb82..44ee32949d 100644
--- a/www/js/zui/kanban/min.js
+++ b/www/js/zui/kanban/min.js
@@ -1,7 +1,7 @@
 /*!
- * ZUI: ZUI Kanban View - v1.10.0 - 2022-05-19
+ * ZUI: ZUI Kanban View - v1.10.0 - 2022-06-01
  * http://openzui.com
  * GitHub: https://github.com/easysoft/zui.git 
  * Copyright (c) 2022 cnezsoft.com; Licensed MIT
  */
-!function(){"use strict";function a(a,e){return n&&!e?requestAnimationFrame(a):setTimeout(a,e||0)}function e(a){return n?cancelAnimationFrame(a):void clearTimeout(a)}var n="function"==typeof window.requestAnimationFrame;$.zui({asap:a,clearAsap:e})}(),function(a){"use strict";function e(e,n){"string"==typeof e&&(e=a(e)),e instanceof a&&(e=e[0]);var t=e.getBoundingClientRect(),r=window.innerHeight||document.documentElement.clientHeight,i=window.innerWidth||document.documentElement.clientWidth;if(n)return t.left>=0&&t.top>=0&&t.left+t.width<=i&&t.top+t.height<=r;var d=t.top<=r&&t.top+t.height>=0,o=t.left<=i&&t.left+t.width>=0;return d&&o}var n="zui.virtualRender",t=function(e,r){"function"==typeof r&&(r={render:r});var i=this;i.name=n,i.$=a(e),i.options=r=a.extend({},t.DEFAULTS,this.$.data(),r),i.rendered=!1;var d=r.container;"function"==typeof d&&(d=d(i));var o=a(d?d:window);i.tryRender()||(i.$container=o,i.scrollListener=i.tryRender.bind(i),r.pendingClass&&i.$.addClass(r.pendingClass),o.on("scroll",i.scrollListener))};t.prototype.tryRender=function(){var n=this;return!(n.rendered||!e(n.$))&&(n.renderTaskID&&a.zui.clearAsap(n.renderTaskID),n.renderTaskID=a.zui.asap(function(){n.renderTaskID=null;var a=n.options.render(n.$);a!==!1&&(n.rendered=!0,n.destroy())},n.options.delay),!0)},t.prototype.destroy=function(){var e=this;e.renderTaskID&&a.zui.clearAsap(e.renderTaskID),e.scrollListener&&(e.$container.off("scroll",e.scrollListener),e.scrollListener=null);var t=e.options.pendingClass;t&&e.$.removeClass(t),e.$.removeData(n)},t.DEFAULTS={pendingClass:"virtual-pending"},a.fn.virtualRender=function(e){return this.each(function(){var r=a(this),i=r.data(n);if(i){if("string"==typeof e)return i[e]();i.destroy()}r.data(n,i=new t(this,e))})},a.zui.isElementInViewport=e}(jQuery),function(a){"use strict";var e="zui.virtuallist",n=function(t,r){"function"==typeof r&&(r={render:r});var i=this;i.name=e,i.$=a(t),i.options=r=a.extend({},n.DEFAULTS,this.$.data(),r),i.render(r.list,r.scrollTop);var d=0;i.$.on("scroll."+e,function(){var e=i.$.scrollTop();e!==i.scrollTop&&(i.scrollTop=e,d&&a.zui.clearAsap(d),d=a.zui.asap(function(){d=0,i.render()}))}),i.$.on("resize."+e,function(){d&&a.zui.clearAsap(d),d=a.zui.asap(function(){d=0,i.render()})})};n.prototype.render=function(e){var n=this;e?n.list=e:e=n.list;var t=n.scrollTop=n.$.scrollTop(),r=n.$,i=n.options.itemClassName,d=n.options.itemHeight,o=n.options.countPerRow,s=Number.parseFloat(r.css("padding-top"),10),l=Array.isArray(e),c="number"==typeof e?e:e.length,u=r.height(),h="virtual-list-item-expired",p=r.children(".virtual-list-holder-top"),b=r.children(".virtual-list-holder-bottom");p.length||(p=a('<div class="virtual-list-holder-top" style="width:100%">').prependTo(r)),b.length||(b=a('<div class="virtual-list-holder-bottom" style="width:100%">').appendTo(r)),r.children("."+i).addClass(h);var v=Math.max(0,o*Math.floor((t-s)/d)),f=Math.min(c,o*Math.ceil((t-s+u)/d));p.height(v*d/o);for(var m=v;m<f;m++){var g=n.options.render(m,e,l?e[m]:null);g.addClass(i).removeClass(h)}return b.height((c-f)*d/o),r.children("."+h).remove(),p.prependTo(r),b.appendTo(r),!0},n.prototype.destroy=function(){that.$.off("."+e)},n.DEFAULTS={itemClassName:"virtual-list-item",countPerRow:1},a.fn.virtualList=function(t){return this.each(function(){var r=a(this),i=r.data(e);if(i){if("string"==typeof t)return i[t]();i.destroy()}r.data(e,i=new n(this,t))})}}(jQuery),function(a){"use strict";var e="zui.kanban",n="object"==typeof CSS&&CSS.supports("display","flex"),t=function(n,r){var i=this;if(i.name=e,i.$=a(n).addClass("kanban"),r=i.setOptions(a.extend({},t.DEFAULTS,this.$.data(),r)),r.onAction){var d=function(e){var n=a(this);r.onAction(n.data("action"),n,e,i)};i.$.on("click",".action",d).on("dblclick",".action-dbc",d)}var o=r.droppable;if("auto"===o&&(o=!r.readonly),o){var s=r.sortable;"function"==typeof s?s={finish:s}:s&&"object"!=typeof s&&(s={});var l=0;"function"==typeof o?o={drop:o}:"object"!=typeof o&&(o={});var c=a.extend({dropOnMouseleave:!0,selector:".kanban-item",target:".kanban-lane-col:not(.kanban-col-sorting)",mouseButton:"left"},o,{before:function(e){if(o.before){var n=o.before(e);if(n===!1)return n}if(s){var t=e.element.closest(".kanban-lane-items");t.closest(".kanban-col").addClass("kanban-col-sorting"),i._sortResult=null,i._$sortItems=t;var r=t.data("zui.sortable");r||t.sortable(a.extend({},s,{selector:".kanban-item",trigger:".kanban-card",dragCssClass:"kanban-item-sorting",noShadow:!0,finish:function(a){a.changed&&a.list.length>1&&(i._sortResult=a)}})).triggerHandler(e.event)}},drop:function(a){o.drop&&o.drop(a),r.onAction&&r.onAction("dropItem",a.element,a,i)},start:function(e){i.$.addClass("kanban-dragging"),l&&clearTimeout(l),l=setTimeout(function(){a(e.shadowElement).addClass("in"),l=0},50),o.start&&o.start(e)},always:function(a){i.$.removeClass("kanban-dragging"),l&&(clearTimeout(l),l=0),s&&(i._$sortItems.sortable("destroy").closest(".kanban-col").removeClass("kanban-col-sorting"),a.target&&a.target[0]===a.element.closest(".kanban-lane-col")[0]&&i._sortResult&&s.finish&&s.finish(i._sortResult)),o.always&&o.always(a)}});i.$.droppable(c)}r.onCreate&&r.onCreate(i)};t.prototype.setOptions=function(e){var t=this,r=a.extend({},t.options,{data:t.data},e);t.options=r,r.useFlex&&!n&&(r.useFlex=!1),t.$.toggleClass("no-flex",!r.useFlex).toggleClass("use-flex",!!r.useFlex);var i=!!a.fn.virtualRender&&r.virtualize;return i&&("object"!=typeof i&&(i={lane:!0}),t.virtualize=a.extend({},i)),t.data=r.data||[],t.render(t.data),r},t.prototype.render=function(a){var e=this;a&&(e.data=a),e.data&&!Array.isArray(e.data)&&(e.data=[e.data]);var n=e.options,t=e.data||[];n.beforeRender&&n.beforeRender(e,t),e.$.toggleClass("kanban-readonly",!!n.readonly).toggleClass("kanban-no-lane-name",!!n.noLaneName),e.$.children(".kanban-board").addClass("kanban-expired"),e.maxKanbanBoardWidth=0;for(var r=0;r<t.length;++r)e.renderKanban(r);e.$.children(".kanban-expired").remove(),n.fluidBoardWidth&&t.length>1&&e.$.children(".kanban-board").css("min-width",e.maxKanbanBoardWidth),n.onRender&&n.onRender(e)},t.prototype.layoutKanban=function(a,e){for(var n=this,t=n.options,r=t.noLaneName?0:t.laneNameWidth,i=0,d={},o=!1,s=[],l=0;l<a.columns.length;++l){var c=a.columns[l];if(d[c.type])console.error('ZUI kanban error: duplicated column type "'+c.type+'" definition.');else{if(d[c.type]=c,c.$cardsCount=0,c.$kanbanData=a,c.$index=i,c.id||(c.id=c.type),c.asParent)o=!0,c.subs=[];else if(i++,c.parentType){var u=d[c.parentType];c.$subIndex=u.subs.length,u.subs.push(c)}s.push(c)}}a.columns=s;var h=a.id,p=n.$,b=t.minColWidth*i+r;e=e||p.children('.kanban-board[data-id="'+h+'"]'),e.css(t.fluidBoardWidth?"min-width":"width",b),n.maxKanbanBoardWidth=Math.max(n.maxKanbanBoardWidth,b),a.$layout={minWidth:b,laneNameWidth:r,columnsCount:i,hasParentCol:o,columnsMap:d,columnWidth:100/i};for(var v=a.cardsPerRow||t.cardsPerRow,f=function(a,e,r){if(a.asParent)return 0;r=r||e.items||e.cards||{};var i=r[a.type]||[];if(a.$cardsCount+=i.length,a.parentType){var o=d[a.parentType];o.$cardsCount+=i.length}var s=Math.ceil(i.length/(a.cardsPerRow||e.cardsPerRow||v))*(t.cardHeight+t.cardSpace)+t.cardSpace,l=e.$parent?t.maxSubColHeight||t.maxColHeight:t.maxColHeight,c=e.$parent?t.minSubColHeight||t.minColHeight:t.minColHeight,u="auto"===l?s:Math.max(c,Math.min(l,s));return t.calcColHeight&&(u=t.calcColHeight(a,e,i,u,n)),u},m=a.lanes||[],l=0;l<m.length;++l){var g=m[l];g.kanban=h,g.$index=l,g.$kanbanData=a,g.$height=0;var k=g.subLanes;if(k){g.$height=0;for(var C=0;C<k.length;++C){var x=k[C];x.kanban=h,x.$parent=g,x.$index=C,x.$kanbanData=a,x.$height=0;for(var y=x.items||x.cards||{},$=0;$<s.length;++$)x.$height=Math.max(x.$height,f(s[$],x,y));g.$height+=x.$height,C>0&&t.subLaneSpace&&(g.$height+=t.subLaneSpace)}}else for(var y=g.items||g.cards||{},C=0;C<s.length;++C)g.$height=Math.max(g.$height,f(s[C],g,y))}},t.prototype.renderKanban=function(e){var n=this;if("number"==typeof e)e=n.data[e];else{var t=n.data.findIndex(function(a){return a.id===e.id});if(t>-1){var r=n.data[t];e=a.extend(r,e),n.data[t]=e}else n.data.push(e)}e.id||(e.id=a.zui.uuid());var i=e.id,d=n.options,o=n.$,s=o.children('.kanban-board[data-id="'+i+'"]');s.length?s.removeClass("kanban-expired"):s=a('<div class="kanban-board" data-id="'+i+'"></div>').appendTo(o),n.layoutKanban(e,s),n.renderKanbanHeader(e,s),s.children(".kanban-lane").addClass("kanban-expired");for(var l=e.lanes||[],c=0;c<l.length;++c)n.renderLane(l[c],e.columns,s,e);s.children(".kanban-expired").remove(),d.onRenderKanban&&d.onRenderKanban(s,e,n)},t.prototype.renderKanbanHeader=function(e,n){var t=this,r=t.options,i=e.$layout.hasParentCol;n=n||t.$.children('.kanban-board[data-id="'+e.id+'"]');var d=n.children(".kanban-header");d.length||(d=a('<div class="kanban-header"><div class="kanban-cols kanban-header-cols"></div></div>').prependTo(n),r.useFlex||d.addClass("clearfix")),d.css("height",(i?2:1)*r.headerHeight).toggleClass("kanban-header-has-parent",!!i);var o=d.children(".kanban-cols");o.css("left",e.$layout.laneNameWidth).children(".kanban-col").addClass("kanban-expired");for(var s=e.columns,l=e.$layout.columnsMap||{},c=null,u=null,h=0;h<s.length;++h){var p=s[h];if(p.asParent)t.renderHeaderParentCol(s[h],o,c,e),c=p,u=null;else if(p.parentType){var b=l[p.parentType];t.renderHeaderCol(s[h],o,b,u,e),u=p}else t.renderHeaderCol(s[h],o,null,c,e),c=p,u=null}o.find(".kanban-expired").remove(),r.onRenderHeader&&r.onRenderHeader(o,e)},t.prototype.renderHeaderParentCol=function(e,n,t,r){var i=this,d=i.options,o=n.children('.kanban-header-parent-col[data-id="'+e.id+'"]'),s=t?n.children('.kanban-header-col[data-id="'+t.id+'"]:not(.kanban-expired)'):null;o.length?o.removeClass("kanban-expired").find(".kanban-header-sub-cols>.kanban-col").addClass("kanban-expired"):o=a(['<div class="kanban-col kanban-header-col kanban-header-parent-col" data-id="'+e.id+'">','<div class="kanban-header-col">','<div class="title">','<i class="icon"></i>','<span class="text"></span>',d.showCount?'<span class="count"></span>':"","</div>","</div>",'<div class="kanban-header-sub-cols">',"</div>","</div>"].join("")),s&&s.length?s.after(o):n.prepend(o),o.data("col",e).attr("data-type",e.type);var l=r.$layout.columnWidth;d.useFlex?o.css("flex",e.subs.length+" "+e.subs.length+" "+l*e.subs.length+"%"):o.css({width:l*e.subs.length+"%",left:e.$index*l+"%"});var c=o.children(".kanban-header-col");c.find(".title>.icon").attr("class","icon icon-"+(e.icon||""));var u=c.find(".title>.text").text(e.name).attr("title",e.name);if(e.color&&u.css("color",e.color),d.showCount){var h=void 0!==e.count?e.count:e.$cardsCount;d.showZeroCount||h||(h="");var p=c.find(".title>.count").text(h);d.onRenderCount&&d.onRenderCount(p,h,e,i)}d.onRenderHeaderCol&&d.onRenderHeaderCol(o,e,n,r)},t.prototype.renderHeaderCol=function(e,n,t,r,i){var d=this,o=d.options;if(e.parentType&&t){var s=n.children('.kanban-header-parent-col[data-id="'+t.id+'"]');n=s.children(".kanban-header-sub-cols")}var l=n.children('.kanban-header-col[data-id="'+e.id+'"]'),c=r?n.children('.kanban-header-col[data-id="'+r.id+'"]:not(.kanban-expired)'):null;l.length?l.removeClass("kanban-expired"):l=a(['<div class="kanban-col kanban-header-col" data-id="'+e.id+'">','<div class="title action-dbc" data-action="editCol">','<i class="icon"></i>','<span class="text"></span>',o.showCount?'<span class="count"></span>':"","</div>",'<div class="actions"></div>',"</div>"].join("")),c&&c.length?c.after(l):n.prepend(l),l.data("col",e).attr("data-type",e.type);var u=t?100/t.subs.length:i.$layout.columnWidth;o.useFlex?l.css("flex","1 1 "+u+"%"):l.css({left:(t?e.$subIndex:e.$index)*u+"%",width:u+"%"}),l.find(".title>.icon").attr("class","icon icon-"+(e.icon||""));var h=l.find(".title>.text").text(e.name).attr("title",e.name);if(e.color&&h.css("color",e.color),o.showCount){var p=void 0!==e.count?e.count:e.$cardsCount;o.showZeroCount||p||(p="");var b=l.find(".title>.count").text(p);o.onRenderCount&&o.onRenderCount(b,p,e,d)}o.onRenderHeaderCol&&o.onRenderHeaderCol(l,e,n,i)},t.prototype.renderLane=function(e,t,r,i){var d=this,o=d.options;r=r||d.$.children('.kanban-board[data-id="'+e.kanban+'"]');var s=r.children('.kanban-lane[data-id="'+e.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('<div class="kanban-lane" data-id="'+e.id+'"></div>').appendTo(r),n||s.addClass("clearfix"));var l=e.subLanes?e.subLanes.length:0;s.attr("data-index",e.$index).data("lane",e).toggleClass("has-sub-lane",l>0).css({height:e.$height||"auto"}),d.virtualizeRender(i,"lane",s,function(){if(!o.noLaneName){var n=s.children('.kanban-lane-name[data-id="'+e.id+'"]');n.length||(n=a('<div class="kanban-lane-name action-dbc" data-action="editLaneName" data-id="'+e.id+'"></div>').prependTo(s)),n.empty().css("width",o.laneNameWidth).attr("title",e.name).append(a('<span class="text" />').text(e.name)),e.color&&n.css("background-color",e.color),o.onRenderLaneName&&o.onRenderLaneName(n,e,r,t,i)}s.children(".kanban-cols,.kanban-sub-lanes").addClass("kanban-expired");var l;l=e.subLanes?d.renderSubLanes(e,t,s,i):d.renderLaneCols(t,e.items||e.cards||{},s,e,i),o.useFlex||l.css("left",i.$layout.laneNameWidth),s.children(".kanban-expired").remove()},{lane:e,columns:t,kanban:i})},t.prototype.virtualizeRender=function(e,n,t,r,i){var d=this,o=d.virtualize,s=o?o[n]:null;return s?("function"==typeof s&&(s=s(i,t)),"number"==typeof s&&t.height(s),void t.virtualRender(a.extend({render:r},d.options.virtualRenderOptions))):r()},t.prototype.renderSubLanes=function(e,n,t,r){var i=this,d=t.children(".kanban-sub-lanes");d.length?d.removeClass("kanban-expired"):d=a('<div class="kanban-sub-lanes"></div>').appendTo(t),d.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o<e.subLanes.length;++o)i.renderSubLane(e.subLanes[o],n,d,r,o);return d.children(".kanban-expired").remove(),d},t.prototype.renderSubLane=function(e,t,r,i,d){var o=r.children('.kanban-sub-lane[data-id="'+e.id+'"]');o.length?o.removeClass("kanban-expired"):(o=a('<div class="kanban-sub-lane" data-id="'+e.id+'"></div>').appendTo(r),n||o.addClass("clearfix")),o.attr("data-index",d).data("lane",e).css({height:e.$height||"auto"}),o.children(".kanban-col").addClass("kanban-expired");var s=e.items||e.cards;s&&this.renderLaneCols(t,s,o,e,i),o.children(".kanban-expired").remove()},t.prototype.renderLaneCols=function(e,n,t,r,i){var d=this,o=t.children(".kanban-cols");o.length?o.removeClass("kanban-expired"):o=a('<div class="kanban-cols kanban-'+(r.$parent?"sub-":"")+'lane-cols"></div>').appendTo(t),o.children(".kanban-col").addClass("kanban-expired");for(var s=null,l=0;l<e.length;++l){var c=e[l];if(!c.asParent){for(var u=d.renderLaneCol(c,o,s),h=n[c.type]||[],p=0;p<h.length;++p){var b=h[p];b.$index=p,b.order=+b.order,Number.isNaN(b.order)&&(b.order=p)}h.sort(function(a,e){var n=a.order-e.order;return 0!==n?n:a.$index-e.$index}),d.renderColumnCards(c,h,u,r,i),s=c}}return o.children(".kanban-expired").remove(),o},t.prototype.renderColumnCards=function(a,e,n,t,r){var i=this,d=i.options,o=n.find(".kanban-lane-items");o.children(".kanban-item").addClass("kanban-expired");var s=a.cardsPerRow||t.cardsPerRow||r.cardsPerRow||d.cardsPerRow;if(d.virtualCardList){var l=o.data("zui.virtuallist");l?l.render(e):o.virtualList({countPerRow:s,itemHeight:d.cardHeight+d.cardSpace,list:e,itemClassName:"kanban-item",render:function(e,n,d){var d=n[e],s=e>0?n[e-1]:null;return d.$index=e,d.$col=a,d.$lane=t,i.renderCard(d,o,s,a,t,r)}})}else for(var c=0;c<e.length;++c){var u=e[c],h=c>0?e[c-1]:null;u.$index=c,u.$col=a,u.$lane=t,i.renderCard(u,o,h,a,t,r)}o.css("padding",d.cardSpace/2).toggleClass("kanban-items-grid",s>1).attr("data-cards-per-row",s).data("cards",e),o.children(".kanban-expired").remove()},t.prototype.renderLaneCol=function(e,n,t){var r=this,i=r.options,d=n.children('.kanban-lane-col[data-id="'+e.id+'"]'),o=t?n.children('.kanban-lane-col[data-id="'+t.id+'"]:not(.kanban-expired)'):null;d.length?d.removeClass("kanban-expired"):(d=a(['<div class="kanban-col kanban-lane-col" data-id="'+e.id+'">','<div class="kanban-lane-items scrollbar-hover"></div>',"</div>"].join("")),r.options.readonly||d.append(['<div class="kanban-lane-actions">','<button class="btn btn-default btn-block action" type="button" data-action="addItem"><span class="text-muted"><i class="icon icon-plus"></i> '+r.options.addItemText+"</span></button>","</div>"].join("")),i.laneItemsClass&&d.find(".kanban-lane-items").addClass(i.laneItemsClass),i.laneColClass&&d.addClass(i.laneColClass)),o&&o.length?o.after(d):n.prepend(d),d.attr({"data-parent":e.parentType?e.parentType:null,"data-type":e.type}).data("col",e);var s=e.$kanbanData.$layout.columnWidth;return i.useFlex?d.css("flex","1 1 "+s+"%"):d.css({left:e.$index*s+"%",width:s+"%"}),d},t.prototype.renderCard=function(e,n,t,r,i,d){var o=this.options,s=n.children('.kanban-item[data-id="'+e.id+'"]'),l=t?n.children('.kanban-item[data-id="'+t.id+'"]:not(.kanban-expired)'):null;s.length?s.removeClass("kanban-expired"):(s=a('<div class="kanban-item" data-id="'+e.id+'"></div>'),o.wrapCard&&s.append('<div class="kanban-card"></div>')),l&&l.length?l.after(s):n.prepend(s);var c=r.cardsPerRow||i.cardsPerRow||d.cardsPerRow||o.cardsPerRow;s.data("item",e).css({padding:o.cardSpace/2,width:c>1?100/c+"%":""});var u=o.wrapCard?s.children(".kanban-card"):s;u.css("height",o.cardHeight);var h=o.cardRender||o.itemRender;if(h)h(e,u,r,i,d);else{var p=u.find(".title");p.length||(p=a('<div class="title"></div>').appendTo(u)),p.text(e.name||e.title)}return s},t.DEFAULTS={minColWidth:100,maxColHeight:400,minColHeight:90,minSubColHeight:40,subLaneSpace:2,laneNameWidth:20,headerHeight:32,cardHeight:40,cardSpace:10,cardsPerRow:1,wrapCard:!0,fluidBoardWidth:!0,addItemText:"添加条目",useFlex:!0,droppable:"auto",laneColClass:"",showCount:!0},a.fn.kanban=function(n){return this.each(function(){var r=a(this),i=r.data(e),d="object"==typeof n&&n;i||r.data(e,i=new t(this,d)),"string"==typeof n&&i[n]()})},t.NAME=e,a.fn.kanban.Constructor=t}(jQuery);
\ No newline at end of file
+!function(){"use strict";function a(a,e){return n&&!e?requestAnimationFrame(a):setTimeout(a,e||0)}function e(a){return n?cancelAnimationFrame(a):void clearTimeout(a)}var n="function"==typeof window.requestAnimationFrame;$.zui({asap:a,clearAsap:e})}(),function(a){"use strict";function e(e,n){"string"==typeof e&&(e=a(e)),e instanceof a&&(e=e[0]);var t=e.getBoundingClientRect(),r=window.innerHeight||document.documentElement.clientHeight,i=window.innerWidth||document.documentElement.clientWidth;if(n)return t.left>=0&&t.top>=0&&t.left+t.width<=i&&t.top+t.height<=r;var d=t.top<=r&&t.top+t.height>=0,o=t.left<=i&&t.left+t.width>=0;return d||o}var n="zui.virtualRender",t=function(e,r){"function"==typeof r&&(r={render:r});var i=this;i.name=n,i.$=a(e),i.options=r=a.extend({},t.DEFAULTS,this.$.data(),r),i.rendered=!1;var d=r.container;"function"==typeof d&&(d=d(i));var o=a(d?d:window);i.tryRender()||(i.$container=o,i.scrollListener=i.tryRender.bind(i),r.pendingClass&&i.$.addClass(r.pendingClass),o.on("scroll",i.scrollListener))};t.prototype.tryRender=function(){var n=this;return!(n.rendered||!e(n.$))&&(n.renderTaskID&&a.zui.clearAsap(n.renderTaskID),n.renderTaskID=a.zui.asap(function(){n.renderTaskID=null;var a=n.options.render(n.$);a!==!1&&(n.rendered=!0,n.destroy())},n.options.delay),!0)},t.prototype.destroy=function(){var e=this;e.renderTaskID&&a.zui.clearAsap(e.renderTaskID),e.scrollListener&&(e.$container.off("scroll",e.scrollListener),e.scrollListener=null);var t=e.options.pendingClass;t&&e.$.removeClass(t),e.$.removeData(n)},t.DEFAULTS={pendingClass:"virtual-pending"},a.fn.virtualRender=function(e){return this.each(function(){var r=a(this),i=r.data(n);if(i){if("string"==typeof e)return i[e]();i.destroy()}r.data(n,i=new t(this,e))})},a.zui.isElementInViewport=e}(jQuery),function(a){"use strict";var e="zui.virtuallist",n=function(t,r){"function"==typeof r&&(r={render:r});var i=this;i.name=e,i.$=a(t),i.options=r=a.extend({},n.DEFAULTS,this.$.data(),r),i.render(r.list,r.scrollTop);var d=0;i.$.on("scroll."+e,function(){var e=i.$.scrollTop();e!==i.scrollTop&&(i.scrollTop=e,d&&a.zui.clearAsap(d),d=a.zui.asap(function(){d=0,i.render()}))}),i.$.on("resize."+e,function(){d&&a.zui.clearAsap(d),d=a.zui.asap(function(){d=0,i.render()})})};n.prototype.render=function(e){var n=this;e?n.list=e:e=n.list;var t=n.scrollTop=n.$.scrollTop(),r=n.$,i=n.options.itemClassName,d=n.options.itemHeight,o=n.options.countPerRow,s=Number.parseFloat(r.css("padding-top"),10),l=Array.isArray(e),c="number"==typeof e?e:e.length,u=r.height(),h="virtual-list-item-expired",p=r.children(".virtual-list-holder-top"),b=r.children(".virtual-list-holder-bottom");p.length||(p=a('<div class="virtual-list-holder-top" style="width:100%">').prependTo(r)),b.length||(b=a('<div class="virtual-list-holder-bottom" style="width:100%">').appendTo(r)),r.children("."+i).addClass(h);var v=Math.max(0,o*Math.floor((t-s)/d)),f=Math.min(c,o*Math.ceil((t-s+u)/d));p.height(v*d/o);for(var m=v;m<f;m++){var g=n.options.render(m,e,l?e[m]:null);g.addClass(i).removeClass(h)}return b.height((c-f)*d/o),r.children("."+h).remove(),p.prependTo(r),b.appendTo(r),!0},n.prototype.destroy=function(){that.$.off("."+e)},n.DEFAULTS={itemClassName:"virtual-list-item",countPerRow:1},a.fn.virtualList=function(t){return this.each(function(){var r=a(this),i=r.data(e);if(i){if("string"==typeof t)return i[t]();i.destroy()}r.data(e,i=new n(this,t))})}}(jQuery),function(a){"use strict";var e="zui.kanban",n="object"==typeof CSS&&CSS.supports("display","flex"),t=function(n,r){var i=this;if(i.name=e,i.$=a(n).addClass("kanban"),r=i.setOptions(a.extend({},t.DEFAULTS,this.$.data(),r)),r.onAction){var d=function(e){var n=a(this);r.onAction(n.data("action"),n,e,i)};i.$.on("click",".action",d).on("dblclick",".action-dbc",d)}var o=r.droppable;if("auto"===o&&(o=!r.readonly),o){var s=r.sortable;"function"==typeof s?s={finish:s}:s&&"object"!=typeof s&&(s={});var l=0;"function"==typeof o?o={drop:o}:"object"!=typeof o&&(o={});var c=a.extend({dropOnMouseleave:!0,selector:".kanban-item",target:".kanban-lane-col:not(.kanban-col-sorting)",mouseButton:"left"},o,{before:function(e){if(o.before){var n=o.before(e);if(n===!1)return n}if(s){var t=e.element.closest(".kanban-lane-items");t.closest(".kanban-col").addClass("kanban-col-sorting"),i._sortResult=null,i._$sortItems=t;var r=t.data("zui.sortable");r||t.sortable(a.extend({},s,{selector:".kanban-item",trigger:".kanban-card",dragCssClass:"kanban-item-sorting",noShadow:!0,finish:function(a){a.changed&&a.list.length>1&&(i._sortResult=a)}})).triggerHandler(e.event)}},drop:function(a){o.drop&&o.drop(a),r.onAction&&r.onAction("dropItem",a.element,a,i)},start:function(e){i.$.addClass("kanban-dragging"),l&&clearTimeout(l),l=setTimeout(function(){a(e.shadowElement).addClass("in"),l=0},50),o.start&&o.start(e)},always:function(a){i.$.removeClass("kanban-dragging"),l&&(clearTimeout(l),l=0),s&&(i._$sortItems.sortable("destroy").closest(".kanban-col").removeClass("kanban-col-sorting"),a.target&&a.target[0]===a.element.closest(".kanban-lane-col")[0]&&i._sortResult&&s.finish&&s.finish(i._sortResult)),o.always&&o.always(a)}});i.$.droppable(c)}r.onCreate&&r.onCreate(i)};t.prototype.setOptions=function(e){var t=this,r=a.extend({},t.options,{data:t.data},e);t.options=r,r.useFlex&&!n&&(r.useFlex=!1),t.$.toggleClass("no-flex",!r.useFlex).toggleClass("use-flex",!!r.useFlex);var i=!!a.fn.virtualRender&&r.virtualize;return i&&("object"!=typeof i&&(i={lane:!0}),t.virtualize=a.extend({},i)),t.data=r.data||[],t.render(t.data),r},t.prototype.render=function(a){var e=this;a&&(e.data=a),e.data&&!Array.isArray(e.data)&&(e.data=[e.data]);var n=e.options,t=e.data||[];n.beforeRender&&n.beforeRender(e,t),e.$.toggleClass("kanban-readonly",!!n.readonly).toggleClass("kanban-no-lane-name",!!n.noLaneName),e.$.children(".kanban-board").addClass("kanban-expired"),e.maxKanbanBoardWidth=0;for(var r=0;r<t.length;++r)e.renderKanban(r);e.$.children(".kanban-expired").remove(),n.fluidBoardWidth&&t.length>1&&e.$.children(".kanban-board").css("min-width",e.maxKanbanBoardWidth),n.onRender&&n.onRender(e)},t.prototype.layoutKanban=function(a,e){for(var n=this,t=n.options,r=t.noLaneName?0:t.laneNameWidth,i=0,d={},o=!1,s=[],l=0;l<a.columns.length;++l){var c=a.columns[l];if(d[c.type])console.error('ZUI kanban error: duplicated column type "'+c.type+'" definition.');else{if(d[c.type]=c,c.$cardsCount=0,c.$kanbanData=a,c.$index=i,c.id||(c.id=c.type),c.asParent)o=!0,c.subs=[];else if(i++,c.parentType){var u=d[c.parentType];c.$subIndex=u.subs.length,u.subs.push(c)}s.push(c)}}a.columns=s;var h=a.id,p=n.$,b=t.minColWidth*i+r;e=e||p.children('.kanban-board[data-id="'+h+'"]'),e.css(t.fluidBoardWidth?"min-width":"width",b),n.maxKanbanBoardWidth=Math.max(n.maxKanbanBoardWidth,b),a.$layout={minWidth:b,laneNameWidth:r,columnsCount:i,hasParentCol:o,columnsMap:d,columnWidth:100/i};for(var v=a.cardsPerRow||t.cardsPerRow,f=function(a,e,r){if(a.asParent)return 0;r=r||e.items||e.cards||{};var i=r[a.type]||[];if(a.$cardsCount+=i.length,a.parentType){var o=d[a.parentType];o.$cardsCount+=i.length}var s=Math.ceil(i.length/(a.cardsPerRow||e.cardsPerRow||v))*(t.cardHeight+t.cardSpace)+t.cardSpace,l=e.$parent?t.maxSubColHeight||t.maxColHeight:t.maxColHeight,c=e.$parent?t.minSubColHeight||t.minColHeight:t.minColHeight,u="auto"===l?s:Math.max(c,Math.min(l,s));return t.calcColHeight&&(u=t.calcColHeight(a,e,i,u,n)),u},m=a.lanes||[],l=0;l<m.length;++l){var g=m[l];g.kanban=h,g.$index=l,g.$kanbanData=a,g.$height=0;var k=g.subLanes;if(k){g.$height=0;for(var C=0;C<k.length;++C){var x=k[C];x.kanban=h,x.$parent=g,x.$index=C,x.$kanbanData=a,x.$height=0;for(var y=x.items||x.cards||{},$=0;$<s.length;++$)x.$height=Math.max(x.$height,f(s[$],x,y));g.$height+=x.$height,C>0&&t.subLaneSpace&&(g.$height+=t.subLaneSpace)}}else for(var y=g.items||g.cards||{},C=0;C<s.length;++C)g.$height=Math.max(g.$height,f(s[C],g,y))}},t.prototype.renderKanban=function(e){var n=this;if("number"==typeof e)e=n.data[e];else{var t=n.data.findIndex(function(a){return a.id===e.id});if(t>-1){var r=n.data[t];e=a.extend(r,e),n.data[t]=e}else n.data.push(e)}e.id||(e.id=a.zui.uuid());var i=e.id,d=n.options,o=n.$,s=o.children('.kanban-board[data-id="'+i+'"]');s.length?s.removeClass("kanban-expired"):s=a('<div class="kanban-board" data-id="'+i+'"></div>').appendTo(o),n.layoutKanban(e,s),n.renderKanbanHeader(e,s),s.children(".kanban-lane").addClass("kanban-expired");for(var l=e.lanes||[],c=0;c<l.length;++c)n.renderLane(l[c],e.columns,s,e);s.children(".kanban-expired").remove(),d.onRenderKanban&&d.onRenderKanban(s,e,n)},t.prototype.renderKanbanHeader=function(e,n){var t=this,r=t.options,i=e.$layout.hasParentCol;n=n||t.$.children('.kanban-board[data-id="'+e.id+'"]');var d=n.children(".kanban-header");d.length||(d=a('<div class="kanban-header"><div class="kanban-cols kanban-header-cols"></div></div>').prependTo(n),r.useFlex||d.addClass("clearfix")),d.css("height",(i?2:1)*r.headerHeight).toggleClass("kanban-header-has-parent",!!i);var o=d.children(".kanban-cols");o.css("left",e.$layout.laneNameWidth).children(".kanban-col").addClass("kanban-expired");for(var s=e.columns,l=e.$layout.columnsMap||{},c=null,u=null,h=0;h<s.length;++h){var p=s[h];if(p.asParent)t.renderHeaderParentCol(s[h],o,c,e),c=p,u=null;else if(p.parentType){var b=l[p.parentType];t.renderHeaderCol(s[h],o,b,u,e),u=p}else t.renderHeaderCol(s[h],o,null,c,e),c=p,u=null}o.find(".kanban-expired").remove(),r.onRenderHeader&&r.onRenderHeader(o,e)},t.prototype.renderHeaderParentCol=function(e,n,t,r){var i=this,d=i.options,o=n.children('.kanban-header-parent-col[data-id="'+e.id+'"]'),s=t?n.children('.kanban-header-col[data-id="'+t.id+'"]:not(.kanban-expired)'):null;o.length?o.removeClass("kanban-expired").find(".kanban-header-sub-cols>.kanban-col").addClass("kanban-expired"):o=a(['<div class="kanban-col kanban-header-col kanban-header-parent-col" data-id="'+e.id+'">','<div class="kanban-header-col">','<div class="title">','<i class="icon"></i>','<span class="text"></span>',d.showCount?'<span class="count"></span>':"","</div>","</div>",'<div class="kanban-header-sub-cols">',"</div>","</div>"].join("")),s&&s.length?s.after(o):n.prepend(o),o.data("col",e).attr("data-type",e.type);var l=r.$layout.columnWidth;d.useFlex?o.css("flex",e.subs.length+" "+e.subs.length+" "+l*e.subs.length+"%"):o.css({width:l*e.subs.length+"%",left:e.$index*l+"%"});var c=o.children(".kanban-header-col");c.find(".title>.icon").attr("class","icon icon-"+(e.icon||""));var u=c.find(".title>.text").text(e.name).attr("title",e.name);if(e.color&&u.css("color",e.color),d.showCount){var h=void 0!==e.count?e.count:e.$cardsCount;d.showZeroCount||h||(h="");var p=c.find(".title>.count").text(h);d.onRenderCount&&d.onRenderCount(p,h,e,i)}d.onRenderHeaderCol&&d.onRenderHeaderCol(o,e,n,r)},t.prototype.renderHeaderCol=function(e,n,t,r,i){var d=this,o=d.options;if(e.parentType&&t){var s=n.children('.kanban-header-parent-col[data-id="'+t.id+'"]');n=s.children(".kanban-header-sub-cols")}var l=n.children('.kanban-header-col[data-id="'+e.id+'"]'),c=r?n.children('.kanban-header-col[data-id="'+r.id+'"]:not(.kanban-expired)'):null;l.length?l.removeClass("kanban-expired"):l=a(['<div class="kanban-col kanban-header-col" data-id="'+e.id+'">','<div class="title action-dbc" data-action="editCol">','<i class="icon"></i>','<span class="text"></span>',o.showCount?'<span class="count"></span>':"","</div>",'<div class="actions"></div>',"</div>"].join("")),c&&c.length?c.after(l):n.prepend(l),l.data("col",e).attr("data-type",e.type);var u=t?100/t.subs.length:i.$layout.columnWidth;o.useFlex?l.css("flex","1 1 "+u+"%"):l.css({left:(t?e.$subIndex:e.$index)*u+"%",width:u+"%"}),l.find(".title>.icon").attr("class","icon icon-"+(e.icon||""));var h=l.find(".title>.text").text(e.name).attr("title",e.name);if(e.color&&h.css("color",e.color),o.showCount){var p=void 0!==e.count?e.count:e.$cardsCount;o.showZeroCount||p||(p="");var b=l.find(".title>.count").text(p);o.onRenderCount&&o.onRenderCount(b,p,e,d)}o.onRenderHeaderCol&&o.onRenderHeaderCol(l,e,n,i)},t.prototype.renderLane=function(e,t,r,i){var d=this,o=d.options;r=r||d.$.children('.kanban-board[data-id="'+e.kanban+'"]');var s=r.children('.kanban-lane[data-id="'+e.id+'"]');s.length?s.removeClass("kanban-expired"):(s=a('<div class="kanban-lane" data-id="'+e.id+'"></div>').appendTo(r),n||s.addClass("clearfix"));var l=e.subLanes?e.subLanes.length:0;s.attr("data-index",e.$index).data("lane",e).toggleClass("has-sub-lane",l>0).css({height:e.$height||"auto"}),d.virtualizeRender(i,"lane",s,function(){if(!o.noLaneName){var n=s.children('.kanban-lane-name[data-id="'+e.id+'"]');n.length||(n=a('<div class="kanban-lane-name action-dbc" data-action="editLaneName" data-id="'+e.id+'"></div>').prependTo(s)),n.empty().css("width",o.laneNameWidth).attr("title",e.name).append(a('<span class="text" />').text(e.name)),e.color&&n.css("background-color",e.color),o.onRenderLaneName&&o.onRenderLaneName(n,e,r,t,i)}s.children(".kanban-cols,.kanban-sub-lanes").addClass("kanban-expired");var l;l=e.subLanes?d.renderSubLanes(e,t,s,i):d.renderLaneCols(t,e.items||e.cards||{},s,e,i),o.useFlex||l.css("left",i.$layout.laneNameWidth),s.children(".kanban-expired").remove()},{lane:e,columns:t,kanban:i})},t.prototype.virtualizeRender=function(e,n,t,r,i){var d=this,o=d.virtualize,s=o?o[n]:null;return s?("function"==typeof s&&(s=s(i,t)),"number"==typeof s&&t.height(s),void t.virtualRender(a.extend({render:r},d.options.virtualRenderOptions))):r()},t.prototype.renderSubLanes=function(e,n,t,r){var i=this,d=t.children(".kanban-sub-lanes");d.length?d.removeClass("kanban-expired"):d=a('<div class="kanban-sub-lanes"></div>').appendTo(t),d.children(".kanban-sub-lane").addClass("kanban-expired");for(var o=0;o<e.subLanes.length;++o)i.renderSubLane(e.subLanes[o],n,d,r,o);return d.children(".kanban-expired").remove(),d},t.prototype.renderSubLane=function(e,t,r,i,d){var o=r.children('.kanban-sub-lane[data-id="'+e.id+'"]');o.length?o.removeClass("kanban-expired"):(o=a('<div class="kanban-sub-lane" data-id="'+e.id+'"></div>').appendTo(r),n||o.addClass("clearfix")),o.attr("data-index",d).data("lane",e).css({height:e.$height||"auto"}),o.children(".kanban-col").addClass("kanban-expired");var s=e.items||e.cards;s&&this.renderLaneCols(t,s,o,e,i),o.children(".kanban-expired").remove()},t.prototype.renderLaneCols=function(e,n,t,r,i){var d=this,o=t.children(".kanban-cols");o.length?o.removeClass("kanban-expired"):o=a('<div class="kanban-cols kanban-'+(r.$parent?"sub-":"")+'lane-cols"></div>').appendTo(t),o.children(".kanban-col").addClass("kanban-expired");for(var s=null,l=0;l<e.length;++l){var c=e[l];if(!c.asParent){for(var u=d.renderLaneCol(c,o,s),h=n[c.type]||[],p=0;p<h.length;++p){var b=h[p];b.$index=p,b.order=+b.order,Number.isNaN(b.order)&&(b.order=p)}h.sort(function(a,e){var n=a.order-e.order;return 0!==n?n:a.$index-e.$index}),d.renderColumnCards(c,h,u,r,i),s=c}}return o.children(".kanban-expired").remove(),o},t.prototype.renderColumnCards=function(a,e,n,t,r){var i=this,d=i.options,o=n.find(".kanban-lane-items");o.children(".kanban-item").addClass("kanban-expired");var s=a.cardsPerRow||t.cardsPerRow||r.cardsPerRow||d.cardsPerRow;if(d.virtualCardList){var l=o.data("zui.virtuallist");l?l.render(e):o.virtualList({countPerRow:s,itemHeight:d.cardHeight+d.cardSpace,list:e,itemClassName:"kanban-item",render:function(e,n,d){var d=n[e],s=e>0?n[e-1]:null;return d.$index=e,d.$col=a,d.$lane=t,i.renderCard(d,o,s,a,t,r)}})}else for(var c=0;c<e.length;++c){var u=e[c],h=c>0?e[c-1]:null;u.$index=c,u.$col=a,u.$lane=t,i.renderCard(u,o,h,a,t,r)}o.css("padding",d.cardSpace/2).toggleClass("kanban-items-grid",s>1).attr("data-cards-per-row",s).data("cards",e),o.children(".kanban-expired").remove()},t.prototype.renderLaneCol=function(e,n,t){var r=this,i=r.options,d=n.children('.kanban-lane-col[data-id="'+e.id+'"]'),o=t?n.children('.kanban-lane-col[data-id="'+t.id+'"]:not(.kanban-expired)'):null;d.length?d.removeClass("kanban-expired"):(d=a(['<div class="kanban-col kanban-lane-col" data-id="'+e.id+'">','<div class="kanban-lane-items scrollbar-hover"></div>',"</div>"].join("")),r.options.readonly||d.append(['<div class="kanban-lane-actions">','<button class="btn btn-default btn-block action" type="button" data-action="addItem"><span class="text-muted"><i class="icon icon-plus"></i> '+r.options.addItemText+"</span></button>","</div>"].join("")),i.laneItemsClass&&d.find(".kanban-lane-items").addClass(i.laneItemsClass),i.laneColClass&&d.addClass(i.laneColClass)),o&&o.length?o.after(d):n.prepend(d),d.attr({"data-parent":e.parentType?e.parentType:null,"data-type":e.type}).data("col",e);var s=e.$kanbanData.$layout.columnWidth;return i.useFlex?d.css("flex","1 1 "+s+"%"):d.css({left:e.$index*s+"%",width:s+"%"}),d},t.prototype.renderCard=function(e,n,t,r,i,d){var o=this.options,s=n.children('.kanban-item[data-id="'+e.id+'"]'),l=t?n.children('.kanban-item[data-id="'+t.id+'"]:not(.kanban-expired)'):null;s.length?s.removeClass("kanban-expired"):(s=a('<div class="kanban-item" data-id="'+e.id+'"></div>'),o.wrapCard&&s.append('<div class="kanban-card"></div>')),l&&l.length?l.after(s):n.prepend(s);var c=r.cardsPerRow||i.cardsPerRow||d.cardsPerRow||o.cardsPerRow;s.data("item",e).css({padding:o.cardSpace/2,width:c>1?100/c+"%":""});var u=o.wrapCard?s.children(".kanban-card"):s;u.css("height",o.cardHeight);var h=o.cardRender||o.itemRender;if(h)h(e,u,r,i,d);else{var p=u.find(".title");p.length||(p=a('<div class="title"></div>').appendTo(u)),p.text(e.name||e.title)}return s},t.DEFAULTS={minColWidth:100,maxColHeight:400,minColHeight:90,minSubColHeight:40,subLaneSpace:2,laneNameWidth:20,headerHeight:32,cardHeight:40,cardSpace:10,cardsPerRow:1,wrapCard:!0,fluidBoardWidth:!0,addItemText:"添加条目",useFlex:!0,droppable:"auto",laneColClass:"",showCount:!0},a.fn.kanban=function(n){return this.each(function(){var r=a(this),i=r.data(e),d="object"==typeof n&&n;i||r.data(e,i=new t(this,d)),"string"==typeof n&&i[n]()})},t.NAME=e,a.fn.kanban.Constructor=t}(jQuery);
\ No newline at end of file