rabin 2 years ago
parent
commit
8431f87fcb

+ 22 - 19
assets/layadmin/html/project/database/list.html

@@ -19,10 +19,10 @@
 }
 
 .table th,.table td {
-  /*min-width: 70px;*/
+  min-width: 60px;
 }
 #table_2,#table_1 {
-  overflow: hidden;
+  overflow: auto;
 }
 .layui-btn-xs
 {
@@ -183,24 +183,27 @@
     var form = layui.form; 
     var formSelects = layui.formSelects;
 
+    if (config.table.cols.length > 0) {
+      console.info(config.table.cols);
+      table.render({
+        elem: '#table'
+        ,page: false
+        ,limit:20
+        ,cols: config.table.cols
+        ,data: config.table.data
+        ,done:function(res, curr, count) {
+            let headerTop = $('.layui-table-header').offset().top; //获取表格头到文档顶部的距离
+            $(window).scroll(function () {
+               if ((headerTop - $(window).scrollTop()) < 0) { //超过了
+                   $('.layui-table-header').addClass('table-header-fixed'); //添加样式,固定住表头
+               } else { //没超过
+                   $('.layui-table-header').removeClass('table-header-fixed'); //移除样式
+               }
+            });
+        }
+      });
+    }
     
-    table.render({
-      elem: '#table'
-      ,page: false
-      ,limit:20
-      ,cols: config.table.cols
-      ,data: config.table.data
-      ,done:function(res, curr, count) {
-          let headerTop = $('.layui-table-header').offset().top; //获取表格头到文档顶部的距离
-          $(window).scroll(function () {
-             if ((headerTop - $(window).scrollTop()) < 0) { //超过了
-                 $('.layui-table-header').addClass('table-header-fixed'); //添加样式,固定住表头
-             } else { //没超过
-                 $('.layui-table-header').removeClass('table-header-fixed'); //移除样式
-             }
-          });
-      }
-    });
     
 
     init();

+ 3 - 0
database/admin.php

@@ -567,6 +567,9 @@ return array
 
 	'manage' => array
 	(
+		# 表格使用html模式,默认是js渲染模式
+        //'list_table' => 'html',
+
 		'delete' => false,
 		// 载入自定义资源
 		'res' => array

+ 31 - 4
src/Database.php

@@ -1561,6 +1561,16 @@ class Database
 
         $config = $this->config();
 
+        if ($type == 'layui') {
+            if (isset($config['manage']['list_table'])) {
+                return false;
+            }
+        } else {
+            if (!isset($config['manage']['list_table'])) {
+                return '';
+            }
+        }
+
         $result = array();
 
         if (isset($config['struct'])) {
@@ -1710,11 +1720,18 @@ class Database
     {
         $html = 'config.table = {};config.table.cols = [];';
 
-        $data = array($this->list_thead('layui'));
-        $data = Dever::json_encode($data);
+        $data = $this->list_thead('layui');
+        if ($data) {
+            $data = array($data);
+            $data = Dever::json_encode($data);
 
-        $html .= 'config.table.cols = ' . $data;
-        return $html;
+            $html .= 'config.table.cols = ' . $data;
+            return $html;
+        } else {
+            $html .= 'config.table.cols = []';
+            return $html;
+        }
+        
     }
 
     # layui表的数据 没有使用其异步方式
@@ -2203,6 +2220,16 @@ class Database
 
         $config = $this->config();
 
+        if ($type == 'layui') {
+            if (isset($config['manage']['list_table'])) {
+                return array();
+            }
+        } else {
+            if (!isset($config['manage']['list_table'])) {
+                return '';
+            }
+        }
+
         $high = array();
         
         $search = Dever::load('manage/auth.oper', 2) ? Dever::preInput('search_') : false;

+ 2 - 6
template/layadmin/project/database/list.php

@@ -35,19 +35,17 @@ $view
 ->fetch('#desc',	'manage/database.info#listDesc', 'none')
  
 # 数据列表的标题 
-
 ->loop('#list-thead-data', 'manage/database.list_thead_layui')      
 
 # 数据列表 
 ->loop('#list-tbody-data','manage/database.list_tbody_layui')  
 
-/*
+
 # 数据列表的标题 
 ->loop('#list-thead tr', 'manage/database.list_thead')      
 
 # 数据列表 
 ->loop('#list-tbody','manage/database.list_tbody') 
-*/
 
 # 统计数据 
 ->loop('#stat_data','manage/database.list_data')  
@@ -82,9 +80,7 @@ $view
 ->fetch('#tables@value', 'manage/database.info#table')
 ->fetch('#menu@value', 'manage/database.info#menu')
 ->fetch('#menu_id@value', 'manage/database.info#menu_id')
-
-->fetch('#list-thead', ' ') 
-->fetch('#list-tbody', '')      
+    
 # 总数据 加在头部里吧
 //->fetch('#list-desc', '<{Dever::load("manage/database.info#list_desc")}>(共<{Dever::total("current")}>条)')