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/install.php

@@ -676,11 +676,11 @@ function show_msg($msg, $class = 'primary'){
 	ob_flush();
 }
 
-function session($name, $value = false){
+function session($name, $value = ''){
 	if ($name == '') {
 		return false;
 	}
-	if (false !== $value) {
+	if ('' !== $value) {
 		$_SESSION[$name] = $value;
 	}else{
 		return isset($_SESSION[$name]) ? $_SESSION[$name] : false;

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'
+			})
 		}
 	};
 

public/static/common/js/require-xlsx.js

@@ -1,5 +1,4 @@
-define(['jquery', 'sheetjs'], function($, XLSX) {
-
+define(['jquery', 'xlsx'], function($, xlsx) {
 	// var wopts = { bookType: 'csv', bookSST: false, type: 'binary' };//ods格式
 	var wopts = { bookType: 'xlsx', bookSST: false, type: 'binary' };//这里的数据是用来定义导出的格式类型
 	// var wopts = { bookType: 'ods', bookSST: false, type: 'binary' };//ods格式
@@ -10,8 +9,8 @@ define(['jquery', 'sheetjs'], function($, XLSX) {
 	var xls = {
 		downloadExl: function (data, fileName) {
 			var wb = { SheetNames: ['Sheet1'], Sheets: {}, Props: {} };
-			wb.Sheets['Sheet1'] = sheetjs.utils.json_to_sheet(data);//通过json_to_sheet转成单页(Sheet)数据
-			this.saveAs(new Blob([this.s2ab(sheetjs.write(wb, wopts))], { type: "application/octet-stream" }), fileName + '.' + (wopts.bookType=="biff2"?"xls":wopts.bookType));
+			wb.Sheets['Sheet1'] = xlsx.utils.json_to_sheet(data);//通过json_to_sheet转成单页(Sheet)数据
+			this.saveAs(new Blob([this.s2ab(xlsx.write(wb, wopts))], { type: "application/octet-stream" }), fileName + '.' + (wopts.bookType=="biff2"?"xls":wopts.bookType));
 		},
 
 		//如果使用 FileSaver.js 就不要同时使用以下函数
@@ -40,7 +39,7 @@ define(['jquery', 'sheetjs'], function($, XLSX) {
 			}
 		}
 	};
-	console.log(XLSX);
+
 	window.xls = xls;
 	return xls;
 });