From a2d9ee622891a7f2f35657658a70744b3f3a0580 Mon Sep 17 00:00:00 2001
From: hdm <hdm58@qq.com>
Date: Sat, 18 Mar 2023 12:19:27 +0800
Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E4=BA=8Elayui=E7=9A=84table=E6=A8=A1?=
 =?UTF-8?q?=E5=9D=97=E7=9A=84=E6=8F=92=E4=BB=B6tablePlus=EF=BC=8C=E4=B8=89?=
 =?UTF-8?q?=E6=AD=A5=E8=AE=BE=E7=BD=AE=E5=AE=8C=E6=88=90=E6=95=B0=E6=8D=AE?=
 =?UTF-8?q?=E5=AE=8C=E7=BE=8E=E5=AF=BC=E5=87=BA=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/customer/view/index/index.html             | 3 ++-
 app/project/view/task/index.html               | 3 ---
 public/static/assets/gougu/module/tablePlus.js | 5 +++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/customer/view/index/index.html b/app/customer/view/index/index.html
index a08f8c6..93a861b 100644
--- a/app/customer/view/index/index.html
+++ b/app/customer/view/index/index.html
@@ -83,7 +83,8 @@
 			elem: '#test',
 			title: '客户列表',
 			toolbar: '#toolbarDemo',
-			is_excel:true,	
+			is_excel:true,
+			excel_limit:2000,
 			url: "/customer/index/index", //数据接口
 			cellMinWidth: 80,
 			page: true, //开启分页
diff --git a/app/project/view/task/index.html b/app/project/view/task/index.html
index 284dc38..f4250c3 100644
--- a/app/project/view/task/index.html
+++ b/app/project/view/task/index.html
@@ -178,9 +178,6 @@
 		});
 		//监听搜索提交
 		form.on('submit(webform)', function (data) {
-			if (data.field.keywords == '') {
-				return false;
-			}
 			tableReload();
 			return false;
 		});
diff --git a/public/static/assets/gougu/module/tablePlus.js b/public/static/assets/gougu/module/tablePlus.js
index ef20560..45cd248 100644
--- a/public/static/assets/gougu/module/tablePlus.js
+++ b/public/static/assets/gougu/module/tablePlus.js
@@ -19,7 +19,7 @@ layui.define(['jquery','layer','table'], function(exports) {
 			else{
 				let _page = parseInt(data.count/page_size);
 				let page = data.count%page_size>0?(_page+1):_page;
-				let pageHtml='<p style="padding:16px 10px; text-align:center; color:red">由于导出数据比较消耗服务器资源，建议使用搜索功能筛选好数据再导出</p><p style="padding:0 10px; text-align:center;">共查询到<strong> '+data.count+' </strong>条数据，每次最多导出<strong>1000</strong>条，共<strong>'+page+'</strong>页，请点击下面的页码导出</p><div id="exportPage" class="layui-box layui-laypage" style="padding:10px 0; width:100%;text-align:center;">';
+				let pageHtml='<p style="padding:16px 10px; text-align:center; color:red">由于导出数据比较消耗服务器资源，建议使用搜索功能筛选好数据再导出</p><p style="padding:0 10px; text-align:center;">共查询到<strong> '+data.count+' </strong>条数据，每次最多导出<strong>'+page_size+'</strong>条，共<strong>'+page+'</strong>页，请点击下面的页码导出</p><div id="exportPage" class="layui-box layui-laypage" style="padding:10px 0; width:100%;text-align:center;">';
 				for (i = 1; i <= page; i++) {
 					pageHtml += '<a href="javascript:;" data-page="'+i+'">'+i+'</a>';
 				}
@@ -78,7 +78,8 @@ layui.define(['jquery','layer','table'], function(exports) {
 				}
 			}
 		}
-		tablePlus._render(params);
+		var init = tablePlus._render(params);
+		return init;
 		//console.log(params);
     };
     exports(MOD_NAME, tablePlus);