From 39f534f6fed4528fa670e0216f7c6f7944a69182 Mon Sep 17 00:00:00 2001
From: Stanislav Popov <popstas@gmail.com>
Date: Sun, 23 Dec 2018 14:34:49 +0500
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=BD=D0=BE=D1=80=D0=BC=D0=B0=D0=BB?=
 =?UTF-8?q?=D1=8C=D0=BD=D0=B0=D1=8F=20=D1=80=D0=B0=D0=B1=D0=BE=D1=82=D0=B0?=
 =?UTF-8?q?=20=D0=BE=D0=B4=D0=B8=D0=BD=D0=BE=D1=87=D0=BD=D1=8B=D1=85=20?=
 =?UTF-8?q?=D1=84=D0=B8=D0=BB=D1=8C=D1=82=D1=80=D0=BE=D0=B2,=20=D0=BE?=
 =?UTF-8?q?=D1=87=D0=B8=D1=81=D1=82=D0=BA=D0=B0=20=D0=B7=D0=B0=D0=BF=D1=80?=
 =?UTF-8?q?=D0=BE=D1=81=D0=B0=20=D0=BF=D0=BE=20=D0=BA=D0=BD=D0=BE=D0=BF?=
 =?UTF-8?q?=D0=BA=D0=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/FilterPresetButton.vue | 3 ++-
 components/QueryInput.vue         | 7 +++++--
 store/index.js                    | 8 ++++++--
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/components/FilterPresetButton.vue b/components/FilterPresetButton.vue
index f29ad41..6706205 100644
--- a/components/FilterPresetButton.vue
+++ b/components/FilterPresetButton.vue
@@ -34,7 +34,8 @@ export default {
 
       let parts = this.$store.state.q ? this.$store.state.q.split("&") : [];
       parts.push(q);
-      this.$store.dispatch("q", parts.join("&"));
+      const result = parts.join("&");
+      this.$store.dispatch("q", { q: result });
     }
   }
 };
diff --git a/components/QueryInput.vue b/components/QueryInput.vue
index ce093ee..0159ec7 100644
--- a/components/QueryInput.vue
+++ b/components/QueryInput.vue
@@ -13,6 +13,7 @@
       valueKey="name"
       :clearable="true"
       @select="querySelect"
+      @clear="queryChangeAction"
       @keyup.enter.native="queryChangeAction"
     >
       <template slot-scope="slotProps">
@@ -111,6 +112,7 @@ export default {
     globalQ() {
       // update local data when store value changes
       this.q = this.globalQ;
+      this.$refs.input.focus();
     }
   },
 
@@ -176,8 +178,9 @@ export default {
 
     // autocomplete of query
     queryComplete(q, cb) {
-      if (!q || this.completionProcess) return cb([]);
-      const parts = q.split("&");
+      // в q старое значение, надо брать this.q
+      if (!this.q || this.completionProcess) return cb([]);
+      const parts = this.q.split("&");
       const lastPart = parts[parts.length - 1];
 
       this.completionProcess = true;
diff --git a/store/index.js b/store/index.js
index 40be4f9..40bc2f8 100644
--- a/store/index.js
+++ b/store/index.js
@@ -350,8 +350,12 @@ export const actions = {
   },
 
   q({ commit, dispatch }, q) {
-    commit('q', q);
-    dispatch('filterSites');
+    if (typeof q == 'object') {
+      commit('q', q.q);
+    } else {
+      commit('q', q);
+      dispatch('filterSites');
+    }
   },
 
   // переключает поле в таблице, через нее проходят все изменения полей