test/amis2
1
0
Fork 0
mirror of https://gitee.com/baidu/amis.git synced 2024-12-05 05:28:37 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

filter 改放第二个参数

Browse Source
This commit is contained in:
2betop 2020-01-08 09:24:28 +08:00
parent 116154d1b0
commit 6bfa6bc502
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/utils/tpl.ts
View File

@ -53,10 +53,11 @@ export function evalExpression(expression: string, data?: object): boolean {
const fn = new Function(
'data',
'utils',
`with(data) {${debug ? 'debugger;' : ''}return !!(${expression});}`
);
data = data || {};
return fn.call(createObject(getFilters(), data), data);
return fn.call(data, data, getFilters());
} catch (e) {
console.warn(e);
return false;
@ -68,10 +69,11 @@ export function evalJS(js: string, data: object): any {
try {
const fn = new Function(
'data',
'utils',
`with(data) {${~js.indexOf('return') ? '' : 'return '}${js};}`
);
data = data || {};
return fn.call(createObject(getFilters(), data), data);
return fn.call(data, data, getFilters());
} catch (e) {
console.warn(e);
return null;