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

Remove more cases of :block/schema

Browse Source
This commit is contained in:
Tienson Qin
2025-01-13 10:00:00 +08:00
parent 639ca09f2e
commit 93a7034249
21 changed files with 133 additions and 120 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -72,7 +72,8 @@
default-open? class-schema?]
:as opts}]
(let [property-name (or (and *property-name @*property-name) (:block/title property))
property-schema (or (and *property-schema @*property-schema) (:block/schema property))
property-schema (or (and *property-schema @*property-schema)
(select-keys property [:property/type]))
schema-types (->> (concat db-property-type/user-built-in-property-types
(when built-in?
db-property-type/internal-built-in-property-types))
@@ -87,7 +88,7 @@
:on-value-change
(fn [v]
(let [type (keyword (string/lower-case v))
update-schema-fn #(assoc % :type type)]
update-schema-fn #(assoc % :property/type type)]
(when *property-schema
(swap! *property-schema update-schema-fn))
(let [schema (or (and *property-schema @*property-schema)
@@ -101,7 +102,7 @@
(p/do!
(when *show-new-property-config?
(reset! *show-new-property-config? false))
(when (= (:type schema) :node) (reset! *show-class-select? true))
(when (= (:property/type schema) :node) (reset! *show-class-select? true))
(db-property-handler/upsert-property!
(:db/ident property)
schema
@@ -127,8 +128,8 @@
(pv/<create-new-block! block property "")))))))}
;; only set when in property configure modal
(and *property-name (:type property-schema))
(assoc :default-value (name (:type property-schema))))
(and *property-name (:property/type property-schema))
(assoc :default-value (name (:property/type property-schema))))
(shui/select-trigger
{:class "!px-2 !py-0 !h-8"}
(shui/select-value
@@ -375,7 +376,7 @@
(if property-key
[:div.ls-property-add.gap-1.flex.flex-1.flex-row.items-center
[:div.flex.flex-row.items-center.property-key.gap-1
(when-not (:db/id property) (property-icon property (:type @*property-schema)))
(when-not (:db/id property) (property-icon property (:property/type @*property-schema)))
(if (:db/id property) ; property exists already
(property-key-cp block property opts)
[:div property-key])]