Modify filter user (#4562)

zcy1010 · web-flow · commit 70791c86404e · 2022-09-09T19:45:07.000+08:00
* Modify Filter User button
diff --git a/apollo-portal/src/main/resources/static/scripts/controller/UserController.js b/apollo-portal/src/main/resources/static/scripts/controller/UserController.js
@@ -24,10 +24,8 @@ function UserController($scope, $window, $translate, toastr, AppUtil, UserServic
     $scope.createdUsers = [];
     $scope.filterUser = [];
     $scope.status = '1'
-    $scope.showSearchUsernameInput = false
     $scope.searchKey = ''
     $scope.changeStatus = changeStatus
-    $scope.toggleUsernameSearchInput = toggleUsernameSearchInput
     $scope.searchUsers = searchUsers
     $scope.resetSearchUser = resetSearchUser
 
@@ -70,10 +68,6 @@ function UserController($scope, $window, $translate, toastr, AppUtil, UserServic
         }
     }
 
-    function toggleUsernameSearchInput() {
-        $scope.showSearchUsernameInput = !$scope.showSearchUsernameInput
-    }
-
     function searchUsers() {
         $scope.searchKey = $scope.searchKey.toLowerCase();
         var filterUser = []
diff --git a/apollo-portal/src/main/resources/static/user-manage.html b/apollo-portal/src/main/resources/static/user-manage.html
@@ -53,25 +53,23 @@
                                         class="btn btn-primary">
                                     {{'UserMange.Add' | translate }}
                                 </button>
-                                <button type="button" class="btn btn-default" data-tooltip="tooltip" data-placement="bottom"
-                                        title="{{'UserMange.SortByUserLoginName' | translate }}"  ng-click="toggleUsernameSearchInput()">
-                                    <span class="glyphicon glyphicon-filter"></span>
-                                    {{'UserMange.FilterUser' | translate }}
-                                </button>
+                                <form class="form-inline" style="display:inline">
+                                    <div class="form-group">
+                                        <input type="text" class="form-control" id="searchUserInput"
+                                               placeholder="{{'UserMange.SortByUserLoginName' | translate }}"
+                                               ng-model="searchKey">
+                                    </div>
+                                    <button type="button" class="btn btn-default" ng-click="searchUsers()">
+                                        <span class="glyphicon glyphicon-filter"></span>
+                                        {{'UserMange.FilterUser' | translate }}
+                                    </button>
+                                    <button type="button" class="btn btn-default" ng-click="resetSearchUser()">
+                                        {{'UserMange.Reset' | translate }}
+                                    </button>
+                                </form>
                             </div>
                             <div style="height: 15px"></div>
                         </div>
-                        <div class="search-input" ng-show="showSearchUsernameInput">
-                            <form class="form-inline">
-                                <div class="form-group">
-                                    <input type="text" class="form-control" id="searchUserInput"
-                                           placeholder="{{'UserMange.SortByUserLoginName' | translate }}"
-                                           ng-model="searchKey" ng-change="searchUsers()">
-                                </div>
-                                <button type="button" class="btn btn-default" ng-click="resetSearchUser()">{{'UserMange.Reset' | translate }}</button>
-                            </form>
-                            <div style="height: 15px"></div>
-                        </div>
                         <table class="table table-bordered table-striped table-hover">
                             <tr>
                                 <th style="text-align: left">{{'UserMange.UserName' | translate }}</th>
