Explorar o código

fix: show page for block searching

Tienson Qin %!s(int64=5) %!d(string=hai) anos
pai
achega
47026e60cf
Modificáronse 2 ficheiros con 11 adicións e 9 borrados
  1. 8 8
      src/main/frontend/components/search.cljs
  2. 3 1
      src/main/frontend/search.cljs

+ 8 - 8
src/main/frontend/components/search.cljs

@@ -34,8 +34,8 @@
 (rum/defc highlight-fuzzy
   [content indexes]
   (let [n (count content)
-        max-hightlighted-len 64
-        max-surrounding-len 32
+        max-hightlighted-len 512
+        max-surrounding-len 512
 
         first-index (first indexes)
         last-index (nth indexes (dec (count indexes)))
@@ -176,12 +176,12 @@
                            data]
 
                           :block
-                          (let [{:block/keys [page content indexes]} data]
-                            (let [page (or (:page/original-name page)
-                                           (:page/name page))]
-                              [:div.flex-1
-                               [:div.text-sm.font-medium page]
-                               (highlight-fuzzy content indexes)]))
+                          (let [{:block/keys [page content indexes]} data
+                                page (or (:page/original-name page)
+                                         (:page/name page))]
+                            [:div.flex-1
+                             [:div.text-sm.font-medium (str "-> " page)]
+                             (highlight-fuzzy content indexes)])
 
                           nil))})])))
 

+ 3 - 1
src/main/frontend/search.cljs

@@ -11,7 +11,8 @@
             [frontend.text :as text]
             [cljs-bean.core :as bean]
             [goog.object :as gobj]
-            ["fuzzysort" :as fuzzy]))
+            ["fuzzysort" :as fuzzy]
+            [medley.core :as medley]))
 
 (def fuzzy-go (gobj/get fuzzy "go"))
 (defonce prepare (gobj/get fuzzy "prepare"))
@@ -157,6 +158,7 @@
                (fn [{:keys [target uuid indexes]}]
                  {:block/uuid uuid
                   :block/content target
+                  :block/page (:block/page (db/entity [:block/uuid (medley/uuid (str uuid))]))
                   :block/indexes indexes}) ; For result highlight
                result)
               (remove nil?)))))))))