@lcap/nasl 2.21.0-beta.2 → 2.21.0-beta.3

package/sandbox/stdlib/nasl.util.ts

@@ -1,17 +1,20 @@
 declare namespace nasl.util {
     export function Convert(value: null): <T extends never>() => T;
-    export function Convert(value: nasl.core.Long): <T extends nasl.core.Decimal | nasl.core.Boolean   | nasl.core.String | nasl.core.DateTime>() => T;
-    export function Convert(value: nasl.core.Decimal): <T extends  nasl.core.Boolean | nasl.core.Long | nasl.core.String>() => T;
+    export function Convert(value: nasl.core.Integer): <T extends nasl.core.Decimal | nasl.core.Boolean | nasl.core.Double | nasl.core.Long | nasl.core.String>() => T;
+    export function Convert(value: nasl.core.Long): <T extends nasl.core.Decimal | nasl.core.Integer | nasl.core.String | nasl.core.Boolean | nasl.core.DateTime>() => T;
+    export function Convert(value: nasl.core.Double): <T extends nasl.core.Decimal | nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.String>() => T;
+    export function Convert(value: nasl.core.Decimal): <T extends nasl.core.String | nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Double>() => T;
+    export function Convert(value: nasl.core.Email): <T extends nasl.core.String>() => T;
     export function Convert(value: nasl.core.Binary): <T extends nasl.core.String>() => T;
-    export function Convert(value: nasl.core.String): <T extends nasl.core.Decimal | nasl.core.Date | nasl.core.Time | nasl.core.DateTime  | nasl.core.Long | nasl.core.Boolean>() => T;
+    export function Convert(value: nasl.core.String): <T extends nasl.core.Decimal | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Double | nasl.core.Integer | nasl.core.Long | nasl.core.Boolean>() => T;
     export function Convert(value: nasl.core.Date): <T extends nasl.core.DateTime | nasl.core.String>() => T;
     export function Convert(value: nasl.core.Time): <T extends nasl.core.String>() => T;
     export function Convert(value: nasl.core.DateTime): <T extends nasl.core.Date | nasl.core.Time | nasl.core.String | nasl.core.Long>() => T;
-    export function Convert(value: nasl.core.Boolean): <T extends nasl.core.String | nasl.core.Long | nasl.core.Decimal>() => T;
+    export function Convert(value: nasl.core.Boolean): <T extends nasl.core.String | nasl.core.Integer | nasl.core.Decimal>() => T;
     export function Convert(value: nasl.core.Any): <T extends nasl.core.String>() => T;
 
     export function ToString<T extends nasl.core.Any>(value: T): nasl.core.String;
-    export function FromString(value: nasl.core.String): <T extends nasl.core.Decimal | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Decimal | nasl.core.Long | nasl.core.Boolean>() => T;
+    export function FromString(value: nasl.core.String): <T extends nasl.core.Decimal | nasl.core.Date | nasl.core.Time | nasl.core.DateTime | nasl.core.Double | nasl.core.Integer | nasl.core.Long | nasl.core.Boolean>() => T;
     export function EnumToList<T extends nasl.core.Enums>(): nasl.collection.List<{ text: nasl.core.String, value: nasl.core.String }>;
     export function EnumValueToText<T extends nasl.core.Enums>(value: nasl.core.Enums): nasl.core.String;
     export function StringToEnumValue<T extends nasl.core.Enums>(value: nasl.core.String): T;
@@ -20,44 +23,44 @@ declare namespace nasl.util {
     export function Join(list: nasl.collection.List<nasl.core.Any>, seperator: nasl.core.String): nasl.core.String;
     // export function Concat(str1: nasl.core.Any, str2: nasl.core.Any): nasl.core.String;
     export function Concat(...args: nasl.core.Any): nasl.core.String;
-    export function Length(str1: nasl.core.String): nasl.core.Long;
-    export function Length<K, V>(str1: nasl.collection.Map<K, V>): nasl.core.Long;
-    export function Length<T>(str1: nasl.collection.List<T>): nasl.core.Long;
-    export function IndexOf(str: nasl.core.String, search: nasl.core.String, formIndex: nasl.core.Long, ignoreCase: nasl.core.Boolean): nasl.core.Long;
-    export function LastIndexOf(str: nasl.core.String, search: nasl.core.String, ignoreCase: nasl.core.Boolean): nasl.core.Long;
+    export function Length(str1: nasl.core.String): nasl.core.Integer;
+    export function Length<K, V>(str1: nasl.collection.Map<K, V>): nasl.core.Integer;
+    export function Length<T>(str1: nasl.collection.List<T>): nasl.core.Integer;
+    export function IndexOf(str: nasl.core.String, search: nasl.core.String, formIndex: nasl.core.Integer, ignoreCase: nasl.core.Boolean): nasl.core.Integer;
+    export function LastIndexOf(str: nasl.core.String, search: nasl.core.String, ignoreCase: nasl.core.Boolean): nasl.core.Integer;
     export function Replace(str: nasl.core.String, search: nasl.core.String, replace: nasl.core.String): nasl.core.String;
-    export function SubString(str: nasl.core.String, start: nasl.core.Long, length?: nasl.core.Long): nasl.core.String;
+    export function SubString(str: nasl.core.String, start: nasl.core.Integer, length?: nasl.core.Integer): nasl.core.String;
     export function ToLower(str1: nasl.core.String): nasl.core.String;
     export function ToUpper(str1: nasl.core.String): nasl.core.String;
     export function Trim(str1: nasl.core.String): nasl.core.String;
 
-    export function Get<T>(list: nasl.collection.List<T>, index: nasl.core.Long): T;
-    export function Set<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Long, item: K): T;
+    export function Get<T>(list: nasl.collection.List<T>, index: nasl.core.Integer): T;
+    export function Set<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Integer, item: K): T;
     export function Contains<T, K extends T>(list: nasl.collection.List<T>, item: K): nasl.core.Boolean;
     export function Add<T, K extends T>(list: nasl.collection.List<T>, item: K): void;
