Browse Source

enhance: drop -page for filter properties

Tienson Qin 1 năm trước cách đây
mục cha
commit
214eefbf67

+ 8 - 6
deps/db/src/logseq/db/frontend/property.cljs

@@ -86,12 +86,14 @@
    :logseq.property/order-list-type {:name :logseq.order-list-type
                                      :schema {:type :default
                                               :hide? true}}
-   :logseq.property.linked-references/included-pages {:schema {:type :page
-                                                               :cardinality :many
-                                                               :hide? true}}
-   :logseq.property.linked-references/excluded-pages {:schema {:type :page
-                                                               :cardinality :many
-                                                               :hide? true}}
+   :logseq.property.linked-references/includes {:schema {
+                                                         ; could be :entity to support blocks(objects) in the future
+                                                         :type :page
+                                                         :cardinality :many
+                                                         :hide? true}}
+   :logseq.property.linked-references/excludes {:schema {:type :page
+                                                         :cardinality :many
+                                                         :hide? true}}
    :logseq.property.tldraw/page {:name :logseq.tldraw.page
                                  :schema {:type :map
                                           :hide? true}}

+ 4 - 4
src/main/frontend/handler/page.cljs

@@ -260,8 +260,8 @@
 (defn get-filters
   [page]
   (if (config/db-based-graph? (state/get-current-repo))
-    (let [included-pages (:logseq.property.linked-references/included-pages page)
-          excluded-pages (:logseq.property.linked-references/excluded-pages page)]
+    (let [included-pages (:logseq.property.linked-references/includes page)
+          excluded-pages (:logseq.property.linked-references/excludes page)]
       {:included included-pages
        :excluded excluded-pages})
     (let [k :filters
@@ -288,8 +288,8 @@
   [page filter-page-id {:keys [include? add?]}]
   (let [repo (state/get-current-repo)
         property-id (if include?
-                      :logseq.property.linked-references/included-pages
-                      :logseq.property.linked-references/excluded-pages)]
+                      :logseq.property.linked-references/includes
+                      :logseq.property.linked-references/excludes)]
     (if add?
       (property-handler/set-block-property! repo (:db/id page) property-id filter-page-id)
       (db-property-handler/delete-property-value! (:db/id page) property-id filter-page-id))))