mirror of https://github.com/logseq/logseq
enhance: put remove property after search results
parent
f4e251f655
commit
e7cd76644b
|
@ -234,12 +234,13 @@
|
||||||
(let [selected-choices (->> selected-choices
|
(let [selected-choices (->> selected-choices
|
||||||
(remove nil?)
|
(remove nil?)
|
||||||
(remove #(= :logseq.property/empty-placeholder %)))
|
(remove #(= :logseq.property/empty-placeholder %)))
|
||||||
clear-value (str "No " (:block/original-name property))
|
clear-value (str "Remove property " (:block/original-name property))
|
||||||
items' (->>
|
items' (->>
|
||||||
(if (and (seq selected-choices) (not multiple-choices?))
|
(if (and (seq selected-choices) (not multiple-choices?))
|
||||||
(cons {:value clear-value
|
(concat items
|
||||||
:label clear-value}
|
[{:value clear-value
|
||||||
items)
|
:label clear-value
|
||||||
|
:clear? true}])
|
||||||
items)
|
items)
|
||||||
(remove #(= :logseq.property/empty-placeholder (:value %))))
|
(remove #(= :logseq.property/empty-placeholder (:value %))))
|
||||||
k :on-chosen
|
k :on-chosen
|
||||||
|
|
|
@ -79,9 +79,12 @@
|
||||||
*toggle (::toggle state)
|
*toggle (::toggle state)
|
||||||
*selected-choices (::selected-choices state)
|
*selected-choices (::selected-choices state)
|
||||||
selected-choices (rum/react *selected-choices)
|
selected-choices (rum/react *selected-choices)
|
||||||
full-choices (->> (concat (map (fn [v] {:value v}) selected-choices) items)
|
full-choices (cond->>
|
||||||
(util/distinct-by-last-wins :value)
|
(->> (concat (map (fn [v] {:value v}) selected-choices) items)
|
||||||
(remove nil?))
|
(util/distinct-by-last-wins :value)
|
||||||
|
(remove nil?))
|
||||||
|
(seq @input)
|
||||||
|
(remove :clear?))
|
||||||
search-result' (->>
|
search-result' (->>
|
||||||
(cond-> (search/fuzzy-search full-choices @input :limit limit :extract-fn extract-fn)
|
(cond-> (search/fuzzy-search full-choices @input :limit limit :extract-fn extract-fn)
|
||||||
(fn? transform-fn)
|
(fn? transform-fn)
|
||||||
|
|
Loading…
Reference in New Issue