Improve AiScript

src/client/app/common/views/components/page-editor/page-editor.script-block.vue

@@ -25,6 +25,9 @@
 	<section v-else-if="value.type === 'ref'" class="hpdwcrvs">
 		<select v-model="value.value">
 			<option v-for="v in aiScript.getVarsByType(getExpectedType ? getExpectedType() : null).filter(x => x.name !== name)" :value="v.name">{{ v.name }}</option>
+			<optgroup :label="$t('script.argVariables')">
+				<option v-for="v in fnSlots" :value="v.name">{{ v.name }}</option>
+			</optgroup>
 			<optgroup :label="$t('script.pageVariables')">
 				<option v-for="v in aiScript.getPageVarsByType(getExpectedType ? getExpectedType() : null)" :value="v">{{ v }}</option>
 			</optgroup>
@@ -33,11 +36,6 @@
 			</optgroup>
 		</select>
 	</section>
-	<section v-else-if="value.type === 'in'" class="hpdwcrvs">
-		<select v-model="value.value">
-			<option v-for="v in fnSlots" :value="v.name">{{ v.name }}</option>
-		</select>
-	</section>
 	<section v-else-if="value.type === 'fn'" class="" style="padding:0 16px 16px 16px;">
 		<ui-textarea v-model="slots">
 			<span>{{ $t('script.blocks._fn.slots') }}</span>
@@ -115,6 +113,7 @@ export default Vue.extend({
 		},
 		typeText(): any {
 			if (this.value.type === null) return null;
+			if (this.value.type.startsWith('fn:')) return this.value.type.split(':')[1];
 			return this.$t(`script.blocks.${this.value.type}`);
 		},
 	},

src/client/app/common/views/components/page-editor/page-editor.vue

@@ -77,6 +77,7 @@
 			<template v-if="moreDetails">
 				<ui-info><span v-html="$t('variables-info2')"></span></ui-info>
 				<ui-info><span v-html="$t('variables-info3')"></span></ui-info>
+				<ui-info><span v-html="$t('variables-info4')"></span></ui-info>
 			</template>
 		</div>
 	</ui-container>

src/client/app/common/views/pages/page/page.if.vue

@@ -1,5 +1,5 @@
 <template>
-<div v-show="script.vars.find(x => x.name === value.var).value">
+<div v-show="script.vars[value.var]">
 	<x-block v-for="child in value.children" :value="child" :page="page" :script="script" :key="child.id" :h="h"/>
 </div>
 </template>

src/client/app/common/views/pages/page/page.vue

@@ -27,7 +27,7 @@ import { url } from '../../../../config';
 
 class Script {
 	public aiScript: AiScript;
-	public vars: any;
+	public vars: Record<string, any>;
 
 	constructor(aiScript) {
 		this.aiScript = aiScript;
@@ -41,7 +41,7 @@ class Script {
 	public interpolate(str: string) {
 		if (str == null) return null;
 		return str.replace(/\{(.+?)\}/g, match => {
-			const v = this.vars.find(x => x.name === match.slice(1, -1).trim()).value;
+			const v = this.vars[match.slice(1, -1).trim()];
 			return v == null ? 'NULL' : v.toString();
 		});
 	}