diff --git a/admin/src/App.vue b/admin/src/App.vue
index 166b549..e0584a8 100644
--- a/admin/src/App.vue
+++ b/admin/src/App.vue
@@ -30,8 +30,13 @@
                        @click="searchInputDivShowHidden"></el-button>
           </div>
           <div v-show="showSearchInput" class="searchInputDiv">
-            <el-input ref="searchInput" v-model="searchInputText" :style="searchInputStyle" clearable
-                      placeholder="请输入要搜索的内容" @keyup.enter.native="searchInputHandle">
+            <el-input ref="searchInput" v-model="searchInputText"
+                      :style="searchInputStyle" clearable
+                      v-focus="showSearchInput"
+                      placeholder="请输入要搜索的内容"
+                      @keyup.enter.native="searchInputHandle"
+                      @blur="searchInputBlur"
+            >
             </el-input>
           </div>
           <div v-show="!showSearchInput" class="toolDiv">
@@ -369,6 +374,7 @@
       //搜索输入框显示和隐藏
       searchInputDivShowHidden() {
         this.showSearchInput = !this.showSearchInput;
+        this.searchInputText = '';
       },
       //退出登录按钮事件
       logoutBtnClick() {
@@ -395,6 +401,19 @@
       //搜索框输入
       searchInputHandle() {
         this.$EventBus.$emit(glob.eventNames.globSearchEventName, this.searchInputText);
+      },
+      //输入框失去焦点
+      searchInputBlur() {
+        this.searchInputDivShowHidden();
+      }
+    },
+    directives: {
+      focus: {
+        update: function (el, {value}) {
+          if (value) {
+            el.getElementsByTagName('input')[0].focus();
+          }
+        }
       }
     }
   }
diff --git a/udf-api/udf-api-server/src/main/resources/templates/common.html b/udf-api/udf-api-server/src/main/resources/templates/common.html
index d65b3c3..b509d87 100644
--- a/udf-api/udf-api-server/src/main/resources/templates/common.html
+++ b/udf-api/udf-api-server/src/main/resources/templates/common.html
@@ -332,7 +332,7 @@
                     </button>
                 </div>
                 <div class="item header-right-bar-search-input-div" style="display:none;">
-                    <input type="text" class="form-control form-control-lg" placeholder="请输入要搜索的内容">
+                    <input type="text" class="form-control form-control-lg glob-search-input" placeholder="请输入要搜索的内容">
                 </div>
                 <div th:if="${tokenInfo!=null}" class="item header-right-bar-bell-div">
                     <div class="el-badge">
@@ -396,28 +396,54 @@
                 });
             });
             //搜索效果
-            $('.header-right-bar-search-div button').on('click', function () {
-                var v1;
-                var v2;
-                if ($('.header-right-bar-search-input-div').css('display')) {
-                    if ($('.header-right-bar-search-input-div').css('display') === 'none') {
-                        v1 = 'table-cell';
-                        v2 = 'none';
+            $(function () {
+                $('.header-right-bar-search-div button').on('click', function () {
+                    var v1;
+                    var v2;
+                    if ($('.header-right-bar-search-input-div').css('display')) {
+                        if ($('.header-right-bar-search-input-div').css('display') === 'none') {
+                            v1 = 'table-cell';
+                            v2 = 'none';
+                        } else {
+                            v1 = 'none';
+                            v2 = 'table-cell';
+                        }
                     } else {
                         v1 = 'none';
                         v2 = 'table-cell';
                     }
-                } else {
-                    v1 = 'none';
-                    v2 = 'table-cell';
-                }
-                $('.header-right-bar-search-input-div').css('display', v1);
-                $('.header-right-bar-search-input-div').css('width', window.innerWidth - 200 - 10 + 'px');
-                $('.header-right-bar-search-input-div').css('max-width', '400px');
-                $('.header-right-bar-bell-div').css('display', v2);
-                $('.header-right-bar-user-div').css('display', v2);
-                $('.header-right-bar-login-div').css('display', v2);
-                $('.header-right-bar-registered-div').css('display', v2);
+                    $('.header-right-bar-search-input-div').css('display', v1);
+                    $('.header-right-bar-search-input-div').css('width', window.innerWidth - 200 - 10 + 'px');
+                    $('.header-right-bar-search-input-div').css('max-width', '400px');
+                    $('.header-right-bar-bell-div').css('display', v2);
+                    $('.header-right-bar-user-div').css('display', v2);
+                    $('.header-right-bar-login-div').css('display', v2);
+                    $('.header-right-bar-registered-div').css('display', v2);
+                    if (v1 == 'table-cell') {
+                        $('.glob-search-input').focus();
+                    } else {
+                        $('.glob-search-input').val(null);
+                    }
+                });
+                //失去焦点后隐藏
+                $('.glob-search-input').on('blur', function () {
+                    var v1 = 'none';
+                    var v2 = 'table-cell';
+                    $('.header-right-bar-search-input-div').css('display', v1);
+                    $('.header-right-bar-search-input-div').css('width', window.innerWidth - 200 - 10 + 'px');
+                    $('.header-right-bar-search-input-div').css('max-width', '400px');
+                    $('.header-right-bar-bell-div').css('display', v2);
+                    $('.header-right-bar-user-div').css('display', v2);
+                    $('.header-right-bar-login-div').css('display', v2);
+                    $('.header-right-bar-registered-div').css('display', v2);
+                    $('.glob-search-input').val(null);
+                });
+                //回车搜索
+                $('.glob-search-input').on('keydown', function () {
+                    if (event.keyCode == 13) {
+                        $('body').trigger('globSearch', $('.glob-search-input').val());
+                    }
+                });
             });
             // 返回顶部处理
             $(function () {