@lcap/nasl 2.13.0-beta.1 → 2.13.0-beta.2

package/src/concepts/View__.ts

@@ -70,6 +70,12 @@ export class View extends BaseNode {
     @property()
     auth: boolean = undefined;
 
+    /**
+     * 权限资源描述
+     */
+    @property()
+    authDescription: string = undefined;
+
     /**
      * 是否是默认跳转的页面
      */
@@ -222,6 +228,18 @@ export class View extends BaseNode {
         });
     }
 
+    /**
+     * 设置权限资源描述
+     */
+    setAuthDescription(authDescription: string) {
+        const object = {
+            authDescription,
+        };
+        this.update({
+            ...object,
+        });
+    }
+
     /**
      * 设置是否是默认跳转的页面
      */
@@ -1453,7 +1471,6 @@ export class View extends BaseNode {
         if (template) {
             const node = ViewElement.fromHTML(template, {
                 view: this,
-                definition,
             });
             if (!parentNode) {
                 return;
@@ -1512,38 +1529,20 @@ export class View extends BaseNode {
         // 页面逻辑
         if (Array.isArray(definition.viewLogics)) {
             definition.viewLogics.forEach((logicOption: any) => {
-                // 页面逻辑只有load函数的走之前的逻辑其余不用创建
-                if (logicOption.name.startsWith('load')) {
-                    const logic = Logic.from({
-                        ...logicOption,
-                    }, this, 'logics');
-                    this.addLogic(logic);
-                }
+                const logic = Logic.from({
+                    ...logicOption,
+                }, this, 'logics');
+                this.addLogic(logic);
             });
         }
+
         // 页面事件
         if (Array.isArray(definition.viewBindEvents)) {
             definition.viewBindEvents.forEach((eventOption: any) => {
-                const newLogic = definition.viewLogics.find((logic: Logic) => {
-                    return eventOption.calleeName === logic.name;
-                });
-                const bindEvent = this.bindEvents.find((currentEventItem) => {
-                    return currentEventItem.name === eventOption.name;
-                });
-
-                // 如果没有event对象就先新增一个，如果已经有了就在内部添加logic
-                if (!bindEvent) {
-                    const event = BindEvent.from({
-                        ...eventOption,
-                        calleeName: '',
-                        logics: [newLogic],
-                    }, this, 'events');
-                    this.addBindEvent(event);
-                } else {
-                    const index = bindEvent.logics.length;
-                    newLogic.name = newLogic.name + index;
-                    bindEvent.addLogic(newLogic);
-                }
+                const event = BindEvent.from({
+                    ...eventOption,
+                }, this, 'events');
+                this.addBindEvent(event);
             });
         }
     }
@@ -1611,7 +1610,6 @@ export class View extends BaseNode {
             crumb: this.crumb,
             first: this.children.find((child) => child.isIndex)?.name,
             auth: this.auth ? 'loginAuth' : undefined,
-            viewBindEvents: this.getViewBindEvents(),
         };
         return `${componentOptions}
             ${translator(definition)}
@@ -1846,49 +1844,6 @@ export class View extends BaseNode {
     get authPath() {
         return this.path;
     }
-    /**
-     * 获取当前页面下所有elements上bindEvents下的logic
-     */
-    get elementLogicRoot() {
-        const logics: Array<Logic> = [];
-        // 页面上的绑定的事件
-        this.bindEvents.forEach((bindEvent) => {
-            bindEvent.logics.forEach((logic) => {
-                // logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
-                logics.push(logic);
-            });
-        });
-        this.elements.forEach((item) => {
-            utils.traverse((current) => {
-                current.node.bindEvents.forEach((bindEvent) => {
-                    bindEvent.logics.forEach((logic) => {
-                        // logic.virtualParams = bindEvent.getContextRenderLogicParams(logic);
-                        logics.push(logic);
-                    });
-                });
-            }, { node: item });
-        });
-        return [{
-            concept: 'elementLogicRoot',
-            expanded: false,
-            children: logics,
-        }];
-    }
-    getViewBindEvents() {
-        const bindEvents: Array<BindEvent> = [];
-        // 页面上的绑定的事件
-        this.bindEvents.forEach((bindEvent) => {
-            bindEvents.push(bindEvent);
-        });
-        this.elements.forEach((item) => {
-            utils.traverse((current) => {
-                current.node.bindEvents.forEach((bindEvent) => {
-                    bindEvents.push(bindEvent);
-                });
-            }, { node: item });
-        });
-        return bindEvents;
-    }
 
     /**
      * @param path 子路径

package/src/concepts/basics/stdlib/nasl.ui.ts

@@ -38,10 +38,6 @@ export const uiStructures = [
             }),
         ],
     }),
-    new Structure({
-        name: 'BaseEvent',
-        properties: [],
-    }),
     new Structure({
         name: 'DataSourceParams',
         properties: [

package/src/index.ts

@@ -8,5 +8,5 @@ export * as genBlock from './templator';
 export * as utils from './utils';
 export * from './config';
 export * from './eventBus';
-export { loadApp, loadAppSync, handleApp } from './service/storage/init';
+export { loadApp, loadAppSync, handleApp, batchAction, batchQuery } from './service/storage/init';
 import './automate/engine';

package/src/server/createUiTs.ts

@@ -1,6 +1,5 @@
 import { Logic, TypeAnnotation, Param, LogicItem, NumericLiteral, BooleanLiteral, StringLiteral, Identifier, MemberExpression } from '..';
-// @ts-ignore
-import trigger from './events.yaml';
+
 const naslStdlibMap: any = {
     'nasl.core.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.core.ts').default,
     'nasl.collection.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.collection.ts').default,
@@ -15,26 +14,6 @@ const naslStdlibMap: any = {
     'nasl.validation.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.validation.ts').default,
     'nasl.process.ts': require('!!raw-loader!../../../file-storage/data/stdlib/nasl.process.ts').default,
 };
-export let elementsEventsMap: { [componentTagEventName: string]: any} = {};
-
-export function getAllComponentEventMap(allComponent: any) {
-    const eventsMap: { [componentTagEventName: string]: any} = {};
-    for (const i in allComponent) {
-        const item = allComponent[i];
-        if (item.events && Array.isArray(item.events)) {
-            item.events.forEach((eventItem: any) => {
-                const name = `${item.name}-${eventItem.name}`;
-                eventsMap[name] = eventItem;
-            });
-        }
-    }
-    trigger.forEach((item: any) => {
-        eventsMap[item.name] = item;
-    });
-
-    elementsEventsMap = eventsMap;
-    return eventsMap;
-}
 
 export default function formatUiTs(allComponent: any) {
     const indent = (tabSize: number) => ' '.repeat(tabSize * 2);
@@ -102,7 +81,6 @@ export default function formatUiTs(allComponent: any) {
         return logic;
     };
     const elementsLogic: { [componentName: string]: Array<Logic> } = {};
-
     let value = `namespace nasl.ui {
     export class VueComponent {
     }
@@ -128,7 +106,7 @@ export default function formatUiTs(allComponent: any) {
             options?: {
               [propname: string]: any,
               bindAttr?: () => Array<any>,
-              slotDefault?: (scope: nasl.ui.ScopeOf<T>) => Array<any>,
+              slotDefault?: ()=> Array<any>,
         }){super()}
     }
     export type GetItemTypeFromDataSource<T> = T extends nasl.collection.PageOf<infer U> | nasl.collection.List<infer U> | ((...args: any) => nasl.collection.PageOf<infer U> | nasl.collection.List<infer U>) ? U : never;
@@ -212,11 +190,9 @@ export default function formatUiTs(allComponent: any) {
     value += '}\n';
     // console.log(value);
     // console.log(elementsLogic);
-    // const elementsEventsMap = getAllComponentEventMap(allComponent);
     return {
         code: value,
         elementsLogic,
         naslStdlibMap,
-        elementsEventsMap,
     };
 }

package/src/server/getMemberIdentifier.ts

@@ -1,6 +1,5 @@
-import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute, LogicItem, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty } from '..';
+import { BaseNode, CompletionProperty, App, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute, LogicItem, TypeAnnotation } from '..';
 import naslServer from './naslServer';
-import { getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 interface variableItem {
     text: string;
@@ -38,7 +37,7 @@ function formatTs2TypeString(displayParts: Array<{ text: string; kind: string }>
  * @param type app
  * @returns typeAnnotation
  */
-export function getCompletionDetailType(type: string): TypeAnnotation {
+function getCompletionDetailType(type: string): TypeAnnotation {
     let typeAnnotation;
     try {
         if (type.includes('<') && type.includes('>')) {
@@ -116,8 +115,6 @@ export function getPlatformType(tsType: string): string {
     const namespacePrefix = ['app', 'extensions', 'apis', 'components', 'nasl'];
     if (tsType === 'String') {
         return 'nasl.core.String';
-    } else if (tsType === 'Boolean') {
-        return 'nasl.core.Boolean';
     }
 
     const strTypes = tsType.split('.');
@@ -168,97 +165,29 @@ function sortFirstVariableData(result: CompletionProperty[], node: BaseNode) {
     newResult.push(...result);
     return newResult;
 }
-export function isNoChildType(type: String) {
-    return type?.startsWith('nasl.core') || type?.startsWith('app.enums');
-}
-function findNode(typeKey: string, node: BaseNode) {
-    let newType: Structure | Entity;
-    if (typeKey.startsWith('nasl.') && typeKey.includes('<')) {
-        const findGenericsIndex = typeKey.indexOf('<');
-        typeKey = typeKey.substring(0, findGenericsIndex);
-        const typeIndex = typeKey.lastIndexOf('.');
-        newType = getNaslNodeByNodeCallee(typeKey.substring(0, typeIndex), typeKey.substring(typeIndex + 1, typeKey.length));
-    } else if (typeKey.startsWith('nasl.')) {
-        const typeIndex = typeKey.lastIndexOf('.');
-        newType = getNaslNodeByNodeCallee(typeKey.substring(0, typeIndex), typeKey.substring(typeIndex + 1, typeKey.length));
-    } else {
-        newType = (node as Identifier)?.app?.findNodeByCompleteName(typeKey);
-    }
-    return newType;
-}
-
-/**
- * 获取下一级的节点进行递归
- * @param typeKey 当前节点的类型，主要为了取出内部的 T中的实际类型
- * @param item 当前节点的内容
- * @param parent 父级节点的内容
- * @param node 获取变量框的位置
- */
-export function nextFindTypeChild(typeKey: string, item: any, parent: any, node: BaseNode) {
-    // 有一个当前树分支的全部节点的node map，用作防止数据无限递归，只保留3层
-    const nodeMap = parent ? parent.nodeMap : new Map();
-    item.nodeMap = nodeMap;
-    const newType = findNode(typeKey, node);
-    if (newType?.properties && newType.properties.length) {
-        // 处理泛型的内容要取到值
-        const StructureJson = newType.toJSON();
-        const newStructure = new Structure(StructureJson);
-        newStructure.properties.forEach((item: StructureProperty | EntityProperty) => {
-            const itemType = item?.typeAnnotation?.typeKey;
-            if (itemType === 'T' && /\<([^()]+)\>/g.exec(typeKey)) {
-                const newTypes = /\<([^()]+)\>/g.exec(typeKey);
-                // 找到当前原来的类型
-                const contentType = getPlatformType(newTypes[1]);
-                const typeNamespace = contentType.substring(0, contentType.lastIndexOf('.'));
-                const typeName = contentType.substring(contentType.lastIndexOf('.') + 1, contentType.length);
-                item.typeAnnotation = new TypeAnnotation({
-                    typeKind: 'reference',
-                    typeNamespace,
-                    typeName,
-                });
-            }
-        });
-        const index = nodeMap.get(newType) || 0;
-        if (index) {
-            nodeMap.set(newType, index + 1);
-        } else {
-            nodeMap.set(newType, 1);
-        }
-        // 最多保留3层
-        if (index < 3) {
-            item.children = formatVariableData(newStructure.properties, node, item);
-        }
-    }
-}
 // 格式化变量数据
 export function formatVariableData(data: unknown | variableItem[], node: BaseNode, parent?: any) {
     if (Array.isArray(data)) {
         let result = data.map((item) => {
-            item.children = [];
+            // value需要拼接生成
+            item.value = parent ? `${parent.value}.${item.text}` : item.text;
+            item.name = item.text;
             // 当前结构的typeAnnotation
             let typeAnnotation;
-            // 当前的类型如 app.entitys.entity1 nasl.core.String
-            let typeKey: string;
+            let type;
 
             if (item.completionDetail) {
-                // 当前节点的完整类型，主要是在有T的内容使用 nasl.list<Enum1> 内部匹配内容给里面子集的T赋值类型
-                const currentType: string = formatTs2TypeString(item.completionDetail.displayParts as Array<{ text: string; kind: string }>);
-                typeAnnotation = getCompletionDetailType(currentType);
-                typeKey = getPlatformType(currentType);
-            } else if (item instanceof StructureProperty) {
-                typeKey = item?.typeAnnotation?.typeKey;
+                let type = formatTs2TypeString(item.completionDetail.displayParts as Array<{ text: string; kind: string }>);
+                typeAnnotation = getCompletionDetailType(type);
+                type = getPlatformType(type);
             }
             // 如果没有父节点就是Identifier
             if (!parent) {
-                // value需要拼接生成
-                item.value = parent ? `${parent.value}.${item.text}` : item.text;
-                item.name = item.text;
                 const identifier = new Identifier({ name: item.name });
                 // 携带上当前的类型
                 identifier.typeAnnotation = typeAnnotation;
                 item.expression = identifier;
             } else {
-                item.value = `${parent.value}.${item.name}`;
                 const memberExpression = new MemberExpression({
                     object: parent.expression,
                     property: new Identifier({ name: item.name }),
@@ -267,18 +196,19 @@ export function formatVariableData(data: unknown | variableItem[], node: BaseNod
                 memberExpression.typeAnnotation = typeAnnotation;
                 item.expression = memberExpression;
             }
-            // 如果有类型而且类型不是没有子集的类型，就把他当前的类型拿到
-            if (typeKey && !isNoChildType(typeKey)) {
-                nextFindTypeChild(typeKey, item, parent, node);
+            if (item.children) {
+                item.children = formatVariableData(item.children, node, item);
             }
-            const completionProperty = new CompletionProperty(item);
             if (!parent) {
+                const completionProperty = new CompletionProperty(item);
                 // 变量 param return 在这里添加图标
                 completionProperty.icon = getNodeiconFromLogic(completionProperty, node);
+                return completionProperty;
             } else {
+                const completionProperty = new CompletionProperty(item);
                 completionProperty.icon = 'refProperty';
+                return completionProperty;
             }
-            return completionProperty;
         });
 
         /**
@@ -533,9 +463,19 @@ export function getEnumsIdentifier(node: BaseNode): CompletionProperty[] {
 // 获取变量
 export async function getVariableIdentifier(node: BaseNode): Promise<CompletionProperty[]> {
     let completionData: CompletionProperty[] = [new CompletionProperty({})];
-    // 只获取第一层内容
-    const nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
-    completionData = formatVariableData(nextCompletion, node);
+    if (node instanceof Identifier || node instanceof MemberExpression) {
+        const value = (node as Identifier | MemberExpression).getValue();
+        if (value) {
+            const completion = (await naslServer.getValueSelectCompletion(node, value)) as variableItem[];
+            completionData = formatVariableData(completion, node);
+        } else {
+            const nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
+            completionData = formatVariableData(nextCompletion, node);
+        }
+    } else {
+        const nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
+        completionData = formatVariableData(nextCompletion, node);
+    }
     return completionData;
 }
 

package/src/server/getProcesses.ts

@@ -1,7 +1,6 @@
 import Constant from '@nasl/concepts/Constant__';
 import { CompletionProperty, Process, ProcessElement, Namespace, Logic, TypeAnnotation, Return, Variable, StructureProperty, Param, Identifier, MemberExpression, LogicItem, App, BaseNode, Structure, Entity, EntityProperty } from '..';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
-import { isNoChildType, nextFindTypeChild } from './getMemberIdentifier';
 function alphaUpper(name: string) {
     if (!name) {
         return '';
@@ -251,26 +250,26 @@ export function genCompletionProperty(prefix: string[] = []):(v: Variable | Para
         if (t.length) {
             prevalue = `${t.join('.')}.`;
         }
-        const noChildType = isNoChildType(v.typeAnnotation.typeKey);
-        const item = {
+        const hasChild = ['reference', 'generic'].includes(v.typeAnnotation.typeKind);
+        const cp = new CompletionProperty({
             expression: m || p,
+            noFurther: !hasChild,
             name: v.name,
             value: prevalue + v.name,
-        };
 
-        if (!noChildType) {
-            nextFindTypeChild(v.typeAnnotation.typeKey, item, null, v);
-        }
-
-        const cp = new CompletionProperty(item);
-        console.log(cp.value, v);
+        });
+        console.log(cp.value);
         cp.icon = v.concept;
+
+        if (hasChild) {
+            cp.children = [new CompletionProperty()];
+        }
         return cp;
     };
 }
 
-export function getPreviousTask(node: ProcessElement, nodePorcess?: Process) {
-    const process = node.process || nodePorcess;
+export function getPreviousTask(node: ProcessElement) {
+    const process = node.process;
     const elems = process.elements;
     const elements: ProcessElement[] = [];
     const visitedMap = new WeakMap();
@@ -296,20 +295,19 @@ export function getPreviousTask(node: ProcessElement, nodePorcess?: Process) {
     return elements;
 }
 
-export function getProcessVariableSuggestions(node: LogicItem, abandonConstant: boolean = false): CompletionProperty {
-    // if (!node.processElement) {
-    //     return;
-    // }
-    //流程下的callback没有processElement
-    const tempPorcessEle = new ProcessElement({});
-    const processElem = node.processElement || tempPorcessEle;
+export function getProcessVariableSuggestions(node: Logic, abandonConstant: boolean = false): CompletionProperty {
+    if (!node.processElement) {
+        return;
+    }
+    const processElem = node.processElement;
     const process = node.process;
 
-    const elements: ProcessElement[] = getPreviousTask(processElem, process);
+    const elements: ProcessElement[] = getPreviousTask(processElem);
     const prevtasks = elements.map((us) => {
         const cp = new CompletionProperty({
             name: us.name,
             value: us.name,
+            noFurther: true,
             children: [
                 ...us.returns.map(genCompletionProperty([process.name, us.name])),
                 ...(abandonConstant ? [] : us.constants.map(genCompletionProperty([process.name, us.name]))),
@@ -323,6 +321,7 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
     const processVariables = new CompletionProperty({
         name: process.name,
         value: process.name,
+        noFurther: true,
         children: [
             ...process.params.map(genCompletionProperty([process.name])),
             ...process.returns.map(genCompletionProperty([process.name])),
@@ -336,6 +335,7 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
+            noFurther: true,
             children: processElem.variables.map(genCompletionProperty([process.name, processElem.name])),
         });
         scopeVariable.isProcess = true;
@@ -344,33 +344,27 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
     }
 
     if (processElem.type === 'UserTask') {
-        // 任务完成时可以拿到该任务的输出参数
-        let returns: CompletionProperty[] = [];
-        if (node.logic && node.logic.parentNode.name === 'OnClose') {
-            returns = processElem.returns.map(genCompletionProperty([process.name, processElem.name]));
-        }
         const scopeVariable = new CompletionProperty({
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
-            children: [
-                ...returns,
-                ...processElem.constants.map(genCompletionProperty([process.name, processElem.name])),
-            ],
+            noFurther: true,
+            children: processElem.constants.map(genCompletionProperty([process.name, processElem.name])),
         });
         scopeVariable.isProcess = true;
         scopeVariable.icon = processElem.type;
         processVariables.children.push(scopeVariable);
     }
-    if (processElem.type === 'AutoTask') {
+    if(processElem.type === 'AutoTask') {
         const scopeVariable = new CompletionProperty({
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
+            noFurther: true,
             children: [
                 ...processElem.variables.map(genCompletionProperty([process.name, processElem.name])),
                 ...processElem.returns.map(genCompletionProperty([process.name, processElem.name])),
-            ],
+            ]
         });
         scopeVariable.isProcess = true;
         scopeVariable.icon = processElem.type;
@@ -463,6 +457,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
         const cp = new CompletionProperty({
             name: us.name,
             value: us.name,
+            noFurther: true,
             children: [
                 ...us.returns.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, us.name], [])),
                ...us.constants.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, us.name], [])),
@@ -477,6 +472,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
     const processVariables = new CompletionProperty({
         name: process.name,
         value: process.name,
+        noFurther: true,
         children: [
             ...process.params.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name], [])),
             ...process.returns.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name], [])),
@@ -491,6 +487,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
+            noFurther: true,
             children: processElem.variables.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),
         });
         scopeVariable.expanded = true;
@@ -504,6 +501,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
+            noFurther: true,
             children: processElem.constants.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),
         });
         scopeVariable.expanded = true;
@@ -516,6 +514,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement) {
             name: processElem.name,
             value: processElem.name,
             icon: processElem.type,
+            noFurther: true,
             children: [
                 ...processElem.variables.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),
                 ...processElem.returns.map(node => deduceTypeAnnotation(app, node, node.typeAnnotation, [process.name, processElem.name], [])),

package/src/server/index.ts

@@ -10,11 +10,9 @@ import {
     getGlobalVariableIdentifier,
     getLiteralsIdentifier,
     getSelectNextCompletionData,
-    getCompletionDetailType,
 } from './getMemberIdentifier';
 import naslServer from './naslServer';
 import './extendBaseNode';
-import { getAllComponentEventMap } from './createUiTs';
 
 const server: any = {
     ...naslServer,
@@ -33,7 +31,5 @@ const server: any = {
     getEnumsIdentifier,
     getGlobalVariableIdentifier,
     getLiteralsIdentifier,
-    getAllComponentEventMap,
-    getCompletionDetailType,
 };
 export default server;

package/src/server/naslServer.ts

@@ -519,20 +519,7 @@ const naslServer = {
             // 先获取原来的节点先清除一下之前有异常的节点，下面重新赋值
             const oldRecord = diagnosticManager.getRecord(record.id);
             oldRecord?.semanticDiagnostics.forEach((item) => {
-                if (item.node) {
-                    item.node.tsErrorDetail = undefined;
-                    // 如果logic中有报错就把标识置为true
-                    if ((item.node as any).logic) {
-                        (item.node as any).logic.haveError = false;
-                    }
-                }
-            });
-
-            // 清空一些状态
-            oldRecord?.suggestionDiagnostics.forEach((item) => {
-                if (item.node && item.node instanceof Logic) {
-                    item.node.isSmpty = false;
-                }
+                item.node ? (item.node.tsErrorDetail = undefined) : '';
             });
             // 语义诊断
             if (isChangeInterface) {
@@ -556,10 +543,11 @@ const naslServer = {
             //     // logic在for循环中，不展示any提示
             //     record.suggestionDiagnostics = record.suggestionDiagnostics.filter((item) => !item.text.includes(`implicitly has an 'any' type, but a better type may be inferred from usage.`));
             // }
-            record.suggestionDiagnostics = record.suggestionDiagnostics
-                .filter((item) => { return [`'$LogicEmpty' is declared but its value is never read.`].includes(item.text); })
-                .map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, node as FileNode))
-                .filter((diag) => !!diag);
+            // record.suggestionDiagnostics = record.suggestionDiagnostics
+            //     .map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, node.sourceMap))
+            //     .filter((diag) => !!diag);
+            record.suggestionDiagnostics = [];
+            // 语法诊断暂时不需要
         });
 
         return records;
@@ -1298,9 +1286,8 @@ const naslServer = {
             App.emit('collect:start', {
                 actionMsg: '增加逻辑参数',
             });
-            const index = node.getIndexOfParent();
             node.create({
-                index,
+                index: 0,
                 parentNode: parantNode,
                 parentKey: node.parentKey,
             });