diff --git a/packages/datalib/src/runMacro.ts b/packages/datalib/src/runMacro.ts index 37a136f5b..83f516faf 100644 --- a/packages/datalib/src/runMacro.ts +++ b/packages/datalib/src/runMacro.ts @@ -16,7 +16,7 @@ const getMacroFunction = { ${code} } `, -transformData: (code) => ` + transformData: (code) => ` (rows, args, modules, selectedCells, cols, columns) => { ${code} } @@ -142,6 +142,7 @@ function runTramsformData( if (cols && !columns) { columns = cols.map((columnName) => ({ columnName })); } + columns = _.uniqBy(columns, 'columnName'); if (!preview) { rows = removePreviewRowFlags(rows); } diff --git a/packages/web/src/freetable/macros.js b/packages/web/src/freetable/macros.js index fba9dbbe2..f614dba4b 100644 --- a/packages/web/src/freetable/macros.js +++ b/packages/web/src/freetable/macros.js @@ -206,12 +206,12 @@ const resultRows = rows.map((row, rowIndex) => { }; const fields = { - year: mom.year(), - month: mom.month() + 1, - day: mom.day(), - hour: mom.hour(), - minute: mom.minute(), - second: mom.second(), + [args.year]: mom.year(), + [args.month]: mom.month() + 1, + [args.day]: mom.day(), + [args.hour]: mom.hour(), + [args.minute]: mom.minute(), + [args.second]: mom.second(), }; return {