From a48a3614aad9a606ca45da4ffc194bf6391d2c35 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 13 Jun 2022 08:08:30 +0800
Subject: [PATCH 1/3] * Fix bug #23581.

---
 module/search/view/buildform.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 97d9ecfe56..52a144bfee 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -526,7 +526,7 @@ $(function()
         {
             if(!$searchForm.find('#value' + i).hasClass('picker-select')) $searchForm.find('#value' + i).val('').trigger('chosen:updated');
             if($searchForm.find('#value' + i).hasClass('picker-select'))  $searchForm.find('#value' + i).data('zui.picker').setValue('');
-            $searchForm.find('#value' + i).val('').attr('placeholder','');
+            $searchForm.find('#value' + i + '.date').val('').attr('placeholder','');
         }
     };
 

From 76b3f952a02e46b0852edbf7fdb67be614cd7c68 Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 13 Jun 2022 10:02:33 +0800
Subject: [PATCH 2/3] * Fix issue #673.

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

diff --git a/module/execution/control.php b/module/execution/control.php
index df08f82457..c456b62e4a 100644
--- a/module/execution/control.php
+++ b/module/execution/control.php
@@ -3842,10 +3842,10 @@ class execution extends control
         $enterTime = date('Y-m-d H:i:s', $enterTime);
         $lastEditedTime = $this->dao->select("max(lastEditedTime) as lastEditedTime")->from(TABLE_KANBANLANE)->where('execution')->eq($executionID)->fetch('lastEditedTime');
 
+        if($from == 'execution') $this->session->set('taskSearchValue', $searchValue);
+        if($from == 'RD')        $this->session->set('rdSearchValue', $searchValue);
         if($lastEditedTime > $enterTime or $groupBy != 'default' or !empty($searchValue))
         {
-            if($from == 'execution') $this->session->set('taskSearchValue', $searchValue);
-            if($from == 'RD')        $this->session->set('rdSearchValue', $searchValue);
             $kanbanGroup = $from == 'execution' ? $this->loadModel('kanban')->getExecutionKanban($executionID, $browseType, $groupBy, $searchValue) : $this->loadModel('kanban')->getRDKanban($executionID, $browseType, 'id_asc', 0, $groupBy, $searchValue);
             return print(json_encode($kanbanGroup));
         }
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 3f7f665b83..71a20c9547 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -1674,6 +1674,7 @@ function searchCards(value)
             if(rdSearchValue != '' && groupBy == 'default' && data.laneCount != 0) $(this).parent().show();
             if(rdSearchValue != '' && groupBy == 'default' && data.laneCount == 0) $(this).parent().hide();
 
+            $(this).empty();
             hideAll = !updateRegion(regionID, data) && hideAll;
         });
 

From cb8dc6954c90368fc7afd42d14246a5265ef1f6d Mon Sep 17 00:00:00 2001
From: liumengyi <liumengyi@easycorp.ltd>
Date: Mon, 13 Jun 2022 10:07:34 +0800
Subject: [PATCH 3/3] * Optimize code for bug #23581.

---
 module/search/view/buildform.html.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/module/search/view/buildform.html.php b/module/search/view/buildform.html.php
index 52a144bfee..8cc6d863ad 100644
--- a/module/search/view/buildform.html.php
+++ b/module/search/view/buildform.html.php
@@ -526,7 +526,7 @@ $(function()
         {
             if(!$searchForm.find('#value' + i).hasClass('picker-select')) $searchForm.find('#value' + i).val('').trigger('chosen:updated');
             if($searchForm.find('#value' + i).hasClass('picker-select'))  $searchForm.find('#value' + i).data('zui.picker').setValue('');
-            $searchForm.find('#value' + i + '.date').val('').attr('placeholder','');
+            $searchForm.find('#value' + i + '.date').val('').attr('placeholder', '');
         }
     };