github/dootask
1
0
Fork 0
mirror of https://github.com/kuaifan/dootask.git synced 2025-12-15 05:12:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

perf: 优化请求时间

Browse Source
This commit is contained in:
kuaifan 2024-01-15 22:11:24 +08:00
parent 569af135bd
commit 31efee2e97
2 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
app/Module/TimeRange.php
View File

@ -15,7 +15,7 @@ class TimeRange
public function __construct($data) public function __construct($data)
{ {
if (is_array($data)) { if (is_array($data)) {
$range = explode("-", str_replace([",", "|"], "-", $data['timerange'])); $range = $this->format($data['timerange']);
if ($data['updated_at'] || $data['at_after']) { if ($data['updated_at'] || $data['at_after']) {
$range[0] = $data['updated_at'] ?: $data['at_after']; $range[0] = $data['updated_at'] ?: $data['at_after'];
} }
@ -23,7 +23,7 @@ class TimeRange
$range[1] = $data['deleted_at']; $range[1] = $data['deleted_at'];
} }
} else { } else {
$range = explode("-", str_replace([",", "|"], "-", $data)); $range = $this->format($data);
} }
// //
$updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]); $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]);
@ -33,6 +33,18 @@ class TimeRange
$this->deleted = $deleted ? Carbon::parse($deleted) : null; $this->deleted = $deleted ? Carbon::parse($deleted) : null;
} }
/**
* @param $timerange
* - 格式1：2021-01-01 00:00:00,2021-01-01 23:59:59
* - 格式2：1612051200-1612137599
* @return array
*/
private function format($timerange)
{
$search = str_contains($timerange, ":") ? ["|"] : ["|", "-"];
return explode(",", str_replace($search, ",", $timerange));
}
/** /**
* @param $data * @param $data
* @return TimeRange * @return TimeRange

3
resources/assets/js/store/utils.js vendored
View File

@ -27,11 +27,12 @@ function __callData(key, requestData, state) {
* @returns {*} * @returns {*}
*/ */
this.get = () => { this.get = () => {
requestData.timerange = requestData.timerange || `${callData.updated}-${callData.deleted}` 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}`
return requestData return requestData
} }
/** /**
* @param total
* @param current_page * @param current_page
* @param deleted_id * @param deleted_id
* @returns {Promise<unknown>} * @returns {Promise<unknown>}