Просмотр исходного кода

Remove more usage of :block/schema

Tienson Qin 11 месяцев назад
Родитель
Сommit
639ca09f2e

+ 32 - 1
deps/db/src/logseq/db/frontend/property.cljs

@@ -58,6 +58,35 @@
   (apply
   (apply
    ordered-map
    ordered-map
    (defkeywords
    (defkeywords
+     :property/type {:title "Property type"
+                     :schema {:type :keyword
+                              :hide? true}}
+     :property/hide? {:title "Hide this property"
+                      :schema {:type :checkbox
+                               :hide? true}}
+     :property/public? {:title "Property public?"
+                        :schema {:type :checkbox
+                                 :hide? true}}
+     :property/view-context {:title "Property view context"
+                             :schema {:type :keyword
+                                      :hide? true}}
+     :property/ui-position {:title "Property position"
+                            :schema {:type :keyword
+                                     :hide? true}}
+     :logseq.property.attribute/property-schema-classes
+     {:title "Property classes"
+      :attribute :property/schema.classes
+      :schema {:type :entity
+               :cardinality :many
+               :public? false
+               :hide? true}}
+     :logseq.property.attribute/property-value-content
+     {:title "Property value"
+      :attribute :property.value/content
+      :schema {:type :any
+               :public? false
+               :hide? true}}
+
      :block/alias           {:title "Alias"
      :block/alias           {:title "Alias"
                              :attribute :block/alias
                              :attribute :block/alias
                              :schema {:type :page
                              :schema {:type :page
@@ -587,7 +616,9 @@
     :block/refs :block/path-refs :block/link
     :block/refs :block/path-refs :block/link
     :block/title :block/closed-value-property
     :block/title :block/closed-value-property
     :block/created-at :block/updated-at
     :block/created-at :block/updated-at
-    :logseq.property.attribute/kv-value})
+    :logseq.property.attribute/kv-value
+    :logseq.property.attribute/property-schema-classes
+    :logseq.property.attribute/property-value-content})
 
 
 (assert (= db-attribute-properties
 (assert (= db-attribute-properties
            (set (keep (fn [[k {:keys [attribute]}]] (when attribute k))
            (set (keep (fn [[k {:keys [attribute]}]] (when attribute k))

+ 1 - 1
src/main/frontend/components/property/value.cljs

@@ -254,7 +254,7 @@
                                                                                                   :logseq.task/scheduled-on-property)))))]
                                                                                                   :logseq.task/scheduled-on-property)))))]
        (if (= :logseq.task/deadline (:db/ident property))
        (if (= :logseq.task/deadline (:db/ident property))
          [:div "Set as repeated task"]
          [:div "Set as repeated task"]
-         [:div "Repeat " (if (= :date (get-in property [:block/schema :type])) "date" "datetime")])]]
+         [:div "Repeat " (if (= :date (:property/type property)) "date" "datetime")])]]
      [:div.flex.flex-row.gap-2
      [:div.flex.flex-row.gap-2
       [:div.flex.text-muted-foreground.mr-4
       [:div.flex.text-muted-foreground.mr-4
        "Every"]
        "Every"]

+ 1 - 1
src/main/frontend/worker/commands.cljs

@@ -155,7 +155,7 @@
         frequency (db-property/property-value-content (:logseq.task/recur-frequency entity))
         frequency (db-property/property-value-content (:logseq.task/recur-frequency entity))
         unit (:logseq.task/recur-unit entity)
         unit (:logseq.task/recur-unit entity)
         property (d/entity db property-ident)
         property (d/entity db property-ident)
-        date? (= :date (get-in property [:block/schema :type]))
+        date? (= :date (:property/type property))
         current-value (cond->
         current-value (cond->
                        (get entity property-ident)
                        (get entity property-ident)
                         date?
                         date?