diff options
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/common/scripts/aiscript.ts | 6 | ||||
| -rw-r--r-- | src/client/app/common/views/pages/page/page.vue | 7 |
2 files changed, 9 insertions, 4 deletions
diff --git a/src/client/app/common/scripts/aiscript.ts b/src/client/app/common/scripts/aiscript.ts index aea89ff9a3..a3e499fc88 100644 --- a/src/client/app/common/scripts/aiscript.ts +++ b/src/client/app/common/scripts/aiscript.ts @@ -316,8 +316,10 @@ export class AiScript { @autobind private interpolate(str: string, values: { name: string, value: any }[]) { - return str.replace(/\{(.+?)\}/g, match => - (this.getVariableValue(match.slice(1, -1).trim(), values) || '').toString()); + return str.replace(/\{(.+?)\}/g, match => { + const v = this.getVariableValue(match.slice(1, -1).trim(), values); + return v == null ? 'NULL' : v.toString(); + }); } @autobind diff --git a/src/client/app/common/views/pages/page/page.vue b/src/client/app/common/views/pages/page/page.vue index 5ca58a6a4e..307ddf8db7 100644 --- a/src/client/app/common/views/pages/page/page.vue +++ b/src/client/app/common/views/pages/page/page.vue @@ -31,6 +31,7 @@ class Script { constructor(aiScript) { this.aiScript = aiScript; this.vars = this.aiScript.evaluateVars(); + console.log(this.vars); } public reEval() { @@ -38,8 +39,10 @@ class Script { } public interpolate(str: string) { - return str.replace(/\{(.+?)\}/g, match => - (this.vars.find(x => x.name === match.slice(1, -1).trim()).value || '').toString()); + return str.replace(/\{(.+?)\}/g, match => { + const v = this.vars.find(x => x.name === match.slice(1, -1).trim()).value; + return v == null ? 'NULL' : v.toString(); + }); } } |