Merge branch 'master' of https://gitee.com/sentcms/sentcms

# Conflicts:
#	public/static/admin/js/module/form.js
#	public/static/common/js/require-xlsx.js

public/static/admin/js/main.js

@@ -26,7 +26,7 @@ require.config({
 	paths: {
 		'sent': ['common/js/sent'],
 		'form': ['common/js/require-form'],
-		'xlsx': ['common/js/require-xlsx'],
+		'xlsxs': ['common/js/require-xlsx'],
 		'upload': 'common/js/require-upload',
 		'validator': 'common/js/require-validator',
 		'message': ['plugins/messager/messager'],
@@ -70,7 +70,7 @@ require.config({
 
 		// nanoscroller
 		'slimscroll': 'plugins/jquery-slimscroll/jquery.slimscroll',
-		'sheetjs': ['plugins/sheetjs/xlsx.full.min']
+		'xlsx': ['plugins/sheetjs/xlsx.full.min']
 	},
 	shim: {
 		'message': {deps: ['jquery', 'css!'+'plugins/messager/css/style.css']},

public/static/admin/js/module/form.js

@@ -1,15 +1,43 @@
-define(['jquery', 'sent', 'form', 'xlsx', 'sheetjs'], function($, sent, form, xlsx, xlsx2){
+define(['jquery', 'sent', 'form', 'xlsxs'], function($, sent, form, xlsxs){
+
+	var outList = [];
 
 	var formModule = {
 		lists: function(){
-			console.log('xlsx2')
 			if($('.btn-out').size() > 0){
 				$('.btn-out').click(function(e){
 					e.preventDefault();
 					var url = $(this).attr('href');
-					console.log(xlsx)
+					formModule.outXlsx(url)
 				})
 			}
+		},
+		outXlsx: function (url, page = 1){
+			var data = $('form').serialize();
+			var pagesize = $('select.pagesize').val() || 30;
+			data = data + '&out=1&pagesize='+pagesize+'&page='+page
+			$.ajax({
+				url: url,
+				data: data,
+				type: 'get',
+				beforeSend: function(){
+					sent.msg('正在导出第'+page+'页，请耐心等待，不要关闭浏览器');
+				},
+				error: function(){
+					sent.msg('导出失败！');
+				},
+				success:function(res){
+					outList = outList.concat(res.data);
+					if (res.last_page > page) {
+						formModule.outXlsx(url, page+1)
+					}else{
+						xlsxs.downloadExl(outList,res.file_name);
+						sent.msg('导出完成！');
+						setTimeout(function(){}, 3000);
+					}
+				},
+				dataType: 'json'
+			})
 		}
 	};