dever 3 gadi atpakaļ
vecāks
revīzija
aabc0da267
1 mainītis faili ar 6 papildinājumiem un 2 dzēšanām
  1. 6 2
      src/Database.php

+ 6 - 2
src/Database.php

@@ -980,7 +980,7 @@ class Database
         # 增加下载报表按钮
         if (isset($config['manage']['excel'])) {
             $name = '导出数据';
-            if (is_string($config['manage']['excel'])) {
+            if (is_string($config['manage']['excel']) && !strstr($config['manage']['excel'], '.')) {
                 $name = $config['manage']['excel'];
             }
             $config['manage']['button'][$name] = 'onclick="jump(\''.$this->url('excel').'\', \'#form1\')"';
@@ -1643,7 +1643,11 @@ class Database
                 $method = 'excel';
                 $info = $this->info();
                 $data = $this->getAdminInfo($data);
-                $this->excel($info, $data, $config);
+                if (is_string($config['manage']['excel']) && strstr($config['manage']['excel'], '.')) {
+                    Dever::load($config['manage']['excel'], $data);
+                } else {
+                    $this->excel($info, $data, $config);
+                }
             }
         }