mirror of https://github.com/logseq/logseq
fix: sorting
parent
67bce113bb
commit
a21a61fde6
|
@ -43,12 +43,16 @@
|
||||||
(set-row-selection! new-selection)))
|
(set-row-selection! new-selection)))
|
||||||
|
|
||||||
(defn- column-toggle-sorting!
|
(defn- column-toggle-sorting!
|
||||||
[column set-sorting! sorting]
|
[column set-sorting! sorting {:keys [sort-by-one-column?]
|
||||||
|
:or {sort-by-one-column? true}}]
|
||||||
(let [id (:id column)
|
(let [id (:id column)
|
||||||
existing-column (some (fn [item] (when (= (:id item) id) item)) sorting)
|
existing-column (some (fn [item] (when (= (:id item) id) item)) sorting)
|
||||||
value' (if existing-column
|
value (if existing-column
|
||||||
(mapv (fn [item] (when (= (:id item) id) (update item :asc? not))) sorting)
|
(mapv (fn [item] (when (= (:id item) id) (update item :asc? not))) sorting)
|
||||||
(conj (if (vector? sorting) sorting (vec sorting)) {:id id :asc? true}))]
|
(conj (if (vector? sorting) sorting (vec sorting)) {:id id :asc? true}))
|
||||||
|
value' (if sort-by-one-column?
|
||||||
|
(filterv (fn [item] (when (= (:id item) id) item)) value)
|
||||||
|
value)]
|
||||||
(set-sorting! value')))
|
(set-sorting! value')))
|
||||||
|
|
||||||
(defn get-selection-rows
|
(defn get-selection-rows
|
||||||
|
@ -86,7 +90,7 @@
|
||||||
:row-selected? (fn [row] (row-selected? row row-selection))
|
:row-selected? (fn [row] (row-selected? row row-selection))
|
||||||
:row-toggle-selected! (fn [row value] (row-toggle-selected! row value set-row-selection! row-selection))
|
:row-toggle-selected! (fn [row value] (row-toggle-selected! row value set-row-selection! row-selection))
|
||||||
:toggle-selected-all! (fn [value] (toggle-selected-all! value set-row-selection!))
|
:toggle-selected-all! (fn [value] (toggle-selected-all! value set-row-selection!))
|
||||||
:column-toggle-sorting! (fn [column] (column-toggle-sorting! column set-sorting! sorting)))))
|
:column-toggle-sorting! (fn [column & {:as option}] (column-toggle-sorting! column set-sorting! sorting option)))))
|
||||||
|
|
||||||
(defn- get-prop-and-children
|
(defn- get-prop-and-children
|
||||||
[prop-and-children]
|
[prop-and-children]
|
||||||
|
|
|
@ -124,7 +124,7 @@
|
||||||
(ui/icon "trash-x")))]
|
(ui/icon "trash-x")))]
|
||||||
[:div.flex.items-center.gap-2
|
[:div.flex.items-center.gap-2
|
||||||
(shui/input
|
(shui/input
|
||||||
{:placeholder "Search pages..."
|
{:placeholder "Search pages"
|
||||||
:value input
|
:value input
|
||||||
:onChange (fn [e]
|
:onChange (fn [e]
|
||||||
(let [value (util/evalue e)]
|
(let [value (util/evalue e)]
|
||||||
|
|
Loading…
Reference in New Issue