瀏覽代碼

fix: page in :datetime value not created yet

Tienson Qin 1 年之前
父節點
當前提交
3862ff436a
共有 2 個文件被更改,包括 8 次插入3 次删除
  1. 6 2
      src/main/frontend/components/block.cljs
  2. 2 1
      src/main/frontend/components/property/value.cljs

+ 6 - 2
src/main/frontend/components/block.cljs

@@ -537,7 +537,7 @@
 
 
         :else
         :else
         (-> (or (:on-redirect-to-page config) route-handler/redirect-to-page!)
         (-> (or (:on-redirect-to-page config) route-handler/redirect-to-page!)
-            (apply [(:block/uuid page)])))))
+            (apply [(or (:block/uuid page) (:block/name page))])))))
   (when (and contents-page?
   (when (and contents-page?
              (util/mobile?)
              (util/mobile?)
              (state/get-left-sidebar-open?))
              (state/get-left-sidebar-open?))
@@ -780,7 +780,7 @@
   "Component for a page. `page` argument contains :block/name which can be (un)sanitized page name.
   "Component for a page. `page` argument contains :block/name which can be (un)sanitized page name.
    Keys for `config`:
    Keys for `config`:
    - `:preview?`: Is this component under preview mode? (If true, `page-preview-trigger` won't be registered to this `page-cp`)"
    - `: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?] :as config} page]
+  [state {:keys [label children preview? disable-preview? show-non-exists-page?] :as config} page]
   (let [entity (if (e/entity? page)
   (let [entity (if (e/entity? page)
                  page
                  page
                  ;; Use uuid when available to uniquely identify case sensitive contexts
                  ;; Use uuid when available to uniquely identify case sensitive contexts
@@ -815,6 +815,10 @@
         (and (:block/name page) (util/uuid-string? (:block/name page)))
         (and (:block/name page) (util/uuid-string? (:block/name page)))
         (invalid-node-ref (:block/name page))
         (invalid-node-ref (:block/name page))
 
 
+        (and (:block/name page) show-non-exists-page?)
+        (page-inner config {:block/title (:block/name page)
+                            :block/name (:block/name page)} children label)
+
         :else
         :else
         nil))))
         nil))))
 
 

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

@@ -306,7 +306,8 @@
            [:div.flex.flex-row.gap-1.items-center
            [:div.flex.flex-row.gap-1.items-center
             (when-let [page-cp (state/get-component :block/page-cp)]
             (when-let [page-cp (state/get-component :block/page-cp)]
               (let [page-title (date/journal-name (date/js-date->goog-date date))]
               (let [page-title (date/journal-name (date/js-date->goog-date date))]
-                (page-cp {:disable-preview? true}
+                (page-cp {:disable-preview? true
+                          :show-non-exists-page? true}
                          {:block/name page-title})))
                          {:block/name page-title})))
             [:span.opacity-50
             [:span.opacity-50
              (str (util/zero-pad (.getHours date))
              (str (util/zero-pad (.getHours date))