clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-01 09:26:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: ref pages in properties

Browse Source
This commit is contained in:
Tienson Qin
2021-03-22 13:57:00 +08:00
parent 279f319bca
commit 0ea56db089
1 changed files with 15 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
src/main/frontend/format/block.cljs
View File

@@ -237,31 +237,31 @@
m))))
(defn with-page-refs
[{:keys [title body tags ref-pages] :as block}]
(let [ref-pages (->> (concat tags ref-pages)
(remove string/blank?)
(distinct))
ref-pages (atom ref-pages)]
[{:keys [title body tags refs] :as block}]
(let [refs (->> (concat tags refs)
(remove string/blank?)
(distinct))
refs (atom refs)]
(walk/postwalk
(fn [form]
(when-let [page (get-page-reference form)]
(swap! ref-pages conj page))
(swap! refs conj page))
(when-let [tag (get-tag form)]
(when (util/tag-valid? tag)
(swap! ref-pages conj tag)))
(swap! refs conj tag)))
form)
(concat title body))
(let [ref-pages (remove string/blank? @ref-pages)
(let [refs (remove string/blank? @refs)
children-pages (->> (mapcat (fn [p]
(if (string/includes? p "/")
;; Don't create the last page for now
(butlast (string/split p #"/"))))
ref-pages)
refs)
(remove string/blank?))
ref-pages (->> (distinct (concat ref-pages children-pages))
refs (->> (distinct (concat refs children-pages))
(remove nil?))
ref-pages (map page-name->map ref-pages)]
(assoc block :refs ref-pages))))
refs (map page-name->map refs)]
(assoc block :refs refs))))
(defn with-block-refs
[{:keys [title body] :as block}]
@@ -396,7 +396,8 @@
(when (util/uuid-string? custom-id)
(uuid custom-id))))
(db/new-block-id))
ref-pages-in-properties (:page-refs properties)
ref-pages-in-properties (->> (:page-refs properties)
(remove string/blank?))
block (second block)
level (:level block)
[children current-block-children]
@@ -417,7 +418,7 @@
:uuid id
:body (vec (reverse block-body))
:properties (:properties properties)
:ref-pages ref-pages-in-properties
:refs ref-pages-in-properties
:children (or current-block-children []))
(assoc-in [:meta :start-pos] start_pos)
(assoc-in [:meta :end-pos] last-pos))