fix: disable query in another query

This commit is contained in:
Tienson Qin
2021-10-09 22:45:53 +08:00
parent 344137ad48
commit b4212173fc
2 changed files with 55 additions and 43 deletions

View File

@@ -458,7 +458,8 @@
(when (string? query-string)
(let [query-string (template/resolve-dynamic-template! query-string)]
(when-not (string/blank? query-string)
(let [{:keys [query sort-by blocks? sample] :as result} (parse repo query-string)]
(let [{:keys [query sort-by blocks? sample] :as result} (parse repo query-string)
query (if (string? query) (string/trim query) query)]
(if (and (string? result) (not (string/includes? result " ")))
(if (= "\"" (first result) (last result))
(subs result 1 (dec (count result)))
@@ -481,7 +482,8 @@
(when (seq (:query query-m))
(let [query-string (pr-str (:query query-m))
query-string (template/resolve-dynamic-template! query-string)
{:keys [query sort-by blocks?]} (parse repo query-string)]
{:keys [query sort-by blocks?]} (parse repo query-string)
query (if (string? query) (string/trim query) query)]
(when query
(when-let [query (query-wrapper query blocks?)]
(react/react-query repo