clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-06-01 19:01:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix: tags property

Browse Source
This commit is contained in:
Tienson Qin
2023-08-11 13:11:13 +08:00
parent 0b785b4069
commit c6c755f6aa
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/frontend/components/property.cljs
View File

@@ -272,8 +272,11 @@
(map (fn [k] [k nil]) properties))
(:block/properties block))
alias (set (map :block/uuid (:block/alias block)))
tags (set (map :block/uuid (:block/tags block)))
alias-properties (when (seq alias)
[[(:block/uuid (db/entity [:block/name "alias"])) alias]])
tags-properties (when (seq tags)
[[(:block/uuid (db/entity [:block/name "tags"])) tags]])
class-properties (->> (:block/tags block)
(mapcat (fn [tag]
(when (= "class" (:block/type tag))
@@ -284,7 +287,8 @@
built-in-properties (set/difference
(set (map name gp-property/db-built-in-properties-keys))
#{"alias" "tags"})
properties (->> (concat (seq alias-properties)
properties (->> (concat (seq tags-properties)
(seq alias-properties)
(seq properties)
class-properties)
(util/distinct-by first)

18
src/main/frontend/handler/db_based/property.cljs
View File

@@ -152,17 +152,17 @@
(catch :default e
(notification/show! (str e) :error false)
nil))
tags-or-alias? (and (contains? #{"tags" "alias"} k-name) (uuid? v*))]
tags-or-alias? (and (contains? #{"tags" "alias"} (string/lower-case k-name)) (uuid? v*))]
(if tags-or-alias?
(let [property-value-id (:db/id (db/entity [:block/uuid v*]))
attribute (case k-name
attribute (case (string/lower-case k-name)
"alias"
:block/alias
"tags"
:block/tags)]
(db/transact! repo
[[:db/add (:db/id block) attribute property-value-id]]
{:outliner-op :save-block}))
[[:db/add (:db/id block) attribute property-value-id]]
{:outliner-op :save-block}))
(when-not (contains? (if (set? value) value #{value}) v*)
(if-let [msg (me/humanize (mu/explain-data schema v*))]
(let [msg' (str "\"" k-name "\"" " " (if (coll? msg) (first msg) msg))]
@@ -193,11 +193,11 @@
refs (outliner-core/rebuild-block-refs block block-properties)]
;; TODO: fix block/properties-order
(db/transact! repo
[[:db/retract (:db/id block) :block/refs]
{:block/uuid (:block/uuid block)
:block/properties block-properties
:block/refs refs}]
{:outliner-op :save-block}))))))))))
[[:db/retract (:db/id block) :block/refs]
{:block/uuid (:block/uuid block)
:block/properties block-properties
:block/refs refs}]
{:outliner-op :save-block}))))))))))
(defn- fix-cardinality-many-values!
[repo property-uuid]