edit

assets/layadmin/html/inc/script.html

@@ -35,5 +35,8 @@
 
 <script type="text/javascript" src="../script/lib/pic/holder.js"></script>
 
+<script type="text/javascript" src="../script/lib/excel/xlsx.min.js"></script>
+<script type="text/javascript" src="../script/lib/excel/excel.js"></script>
+
 <!-- 加载主要js，很乱，后续优化 -->
-<script type="text/javascript" src="../script/lib/manage/main.js?v110"></script>
+<script type="text/javascript" src="../script/lib/manage/main.js?v119"></script>

assets/layadmin/html/project/database/list.html

@@ -170,6 +170,7 @@
   <script class="include" system="" path="inc/" file="script">include()</script>
   <script id="list-thead-data">
     config.table = {};
+    config.table.limit = 20;
     config.table.cols = [];
   </script>
   <script id="list-tbody-data">
@@ -190,7 +191,7 @@
       table.render({
         elem: '#table'
         ,page: false
-        ,limit:20
+        ,limit:config.table.limit
         //,toolbar:'default'
         //,defaultToolbar:["filter","exports","print"]
         ,cols: config.table.cols

page/list.php

@@ -4,6 +4,18 @@ if (layadmin()) {
 	if ($page->page <= 1) {
 		$html->html = '<ul class="pagination layui-box layui-laypage layui-laypage-default" style="display:inline-flex;"><li><span class="layui-laypage-count">每页 '.$page->num.' 条，共 '.$page->total.' 条</span></li></ul>';
 	} else {
+		$select = '<select onchange="go(\'search_limit\', $(this).val())">';
+		$num = Dever::config('base')->page_num;
+		$search_limit = Dever::input('search_limit', 0);
+		
+		foreach($num as $k => $v) {
+			$check = '';
+			if ($search_limit == $k) {
+				$check = 'selected';
+			}
+			$select .= '<option value="'.$k.'" '.$check.'>'.$v.'</option>';
+		}
+		$select .= '</select>';
 		# 定义父节点的类型、属性等（整个page的节点）
 		$html->parent = array('ul', 'class="pagination layui-box layui-laypage layui-laypage-default" style="display:inline-flex;"');
 		# 定义子节点的类型、属性等（每个page的节点）
@@ -19,7 +31,7 @@ if (layadmin()) {
 		# 定义结束页
 		$html->end = array('末页', 'layui-laypage-last');
 		# 定义跳转页
-		$html->jump = '<li class="layui-laypage-skip"><input type="text" class="form-control" id="dever_page" style="margin-top:0px;width:50px;font-size: 12px;" value="'.$page->current().'" onclick="$(this).val(\'\')"/><a href="javascript:;" style="float:right;" class="" {click}>跳转</a></li><li><span class="layui-laypage-count">每页 '.$page->num.' 条，共 '.$page->total.' 条</span></li>';
+		$html->jump = '<li class="layui-laypage-skip"><input type="text" class="form-control" id="dever_page" style="margin-top:0px;width:50px;font-size: 12px;" value="'.$page->current().'" onclick="$(this).val(\'\')"/><a href="javascript:;" style="float:right;" class="" {click}>跳转</a></li><li><span class="layui-laypage-count">每页 '.$select.' 条，共 '.$page->page.' 页，共 '.$page->total.' 条</span></li>';
 		# 定义扩展信息
 		$html->ext = '';
 		# 生成

src/Database.php

@@ -1469,7 +1469,8 @@ class Database
             $config['manage']['num'] = $this->getNumConfig($config);
             
             if ($config['manage']['num']) {
-                $result = $this->num($result, $config['manage']['num']);
+                Dever::config('base')->page_num = $config['manage']['num'];
+                //$result = $this->num($result, $config['manage']['num']);
             }
         }
 
@@ -1516,7 +1517,7 @@ class Database
             return false;
         }
         if (!isset($config['manage']['num'])) {
-            $config['manage']['num'] = array(20,50,100);
+            $config['manage']['num'] = array(20,30,40,50,60,70,80,90,100);
         }
         return $config['manage']['num'];
     }
@@ -1528,6 +1529,7 @@ class Database
      */
     private function num($result, $config)
     {
+        return $result;
         $limit = '';
         $cur = Dever::input('search_limit', 0);
         foreach($config as $k => $v) {
@@ -1537,14 +1539,15 @@ class Database
                 $btn = 'default';
             }
             $url = $this->url('list', 0, false, '&search_limit=' . $k);
-            $limit .= '<a href="'.$url.'" style="width:60px;font-weight:bold;" class="btn btn-'.$btn.'">'.$v.'</a> ';
+            $limit .= '<a href="'.$url.'" style="width:60px;font-weight:bold;" class="btn btn-'.$btn.' layui-btn layui-btn-radius layui-btn-primary">'.$v.'</a> ';
         }
          
-        $num = '<div class="form-group layui-inline"><div style="padding-top:20px;margin-bottom: -30px;"><label style="color:#bababa;margin-left:8px;margin-right:10px;font-size:14px;font-weight:bold;">每页显示条数：</label>'.$limit.'</div></div>';
+        $num = '<div class="form-group layui-inline"><div style="padding-top:10px;margin-bottom: -10px;"><label style="color:#bababa;margin-left:8px;margin-right:10px;font-size:14px;font-weight:bold;">每页显示条数：</label>'.$limit.'</div></div>';
 
+        /*
         if (layadmin()) {
             $num = '';
-        }
+        }*/
 
         $result .= $num;
 
@@ -1768,11 +1771,11 @@ class Database
                 $data = $this->getAdminInfo($data);
                 $load = Dever::input('excel_load');
                 if ($load) {
-                    Dever::load($load, $data);
+                    return Dever::load($load, $data);
                 } elseif (is_string($config['manage']['excel']) && strstr($config['manage']['excel'], '.')) {
-                    Dever::load($config['manage']['excel'], $data);
+                    return Dever::load($config['manage']['excel'], $data);
                 } else {
-                    $this->excel($info, $data, $config);
+                    return $this->excel($info, $data, $config);
                 }
             }
         } else {
@@ -2279,7 +2282,7 @@ class Database
         }
 
         if ($excel == true) {
-            $method = $this->project . '/' . $this->table . '-all';
+            $method = $this->project . '/' . $this->table . '-list';//all
         } else {
             $method = $this->project . '/' . $this->table . '-list';
         }