diff --git a/app/Module/TimeRange.php b/app/Module/TimeRange.php index 7bff37fa7..5b9b8d95f 100644 --- a/app/Module/TimeRange.php +++ b/app/Module/TimeRange.php @@ -15,7 +15,7 @@ class TimeRange public function __construct($data) { if (is_array($data)) { - $range = explode("-", str_replace([",", "|"], "-", $data['timerange'])); + $range = $this->format($data['timerange']); if ($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']; } } else { - $range = explode("-", str_replace([",", "|"], "-", $data)); + $range = $this->format($data); } // $updated = Base::isNumber($range[0]) ? intval($range[0]) : trim($range[0]); @@ -33,6 +33,18 @@ class TimeRange $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 * @return TimeRange diff --git a/resources/assets/js/store/utils.js b/resources/assets/js/store/utils.js index b67cd490d..47670ccfd 100644 --- a/resources/assets/js/store/utils.js +++ b/resources/assets/js/store/utils.js @@ -27,11 +27,12 @@ function __callData(key, requestData, state) { * @returns {*} */ 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 } /** + * @param total * @param current_page * @param deleted_id * @returns {Promise}