Forráskód Böngészése

fix: property table filters crash

Tienson Qin 1 éve
szülő
commit
ec94292858

+ 3 - 1
src/main/frontend/components/objects.cljs

@@ -145,7 +145,9 @@
          (when-let [view (first views)]
            (set-view-entity! view))
          (p/let [result (db-async/<get-property-objects (state/get-current-repo) (:db/ident property))]
-           (set-data! (mapv #(assoc % :id (:db/id %)) result))
+           (set-data! (mapv (fn [m]
+                              (let [e (db/entity (:db/id m))]
+                                (assoc e :id (:db/id m)))) result))
            (set-loading? false))))
      [])
 

+ 2 - 1
src/main/frontend/components/views.cljs

@@ -381,7 +381,8 @@
   [rows property]
   (let [property-ident (:db/ident property)
         block-type? (= property-ident :block/type)
-        values (->> (mapcat (fn [e] (let [v (get e property-ident)]
+        values (->> (mapcat (fn [e] (let [e' (if (de/entity? e) e (db/entity (:db/id e)))
+                                          v (get e' property-ident)]
                                       (if (set? v) v #{v}))) rows)
                     (remove nil?)
                     (distinct))]