Merge branch 'master' into feat/capacitor-new

This commit is contained in:
charlie
2025-06-09 09:02:36 +08:00
31 changed files with 255 additions and 177 deletions

View File

@@ -281,14 +281,16 @@
(defn page-item
[repo page]
(let [entity (db/entity [:block/uuid (:block/uuid page)])
source-page (model/get-alias-source-page repo (:db/id entity))
source-page (or (model/get-alias-source-page repo (:db/id entity))
(:alias page))
icon (get-page-icon entity)
title (block-handler/block-unique-title page)
title' (if source-page (str title " -> alias: " (:block/title source-page)) title)]
(hash-map :icon icon
:icon-theme :gray
:text title'
:source-page (or source-page page))))
:source-page (or source-page page)
:alias (:alias page))))
(defn block-item
[repo block current-page input]
@@ -433,9 +435,11 @@
(defn- get-highlighted-page-uuid-or-name
[state]
(let [highlighted-item (some-> state state->highlighted-item)]
(or (:block/uuid (:source-block highlighted-item))
(:block/uuid (:source-page highlighted-item)))))
(let [highlighted-item (some-> state state->highlighted-item)
block (or (:alias highlighted-item)
(:source-block highlighted-item)
(:source-page highlighted-item))]
(:block/uuid block)))
(defmethod handle-action :open-page [_ state _event]
(when-let [page-name (get-highlighted-page-uuid-or-name state)]