* [story#59894,doing,0.5h] finish filter default value.

2024-07-25 09:29:44 +08:00
parent e4930f2a8f
commit bcda836b58
1 changed files with 19 additions and 1 deletions
@@ -552,7 +552,25 @@ class pivotState
            if(!isset($filterValues[$index])) continue;

            $default = $filterValues[$index];
-            if($filter['type'] == 'select' && is_array($default)) $default = array_filter($default);
+            $type    = $filter['type'];
+            if($type == 'select' && is_array($default)) $default = array_filter($default);
+            if($type == 'date' || $type == 'datetime')
+            {
+                if(is_array($default))
+                {
+                    $begin = $default['begin'];
+                    $end   = $default['end'];
+
+                    $begin = date('Y-m-d H:i:s', $begin / 1000);
+                    $end = date('Y-m-d H:i:s', $end / 1000);
+
+                    $default = array('begin' => $begin, 'end' => $end);
+                }
+                else
+                {
+                    $default = array('begin' => '', 'end' => '');
+                }
+            }
            $filter['default'] = $default;
            $filters[] = $filter;
        }