DatseMultimediaSites
/
misskey
mirror of https://github.com/misskey-dev/misskey.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

MisskeyPagesで値が0の変数が表示されない問題を修正

This commit is contained in:
syuilo 2019-04-29 11:08:35 +09:00
parent e86d0007c6
commit c886c09cdb
No known key found for this signature in database
GPG Key ID: BDC4C49D06AB9D69
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/client/app/common/scripts/aiscript.ts
View File

@ -316,8 +316,10 @@ export class AiScript {
@autobind @autobind
private interpolate(str: string, values: { name: string, value: any }[]) { private interpolate(str: string, values: { name: string, value: any }[]) {
return str.replace(/\{(.+?)\}/g, match => return str.replace(/\{(.+?)\}/g, match => {
(this.getVariableValue(match.slice(1, -1).trim(), values) || '').toString()); const v = this.getVariableValue(match.slice(1, -1).trim(), values);
return v == null ? 'NULL' : v.toString();
});
} }
@autobind @autobind

7
src/client/app/common/views/pages/page/page.vue
View File

@ -31,6 +31,7 @@ class Script {
constructor(aiScript) { constructor(aiScript) {
this.aiScript = aiScript; this.aiScript = aiScript;
this.vars = this.aiScript.evaluateVars(); this.vars = this.aiScript.evaluateVars();
console.log(this.vars);
} }
public reEval() { public reEval() {
@ -38,8 +39,10 @@ class Script {
} }
public interpolate(str: string) { public interpolate(str: string) {
return str.replace(/\{(.+?)\}/g, match => return str.replace(/\{(.+?)\}/g, match => {
(this.vars.find(x => x.name === match.slice(1, -1).trim()).value || '').toString()); const v = this.vars.find(x => x.name === match.slice(1, -1).trim()).value;
return v == null ? 'NULL' : v.toString();
});
} }
} }