Merge branch 'dev' into master-fetch-dev

3 years ago · 0d52a8bc5e
parent 09ac83a62b f49a556953
commit 0d52a8bc5e
1 changed files with 6 additions and 0 deletions
--- a/src/utils/utils.ts
+++ b/src/utils/utils.ts
@ -298,6 +298,12 @@ export const JSONParse = (data: string) => {
  return JSON.parse(data, (k, v) => {
    if (typeof v === 'string' && v.indexOf && (v.indexOf('function') > -1 || v.indexOf('=>') > -1)) {
      return eval(`(function(){return ${v}})()`)
+    } else if (typeof v === 'string' && v.indexOf && (v.indexOf('return ') > -1)) {
+      const baseLeftIndex = v.indexOf('(')
+      if (baseLeftIndex > -1) {
+        const newFn = `function ${v.substring(baseLeftIndex)}`
+        return eval(`(function(){return ${newFn}})()`)
+      }
    }
    return v
  })