From c3d53281541eefb4e211a25a1a5d0b308e875166 Mon Sep 17 00:00:00 2001 From: kuaifan Date: Thu, 14 Mar 2024 13:44:46 +0900 Subject: [PATCH] =?UTF-8?q?perf:=20=E4=BC=98=E5=8C=96=E6=8E=A5=E5=8F=A3?= =?UTF-8?q?=E6=97=B6=E9=97=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/Module/TimeRange.php | 5 +++-- resources/assets/js/store/utils.js | 2 +- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/app/Module/TimeRange.php b/app/Module/TimeRange.php index 5b9b8d95f..2e77b823d 100644 --- a/app/Module/TimeRange.php +++ b/app/Module/TimeRange.php @@ -29,8 +29,9 @@ class TimeRange $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]); $deleted = Base::isNumber($range[1]) ? intval($range[1]) : trim($range[1]); // - $this->updated = $updated ? Carbon::parse($updated) : null; - $this->deleted = $deleted ? Carbon::parse($deleted) : null; + $timezone = config('app.timezone'); + $this->updated = $updated ? Carbon::parse($updated)->setTimezone($timezone) : null; + $this->deleted = $deleted ? Carbon::parse($deleted)->setTimezone($timezone) : null; } /** diff --git a/resources/assets/js/store/utils.js b/resources/assets/js/store/utils.js index 47670ccfd..7e15d0642 100644 --- a/resources/assets/js/store/utils.js +++ b/resources/assets/js/store/utils.js @@ -27,7 +27,7 @@ function __callData(key, requestData, state) { * @returns {*} */ this.get = () => { - requestData.timerange = requestData.timerange || `${callData.updated ? $A.formatDate("Y-m-d H:i:s", callData.updated) : 0},${callData.deleted ? $A.formatDate("Y-m-d H:i:s", callData.deleted) : 0}` + requestData.timerange = requestData.timerange || `${callData.updated || 0},${callData.deleted || 0}` return requestData }