Mizah/mizzkey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
syuilo 2019-04-29 11:11:17 +09:00
commit 8836bd4f3b
No known key found for this signature in database
GPG key ID: BDC4C49D06AB9D69
5 changed files with 17 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/client/app/common/scripts/aiscript.ts
View file

@ -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
@ -445,7 +447,7 @@ export class AiScript {
}
if (AiScript.envVarsDef[name]) {
return this.envVars[name].value;
return this.envVars[name];
}
throw new Error(`Script: No such variable '${name}'`);

6
src/client/app/common/views/pages/page/page.vue
View file

@ -38,8 +38,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();
});
}
}