Skip to content
This repository has been archived by the owner on Jul 25, 2021. It is now read-only.

Commit

Permalink
v3.3.11 - fix not able to sum number, closes #32
Browse files Browse the repository at this point in the history
  • Loading branch information
@clarketm
clarketm committed May 2, 2017
1 parent 818b49f commit 14c61cd
Show file tree
Hide file tree
Showing 12 changed files with 293 additions and 145 deletions.
2 changes: 1 addition & 1 deletion bower.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tableexport.js",
"version": "3.3.10",
"version": "3.3.11",
"authors": [
"clarketm <[email protected]>"
],
Expand Down
2 changes: 1 addition & 1 deletion dist/css/tableexport.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* TableExport.js v3.3.10 (https://www.travismclarke.com)
* TableExport.js v3.3.11 (https://www.travismclarke.com)
* Copyright 2017 Travis Clarke
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion dist/css/tableexport.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

210 changes: 107 additions & 103 deletions dist/js/tableexport.js
View file

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions dist/js/tableexport.min.js
View file

Large diffs are not rendered by default.

41 changes: 40 additions & 1 deletion dist/typings/tableexport.d.ts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -88,6 +88,12 @@ export class TableExport {
*/
txt: TXT;

/**
* Cell-types override and assertion configuration
* @memberof TableExport.prototype
*/
types: Types;

/**
* Escapes special characters with HTML entities
* @memberof TableExport.prototype
Expand All @@ -96,6 +102,23 @@ export class TableExport {
*/
escapeHtml: (string: string) => string;

/**
* Removes leading/trailing whitespace from cell string
* @memberof TableExport.prototype
* @param isTrimWhitespace {Boolean}
* @param string {String}
* @returns {String} trimmed string
*/
formatValue: (string: string) => string;

/**
* Get cell data-type
* @memberof TableExport.prototype
* @param string {String}
* @returns {String} data-type
*/
getType: (string: string) => string;

/**
* Formats datetimes for compatibility with Excel
* @memberof TableExport.prototype
Expand All @@ -111,7 +134,7 @@ export class TableExport {
* @param data {String}
* @returns {Number} epoch time
*/
createSheet: (data: string) => number;
createSheet: (data: string) => void;

/**
* Converts a string to an arraybuffer
Expand Down Expand Up @@ -225,6 +248,22 @@ export interface TXT {
fileExtension: string;
}

/**
* Cell-types override and assertion configuration
* @memberof TableExport.prototype
*/
export interface Types {
string: Type;
number: Type;
boolean: Type;
date: Type;
}

export interface Type {
defaultClass: string;
assert: (v: any) => boolean;
}

interface JQuery {

/**
Expand Down
2 changes: 1 addition & 1 deletion package.json
View file
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "tableexport",
"version": "3.3.10",
"version": "3.3.11",
"authors": [
"clarketm <[email protected]>"
],
Expand Down
2 changes: 1 addition & 1 deletion src/stable/css/tableexport.css
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* TableExport.js v3.3.10 (https://www.travismclarke.com)
* TableExport.js v3.3.11 (https://www.travismclarke.com)
* Copyright 2017 Travis Clarke
* Licensed under the MIT license
*/
Expand Down
2 changes: 1 addition & 1 deletion src/stable/css/tableexport.min.css
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

126 changes: 96 additions & 30 deletions src/stable/js/tableexport.js
View file
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*!
* TableExport.js v3.3.10 (https://www.travismclarke.com)
* TableExport.js v3.3.11 (https://www.travismclarke.com)
* Copyright 2017 Travis Clarke
* Licensed under the MIT license
*/
Expand Down Expand Up @@ -37,6 +37,7 @@
self.selectors = selectors;

var rowD = TableExport.prototype.rowDel,
isTrimWhitespace = self.settings.trimWhitespace,
ignoreRows = self.settings.ignoreRows instanceof Array ? self.settings.ignoreRows : [self.settings.ignoreRows],
ignoreCols = self.settings.ignoreCols instanceof Array ? self.settings.ignoreCols : [self.settings.ignoreCols],
ignoreCSS = self.settings.ignoreCSS instanceof Array ? self.settings.ignoreCSS.join(", ") : self.settings.ignoreCSS,
Expand Down Expand Up @@ -98,9 +99,15 @@
break;
}
}
return new Array(total).concat($(val).text());
return new Array(total).concat({
v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()),
t: TableExport.prototype.getType($(val).attr('class'))
});
}
return formatValue($(val).text());
return {
v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()),
t: TableExport.prototype.getType($(val).attr('class'))
};
}).get()];
}).get(),
dataObject = TableExport.prototype.escapeHtml(
Expand Down Expand Up @@ -149,9 +156,15 @@
break;
}
}
return new Array(total).concat($(val).text());
return new Array(total).concat({
v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()),
t: TableExport.prototype.getType($(val).attr('class'))
});
}
return formatValue($(val).text());
return {
v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()),
t: TableExport.prototype.getType($(val).attr('class'))
};
}).get()];
}).get(),
dataObject = TableExport.prototype.escapeHtml(
Expand Down Expand Up @@ -179,7 +192,10 @@
if ($(val).is(emptyCSS)) {
return " "
}
return formatValue($(val).text());
return {
v: TableExport.prototype.formatValue(isTrimWhitespace, $(val).text()),
t: TableExport.prototype.getType($(val).attr('class'))
};
}).get().join(colD);
}).get().join(rdel),
dataObject = TableExport.prototype.escapeHtml(
Expand Down Expand Up @@ -207,7 +223,7 @@
if ($(val).is(emptyCSS)) {
return " "
}
return '"' + formatValue($(val).text().replace(/"/g, '""')) + '"';
return '"' + TableExport.prototype.formatValue(isTrimWhitespace, $(val).text().replace(/"/g, '""')) + '"';
}).get().join(colD);
}).get().join(rdel),
dataObject = TableExport.prototype.escapeHtml(
Expand Down Expand Up @@ -235,7 +251,7 @@
if ($(val).is(emptyCSS)) {
return " "
}
return formatValue($(val).text());
return TableExport.prototype.formatValue(isTrimWhitespace, $(val).text());
}).get().join(colD);
}).get().join(rdel),
dataObject = TableExport.prototype.escapeHtml(
Expand All @@ -258,16 +274,6 @@
key && exporters[key](rowD, fileName);
}
);

