issue functionscope#41/functionscope#48

issue functionscope#38

Readme.md

@@ -1,5 +1,7 @@
-# excel-export #
+# excel-export2 #
 
+引用：[https://github.com/functionscope/Node-Excel-Export](https://github.com/functionscope/Node-Excel-Export)
+
 A simple node.js module for exporting data set to Excel xlsx file.
 
 ## Using excel-export ##

example/package.json

@@ -1,12 +1,12 @@
 {
-  "name": "Excel-export",
+  "name": "excel-export-example",
   "description": "Node Excel Export test app",
   "version": "0.3.1",
   "private": true,
   "dependencies": {
-    "excel-export": "0.3.9",
+    "excel-export2": "0.5.2",
     "express": "3.x",
     "node-uuid": "^1.4.1",
-    "node-zip": "1.x"
+    "jszip": "^2.6.0"
   }
 }

package.json

@@ -1,21 +1,21 @@
 {
-  "name": "excel-export",
-  "version": "0.5.1",
+  "name": "excel-export2",
+  "version": "0.5.2",
   "description": "Simple data set export to Excel xlsx file",
   "main": "index.js",
   "scripts": {
     "test": "mocha test/main"
   },
-  "repository": "https://github.com/functionscope/Node-Excel-Export",
+  "repository": "https://github.com/chendong0120/Node-Excel-Export",
   "keywords": [
     "Excel",
     "xlsx"
   ],
-  "author": "Ber-Lin Lai <berlin.lai@gmail.com>",
+  "author": "Kevin Chen <chendong0120@outlook.com>",
   "license": "BSD",
   "dependencies": {
-    "collections": "^3.0.0",
-    "node-zip": "1.x"
+    "collections": "^5.1.12",
+    "jszip": "^2.6.0"
   },
   "devDependencies": {
     "mocha": "",

sheet.js

@@ -1,16 +1,17 @@
-var sheetFront = '<?xml version="1.0" encoding="UTF-8" standalone="yes"?><x:worksheet xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main">' 
-		+ ' <x:sheetPr/><x:sheetViews><x:sheetView tabSelected="1" workbookViewId="0" /></x:sheetViews>' 
-		+ ' <x:sheetFormatPr defaultRowHeight="15" />';
+var sheetFront = '<?xml version="1.0" encoding="utf-8"?><x:worksheet xmlns:ss="urn:schemas-microsoft-com:office:spreadsheet" xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:x="http://schemas.openxmlformats.org/spreadsheetml/2006/main" '
+	+ 'xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" mc:Ignorable="x14ac" xmlns:x14ac="http://schemas.microsoft.com/office/spreadsheetml/2009/9/ac">'
+	+ ' <x:sheetPr/><x:sheetViews><x:sheetView tabSelected="1" workbookViewId="0" /></x:sheetViews>'
+	+ ' <x:sheetFormatPr defaultRowHeight="15" />';
 var sheetBack =' <x:pageMargins left="0.75" right="0.75" top="0.75" bottom="0.5" header="0.5" footer="0.75" />'
 		+ ' <x:headerFooter /></x:worksheet>';
-    
+
 var fs = require('fs');
 
 function Sheet(config, xlsx, shareStrings, convertedShareStrings){
   this.config = config;
   this.xlsx = xlsx;
   this.shareStrings = shareStrings;
-  this.convertedShareStrings = convertedShareStrings; 
+  this.convertedShareStrings = convertedShareStrings;
 }
 
 Sheet.prototype.generate = function(){

test/main.js

@@ -2,6 +2,14 @@
 var should = require('should');
 var nodeExcel = require('../index');
 
+Date.prototype.getJulian = function() {
+	return Math.floor((this / 86400000) - (this.getTimezoneOffset() / 1440) + 2440587.5);
+};
+
+Date.prototype.oaDate = function() {
+	return (this - new Date(Date.UTC(1899, 11, 30))) / (24 * 60 * 60 * 1000);
+};
+
 describe('Simple Excel xlsx Export', function() {
 	describe('Export', function() {
 		it('returns xlsx', function() {