From c28e4c1b61d730596f58302e1d852ef65d922697 Mon Sep 17 00:00:00 2001
From: dingna <dingna@easycorp.ltd>
Date: Mon, 1 Nov 2021 09:22:01 +0800
Subject: [PATCH] * Fix code for task#43401,#43403,#43404,#43405,#43398,#43399.

---
 module/execution/css/kanban.css       |  3 ++-
 module/execution/js/kanban.js         | 21 +--------------------
 module/execution/view/kanban.html.php |  3 ++-
 3 files changed, 5 insertions(+), 22 deletions(-)

diff --git a/module/execution/css/kanban.css b/module/execution/css/kanban.css
index a04ce818c5..cef2290d04 100644
--- a/module/execution/css/kanban.css
+++ b/module/execution/css/kanban.css
@@ -31,4 +31,5 @@
 
 .dropdown-menu a {text-align: left;}
 .scrollbar-hover {max-height: 2000px; overflow: scroll !important;}
-.c-type, .c-group {width: 150px !important; overflow: unset; display: "";}
+.c-type, .c-group {width: 150px !important; overflow: unset;}
+.c-type {margin-left: 0px !important;}
diff --git a/module/execution/js/kanban.js b/module/execution/js/kanban.js
index 1320523f63..52180a5e36 100644
--- a/module/execution/js/kanban.js
+++ b/module/execution/js/kanban.js
@@ -660,9 +660,6 @@ $(function()
         onRenderCount:     renderColumnCount
     };
 
-    /* Hide group menu. */
-    hideGroupMenu();
-
     if(groupBy == 'default')
     {
         /* Create story kanban 创建需求看板 */
@@ -719,26 +716,10 @@ $(function()
     })
 });
 
-/**
- * Hide group menu.
- *
- * @access public
- * @return void
- */
-function hideGroupMenu()
-{
-    var type = $('#type').val();
-    if(type == 'all') $('.c-group').hide();
-}
-
 $('#type').change(function()
 {
     var type = $('#type').val();
-    if(type == 'all')
-    {
-        $('.c-group').hide();
-    }
-    else
+    if(type != 'all')
     {
         $('.c-group').show();
         $.get(createLink('execution', 'ajaxGetGroup', 'type=' + type), function(data)
diff --git a/module/execution/view/kanban.html.php b/module/execution/view/kanban.html.php
index c3158959c8..7c82a688b9 100644
--- a/module/execution/view/kanban.html.php
+++ b/module/execution/view/kanban.html.php
@@ -13,12 +13,13 @@
 <div id='mainMenu' class='clearfix'>
   <div class='btn-toolbar pull-left'>
     <div class="input-control space c-type">
-      <i class="icon icon-list-all"></i>
       <?php echo html::select('type', $lang->kanban->type, $browseType, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
+    <?php if($browseType != 'all'):?>
     <div class="input-control space c-group">
       <?php echo html::select('group',  $lang->kanban->group->$browseType, $groupBy, 'class="form-control chosen" data-max_drop_width="215"');?>
     </div>
+    <?php endif;?>
   </div>
   <div class='btn-toolbar pull-right'>
     <?php