@lcap/nasl 1.0.0-alpha.8 → 1.0.0-alpha.9

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@lcap/nasl",
   "description": "NetEase Application Specific Language",
-  "version": "1.0.0-alpha.8",
+  "version": "1.0.0-alpha.9",
   "author": "Forrest <rainforest92@126.com>",
   "scripts": {
     "dev": "tsc -watch -p ./",

package/src/automate/engine/index.js

@@ -1,8 +1,8 @@
 // const { v4: uuidv4 } = require('uuid');
 const { uniq, omit } = require('lodash');
-const { BaseNode } = require('../../common/BaseNode');
+const { BaseNode } = require('../../../out/common/BaseNode');
 const { tracking, TRACK_TYPE, IGNORE_PROPERTY } = require('./utils');
-const { getConceptConstructor, getConceptMeta } = require('../../decorators/index');
+const { getConceptConstructor, getConceptMeta } = require('../../../out/decorators/index');
 let id = 0;
 class TemplateMeta {
     constructor(node) {
@@ -38,7 +38,10 @@ class TemplateMeta {
     addPlainBinds(propertyName, value) {
         // this.node.[propertyName] = value
         if (typeof value === 'string') {
-            value = value.split(/\n/).map(c => `"${c}"`).join(" +\n");
+            value = value
+                .split(/\n/)
+                .map((c) => `"${c}"`)
+                .join(' +\n');
         }
         if (typeof value === 'object') {
             value = JSON.stringify(value);

package/src/automate/engine/utils.js

@@ -2,8 +2,8 @@
 //     BaseNode,
 //     Module
 // } from '../../concepts';
-const { BaseNode } = require('../../concepts');
-const { getConceptMeta } = require('../../decorators/index');
+const { BaseNode } = require('../../../out/concepts');
+const { getConceptMeta } = require('../../../out/decorators/index');
 
 /*
     根据 namespace 字符串来获取 node

package/src/common/BaseNode.ts

@@ -168,13 +168,10 @@ export class BaseNode extends EventEmitter {
     subConstructor(source?: Partial<BaseNode>) {
         const propertyMap = getConceptPropertyMap(this.constructor.name);
 
-        const properties = Array.from(new Set([...Object.keys(this), ...Object.keys(source)])).filter((key) => {
-            const property = propertyMap.get(key);
-            return !!property;
-        });
+        const properties = Array.from(new Set([...Object.keys(this), ...Object.keys(source)])).filter((key) => propertyMap.has(key));
         properties.forEach((key) => {
             const property = propertyMap.get(key);
-            const sourceItem = (source as any)[key] || (this as any)[key];
+            const sourceItem = (source as any)[key] ?? (this as any)[key];
             const { objectRef: propertyObjectRef } = property;
             let objectRefCtor;
             try {
@@ -250,15 +247,7 @@ export class BaseNode extends EventEmitter {
             if (!$event.eventStop) {
                 $event.eventList.push($event);
                 // 页面逻辑需要冒泡到页面
-                if ([
-                    'Process',
-                    'View',
-                    'Interface',
-                    'Entity',
-                    'Structure',
-                    'Enum',
-                    'ConfigProperty',
-                ].includes(this.concept) || this.concept === 'Logic' && this.parentNode?.concept !== 'View') {
+                if (['Process', 'View', 'Interface', 'Entity', 'Structure', 'Enum', 'ConfigProperty'].includes(this.concept) || (this.concept === 'Logic' && this.parentNode?.concept !== 'View')) {
                     $event.eventStop = true;
                 }
             }
@@ -458,13 +447,16 @@ export class BaseNode extends EventEmitter {
      * 获取当前的TsName
      */
     get tsName() {
-        let tsName = this.name;
-        if (/^\d/.test(tsName)) {
-            tsName = '$' + tsName;
+        if (this.name) {
+            let tsName = this.name;
+            if (/^\d/.test(tsName)) {
+                tsName = '$' + tsName;
+            }
+            // 匹配所有特殊字符都转为_
+            tsName = tsName.replace(/\W/g, '_');
+            return tsName;
         }
-        // 匹配所有特殊字符都转为_
-        tsName = tsName.replace(/\W/g, '_');
-        return tsName;
+        return '';
     }
     /**
      * 激活 JSON 内部实例

package/src/concepts/CallFunction__.ts

@@ -384,7 +384,7 @@ export class CallFunction extends LogicItem {
     }
 
     toUI(): string {
-        let code = `$utils['${this.calleeName}']`;
+        let code = this.calleeName;
         code += '(';
         this.arguments.forEach((arg, index) => {
             code += arg.toUI();
@@ -432,19 +432,19 @@ export class CallFunction extends LogicItem {
             return argument;
         });
         let typeArguments = null;
-        if(func.typeParams) {
+        if (func.typeParams) {
             typeArguments = func.typeParams.map(() => {
                 const relationOptions = { parentNode: this, parentKey: 'typeArguments' };
                 const typeArgu = new TypeAnnotation();
                 Object.assign(typeArgu, relationOptions);
                 return typeArgu;
-            })
+            });
         }
         this.update({
             calleeNamespace,
             calleeName,
             arguments: params,
-            typeArguments
+            typeArguments,
         });
     }
 

package/src/concepts/CallQueryComponent__.ts

@@ -922,7 +922,7 @@ export class CallQueryComponent extends LogicItem {
                 concept: 'TypeAnnotation',
                 typeKind: 'reference',
                 typeName: source.name,
-                typeNamespace: `app.${this.app.name}.structures`,
+                typeNamespace: `app.structures`,
             }, this);
             this.update({
                 typeAnnotation,
@@ -963,8 +963,8 @@ export class CallQueryComponent extends LogicItem {
             .map((entity) => ({
                 concept: 'Entity',
                 name: entity.name,
-                children: entity.properties.map((property) =>
-                    new CompletionProperty({
+                children: entity.properties.map((property) => {
+                    const completionProperty = new CompletionProperty({
                         concept: 'CompletionProperty',
                         name: property.name,
                         value: `${entity.name}.${property.name}`,
@@ -975,12 +975,19 @@ export class CallQueryComponent extends LogicItem {
                             entityAsName: entity.name,
                             propertyName: property.name,
                         }),
-                    })),
+                    });
+                    completionProperty.icon = 'property';
+                    return completionProperty;
+                }),
             }));
         if (children.length === 0)
             return;
 
-        return { name: '实体', children };
+        return {
+            name: '实体',
+            icon: 'category',
+            children,
+        };
     }
 
     getCompletionPropertyOfAggregateAsNames() {

package/src/concepts/EntityProperty__.ts

@@ -331,6 +331,17 @@ export class EntityProperty extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    /**
+     * 设置是否必填
+     */
+    setSequence(sequence: string) {
+        const object = {
+            sequence,
+        };
+        this.update({
+            ...object,
+        });
+    }
     /**
      * 设置是否必填
      */

package/src/concepts/Identifier__.ts

@@ -129,7 +129,7 @@ export class Identifier extends LogicItem {
         // 如果是nasl.util.Enum 的子集里的 Identifier > MemberExpression > Argument > callfunction
         // nasl.util.Enum 的 右侧是转成字符串的
         // 如果是identifier 而且枚举
-        if (this.parentNode.parentNode.parentNode instanceof CallFunction) {
+        if (this.parentNode?.parentNode?.parentNode instanceof CallFunction) {
             const calleeNamespace = this.parentNode.parentNode.parentNode.calleeNamespace;
             const calleeName = this.parentNode.parentNode.parentNode.calleeName;
             if (calleeNamespace + '.' + calleeName === 'nasl.util.Enum') {
@@ -137,7 +137,6 @@ export class Identifier extends LogicItem {
                 return str.includes('.enums.') ? str : str + '.toString()';
             }
         }
-
         return this.namespace ? this.namespace + '.' + this.name : this.name || '__IDENTIFIER__';
     }
 

package/src/concepts/InterfaceParam__.ts

@@ -2,6 +2,8 @@ import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import Entity from './Entity__';
 import Structure from './Structure__';
+import { getNodeByNodeCallee } from '@nasl/automate/engine/utils';
+
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -274,27 +276,11 @@ export class InterfaceParam extends BaseNode {
 
     getSelectRef() {
         const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
         let completionChildren;
         if (typeKind === 'reference') {
-            let type: 'entities' | 'structures';
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
-            } else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
-            }
-            // 内置模块
-            // if (typeNamespace.startsWith('nasl.')) {
-            // } else {
-            const data = this.app[type] as Array<Entity | Structure>;
-            if (data) {
-                const properties = data.find((item) => item.name === typeName)?.properties;
-                completionChildren = properties;
-            } else {
-                completionChildren = undefined;
-            }
-            // }
+            const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+            const properties = node.properties || [];
+            completionChildren = properties;
         } else {
             completionChildren = undefined;
         }

package/src/concepts/Logic__.ts

@@ -1298,7 +1298,16 @@ export class Logic extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
-
+    // 设置定时任务
+    setCronAndTriggerType(cron: string, triggerType: string) {
+        const object = {
+            cron,
+            triggerType,
+        };
+        this.update({
+            ...object,
+        });
+    }
     findLogicItemByConcept(concept: string) {
         let result: any;
 

package/src/concepts/Param__.ts

@@ -6,6 +6,7 @@ import Entity from './Entity__';
 import EntityProperty from './EntityProperty__';
 import Structure from './Structure__';
 import StructureProperty from './StructureProperty__';
+import { getNodeByNodeCallee } from '@nasl/automate/engine/utils';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -300,9 +301,9 @@ export class Param extends BaseNode {
         }
         const object = {
             typeAnnotation,
-            // 处理下拉属性
-            completionChildren: this.getSelectRef(),
         };
+        // 处理下拉属性
+        this.completionChildren = this.getSelectRef();
         return this.update({
             ...object,
         });
@@ -328,27 +329,11 @@ export class Param extends BaseNode {
 
     getSelectRef() {
         const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
         let completionChildren;
         if (typeKind === 'reference') {
-            let type: 'entities' | 'structures';
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
-            } else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
-            }
-            // 内置模块
-            // if (typeNamespace.startsWith('nasl.')) {
-            // } else {
-            const data = this.app[type] as Array<Entity | Structure>;
-            if (data) {
-                const properties = data.find((item) => item.name === typeName)?.properties;
-                completionChildren = properties;
-            } else {
-                completionChildren = undefined;
-            }
-            // }
+            const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+            const properties = node.properties || [];
+            completionChildren = properties;
         } else {
             completionChildren = undefined;
         }

package/src/concepts/Return__.ts

@@ -5,6 +5,7 @@ import Entity from './Entity__';
 import EntityProperty from './EntityProperty__';
 import Structure from './Structure__';
 import StructureProperty from './StructureProperty__';
+import { getNodeByNodeCallee } from '@nasl/automate/engine/utils';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -268,11 +269,10 @@ export class Return extends BaseNode {
             const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
             Object.assign(typeAnnotation, relationOptions);
         }
-
+        // 处理下拉属性
+        this.completionChildren = this.getSelectRef();
         const object = {
             typeAnnotation,
-            // 处理下拉属性
-            // completionChildren: this.getSelectRef(),
         };
 
         return this.update({
@@ -300,27 +300,11 @@ export class Return extends BaseNode {
 
     getSelectRef() {
         const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
         let completionChildren;
         if (typeKind === 'reference') {
-            let type: 'entities' | 'structures';
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
-            } else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
-            }
-            // 内置模块
-            // if (typeNamespace.startsWith('nasl.')) {
-            // } else {
-            const data = this.app[type] as Array<Entity | Structure>;
-            if (data) {
-                const properties = data.find((item) => item.name === typeName)?.properties;
-                completionChildren = properties;
-            } else {
-                completionChildren = undefined;
-            }
-            // }
+            const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+            const properties = node.properties || [];
+            completionChildren = properties;
         } else {
             completionChildren = undefined;
         }

package/src/concepts/Role__.ts

@@ -36,6 +36,12 @@ export class Role extends BaseNode {
     @property()
     uuid: string = uuidv4().replace(/-/g, '');
 
+    /**
+     * 创建时间
+     */
+    @property()
+    createdTime: string = undefined;
+
     /**
      * 角色描述
      */

package/src/concepts/StructureProperty__.ts

@@ -2,6 +2,7 @@ import { dataTypesMap } from './basics/types';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import EntityProperty from './EntityProperty__';
 import Entity from './Entity__';
+import { getNodeByNodeCallee } from '@nasl/automate/engine/utils';
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -295,27 +296,11 @@ export class StructureProperty extends BaseNode {
 
     getSelectRef() {
         const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
         let completionChildren;
         if (typeKind === 'reference') {
-            let type: 'entities' | 'structures';
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
-            } else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
-            }
-            // 内置模块
-            // if (typeNamespace.startsWith('nasl.')) {
-            // } else {
-            const data = this.app[type] as Array<Entity | Structure>;
-            if (data) {
-                const properties = data.find((item) => item.name === typeName)?.properties;
-                completionChildren = properties;
-            } else {
-                completionChildren = undefined;
-            }
-            // }
+            const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+            const properties = node.properties || [];
+            completionChildren = properties;
         } else {
             completionChildren = undefined;
         }

package/src/concepts/TypeAnnotation__.ts

@@ -323,7 +323,7 @@ export class TypeAnnotation extends BaseNode {
     toEmbeddedTS(state?: TranslatorState): string {
         if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
             if (this.typeKind === 'reference' && this.typeNamespace.endsWith('enums')) {
-                return `ReturnType<typeof ${this.tsCalleeNamespace}.${this.typeName}.toList>`;
+                return `${this.tsCalleeNamespace}.${this.typeName}`;
             }
             return `${this.tsCalleeNamespace}.${this.typeName}`;
         } else if (this.typeKind === 'generic') {

package/src/concepts/Variable__.ts

@@ -3,6 +3,8 @@ import { TranslatorState, shiftState, withSourceMap } from '../translator';
 import Entity from './Entity__';
 import Structure from './Structure__';
 import { ElementToVueOptions } from './ViewElement__';
+import { getNodeByNodeCallee } from '@nasl/automate/engine/utils';
+import EntityProperty from './EntityProperty__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -211,6 +213,11 @@ export class Variable extends BaseNode {
     // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
     // 自动生成的代码已结束。下面可以手动编写。
     //================================================================================
+    /**
+     * 自动补全的字段列表
+     */
+    completionChildren: Array<EntityProperty | StructureProperty> = undefined;
+
     toVue(options?: ElementToVueOptions): string {
         return this.name;
     }
@@ -257,6 +264,8 @@ export class Variable extends BaseNode {
             const relationOptions = { parentId: this.id, parentConcept: this.concept, parentNode: this };
             Object.assign(typeAnnotation, relationOptions);
         }
+        // 处理下拉属性
+        this.completionChildren = this.getSelectRef();
         const object = {
             typeAnnotation,
         };
@@ -286,27 +295,11 @@ export class Variable extends BaseNode {
 
     getSelectRef() {
         const { typeName, typeKind, typeNamespace } = this.typeAnnotation;
-        const moduleNames = typeNamespace.split('.');
         let completionChildren;
         if (typeKind === 'reference') {
-            let type: 'entities' | 'structures';
-            if (typeNamespace.endsWith('entities')) {
-                type = 'entities';
-            } else if (typeNamespace.endsWith('structures')) {
-                // 数据结构比较复杂，会有
-                type = 'structures';
-            }
-            // 内置模块
-            // if (typeNamespace.startsWith('nasl.')) {
-            // } else {
-            const data = this.app[type] as Array<Entity | Structure>;
-            if (data) {
-                const properties = data.find((item) => item.name === typeName)?.properties;
-                completionChildren = properties;
-            } else {
-                completionChildren = undefined;
-            }
-            // }
+            const node = getNodeByNodeCallee(this.app, typeNamespace + '.' + typeName);
+            const properties = node.properties || [];
+            completionChildren = properties;
         } else {
             completionChildren = undefined;
         }

package/src/concepts/ViewElement__.ts

@@ -227,6 +227,8 @@ export class ViewElement extends BaseNode {
         super.subConstructor(source);
     }
 
+
+
     /**
      * 从父级删除该节点
      * @internal
@@ -263,7 +265,7 @@ export class ViewElement extends BaseNode {
         });
     }
 
-    getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
+        getBindAttributeExistingNames(excludedList: Array<BindAttribute> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindAttrs || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
@@ -272,24 +274,24 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-     * 插入元素绑定属性
-     * @internal
-     * @param name 元素绑定属性名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入元素绑定属性
+    * @internal
+    * @param name 元素绑定属性名称，如果不填会自动生成一个唯一名称
+    */
     _insertBindAttributeAt(name: string, index: number): BindAttribute;
 
     /**
-     * 插入元素绑定属性
-     * @internal
-     * @param bindAttributeOptions 元素绑定属性参数
-     */
+    * 插入元素绑定属性
+    * @internal
+    * @param bindAttributeOptions 元素绑定属性参数
+    */
     _insertBindAttributeAt(bindAttributeOptions: Partial<BindAttribute>, index: number): BindAttribute;
 
     /**
-     * 插入元素绑定属性
-     * @internal
-     * @param bindAttribute 已有的元素绑定属性实例
-     */
+    * 插入元素绑定属性
+    * @internal
+    * @param bindAttribute 已有的元素绑定属性实例
+    */
     _insertBindAttributeAt(bindAttribute: BindAttribute, index: number): BindAttribute;
 
     _insertBindAttributeAt(options: string | Partial<BindAttribute> | BindAttribute, index: number) {
@@ -404,6 +406,7 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -413,24 +416,24 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-     * 插入元素绑定事件
-     * @internal
-     * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入元素绑定事件
+    * @internal
+    * @param name 元素绑定事件名称，如果不填会自动生成一个唯一名称
+    */
     _insertBindEventAt(name: string, index: number): BindEvent;
 
     /**
-     * 插入元素绑定事件
-     * @internal
-     * @param bindEventOptions 元素绑定事件参数
-     */
+    * 插入元素绑定事件
+    * @internal
+    * @param bindEventOptions 元素绑定事件参数
+    */
     _insertBindEventAt(bindEventOptions: Partial<BindEvent>, index: number): BindEvent;
 
     /**
-     * 插入元素绑定事件
-     * @internal
-     * @param bindEvent 已有的元素绑定事件实例
-     */
+    * 插入元素绑定事件
+    * @internal
+    * @param bindEvent 已有的元素绑定事件实例
+    */
     _insertBindEventAt(bindEvent: BindEvent, index: number): BindEvent;
 
     _insertBindEventAt(options: string | Partial<BindEvent> | BindEvent, index: number) {
@@ -545,6 +548,7 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
     getBindDirectiveExistingNames(excludedList: Array<BindDirective> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindDirectives || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -554,24 +558,24 @@ export class ViewElement extends BaseNode {
     }
 
     /**
-     * 插入元素指令
-     * @internal
-     * @param name 元素指令名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入元素指令
+    * @internal
+    * @param name 元素指令名称，如果不填会自动生成一个唯一名称
+    */
     _insertBindDirectiveAt(name: string, index: number): BindDirective;
 
     /**
-     * 插入元素指令
-     * @internal
-     * @param bindDirectiveOptions 元素指令参数
-     */
+    * 插入元素指令
+    * @internal
+    * @param bindDirectiveOptions 元素指令参数
+    */
     _insertBindDirectiveAt(bindDirectiveOptions: Partial<BindDirective>, index: number): BindDirective;
 
     /**
-     * 插入元素指令
-     * @internal
-     * @param bindDirective 已有的元素指令实例
-     */
+    * 插入元素指令
+    * @internal
+    * @param bindDirective 已有的元素指令实例
+    */
     _insertBindDirectiveAt(bindDirective: BindDirective, index: number): BindDirective;
 
     _insertBindDirectiveAt(options: string | Partial<BindDirective> | BindDirective, index: number) {
@@ -686,25 +690,30 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
+
+
+
+
     /**
-     * 插入页面元素
-     * @internal
-     * @param name 页面元素名称，如果不填会自动生成一个唯一名称
-     */
+    * 插入页面元素
+    * @internal
+    * @param name 页面元素名称，如果不填会自动生成一个唯一名称
+    */
     _insertViewElementAt(name: string, index: number): ViewElement;
 
     /**
-     * 插入页面元素
-     * @internal
-     * @param viewElementOptions 页面元素参数
-     */
+    * 插入页面元素
+    * @internal
+    * @param viewElementOptions 页面元素参数
+    */
     _insertViewElementAt(viewElementOptions: Partial<ViewElement>, index: number): ViewElement;
 
     /**
-     * 插入页面元素
-     * @internal
-     * @param viewElement 已有的页面元素实例
-     */
+    * 插入页面元素
+    * @internal
+    * @param viewElement 已有的页面元素实例
+    */
     _insertViewElementAt(viewElement: ViewElement, index: number): ViewElement;
 
     _insertViewElementAt(options: string | Partial<ViewElement> | ViewElement, index: number) {
@@ -819,10 +828,13 @@ export class ViewElement extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
-     * 删除元素绑定属性
-     * @param name 元素绑定属性名称
-     */
+    * 删除元素绑定属性
+    * @param name 元素绑定属性名称
+    */
     removeBindAttribute(name: string): void;
 
     /**
@@ -867,10 +879,12 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
-     * 删除元素绑定事件
-     * @param name 元素绑定事件名称
-     */
+    * 删除元素绑定事件
+    * @param name 元素绑定事件名称
+    */
     removeBindEvent(name: string): void;
 
     /**
@@ -915,10 +929,12 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
-     * 删除元素指令
-     * @param name 元素指令名称
-     */
+    * 删除元素指令
+    * @param name 元素指令名称
+    */
     removeBindDirective(name: string): void;
 
     /**
@@ -963,10 +979,12 @@ export class ViewElement extends BaseNode {
         return params;
     }
 
+
+
     /**
-     * 删除页面元素
-     * @param name 页面元素名称
-     */
+    * 删除页面元素
+    * @param name 页面元素名称
+    */
     removeViewElement(name: string): void;
 
     /**
@@ -1046,33 +1064,6 @@ export class ViewElement extends BaseNode {
         return this.bindAttrs.find((bindAttr) => bindAttr.name === name);
     }
 
-    /**
-     * 角色
-     */
-    @property()
-    roles: Array<{
-        namespace: string;
-        name: string;
-    }> = [];
-
-    toggleRole(role: Role) {
-        const index = this.roles.findIndex((roleItem) => roleItem.name === role.name);
-        const roles = [...this.roles];
-        if (index !== -1) {
-            roles.splice(index, 1);
-        } else {
-            roles.push({
-                namespace: role.getNamespace(),
-                name: role.name,
-            });
-        }
-        const object = {
-            roles,
-        };
-        this.update({
-            ...object,
-        });
-    }
     toHump(name: string): string {
         return name.replace(/\-(\w)/g, (all, letter) => letter.toUpperCase());
     }
@@ -1116,7 +1107,7 @@ export class ViewElement extends BaseNode {
                         let parentNode = this.parentNode;
                         let haveScopeFlag = false;
                         while (!haveScopeFlag && parentNode.concept !== 'View') {
-                            if (this.haveScope((parentNode) as ViewElement)) {
+                            if (this.haveScope(parentNode as ViewElement)) {
                                 // type d = nasl.ui.GetItemTypeFromDataSource<typeof listStructure>['tableRelation']
                                 const tsArr = expressionTs.split('.');
                                 const parentbindAttrs = (parentNode as ViewElement).bindAttrs;
@@ -1203,25 +1194,27 @@ export class ViewElement extends BaseNode {
         if (Array.isArray(this.children)) {
             code += indent(state.tabSize + 1);
 
-            let levelIndex = parentLevel || 0;
-            if (this.haveScope(this)) {
-                code += `slotDefault: (scope${levelIndex || ''})=> [\n`;
-                levelIndex++;
-            } else {
-                code += `slotDefault: ()=> [\n`;
-            }
             if (Array.isArray(this.bindAttrs)) {
-                code += indent(state.tabSize + 2) + `() => [\n`;
+                code += `bindAttr: () => [\n`;
                 this.bindAttrs.forEach((attr) => {
                     if (attr.expression) {
                         code
                             += attr.expression.toEmbeddedTS(shiftState(state, code, {
-                                tabSize: state.tabSize + 3,
+                                tabSize: state.tabSize + 2,
                             })) + ',\n';
                     }
                 });
                 code += indent(state.tabSize + 2) + '],\n';
             }
+
+            let levelIndex = parentLevel || 0;
+            if (this.haveScope(this)) {
+                code += `slotDefault: (scope)=> [\n`;
+                levelIndex++;
+            } else {
+                code += `slotDefault: ()=> [\n`;
+            }
+
             this.children.forEach((element) => {
                 code += element.toEmbeddedTS(shiftState(state, code, {
                     tabSize: state.tabSize + 2,
@@ -1590,7 +1583,7 @@ export class ViewElement extends BaseNode {
                                 if (apiOfAttr && !apiOfAttr.type.includes('string'))
                                     return '';
                             }
-                            return `${name}="{{ ${value.replace(/"/g, "'")} }}"`;
+                            return `${name}="{{ ${value.replace(/"/g, "'").replace(/\$utils\['(.+?)'\]/g, '$1')} }}"`;
                         });
                     else
                         return defaultResult;
@@ -1685,7 +1678,7 @@ export class ViewElement extends BaseNode {
     //================================================================================
 }
 
-classMap.ViewElement = ViewElement;
+classMap['ViewElement'] = ViewElement;
 export default ViewElement;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/View__.ts

@@ -234,6 +234,8 @@ export class View extends BaseNode {
         });
     }
 
+    
+
     /**
     * 插入页面元素
     * @internal
@@ -367,6 +369,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getParamExistingNames(excludedList: Array<Param> = []) {
         const excludedSet = new Set(excludedList);
         return (this.params || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -508,6 +511,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getVariableExistingNames(excludedList: Array<Variable> = []) {
         const excludedSet = new Set(excludedList);
         return (this.variables || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -649,6 +653,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getLogicExistingNames(excludedList: Array<Logic> = []) {
         const excludedSet = new Set(excludedList);
         return (this.logics || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -790,6 +795,7 @@ export class View extends BaseNode {
         return node;
     }
 
+
     getBindEventExistingNames(excludedList: Array<BindEvent> = []) {
         const excludedSet = new Set(excludedList);
         return (this.bindEvents || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -931,6 +937,9 @@ export class View extends BaseNode {
         return node;
     }
 
+
+
+
     getViewExistingNames(excludedList: Array<View> = []) {
         const excludedSet = new Set(excludedList);
         return (this.children || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
@@ -1072,6 +1081,9 @@ export class View extends BaseNode {
         return node;
     }
 
+
+    
+
     /**
     * 删除页面元素
     * @param name 页面元素名称
@@ -1120,6 +1132,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除输入参数
     * @param name 输入参数名称
@@ -1168,6 +1182,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除局部变量
     * @param name 局部变量名称
@@ -1216,6 +1232,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除逻辑
     * @param name 逻辑名称
@@ -1264,6 +1282,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除元素绑定事件
     * @param name 元素绑定事件名称
@@ -1312,6 +1332,8 @@ export class View extends BaseNode {
         return params;
     }
 
+
+
     /**
     * 删除页面
     * @param name 页面名称
@@ -1521,36 +1543,6 @@ export class View extends BaseNode {
         return [...this.params, ...this.variables].filter((item) => !excludedSet.has(item)).map((item) => item.name);
     }
 
-    /**
-     * 角色
-     */
-    @property()
-    roles: Array<{
-        namespace: string;
-        name: string;
-    }> = [];
-
-    toggleRole(role: Role) {
-        const index = this.roles.findIndex((roleItem) => roleItem.name === role.name);
-        const roles = [...this.roles];
-        if (index !== -1) {
-            roles.splice(index, 1);
-            this.roles = roles;
-        } else {
-            roles.push({
-                namespace: role.getNamespace(),
-                name: role.name,
-            });
-        }
-        const object = {
-            roles,
-        };
-
-        this.update({
-            ...object,
-        });
-    }
-
     /**
      * 生成 Vue 中需要的 JS 代码
      * @TODO 这一版先做成 componentOptions 式的，后面再美化
@@ -1638,7 +1630,6 @@ export class View extends BaseNode {
             throw new Error('无法获取命名空间，请设置 parentNode！');
     }
 
-
     // 获取当前element，铺平
     elementsMethods(elements: Array<ViewElement>, allMethods: Array<ViewElement>) {
         if (elements) {
@@ -1857,7 +1848,7 @@ export class View extends BaseNode {
     //================================================================================
 }
 
-classMap.View = View;
+classMap['View'] = View;
 export default View;
 //================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑

package/src/concepts/basics/types/coreTypeList.ts

@@ -6,6 +6,7 @@ export const primitiveTypeList: Array<TypeAnnotation> = [
     TypeAnnotation.createPrimitive('Long', { text: 'Long 长整数' }),
     TypeAnnotation.createPrimitive('Double', { text: 'Double 小数' }),
     TypeAnnotation.createPrimitive('String', { text: 'String 字符串' }),
+    TypeAnnotation.createPrimitive('Text', { text: 'Text 长文本' }),
     TypeAnnotation.createPrimitive('Binary', { text: 'Binary 二进制流' }),
     TypeAnnotation.createPrimitive('Date', { text: 'Date 日期' }),
     TypeAnnotation.createPrimitive('Time', { text: 'Time 时间' }),

package/src/server/createUiTs.ts

@@ -53,18 +53,21 @@ export default function formatUiTs(allComponent: any) {
     export class lRoot<T> extends VueComponent{
         constructor(
             options?: {
+              bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
         }){super()}
     }
     export class div<T> extends VueComponent {
         constructor(
             options?: {
+              bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
         }){super()}
     }
     export class template<T> extends VueComponent {
         constructor(
             options?: {
+              bindAttr?: () => Array<any>,
               slotDefault?: ()=> Array<any>,
         }){super()}
     }
@@ -79,7 +82,8 @@ export default function formatUiTs(allComponent: any) {
         value += `export class ${componentName}<T> extends VueComponent{\n
                 constructor(\n
                 options?: {\n
-                [propname: string]: any,\n`;
+                [propname: string]: any,
+                bindAttr?: () => Array<any>,\n`;
         // 生成slot
         if (Object.prototype.toString.call(item.slots) === '[object Array]') {
             let hasDefault = false;

package/src/server/getMemberIdentifier.ts

@@ -1,4 +1,4 @@
-import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute } from '..';
+import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute, LogicItem } from '..';
 import naslServer from './naslServer';
 
 interface variableItem {
@@ -109,7 +109,66 @@ function formatLiterals() {
 }
 
 function formatGlobalVariable() {
-    return [];
+    const newList = [];
+    const globalVariable = {
+        name: 'userInfo',
+        children: [
+            { name: 'Status' },
+            { name: 'UserInfoExtend',
+                children: [
+                    { name: 'Company' },
+                    { name: 'JobLevel' },
+                    { name: 'JobNum' },
+                    { name: 'RealName' },
+                    { name: 'JobYear' },
+                ],
+            },
+            { name: 'UserName' },
+            { name: 'Email' },
+            { name: 'UserId' },
+            { name: 'Phone' },
+            { name: 'CreateTime' },
+            { name: 'UpdateTime' },
+            { name: 'LoginCount' },
+            { name: 'Source' },
+        ],
+    };
+    const userInfoIdentifier = new Identifier({
+        name: 'userInfo',
+        namespace: 'nasl.brower',
+    });
+    const userCompletionProperty = new CompletionProperty({
+        name: 'userInfo',
+        expression: userInfoIdentifier,
+        children: [],
+    });
+    userCompletionProperty.icon = 'variable';
+    newList.push(userCompletionProperty);
+    globalVariable.children.forEach((item) => {
+        const expression = new MemberExpression({
+            object: userInfoIdentifier,
+            property: new Identifier({ name: item.name }),
+        });
+        (item as any).expression = expression;
+        const completionProperty = new CompletionProperty(item as any);
+        completionProperty.icon = 'literal';
+        if (item.children) {
+            const children: LogicItem[] = [];
+            item.children.forEach((child) => {
+                const childExpression = new MemberExpression({
+                    object: expression,
+                    property: new Identifier({ name: child.name }),
+                });
+                (child as any).expression = childExpression;
+                const childProperty = new CompletionProperty(child as any);
+                childProperty.icon = 'literal';
+                children.push(childProperty as any);
+            });
+            completionProperty.children = children;
+        }
+        userCompletionProperty.children.push(completionProperty as any);
+    });
+    return newList;
 }
 
 

package/src/server/naslServer.ts

@@ -269,14 +269,14 @@ const naslServer = {
         return this.messager.requestCommand('updateFiles', args);
     },
     _debugInFileStorage(node: BaseNode, openFiles: Array<tsProtocol.OpenRequestArgs>) {
-        let app = node;
-        if (node.concept !== 'App') {
-            app = (node as any).rootNode || (node as any).app;
-        }
-        return Promise.all(openFiles.map(async (file) => {
-            const res = await axios.post('/api/App/debugEmbedded?id=' + app.id, file);
-            return res.data;
-        }));
+        // let app = node;
+        // if (node.concept !== 'App') {
+        //     app = (node as any).rootNode || (node as any).app;
+        // }
+        // return Promise.all(openFiles.map(async (file) => {
+        //     const res = await axios.post('/api/App/debugEmbedded?id=' + app.id, file);
+        //     return res.data;
+        // }));
     },
     open() {
         return this.messager.requestCommand('open');

package/src/service/storage/init.ts

@@ -26,6 +26,9 @@ async function doAction(app: any, actionItem: any) {
             } else {
                 hasBackEnd = true;
             }
+            if (emitTarget.concept === 'CallLogic') {
+                hasBackEnd = true;
+            }
             event.eventList.forEach(({
                 action,
                 path,
@@ -108,7 +111,7 @@ async function doAction(app: any, actionItem: any) {
 }
 
 function handleApp(app: any) {
-    app._isCollecting = false;
+    app._isCollectingCount = 0;
     app._collectingList = [];
     app._historyList = [];
     app._historyIndex = 0;
@@ -126,7 +129,7 @@ function handleApp(app: any) {
      * 开启收集
      */
     app.on('collect:start', (event: any) => {
-        app._isCollecting = true;
+        app._isCollectingCount++;
         app._actionMsg = event?.actionMsg;
         app._action = event?.action;
     });
@@ -145,7 +148,7 @@ function handleApp(app: any) {
                 action: app._action,
             });
         }
-        app._isCollecting = false;
+        app._isCollectingCount--;
         app._collectingList = [];
         app._actionMsg = '';
         app._action = '';
@@ -156,7 +159,7 @@ function handleApp(app: any) {
      */
     app.on('storage', (event: any) => {
         // 是否正在收集
-        if (!app._isCollecting) {
+        if (app._isCollectingCount === 0) {
             embeddedTSEmitter.emit('change', {
                 value: [event],
             });
@@ -234,6 +237,7 @@ export async function loadApp(appId?: string) {
     }
     config.scope = app.scope;
     handleApp(app);
+    (app as any)._isCollectingCount = 0;
     return app as App;
 }