-    export function AddAll<T>(list: nasl.collection.List<T>, addList: nasl.collection.List<T>): nasl.core.Long;
-    export function Insert<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Long, item: K): void;
+    export function AddAll<T>(list: nasl.collection.List<T>, addList: nasl.collection.List<T>): nasl.core.Integer;
+    export function Insert<T, K extends T>(list: nasl.collection.List<T>, index: nasl.core.Integer, item: K): void;
     export function Remove<T, K extends T>(list: nasl.collection.List<T>, item: K): void;
-    export function RemoveAt<T>(list: nasl.collection.List<T>, index: nasl.core.Long): T;
+    export function RemoveAt<T>(list: nasl.collection.List<T>, index: nasl.core.Integer): T;
 
     export function ListHead<T>(list: nasl.collection.List<T>): T;
     export function ListLast<T>(list: nasl.collection.List<T>): T;
     export function ListFlatten<T>(list: nasl.collection.List<nasl.collection.List<T>>): nasl.collection.List<T>;
     export function ListTransform<T0, T>(list: nasl.collection.List<T0>, by: (elem: T0) => T): nasl.collection.List<T>;
-    export function ListToMap<T, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.List<T>, byKey: (elem: T) => K, byVal: (elem: T) => V): nasl.collection.Map<K, V>;
-    export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
+    export function ListToMap<T, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.List<T>, byKey: (elem: T) => K, byVal: (elem: T) => V): nasl.collection.Map<K, V>;
+    export function ListGroupBy<A, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<A>, by: (elem: A) => K): nasl.collection.Map<K, nasl.collection.List<A>>;
 
-    export function ListSum<T extends nasl.core.Long | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
-    export function ListProduct<T extends nasl.core.Long | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
-    export function ListMax<T extends nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<T>): T;
-    export function ListMin<T extends nasl.core.Long | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<T>): T;
+    export function ListSum<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
+    export function ListProduct<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal>(list: nasl.collection.List<T>): T;
+    export function ListMax<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<T>): T;
+    export function ListMin<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal | nasl.core.String>(list: nasl.collection.List<T>): T;
 
