Merge pull request #5935 from wenzhixin/fix/5933

Fix control remove logic

src/extensions/filter-control/utils.js

@@ -353,9 +353,8 @@ export function createControls (that, header) {
     $.each(header.find('th'), (i, th) => {
       const $th = $(th)
 
-      $th.find('.filter-control').remove()
-
       if ($th.data('field') === column.field) {
+        $th.find('.filter-control').remove()
         $th.find('.fht-cell').append(html.join(''))
         return false
       }