1
0
Эх сурвалжийг харах

fix: load property pairs too when lazy load a block

Tienson Qin 1 жил өмнө
parent
commit
47abd92155

+ 4 - 0
deps/db/src/logseq/db/sqlite/common_db.cljs

@@ -93,12 +93,16 @@
                           mark-block-fully-loaded)]
           (cond->
            {:block block'}
+            (seq (:block/raw-properties block))
+            (assoc :property-pairs (d/pull-many db '[*] (map :db/id (:block/raw-properties block))))
             children?
             (assoc :children (get-children (:block/_parent block)))))
         (cond->
          {:block (->> (d/pull db '[*] (:db/id block))
                       (with-tags db)
                       mark-block-fully-loaded)}
+          (seq (:block/raw-properties block))
+          (assoc :property-pairs (d/pull-many db '[*] (map :db/id (:block/raw-properties block))))
           children?
           (assoc :children
                  (if (contains? (:block/type block) "whiteboard")

+ 2 - 2
src/main/frontend/db/async.cljs

@@ -103,9 +103,9 @@
       (when-let [^Object sqlite @db-browser/*worker]
         (state/update-state! :db/async-queries (fn [s] (conj s name')))
         (p/let [result (.get-block-and-children sqlite graph uuid-str children?)
-                {:keys [block children] :as result'} (ldb/read-transit-str result)
+                {:keys [property-pairs block children] :as result'} (ldb/read-transit-str result)
                 conn (db/get-db graph false)
-                block-and-children (cons block children)
+                block-and-children (concat property-pairs [block] children)
                 _ (d/transact! conn block-and-children)]
           (state/update-state! :db/async-queries (fn [s] (disj s name')))
           (react/refresh-affected-queries!