From: Alan Date: Tue, 19 Jul 2022 06:59:39 +0000 (+0800) Subject: fix date type column X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=ef07772ae2edc7b3350f802bd17be363574ceee1 fix date type column --- diff --git a/SimpleExcel.php b/SimpleExcel.php index 6c36750e..3928a84a 100644 --- a/SimpleExcel.php +++ b/SimpleExcel.php @@ -394,7 +394,7 @@ class Pman_Core_SimpleExcel extends Pman // print_R(array($start_row+$r, $c, $v, $format));exit; // handle 0 prefixes.. - if (preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $v)) { + if ($dataFormat == 'date' || preg_match('/^[0-9]{4}-[0-9]{2}-[0-9]{2}$/', $v)) { $dataFormat = 'date'; $format = empty($format) ? $this->formats['_default_date_format_']: $format; $ut_to_ed_diff = 86400 * 25569;