From ce9eff332d07b4e7041dca348ac6b3b30e268b2d Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Thu, 12 May 2022 08:22:15 +0800 Subject: [PATCH] fix: prefer block template if there're other page templates with the same name --- src/main/frontend/db/model.cljs | 5 +++-- src/main/frontend/modules/outliner/datascript.cljc | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/frontend/db/model.cljs b/src/main/frontend/db/model.cljs index 7f620300d2..90e2b9d682 100644 --- a/src/main/frontend/db/model.cljs +++ b/src/main/frontend/db/model.cljs @@ -1321,7 +1321,7 @@ [name] (when (string? name) (->> (d/q - '[:find (pull ?b [*]) + '[:find [(pull ?b [*]) ...] :in $ ?name :where [?b :block/properties ?p] @@ -1329,7 +1329,8 @@ [(= ?t ?name)]] (conn/get-db) name) - ffirst))) + (sort-by :block/name) + (first)))) (defonce blocks-count-cache (atom nil)) diff --git a/src/main/frontend/modules/outliner/datascript.cljc b/src/main/frontend/modules/outliner/datascript.cljc index 244f0e08cc..f1da4d0524 100644 --- a/src/main/frontend/modules/outliner/datascript.cljc +++ b/src/main/frontend/modules/outliner/datascript.cljc @@ -45,7 +45,7 @@ txs (map (fn [m] (if (map? m) (dissoc m :block/children :block/meta :block/top? :block/bottom? :block/anchor - :block/title :block/body :block/level :block/container) + :block/title :block/body :block/level :block/container :db/other-tx) m)) txs)] (when (and (seq txs) (not (:skip-transact? opts)))