clone/logseq
1
0
Fork 0
mirror of https://github.com/logseq/logseq.git synced 2026-05-29 23:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'feat/db' into enhance/plugin-web

Browse Source
This commit is contained in:
charlie
2024-12-28 11:48:58 +08:00
parent ca03681754 8e07bea746
commit 91ef984f7a
24 changed files with 240 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/main/frontend/components/block.cljs
View File

@@ -19,8 +19,8 @@
[frontend.components.property.value :as pv]
[frontend.components.query :as query]
[frontend.components.query.builder :as query-builder-component]
[frontend.components.svg :as svg]
[frontend.components.select :as select]
[frontend.components.svg :as svg]
[frontend.config :as config]
[frontend.context.i18n :refer [t]]
[frontend.date :as date]
@@ -78,6 +78,7 @@
[logseq.common.util.page-ref :as page-ref]
[logseq.db :as ldb]
[logseq.db.frontend.content :as db-content]
[logseq.db.frontend.entity-plus :as entity-plus]
[logseq.graph-parser.block :as gp-block]
[logseq.graph-parser.mldoc :as gp-mldoc]
[logseq.graph-parser.text :as text]
@@ -2285,7 +2286,9 @@
;; highlight ref block (area)
(when area? [(hl-ref)])
(when (and (seq block-ast-title) (ldb/class-instance? (db/entity :logseq.class/Cards) block))
(when (and (seq block-ast-title) (ldb/class-instance?
(entity-plus/entity-memoized (db/get-db) :logseq.class/Cards)
block))
[(ui/tooltip
(shui/button
{:variant :ghost
@@ -2302,7 +2305,8 @@
(let [collapsed? (:collapsed? config)
block' (db/entity (:db/id block))
node-display-type (:logseq.property.node/display-type block')
query? (ldb/class-instance? (db/entity :logseq.class/Query) block')
db (db/get-db)
query? (ldb/class-instance? (entity-plus/entity-memoized db :logseq.class/Query) block')
query (:logseq.property/query block')
advanced-query? (and query? (= :code node-display-type))]
(cond
@@ -3278,7 +3282,8 @@
(rum/defc query-property-cp < rum/reactive db-mixins/query
[block config collapsed?]
(let [block (db/entity (:db/id block))
query? (ldb/class-instance? (db/entity :logseq.class/Query) block)]
db (db/get-db)
query? (ldb/class-instance? (entity-plus/entity-memoized db :logseq.class/Query) block)]
(when (and query? (not collapsed?))
(let [query-id (:db/id (:logseq.property/query block))
query (some-> query-id db/sub-block)
@@ -3497,7 +3502,7 @@
(db-properties-cp config block {:in-block-container? true})])
(when (and db-based? (not collapsed?) (not (or table? property?))
(ldb/class-instance? (db/entity :logseq.class/Query) block))
(ldb/class-instance? (entity-plus/entity-memoized (db/get-db) :logseq.class/Query) block))
(let [query-block (:logseq.property/query (db/entity (:db/id block)))
query-block (if query-block (db/sub-block (:db/id query-block)) query-block)
query (:block/title query-block)
@@ -3506,7 +3511,9 @@
[:div {:style {:padding-left 42}}
(query/custom-query (wrap-query-components (assoc config
:dsl-query? (not advanced-query?)
:cards? (ldb/class-instance? (db/entity :logseq.class/Cards) block)))
:cards? (ldb/class-instance? (entity-plus/entity-memoized
(db/get-db)
:logseq.class/Cards) block)))
(if advanced-query? result {:builder nil
:query (query-builder-component/sanitize-q query)}))]))

9
src/main/frontend/components/property.cljs
View File

@@ -2,7 +2,6 @@
"Block properties management."
(:require [clojure.set :as set]
[clojure.string :as string]
[dommy.core :as d]
[frontend.components.dnd :as dnd]
[frontend.components.icon :as icon-component]
[frontend.components.property.config :as property-config]
@@ -10,16 +9,16 @@
[frontend.components.property.value :as pv]
[frontend.components.select :as select]
[frontend.components.svg :as svg]
[frontend.handler.property.util :as pu]
[frontend.config :as config]
[frontend.db :as db]
[frontend.db.model :as db-model]
[frontend.db-mixins :as db-mixins]
[frontend.db.async :as db-async]
[frontend.db.model :as db-model]
[frontend.handler.db-based.property :as db-property-handler]
[frontend.handler.notification :as notification]
[frontend.handler.route :as route-handler]
[frontend.handler.editor :as editor-handler]
[frontend.handler.notification :as notification]
[frontend.handler.property.util :as pu]
[frontend.handler.route :as route-handler]
[frontend.mixins :as mixins]
[frontend.modules.shortcut.core :as shortcut]
[frontend.state :as state]