clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-28 16:15:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat(query-dsl): add more filters

Browse Source 
There're some graph improvements too:
1. the fly dots are smaller now
2. page tags have a different color
This commit is contained in:
Tienson Qin
2020-12-25 22:36:03 +08:00
parent 378d692eaa
commit a16d360611
6 changed files with 108 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
src/main/frontend/handler/graph.cljs
View File

@@ -21,21 +21,26 @@
edges)))
(defn- build-nodes
[dark? current-page edges nodes]
(mapv (fn [p]
(let [current-page? (= p current-page)
color (case [dark? current-page?]
[false false] "#222222"
[false true] "#045591"
[true false] "#8abbbb"
[true true] "#ffffff")] ; FIXME: Put it into CSS
{:id p
:name p
:val (get-connections p edges)
:autoColorBy "group"
:group (js/Math.ceil (* (js/Math.random) 12))
:color color}))
(set (flatten nodes))))
[dark? current-page edges tags nodes]
(let [pages (->> (set (flatten nodes))
(remove nil?))]
(mapv (fn [p]
(let [current-page? (= p current-page)
color (case [dark? current-page?] ; FIXME: Put it into CSS
[false false] "#222222"
[false true] "#045591"
[true false] "#8abbbb"
[true true] "#ffffff")
color (if (contains? tags (string/lower-case p))
(if dark? "orange" "green")
color)]
{:id p
:name p
:val (get-connections p edges)
:autoColorBy "group"
:group (js/Math.ceil (* (js/Math.random) 12))
:color color}))
pages)))
(defn- normalize-page-name
[{:keys [nodes links] :as g}]
@@ -62,6 +67,7 @@
(when-let [repo (state/get-current-repo)]
(let [relation (db/get-pages-relation repo show-journal?)
tagged-pages (db/get-all-tagged-pages repo)
tags (set (map second tagged-pages))
linked-pages (-> (concat
relation
tagged-pages)
@@ -86,7 +92,7 @@
(fn [[_ to]]
(nil? to))
nodes))
nodes (build-nodes dark? current-page edges nodes)]
nodes (build-nodes dark? current-page edges tags nodes)]
(normalize-page-name
{:nodes nodes
:links edges})))))
@@ -138,7 +144,7 @@
tags)
(remove nil?)
(distinct)
(build-nodes dark? page edges))]
(build-nodes dark? page edges (set tags)))]
(normalize-page-name
{:nodes nodes
:links edges})))))
@@ -172,6 +178,7 @@
(map first ref-blocks))
(remove nil?)
(distinct)
(build-nodes dark? block edges))]
;; FIXME: get block tags
(build-nodes dark? block edges #{}))]
{:nodes nodes
:links edges}))))