소스 검색

fix: prefer to use db-based schema's cardinality && valueType

Instead of those values stored in the property blocks.
Tienson Qin 1 년 전
부모
커밋
dbd9ab6bbb
1개의 변경된 파일7개의 추가작업 그리고 4개의 파일을 삭제
  1. 7 4
      deps/db/src/logseq/db/frontend/malli_schema.cljs

+ 7 - 4
deps/db/src/logseq/db/frontend/malli_schema.cljs

@@ -117,10 +117,13 @@
                                       (d/entity db k))]
                  (update m :block/properties (fnil conj [])
                          ;; use explicit call to be nbb compatible
-                         [(let [closed-values (entity-plus/lookup-kv-then-entity property :property/closed-values)]
-                            (cond-> (assoc (select-keys property [:db/ident :db/valueType :db/cardinality])
-                                    :block/schema
-                                    (select-keys (:block/schema property) [:type]))
+                         [(let [closed-values (entity-plus/lookup-kv-then-entity property :property/closed-values)
+                                property' (or
+                                           (get db-schema/schema-for-db-based-graph (:db/ident property))
+                                           (select-keys property [:db/ident :db/valueType :db/cardinality]))]
+                            (cond-> (assoc property'
+                                           :block/schema
+                                           (select-keys (:block/schema property) [:type]))
                               (seq closed-values)
                               (assoc :property/closed-values closed-values)))
                           v])