evalJs 优化是否补 return 的判断

2020-01-15 18:22:01 +08:00 · 2020-01-15 18:22:01 +08:00 · 4977813a06
parent dc24cd30e2
commit 4977813a06
1 changed files with 1 additions and 1 deletions
--- a/src/utils/tpl.ts
+++ b/src/utils/tpl.ts
@ -70,7 +70,7 @@ export function evalJS(js: string, data: object): any {
    const fn = new Function(
      'data',
      'utils',
-      `with(data) {${~js.indexOf('return') ? '' : 'return '}${js};}`
+      `with(data) {${/^\s*return\b/.test(js) ? '' : 'return '}${js};}`
    );
    data = data || {};
    return fn.call(data, data, getFilters());