clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-04-30 00:46:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

enhance: support user reschedule property other than Status

Browse Source
This commit is contained in:
Tienson Qin
2024-12-23 22:08:24 +08:00
parent c9ef716feb
commit 0a2628d125
5 changed files with 117 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -228,43 +228,48 @@
(property-value block (db/entity :logseq.task/repeated?)
(assoc opts
:on-checked-change (fn [value]
(db-property-handler/set-block-property! (:db/id block)
:logseq.task/reschedule-property
(if value (:db/id property) nil)))))]
(if value
(db-property-handler/set-block-property! (:db/id block)
:logseq.task/reschedule-property
(:db/id property))
(db-property-handler/remove-block-property! (:db/id block)
:logseq.task/reschedule-property)))))]
[:div "Set as repeated task"]]]
[:div.flex.flex-row.gap-2
[:div.flex.text-muted-foreground.mr-4
"Every"]
;; recur frequency
;; recur frequency
[:div.w-6
(property-value block (db/entity :logseq.task/recur-frequency) opts)]
;; recur unit
;; recur unit
[:div.w-20
(property-value block (db/entity :logseq.task/recur-unit) opts)]]
[:div.flex.flex-col.gap-2
[:div.text-muted-foreground
"When"]
[:div.flex.flex-col.gap-1
[:div.flex.flex-row.gap-2
;; property select
"Status"
[:div.text-muted-foreground
"is"]
;; value select
"Done"]
(let [properties (->>
(outliner-property/get-block-full-properties (db/get-db) (:db/id block))
(filter (fn [property]
(and (not (ldb/built-in? property))
(>= (count (:property/closed-values property)) 2))))
(concat [(db/entity :logseq.task/status)])
(util/distinct-by :db/id))
property-id (:db/id (:logseq.task/recur-status-property block))]
[:div.flex.flex-col.gap-2
[:div.flex.flex-row.gap-2
;; property select
[:div.text-muted-foreground
"Update it to"]
;; value select
"Todo"]]]]]))
[:div.text-muted-foreground
"Reschedule on:"]
(shui/select
(cond->
{:on-value-change (fn [v]
(db-property-handler/set-block-property! (:db/id block)
:logseq.task/recur-status-property
v))}
property-id
(assoc :default-value property-id))
(shui/select-trigger
(shui/select-value {:placeholder "Select a property"}))
(shui/select-content
(map (fn [choice]
(shui/select-item {:value (:db/id choice)} (:block/title choice))) properties)))])]))
(rum/defcs calendar-inner < rum/reactive db-mixins/query
(rum/local (str "calendar-inner-" (js/Date.now)) ::identity)