greatbody
/
logseq
mirror of https://github.com/logseq/logseq
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix: add page type property value

pull/11311/head
Tienson Qin 2024-05-09 16:40:58 +08:00
parent 339883800d
commit 3e77b53b91
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/main/frontend/components/property/value.cljs
View File

@ -96,11 +96,10 @@
(exit-edit-property)))))) (exit-edit-property))))))
(defn- add-or-remove-property-value (defn- add-or-remove-property-value
[block property value selected? page?] [block property value selected?]
(let [many? (db-property/many? property)] (let [many? (db-property/many? property)]
(if selected? (if selected?
(let [value' (if page? (:block/uuid (db/entity value)) value)] (<add-property! block (:db/ident property) value {:exit-edit? (not many?)})
(<add-property! block (:db/ident property) value' {:exit-edit? (not many?)}))
(p/do! (p/do!
(db/transact! (state/get-current-repo) (db/transact! (state/get-current-repo)
[[:db/retract (:db/id block) (:db/ident property) value]] [[:db/retract (:db/id block) (:db/ident property) value]]
@ -330,7 +329,7 @@
(when-not (string/blank? page*) (when-not (string/blank? page*)
(p/let [id (<create-page-if-not-exists! property classes' page*)] (p/let [id (<create-page-if-not-exists! property classes' page*)]
(when id (when id
(add-or-remove-property-value block property id selected? true))))))}))] (add-or-remove-property-value block property id selected?))))))}))]
(select-aux block property opts'))) (select-aux block property opts')))
(defn property-value-select-page (defn property-value-select-page
@ -414,7 +413,7 @@
(remove nil?)) (remove nil?))
on-chosen (fn [chosen selected?] on-chosen (fn [chosen selected?]
(let [value (if (map? chosen) (:value chosen) chosen)] (let [value (if (map? chosen) (:value chosen) chosen)]
(add-or-remove-property-value block property value selected? false))) (add-or-remove-property-value block property value selected?)))
selected-choices' (get block (:db/ident property)) selected-choices' (get block (:db/ident property))
selected-choices (if (coll? selected-choices') selected-choices (if (coll? selected-choices')
(->> selected-choices' (->> selected-choices'
@ -817,13 +816,12 @@
[:div.multi-values.jtrigger [:div.multi-values.jtrigger
{:tab-index "0" {:tab-index "0"
:ref *el :ref *el
:on-click (fn [^js e] :on-click (fn [^js _e]
(when-not (.closest (.-target e) ".select-item")
(if config/publishing? (if config/publishing?
nil nil
(shui/popup-show! (rum/deref *el) content-fn (shui/popup-show! (rum/deref *el) content-fn
{:as-dropdown? true :as-content? false {:as-dropdown? true :as-content? false
:align "start" :auto-focus? true})))) :align "start" :auto-focus? true})))
:on-key-down (fn [^js e] :on-key-down (fn [^js e]
(case (.-key e) (case (.-key e)
(" " "Enter") (" " "Enter")