dennii/dbgate
1
0
Fork 0
mirror of https://github.com/DeNNiiInc/dbgate.git synced 2026-04-19 07:16:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

handle macro errors

Browse Source
This commit is contained in:
Jan Prochazka
2020-11-01 10:47:13 +01:00
parent 4efa87c3c8
commit cb0aee6476
5 changed files with 48 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/datalib/src/runMacro.ts
View File

@@ -25,9 +25,16 @@ export function runMacro(
macroArgs: {},
data: FreeTableModel,
preview: boolean,
selectedCells: MacroSelectedCell[]
selectedCells: MacroSelectedCell[],
errors: string[] = []
): FreeTableModel {
const func = eval(getMacroFunction[macro.type](macro.code));
let func;
try {
func = eval(getMacroFunction[macro.type](macro.code));
} catch (err) {
errors.push(`Error compiling macro ${macro.name}: ${err.message}`);
return data;
}
if (macro.type == 'transformValue') {
const selectedRows = _.groupBy(selectedCells, 'row');
const rows = data.rows.map((row, rowIndex) => {
@@ -38,7 +45,12 @@ export function runMacro(
for (const cell of selectedRow) {
const { column } = cell;
const oldValue = row[column];
const newValue = func(oldValue, macroArgs, modules, rowIndex, row, column);
let newValue = oldValue;
try {
newValue = func(oldValue, macroArgs, modules, rowIndex, row, column);
} catch (err) {
errors.push(`Error processing column ${column} on row ${rowIndex}: ${err.message}`);
}
if (newValue != oldValue) {
if (res == null) {
res = { ...row };