From 0aafe38a8da7d9c8e47c06d512c9b2ae9359a5b2 Mon Sep 17 00:00:00 2001 From: tensent Date: Sun, 12 Jul 2020 18:41:48 +0800 Subject: [PATCH] =?UTF-8?q?jsxls=E6=9B=B4=E6=96=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- public/static/admin/js/main.js | 4 +- public/static/admin/js/module/form.js | 17 + public/static/common/js/require-xlsx.js | 20 +- public/static/plugins/sheetjs/cpexcel.js | 14 +- public/static/plugins/sheetjs/jszip.js | 8 +- .../static/plugins/sheetjs/xlsx.core.min.js | 31 +- .../plugins/sheetjs/xlsx.extendscript.js | 2423 ++++------------- .../static/plugins/sheetjs/xlsx.full.min.js | 34 +- public/static/plugins/sheetjs/xlsx.js | 2415 ++++------------ public/static/plugins/sheetjs/xlsx.min.js | 26 +- 10 files changed, 1241 insertions(+), 3751 deletions(-) create mode 100644 public/static/admin/js/module/form.js diff --git a/public/static/admin/js/main.js b/public/static/admin/js/main.js index ce0b6282..48a38551 100644 --- a/public/static/admin/js/main.js +++ b/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']}, diff --git a/public/static/admin/js/module/form.js b/public/static/admin/js/module/form.js new file mode 100644 index 00000000..033aaef9 --- /dev/null +++ b/public/static/admin/js/module/form.js @@ -0,0 +1,17 @@ +define(['jquery', 'sent', 'form', 'xlsx', 'sheetjs'], function($, sent, form, xlsx, xlsx2){ + + 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) + }) + } + } + }; + + return formModule; +}) \ No newline at end of file diff --git a/public/static/common/js/require-xlsx.js b/public/static/common/js/require-xlsx.js index abfaec1e..be900a3c 100644 --- a/public/static/common/js/require-xlsx.js +++ b/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 = $("