Browse Source

fix: datetime values not shown if their journal pages not exist

Tienson Qin 1 month ago
parent
commit
4b680bb737
2 changed files with 32 additions and 31 deletions
  1. 1 0
      deps/db/src/logseq/db/frontend/property.cljs
  2. 31 31
      src/main/frontend/components/block.cljs

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

@@ -580,6 +580,7 @@
                                                        :schema {:type :datetime
                                                                 :public? false
                                                                 :hide? true}
+                                                       :queryable? false
                                                        :rtc property-ignore-rtc})))
 
 (def db-attribute-properties

+ 31 - 31
src/main/frontend/components/block.cljs

@@ -992,38 +992,38 @@
    Keys for `config`:
    - `:preview?`: Is this component under preview mode? (If true, `page-preview-trigger` won't be registered to this `page-cp`)"
   [state {:keys [label children preview? disable-preview? show-non-exists-page? tag? _skip-async-load?] :as config} page]
-  (when-let [entity' (rum/react (:*entity state))]
-    (let [entity (or (db/sub-block (:db/id entity')) entity')
-          config (assoc config :block entity)]
-      (cond
-        entity
-        (let [page-name (some-> (:block/title entity) util/page-name-sanity-lc)
-              whiteboard-page? (model/whiteboard-page? entity)
-              inner (page-inner (assoc config :whiteboard-page? whiteboard-page?) entity children label)
-              modal? (shui-dialog/has-modal?)]
-          (if (and (not (util/mobile?))
-                   (not= page-name (:id config))
-                   (not (false? preview?))
-                   (not disable-preview?)
-                   (not modal?))
-            (page-preview-trigger (assoc config :children inner) entity)
-            inner))
-
-        (and (:block/name page) show-non-exists-page?)
-        (page-inner config (merge
-                            {:block/title (or (:block/title page)
-                                              (:block/name page))
-                             :block/name (:block/name page)}
-                            page) children label)
-
-        (:block/name page)
-        [:span (str (when tag? "#")
-                    (when-not tag? page-ref/left-brackets)
-                    (:block/name page)
-                    (when-not tag? page-ref/right-brackets))]
+  (let [entity' (rum/react (:*entity state))
+        entity (or (db/sub-block (:db/id entity')) entity')
+        config (assoc config :block entity)]
+    (cond
+      entity
+      (let [page-name (some-> (:block/title entity) util/page-name-sanity-lc)
+            whiteboard-page? (model/whiteboard-page? entity)
+            inner (page-inner (assoc config :whiteboard-page? whiteboard-page?) entity children label)
+            modal? (shui-dialog/has-modal?)]
+        (if (and (not (util/mobile?))
+                 (not= page-name (:id config))
+                 (not (false? preview?))
+                 (not disable-preview?)
+                 (not modal?))
+          (page-preview-trigger (assoc config :children inner) entity)
+          inner))
+
+      (and (:block/name page) show-non-exists-page?)
+      (page-inner config (merge
+                          {:block/title (or (:block/title page)
+                                            (:block/name page))
+                           :block/name (:block/name page)}
+                          page) children label)
+
+      (:block/name page)
+      [:span (str (when tag? "#")
+                  (when-not tag? page-ref/left-brackets)
+                  (:block/name page)
+                  (when-not tag? page-ref/right-brackets))]
 
-        :else
-        nil))))
+      :else
+      nil)))
 
 (rum/defc page-cp
   [config page]