From d85dd443e084ccdf98ae5abf427cb94579f61faa Mon Sep 17 00:00:00 2001
From: simba <ycyin8795@163.com>
Date: Fri, 18 Oct 2019 22:35:42 +0800
Subject: [PATCH] fix: some search problems.

---
 src/views/matter/List.vue | 12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/src/views/matter/List.vue b/src/views/matter/List.vue
index 77835db..dfd85d6 100644
--- a/src/views/matter/List.vue
+++ b/src/views/matter/List.vue
@@ -186,6 +186,12 @@
           this.pager.setFilterValue('puuid', 'root')
         }
 
+        this.pager.setFilterValue("name", this.searchText)
+        //如果是有关键字的进行搜索，那么搜索条件就不应该有puuid
+        if(this.searchText) {
+            this.pager.setFilterValue('puuid', null)
+        }
+
         //如果所有的排序都没有设置，那么默认以时间降序。
         this.pager.setFilterValue('orderCreateTime', SortDirection.DESC)
         this.pager.setFilterValue("orderDir", SortDirection.DESC)
@@ -195,14 +201,13 @@
           this.pager.setFilterValue('userUuid', this.user.uuid)
         }
 
-        this.pager.setFilterValue("name", this.searchText)
-
         //刷新面包屑
         this.refreshBreadcrumbs()
 
         this.pager.httpFastPage()
       },
       goToDirectory(uuid) {
+        this.searchText = null
         this.pager.setFilterValue('puuid', uuid)
         this.pager.page = 0
         let query = this.pager.getParams()
@@ -488,6 +493,7 @@
           that.pager.resetFilter()
           that.pager.setFilterValue('puuid', null)
           that.pager.setFilterValue("orderCreateTime", SortDirection.DESC)
+          that.pager.setFilterValue("orderDir", SortDirection.DESC)
           that.pager.setFilterValue("name", that.searchText)
 
           that.pager.httpFastPage()
@@ -507,7 +513,7 @@
 
       },
       'searchText'(newVal, oldVal) {
-        if (oldVal && !newVal) {
+        if (!newVal && newVal !== null) {
           this.refresh()
         }
       }