-    export function ListAverage<T extends nasl.core.Long | nasl.core.Decimal>(list: nasl.collection.List<T>): nasl.core.Decimal;
+    export function ListAverage<T extends nasl.core.Integer | nasl.core.Long | nasl.core.Double>(list: nasl.collection.List<T>): nasl.core.Double;
     export function ListAverage(list: nasl.collection.List<nasl.core.Decimal>): nasl.core.Decimal;
 
     export function ListSort<T>(list: nasl.collection.List<T>, by: (item: T) => any, sort: nasl.core.Boolean): void;
     export function ListFind<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): T;
-    export function ListFindIndex<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.core.Long;
+    export function ListFindIndex<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.core.Integer;
 
     export function ListFindAll<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.collection.List<T>;
     export function ListFilter<T>(list: nasl.collection.List<T>, by: (item: T) => nasl.core.Boolean): nasl.collection.List<T>;
@@ -65,8 +68,8 @@ declare namespace nasl.util {
     export function ListReverse<T>(list: nasl.collection.List<T>): void;
     export function ListDistinct<T>(list: nasl.collection.List<T>): void;
     export function ListDistinctBy<A, B>(list: nasl.collection.List<A>, by: (elem: A) => B): nasl.collection.List<A>;
-    export function ListSlice<T>(list: nasl.collection.List<T>, start: nasl.core.Long, end: nasl.core.Long): nasl.collection.List<T>;
-    export function SliceToListPage<T>(list: nasl.collection.List<T>, page: nasl.core.Long, size: nasl.core.Long): { list: nasl.collection.List<T>, total: nasl.core.Long };
+    export function ListSlice<T>(list: nasl.collection.List<T>, start: nasl.core.Integer, end: nasl.core.Integer): nasl.collection.List<T>;
+    export function SliceToListPage<T>(list: nasl.collection.List<T>, page: nasl.core.Integer, size: nasl.core.Integer): { list: nasl.collection.List<T>, total: nasl.core.Integer };
 
     export function MapGet<K, V>(map: nasl.collection.Map<K, V>, key: K): V;
     export function MapPut<K, V>(map: nasl.collection.Map<K, V>, key: K, value: V): void;
@@ -76,32 +79,32 @@ declare namespace nasl.util {
     export function MapValues<K, V>(map: nasl.collection.Map<K, V>): nasl.collection.List<V>;
     export function MapFilter<K, V>(map: nasl.collection.Map<K, V>, by: (key: K, value: V) => nasl.core.Boolean): nasl.collection.Map<K, V>;
     // 将元素类型为 K0, V0 的 Map 映射为元素类型为 K, V 的 Map
-    export function MapTransform<K0, V0, K extends nasl.core.Boolean | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.Map<K0, V0>, byKey: (key: K0, value: V0) => K, byVal: (key: K0, value: V0) => V): nasl.collection.Map<K, V>;
+    export function MapTransform<K0, V0, K extends nasl.core.Boolean | nasl.core.Integer | nasl.core.Long | nasl.core.Decimal | nasl.core.String, V>(map: nasl.collection.Map<K0, V0>, byKey: (key: K0, value: V0) => K, byVal: (key: K0, value: V0) => V): nasl.collection.Map<K, V>;
 
     export function CurrDate(): nasl.core.Date;
     export function CurrTime(): nasl.core.Time;
     export function CurrDateTime(): nasl.core.DateTime;
     export function FormatDate(date: nasl.core.Date, formatter: nasl.core.String): nasl.core.String;
     export function FormatDateTime(dateTime: nasl.core.DateTime, formatter: nasl.core.String): nasl.core.String;
-    export function FormatNumber(doubleValue: nasl.core.Decimal | nasl.core.Long, digits: nasl.core.Long, showGroups: nasl.core.Boolean): nasl.core.String;
-    export function AddDays(dateTime: nasl.core.Date, amount: nasl.core.Long): nasl.core.Date;
-    export function AddDays(dateTime: nasl.core.DateTime, amount: nasl.core.Long): nasl.core.DateTime;
-    export function AddMonths(dateTime: nasl.core.Date, amount: nasl.core.Long): nasl.core.Date;
-    export function AddMonths(dateTime: nasl.core.DateTime, amount: nasl.core.Long): nasl.core.DateTime;
-    export function DateDiff<T extends nasl.core.Date | nasl.core.Time | nasl.core.DateTime>(dateTime1: T, dateTime2: T, calcType: nasl.core.String): nasl.core.Long;
+    export function FormatNumber(doubleValue: nasl.core.Decimal | nasl.core.Double | nasl.core.Integer | nasl.core.Long, digits: nasl.core.Integer, showGroups: nasl.core.Boolean): nasl.core.String;
+    export function AddDays(dateTime: nasl.core.Date, amount: nasl.core.Integer): nasl.core.Date;
+    export function AddDays(dateTime: nasl.core.DateTime, amount: nasl.core.Integer): nasl.core.DateTime;
+    export function AddMonths(dateTime: nasl.core.Date, amount: nasl.core.Integer): nasl.core.Date;
+    export function AddMonths(dateTime: nasl.core.DateTime, amount: nasl.core.Integer): nasl.core.DateTime;
+    export function DateDiff<T extends nasl.core.Date | nasl.core.Time | nasl.core.DateTime>(dateTime1: T, dateTime2: T, calcType: nasl.core.String): nasl.core.Integer;
     export function Clone<T>(struct: T): T;
     export function Clear<T>(struct: T): T;
-    export function RandomInt(start: nasl.core.Long, end: nasl.core.Long): nasl.core.Long;
+    export function RandomInt(start: nasl.core.Integer, end: nasl.core.Integer): nasl.core.Integer;
     export function New<T>(): T;
     export function NewList<T>(...args: T[]): nasl.collection.List<T>;
-    export function NewMap<K extends nasl.core.String, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
-    export function NewMap<K extends nasl.core.Long, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
-    export function NewMap<K extends nasl.core.Boolean, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
-    export function NewMap<K extends nasl.core.Long, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
-    export function NewMap<K extends nasl.core.Decimal, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
-    export function NewMap<K extends nasl.core.None, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
-
-    export function CreateListPage<T>(list: nasl.collection.List<T>, total: nasl.core.Long): { list: nasl.collection.List<T>, total: nasl.core.Long };
+    export function NewMap<K, T>(key: K, ...args: T[]): nasl.collection.Map<K, T>;
+    export function ValidMapKey<K extends nasl.core.String>(key: K): K;
+    export function ValidMapKey<K extends nasl.core.Integer>(key: K): K;
+    export function ValidMapKey<K extends nasl.core.Boolean>(key: K): K;
+    export function ValidMapKey<K extends nasl.core.Long>(key: K): K;
+    export function ValidMapKey<K extends nasl.core.Decimal>(key: K): K;
+    export function ValidMapKey<K extends nasl.core.None>(key: K): K;
+    export function CreateListPage<T>(list: nasl.collection.List<T>, total: nasl.core.Integer): { list: nasl.collection.List<T>, total: nasl.core.Integer };
 
     export function consoleLog(arg: nasl.core.Any): void;
     export function jsonSerialize(arg: nasl.core.Any): nasl.core.String;
@@ -112,8 +115,6 @@ declare namespace nasl.util {
 
     // 处理携带了error的类型，去除掉error然后返回
     export function autoHandleError<T>(value: T): Exclude<T, nasl.ui.Error>;
-    export function Round(value: nasl.core.Decimal, moda: nasl.core.String): nasl.core.Long;
-
 }
 
 

package/sandbox/stdlib/nasl.validation.ts

@@ -1,10 +1,10 @@
 declare namespace nasl.validation {
-    export function minLength(min: nasl.core.Long): nasl.core.Boolean;
-    export function maxLength(min: nasl.core.Long): nasl.core.Boolean;
-    export function rangeLength(min: nasl.core.Long, max: nasl.core.Long): nasl.core.Boolean;
-    export function min(min: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
-    export function max(min: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
-    export function range(min: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime, max: nasl.core.Decimal | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
+    export function minLength(min: nasl.core.Integer): nasl.core.Boolean;
+    export function maxLength(min: nasl.core.Integer): nasl.core.Boolean;
+    export function rangeLength(min: nasl.core.Integer, max: nasl.core.Integer): nasl.core.Boolean;
+    export function min(min: nasl.core.Decimal | nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
+    export function max(min: nasl.core.Decimal | nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
+    export function range(min: nasl.core.Decimal | nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime, max: nasl.core.Decimal | nasl.core.Double | nasl.core.String | nasl.core.Date | nasl.core.DateTime): nasl.core.Boolean;
     export function pattern(re: nasl.core.String | RegExp): nasl.core.Boolean;
     export function is(arg: nasl.core.Any): nasl.core.Boolean;
     export function isNot(arg: nasl.core.Any): nasl.core.Boolean;
@@ -21,8 +21,8 @@ declare namespace nasl.validation {
     export function decimal(force?: nasl.core.Boolean, digits?: nasl.core.String): nasl.core.Boolean;
     export function ip(version: nasl.core.Decimal): nasl.core.Boolean;
     export function ipRange(version: nasl.core.Decimal): nasl.core.Boolean;
-    export function byteLength(min: nasl.core.Long, max: nasl.core.Long): nasl.core.Boolean;
-    export function divisibleBy(divisor: nasl.core.Long | nasl.core.Decimal): nasl.core.Boolean;
+    export function byteLength(min: nasl.core.Integer, max: nasl.core.Integer): nasl.core.Boolean;
+    export function divisibleBy(divisor: nasl.core.Integer | nasl.core.Long | nasl.core.Double | nasl.core.Decimal): nasl.core.Boolean;
     export function hash(algorithm?: nasl.core.String): nasl.core.Boolean;
     export function isbn(version: nasl.core.String): nasl.core.Boolean;
     export function iso8601(strict: nasl.core.Boolean): nasl.core.Boolean;

package/src/automate/engine/operators.js

@@ -162,7 +162,7 @@ export const ops = {
         }
         return item;
     },
-    _addModule(app, name, belongs, data) {
+    _addModule(app, frontend, name, belongs, data) {
         // const ms = app[belongs];
         // const exist = ms.find((m) => m.name === name);
         // if (!exist) {
@@ -172,10 +172,18 @@ export const ops = {
         if (app[method])
             app[method](data);
         else {
-            const ms = app[belongs];
-            const exist = ms.find((m) => m.name === name);
-            if (!exist) {
-                app['addModuleIn' + firstUpperCase(belongs)](data);
+            if (frontend && belongs === 'componentDependencies') {
+                const ms = frontend[belongs];
+                const exist = ms.find((m) => m.name === name);
+                if (!exist) {
+                    frontend.addModule(data);
+                }
+            } else {
+                const ms = app[belongs];
+                const exist = ms.find((m) => m.name === name);
+                if (!exist) {
+                    app['addModuleIn' + firstUpperCase(belongs)](data);
+                }
             }
         }
     },

package/src/automate/upgrader/2.20.js

@@ -21,6 +21,7 @@ const excludedKeySet = new Set([
 export function replace(script) {
     script = script.replace('execTemplate = function(app,', 'execTemplate = function(app, frontend, ');
     script = script.replace('_uniqueName.initAppUniqueNames(app);', '_uniqueName.initAppUniqueNames(app, frontend);');
+    script = script.replace('_addModule(app', '_addModule(app, frontend');
     return script;
 }
 

package/src/common/BaseNode.ts

@@ -15,10 +15,13 @@ import { Diagnostic } from '../manager/diagnostic';
 import { ViewElement, App, TypeAnnotation } from '..';
 import * as jsoner from '../service/storage/jsoner';
 
+import { sentryMonitorNaslNode } from '../sentry';
+
 /**
  * 顶点类
  * 属性均为只读，仅在初始化和 load 的情况下可以修改
  */
+@sentryMonitorNaslNode
 export class BaseNode extends EventEmitter {
     /**
      * 可修改标志，内部属性
@@ -810,7 +813,13 @@ export class BaseNode extends EventEmitter {
     async getCurrentTypeAnnotation(): Promise<any> {
         /* override */
     }
-
+    /**
+     * 获取当前节点的下一级内容
+     */
+    @action('获取当前节点的下一级内容')
+    getSelectRef(newTypeAnnotation: TypeAnnotation, needNewStructure = false): any {
+        /* override */
+    }
     /**
      * 销毁
      * 从 Map 中删除点和子节点
@@ -1026,6 +1035,28 @@ export class BaseNode extends EventEmitter {
         });
         return arr;
     }
+    get isTreeLeaf() {
+        if (this.concept === 'EntityProperty' || this.concept === 'InterfaceParam' || this.concept === 'Param'
+         || this.concept === 'Return' || this.concept === 'StructureProperty' || this.concept === 'Variable') {
+            return !this.hasChildren;
+        }
+        return false;
+    }
+    get hasChildren() {
+        const typeAnnotation = (this as any).typeAnnotation || this.__TypeAnnotation;
+        if (typeAnnotation) {
+            const { typeKind, typeNamespace, typeName } = typeAnnotation;
+            if (typeKind === 'reference' || typeKind === 'generic') {
+                if (typeNamespace.endsWith('.enums'))
+                    return null;
+                return [{}];
+            } else if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {
+                return [{}];
+            }
+            return null;
+        }
+        return null;
+    }
 }
 
 export default BaseNode;

package/src/concepts/Abort__.ts

@@ -39,9 +39,6 @@ export class Abort extends LogicItem {
         super(source);
         super.subConstructor(source);
     }
-    getClassName() {
-        return 'Abort';
-    }
 
     static from(source: any, parentNode?: any, parentKey?: string): Abort {
         return super.from(source, parentNode, parentKey) as Abort;
@@ -58,6 +55,10 @@ export class Abort extends LogicItem {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    toUI(): string {
+        return '中止';
+    }
+
     toJS(state?: TranslatorState): string {
         const code = `throw Error('程序中止');`;
         return code;

package/src/concepts/App__.ts

@@ -6,6 +6,7 @@ export interface AssetsInfo {
 
 import { queryNodeByPath } from '../service/storage/jsoner';
 import { getNaslNodeByNodeCallee, getNodeByNodeCallee } from '../automate/engine/utils';
+import ConfigProperty from './ConfigProperty__';
 import TypeAnnotation from './TypeAnnotation__';
 import View from './View__';
 interface MessageData {
@@ -16,7 +17,7 @@ interface MessageData {
     type: number
     resultName?: string,
 }
-import ConfigProperty from './ConfigProperty__';
+// import CallLogic from './CallLogic__';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -2459,43 +2460,6 @@ export class App extends BaseNode {
         this.emit('collect:end');
     }
 
-    getSelectRef(newTypeAnnotation: TypeAnnotation) {
-        try {
-            const { typeName, typeKind, typeNamespace, typeArguments } = newTypeAnnotation;
-            let completionChildren;
-            if (typeKind === 'reference') {
-                if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process' || typeNamespace === 'nasl.auth') {
-                    const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                    const properties = (node as Structure)?.properties || [];
-                    completionChildren = properties;
-                } else if (typeNamespace.endsWith('.enums')) {
-                    completionChildren = [];
-                } else {
-                    const node = getNodeByNodeCallee(this, typeNamespace + '.' + typeName);
-                    const properties = node?.properties || [];
-                    completionChildren = properties;
-                }
-            } else if (typeKind === 'generic') {
-                const node = getNaslNodeByNodeCallee(typeNamespace, typeName);
-                const properties = ((node as Structure)?.properties && [...(node as Structure)?.properties]) || [];
-                for (let i = 0; i < properties.length; i++) {
-                    const item = properties[i];
-                    if (item?.typeAnnotation?.typeKind === 'typeParam') {
-                        const newItem: any = BaseNode.from(item.toJSON());
-                        newItem.typeAnnotation = typeArguments[0];
-                        newItem.parentNode = this;
-                        properties[i] = newItem;
-                    }
-                }
-                completionChildren = properties;
-            } else {
-                completionChildren = [];
-            }
-            return completionChildren;
-        } catch (err) {
-            console.log(err);
-        }
-    }
     /* 判断接口是否有误，需要重新导出 */
 
     getQualifiedInterface(interfaces: Interface[] = this.interfaces): MessageData[] {

package/src/concepts/BindAttribute__.ts

@@ -942,7 +942,7 @@ export class BindAttribute extends BaseNode {
             } else {
                 value = this.expression?.toVue(options) || '';
             }
-        } else if (this.type === 'string') {
+        } else if (this.type === 'string') {     
             if (
                 (
                     this.name === 'destination' || (this.name === 'href' && value.startsWith('/'))
@@ -955,6 +955,22 @@ export class BindAttribute extends BaseNode {
                 && this.app?.sysPrefixPath
             ) {
                 value = `${this.app?.sysPrefixPath}${value}`;
+            } else {
+                let code = '';
+                if (typeof value === 'string') {
+                    code = value;
+                    if (options?.finalCode !== false) {
+                        code = value.replace(/['"`\\]/g, (m) => {
+                            const escape = '\\';
+                            if (m === '\\') {
+                                return `${escape}${escape}`;
+                            } else {
+                                return `${escape}${m}`;
+                            }
+                        });
+                    }
+                }
+                value = code;
             }
         }
         if (value !== undefined && value !== null && typeof value === 'string') {

package/src/concepts/BindEvent__.ts

@@ -748,39 +748,39 @@ export class BindEvent extends BaseNode {
     // 获取bindEvent上的logic的参数从上文获取
     getContextRenderLogicParams(logic: Logic) {
         const argsList: Param[] = [];
+        const virtualParams = logic.virtualParams;
         if (this.logics?.length) {
             let parent = this.parentNode;
             let index = 0;
-            const event = Param.from({ name: 'event' }, logic, 'virtualParams');
-            const typeString = this.getEventTypeString();
-            if (!typeString)
-                return argsList;
-            if (typeString && typeString.includes('nasl.ui')) {
-                const last = typeString.lastIndexOf('.');
-                event.typeAnnotation = TypeAnnotation.createReference(typeString.substring(last + 1, typeString.length), {
-                    typeNamespace: 'nasl.ui',
-                });
-            } else {
-                const last = typeString.lastIndexOf('.');
-                event.typeAnnotation = TypeAnnotation.createPrimitive(typeString.substring(last + 1, typeString.length), {
-                    typeNamespace: 'nasl.core',
-                });
-            }
+            const event = Param.from({ name: 'event', typeAnnotation: null }, logic, 'virtualParams');
             argsList.push(event);
-
             while (parent && parent.concept !== 'View') {
                 if ((parent as ViewElement).slotScope) {
-                    const param = Param.from({ name: index === 0 ? 'current' : 'current' + index }, logic, 'virtualParams');
-                    param.typeAnnotation = TypeAnnotation.createGeneric('Current', {
-                        typeNamespace: 'nasl.ui',
-                        typeArguments: [],
-                    });
+                    const param = Param.from({ name: index === 0 ? 'current' : 'current' + index, typeAnnotation: null }, logic, 'virtualParams');
                     argsList.push(param);
                     index++;
                 }
                 parent = parent.parentNode;
             }
         }
+        let haveDifference = false;
+        // 如果长度一样
+        if (virtualParams.length === argsList.length) {
+            // 那就看一下每一项的名字是不是变了
+            for (let i = 0; i < virtualParams.length; i++) {
+                if (virtualParams[i].name !== argsList[i].name) {
+                    haveDifference = true;
+                    break;
+                }
+            }
+            // 如果变了， 输出新的
+            if (haveDifference) {
+                return argsList;
+            }
+            // 如果没变,输出旧的不让树组件刷新
+            return virtualParams;
+        }
+        // 长度啥的都不一样，就输出新的
         return argsList;
     }
 

package/src/concepts/CallFunction__.ts

@@ -410,7 +410,6 @@ export class CallFunction extends LogicItem {
         }
     }
 
-
     toUI(): string {
         let code = this.calleeName;
         code += '(';