|
@@ -1020,13 +1020,17 @@ export function showErrorDialog(msg, sender?) {
|
|
export function evalFunction(data, express) {
|
|
export function evalFunction(data, express) {
|
|
const keys = []
|
|
const keys = []
|
|
const values = []
|
|
const values = []
|
|
|
|
+
|
|
_.forOwn(data, (value, key) => {
|
|
_.forOwn(data, (value, key) => {
|
|
|
|
+ const match = key.match(/\-|\*|\\|\/|\!|\@|\#|\$|\%|\^|\&|\*|\(|\)/i)
|
|
|
|
+ if(match){
|
|
|
|
+ key = key.substring(0, match.index)
|
|
|
|
+ }
|
|
keys.push(key)
|
|
keys.push(key)
|
|
values.push(value)
|
|
values.push(value)
|
|
})
|
|
})
|
|
|
|
|
|
const func = Function(...keys, 'return ' + express)
|
|
const func = Function(...keys, 'return ' + express)
|
|
-
|
|
|
|
try {
|
|
try {
|
|
return func(...values)
|
|
return func(...values)
|
|
} catch (e) {
|
|
} catch (e) {
|
|
@@ -1090,4 +1094,4 @@ export function getGridEditRows(grid) {
|
|
modifyRows,
|
|
modifyRows,
|
|
err: err
|
|
err: err
|
|
}
|
|
}
|
|
-}
|
|
|
|
|
|
+}
|