jsxls更新

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

@@ -1,5 +1,4 @@
-require(['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格式
@@ -9,10 +8,9 @@ require(['jquery', 'sheetjs'], function($, XLSX) {
 
 	var xls = {
 		downloadExl: function (data, fileName) {
-			checkFileIn();
 			var wb = { SheetNames: ['Sheet1'], Sheets: {}, Props: {} };
-			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));
+			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 就不要同时使用以下函数
@@ -42,18 +40,6 @@ require(['jquery', 'sheetjs'], function($, XLSX) {
 		}
 	};
 
-	checkFileIn = function(){
-		if($("script[src='/static/js/js-xlsx/xlsx.full.min.js']").length > 0){
-			return;
-		}else{
-			var body = $("body");
-			var script = $("<script>");
-			$(script).attr('type','text/javascript');
-			$(script).attr('src','/static/js/js-xlsx/xlsx.full.min.js');
-			$(body).append(script);
-		}
-	}
-
 	window.xls = xls;
 	return xls;
 });