Skip to content

Commit 29d4803

Browse files
rpmeletmportuga
authored andcommitted
fix: export filter with time part ('date:"MM-dd-YYYY HH:mm').
1 parent ed76f02 commit 29d4803

File tree

1 file changed

+8
-7
lines changed

1 file changed

+8
-7
lines changed

packages/exporter/src/js/exporter.js

+8-7
Original file line numberDiff line numberDiff line change
@@ -1653,14 +1653,15 @@
16531653
}
16541654

16551655
function defaultExporterFieldCallback(grid, row, col, value) {
1656-
// fix to handle cases with 'number : 1' or 'date:MM-dd-YYYY', etc.. We needed to split the string
1656+
// fix to handle cases with 'number : 1' or 'date:"MM-dd-YYYY HH:mm"', etc.. We needed to split the string
16571657
if (col.cellFilter) {
1658-
var args, filter, arg1, arg2;
1659-
// remove space, single/double to mantein retro-compatibility
1660-
args = col.cellFilter.replace(/[\'\"\s]/g, "").split(':');
1661-
filter = args[0] ? args[0] : null;
1662-
arg1 = args[1] ? args[1] : null;
1663-
arg2 = args[2] ? args[2] : null;
1658+
var args, filter, arg1, arg2;
1659+
// Split on ':' except when in double quotes.
1660+
args = col.cellFilter.match(/(?:[^:"]+|"[^"]*")+/g);
1661+
// remove space, single/double to maintain retro-compatibility, but keep spaces in second argument (arg[1])
1662+
filter = args[0] ? args[0].replace(/[\'\"\s]/g, "") : null;
1663+
arg1 = args[1] ? args[1].replace(/[\'\"]/g, "").trim() : null;
1664+
arg2 = args[2] ? args[2].replace(/[\'\"\s]/g, "") : null;
16641665
return $filter(filter)(value, arg1, arg2);
16651666
} else {
16661667
return value;

0 commit comments

Comments
 (0)