From d3329856af7afc8a33af76462e51f83cdbe2f5a3 Mon Sep 17 00:00:00 2001 From: Tienson Qin Date: Thu, 3 Aug 2023 16:24:21 +0800 Subject: [PATCH] fix: put alias before tags --- src/main/frontend/components/property.cljs | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/src/main/frontend/components/property.cljs b/src/main/frontend/components/property.cljs index e2fb9a0e3e..9e1125eb73 100644 --- a/src/main/frontend/components/property.cljs +++ b/src/main/frontend/components/property.cljs @@ -560,11 +560,11 @@ (:block/properties block)) alias (set (map :block/uuid (:block/alias block))) tags (set (map :block/uuid (:block/tags block))) - alias-and-tags (cond-> {} - (seq tags) - (assoc (:block/uuid (db/entity [:block/name "tags"])) tags) + alias-and-tags (cond-> [] (seq alias) - (assoc (:block/uuid (db/entity [:block/name "alias"])) alias)) + (conj [(:block/uuid (db/entity [:block/name "alias"])) alias]) + (seq tags) + (conj [(:block/uuid (db/entity [:block/name "tags"])) tags])) new-property? (= edit-input-id (state/sub :ui/new-property-input-id)) class-properties (->> (:block/tags block) (mapcat (fn [tag] @@ -576,7 +576,9 @@ built-in-properties (set/difference (set (map name gp-property/db-built-in-properties-keys)) #{"tags" "alias"}) - properties (->> (concat (seq alias-and-tags) (seq properties) class-properties) + properties (->> (concat (seq alias-and-tags) + (seq properties) + class-properties) (util/distinct-by first) (remove (fn [[k _v]] (when (uuid? k)