|
@@ -1010,7 +1010,7 @@ class Database
|
|
|
}
|
|
|
|
|
|
# 增加下载报表按钮
|
|
|
- if (isset($config['manage']['excel'])) {
|
|
|
+ if (isset($config['manage']['excel']) && $config['manage']['excel']) {
|
|
|
$url = $this->url('excel');
|
|
|
if (is_array($config['manage']['excel'])) {
|
|
|
foreach ($config['manage']['excel'] as $k => $v) {
|
|
@@ -1566,11 +1566,11 @@ class Database
|
|
|
$config = $this->config();
|
|
|
|
|
|
if ($type == 'layui') {
|
|
|
- if (isset($config['manage']['list_table'])) {
|
|
|
+ if (!isset($config['manage']['list_table']) || (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'html')) {
|
|
|
return false;
|
|
|
}
|
|
|
} else {
|
|
|
- if (!isset($config['manage']['list_table'])) {
|
|
|
+ if (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'js') {
|
|
|
return '';
|
|
|
}
|
|
|
}
|
|
@@ -2234,11 +2234,11 @@ class Database
|
|
|
|
|
|
if (!$excel) {
|
|
|
if ($type == 'layui') {
|
|
|
- if (isset($config['manage']['list_table'])) {
|
|
|
+ if (!isset($config['manage']['list_table']) || (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'html')) {
|
|
|
return array();
|
|
|
}
|
|
|
} else {
|
|
|
- if (!isset($config['manage']['list_table'])) {
|
|
|
+ if (isset($config['manage']['list_table']) && $config['manage']['list_table'] == 'js') {
|
|
|
return '';
|
|
|
}
|
|
|
}
|