Merge branch 'feat/db' of https://github.com/logseq/logseq into feat/db

pull/11102/head
charlie 2024-03-04 17:45:01 +08:00
commit e13ae5fca2
2 changed files with 2 additions and 11 deletions

View File

@ -171,7 +171,7 @@
[:label.col-span-1 "Name:"]
(shui/input
{:class "col-span-2 !px-2 !py-0 !h-8"
:auto-focus true
:auto-focus (not add-new-property?)
:on-change #(reset! *property-name (util/evalue %))
:on-blur save-property-fn
:on-key-press (fn [e]

View File

@ -478,16 +478,7 @@
(when-let [conn (worker-state/get-datascript-conn repo)]
(let [ops (edn/read-string ops-str)
opts (edn/read-string opts-str)
start-tx (:max-tx @conn)
result (outliner-op/apply-ops! repo conn ops (worker-state/get-date-formatter repo) opts)
end-tx (:max-tx @conn)]
(when (= start-tx end-tx) ; nothing changes
;; remove task from ldb/*request-id->response
(worker-util/post-message :sync-db-changes (pr-str
{:request-id (:request-id opts)
:repo repo
:tx-data []
:tx-meta nil})))
result (outliner-op/apply-ops! repo conn ops (worker-state/get-date-formatter repo) opts)]
(pr-str result))))
(file-writes-finished?