dever hace 3 años
padre
commit
f6c35b8bd4
Se han modificado 1 ficheros con 24 adiciones y 17 borrados
  1. 24 17
      src/Database.php

+ 24 - 17
src/Database.php

@@ -1363,6 +1363,30 @@ class Database
                 $result .= Html::text($value, false);
             }
 
+            if (isset($config['manage']['search']['day'])) {
+                foreach ($config['manage']['search']['day'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'day');
+                }
+            }
+
+            if (isset($config['manage']['search']['date'])) {
+                foreach ($config['manage']['search']['date'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'date');
+                }
+            }
+
+            if (isset($config['manage']['search']['year'])) {
+                foreach ($config['manage']['search']['year'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'year');
+                }
+            }
+
+            if (isset($config['manage']['search']['month'])) {
+                foreach ($config['manage']['search']['month'] as $k => $v) {
+                    $this->list_search_time($result, $search, $prefix, $k, $v, 'month');
+                }
+            }
+
             if (isset($config['manage']['search']['sday'])) {
                 $result .= '<br />';
                 foreach ($config['manage']['search']['sday'] as $k => $v) {
@@ -1407,23 +1431,6 @@ class Database
                 $result .= '<button class="btn btn-primary layui-btn layuiadmin-btn-list layui-btn-primary sdate_button '.$s3.'" onclick="setDate($(this), 30)" type="button" style="height: 38px;margin-right:20px;margin-top:-4px;">30日</button><style>.sdate_button_border{border-color: #009688;}</style>';
 
                 $result .= '<input type="hidden" name="search_option_sdate" id="search_option_sdate" value="0">';
-            } elseif (isset($config['manage']['search']['day'])) {
-                $result .= '<br />';
-                foreach ($config['manage']['search']['day'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'day');
-                }
-            } elseif (isset($config['manage']['search']['date'])) {
-                foreach ($config['manage']['search']['date'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'date');
-                }
-            } elseif (isset($config['manage']['search']['year'])) {
-                foreach ($config['manage']['search']['year'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'year');
-                }
-            } elseif (isset($config['manage']['search']['month'])) {
-                foreach ($config['manage']['search']['month'] as $k => $v) {
-                    $this->list_search_time($result, $search, $prefix, $k, $v, 'month');
-                }
             }
 
             # 列表页按钮