Merge remote-tracking branch 'origin/dev'

shiguanghuxian · Feb 19, 2019 · 40c0434 · 40c0434
2 parents 29a8e1a + 122c893
commit 40c0434
Show file tree

Hide file tree

Showing 3 changed files with 261 additions and 24 deletions.
diff --git a/program/http_ui.go b/program/http_ui.go
@@ -15,6 +15,7 @@ import (
 // 处理静态文件
 func (p *Program) handlerStatic(c *gin.Context) {
 	uri := strings.TrimLeft(c.Request.RequestURI, "/")
+	uri = strings.TrimRight(uri, "?")
 	if uri == "ui/" || uri == "ui" {
 		uri = "dist/index.html"
 	} else {

diff --git a/static/src/views/Keys.vue b/static/src/views/Keys.vue
@@ -49,7 +49,7 @@
               </Select>
             </FormItem>
             <FormItem class="search-in">
-              <Input v-model="searchVal" @on-keyup="onSearchLocal">
+              <Input v-model="searchVal" type="text" @on-keyup="onSearchLocal">
                 <Button slot="prepend" type="primary">{{$t('public.screen')}}</Button>
                 <Button slot="append" type="primary" icon="ios-search" @click="onSearchLocal"></Button>
               </Input>
@@ -535,14 +535,20 @@ export default {
     },
 
     // 搜索本地
-    onSearchLocal(){
+    onSearchLocal(e){
+      if (e.keyCode == 13){
+        return
+      }
       console.log(this.searchVal)
       if (this.searchVal == ''){
         this.pageShow = true;
       }else{
         this.pageShow = false;
       }
       let list = [];
+      if(typeof this.baseList == 'undefined'){
+        return
+      }
       this.baseList.forEach(val => {
         let fullDir = val.full_dir.substring(this.currentPath.length+1);
         // console.log(fullDir)