|
|
@ -2,7 +2,6 @@ import jsep from 'jsep'; |
|
|
|
|
|
|
|
|
|
|
|
import { ColumnType } from './Api'; |
|
|
|
import { ColumnType } from './Api'; |
|
|
|
import UITypes from './UITypes'; |
|
|
|
import UITypes from './UITypes'; |
|
|
|
import { formulaTypes } from '../../../nc-gui/utils'; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
export const jsepCurlyHook = { |
|
|
|
export const jsepCurlyHook = { |
|
|
|
name: 'curly', |
|
|
|
name: 'curly', |
|
|
@ -221,7 +220,7 @@ interface FormulaMeta { |
|
|
|
min?: number; |
|
|
|
min?: number; |
|
|
|
max?: number; |
|
|
|
max?: number; |
|
|
|
rqd?: number; |
|
|
|
rqd?: number; |
|
|
|
validator?: (args: formulaTypes[]) => boolean; |
|
|
|
validator?: (args: FormulaDataTypes[]) => boolean; |
|
|
|
}; |
|
|
|
}; |
|
|
|
}; |
|
|
|
}; |
|
|
|
description?: string; |
|
|
|
description?: string; |
|
|
@ -1180,6 +1179,7 @@ export function validateFormulaAndExtractTreeWithType( |
|
|
|
const result = validateAndExtract(parsedFormula); |
|
|
|
const result = validateAndExtract(parsedFormula); |
|
|
|
return result; |
|
|
|
return result; |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
/* |
|
|
|
|
|
|
|
|
|
|
|
function checkForCircularFormulaRef(formulaCol, parsedTree, columns) { |
|
|
|
function checkForCircularFormulaRef(formulaCol, parsedTree, columns) { |
|
|
|
// check circular reference
|
|
|
|
// check circular reference
|
|
|
@ -1272,3 +1272,4 @@ function checkForCircularFormulaRef(formulaCol, parsedTree, columns) { |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
*/ |
|
|
|