/**
* Removes leading/trailing whitespace from cell string
* @param string {String}
* @returns {String} trimmed string
*/
function formatValue(string) {
return self.settings.trimWhitespace ? string.trim() : string;
}

/**
* Initializes table caption with export buttons
* @param exportButton {HTMLButtonElement}
Expand Down Expand Up @@ -309,7 +315,7 @@
* Version.
* @memberof TableExport.prototype
*/
version: "3.3.10",
version: "3.3.11",
/**
* Default plugin options.
* @memberof TableExport.prototype
Expand Down Expand Up @@ -400,6 +406,33 @@
mimeType: "text/plain",
fileExtension: ".txt"
},
/**
* Cell-types override and assertion configuration
* @memberof TableExport.prototype
*/
types: {
string: {
defaultClass: "tableexport-string"
},
number: {
defaultClass: "tableexport-number",
assert: function (v) {
return !isNaN(v.replace(/,/g, ''));
}
},
boolean: {
defaultClass: "tableexport-boolean",
assert: function (v) {
return v.toLowerCase() === 'true' || v.toLowerCase() === 'false';
}
},
date: {
defaultClass: "tableexport-date",
assert: function (v) {
return !isNaN(Date.parse(v))
}
}
},
/**
* Escapes special characters with HTML entities
* @memberof TableExport.prototype
Expand All @@ -411,6 +444,35 @@
return TableExport.prototype.entityMap[s];
});
},
/**
* Removes leading/trailing whitespace from cell string
* @param isTrimWhitespace {Boolean}
* @param string {String}
* @returns {String} trimmed string
*/
formatValue: function (isTrimWhitespace, string) {
return isTrimWhitespace ? string.trim() : string;
},
/**
* Get cell data-type
* @param string {String}
* @returns {String} data-type
*/
getType: function (string) {
if (!string) return '';
var types = TableExport.prototype.types;
if (~string.indexOf(types.string.defaultClass)) {
return 's';
} else if (~string.indexOf(types.number.defaultClass)) {
return 'n';
} else if (~string.indexOf(types.boolean.defaultClass)) {
return 'b';
} else if (~string.indexOf(types.date.defaultClass)) {
return 'd';
} else {
return '';
}
},
/**
* Formats datetimes for compatibility with Excel
* @memberof TableExport.prototype
Expand All @@ -427,29 +489,33 @@
* Creates an Excel spreadsheet from a data string
* @memberof TableExport.prototype
* @param data {String}
* @returns {Number} epoch time
*/
createSheet: function (data) {
var ws = {};
var range = {s: {c: 10000000, r: 10000000}, e: {c: 0, r: 0}};
for (var R = 0; R != data.length; ++R) {
for (var C = 0; C != data[R].length; ++C) {
var types = TableExport.prototype.types;
for (var R = 0; R !== data.length; ++R) {
for (var C = 0; C !== data[R].length; ++C) {
if (range.s.r > R) range.s.r = R;
if (range.s.c > C) range.s.c = C;
if (range.e.r < R) range.e.r = R;
if (range.e.c < C) range.e.c = C;
var cell = {v: data[R][C]};
if (cell.v == null) continue;
var cell = data[R][C];
if (!cell || !cell.v) continue;
var cell_ref = XLSX.utils.encode_cell({c: C, r: R});

if (typeof cell.v === 'number') cell.t = 'n';
else if (typeof cell.v === 'boolean') cell.t = 'b';
else if (cell.v instanceof Date) {
if (!cell.t) {
if (types.number.assert(cell.v)) cell.t = 'n';
else if (types.boolean.assert(cell.v)) cell.t = 'b';
else if (types.date.assert(cell.v)) cell.t = 'd';
else cell.t = 's';
}

if (cell.t === 'd') {
cell.t = 'n';
cell.z = XLSX.SSF._table[14];
cell.v = this.dateNum(cell.v);
}
else cell.t = 's';

ws[cell_ref] = cell;
}
Expand All @@ -475,7 +541,7 @@
string2ArrayBuffer: function (s) {
var buf = new ArrayBuffer(s.length);
var view = new Uint8Array(buf);
for (var i = 0; i != s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
for (var i = 0; i !== s.length; ++i) view[i] = s.charCodeAt(i) & 0xFF;
return buf;
},
/**
Expand All @@ -487,7 +553,7 @@
* @param extension {String} file extension
*/
export2file: function (data, mime, name, extension) {
if (XLSX && extension.substr(0, 4) == (".xls")) {
if (XLSX && extension.substr(0, 4) === (".xls")) {
var wb = new this.Workbook(),
ws = this.createSheet(data);

Expand Down
Loading

0 comments on commit 14c61cd

Please sign in to comment.