Răsfoiți Sursa

fix: datetime timezone

Tienson Qin 1 an în urmă
părinte
comite
15045ea0f7
1 a modificat fișierele cu 11 adăugiri și 6 ștergeri
  1. 11 6
      src/main/frontend/components/property/value.cljs

+ 11 - 6
src/main/frontend/components/property/value.cljs

@@ -235,7 +235,9 @@
                  (js/Date. value)
                  (js/Date. value)
 
 
                  :else
                  :else
-                 (js/Date.))
+                 (let [d (js/Date.)]
+                   (.setHours d 0 0 0)
+                   d))
         content-fn (fn [{:keys [id]}] (calendar-inner id
         content-fn (fn [{:keys [id]}] (calendar-inner id
                                                       {:on-change on-change
                                                       {:on-change on-change
                                                        :value value'
                                                        :value value'
@@ -280,12 +282,15 @@
 
 
          (number? value)
          (number? value)
          (when-let [date (js/Date. value)]
          (when-let [date (js/Date. value)]
-           [:div.flex.flex-row.gap-1
+           [: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/js-date->journal-title date)]
-               (page-cp {:disable-preview? true}
-                        {:block/name page-title})))
-            [:span (str (.getHours date) ":" (.getMinutes date))]])
+              (let [page-title (date/journal-name (date/js-date->goog-date date))]
+                (page-cp {:disable-preview? true}
+                         {:block/name page-title})))
+            [:span.opacity-50
+             (str (util/zero-pad (.getHours date))
+                  ":"
+                  (util/zero-pad (.getMinutes date)))]])
 
 
          :else
          :else
          (property-empty-btn-value nil))))))
          (property-empty-btn-value nil))))))