@lcap/nasl 2.22.0-beta.5 → 3.0.0-beta.1

package/src/concepts/index__.ts

@@ -2,6 +2,7 @@ export * from './App__';
 export * from './Module__';
 export * from './Namespace__';
 export * from './Frontend__';
+export * from './Backend__';
 export * from './Integration__';
 export * from './MicroApp__';
 export * from './TypeAnnotation__';
@@ -28,9 +29,14 @@ export * from './Event__';
 export * from './Slot__';
 export * from './Theme__';
 export * from './Logic__';
+export * from './AuthLogic__';
+export * from './AuthLogicForCallInterface__';
+export * from './OverriddenLogic__';
 export * from './Param__';
 export * from './Return__';
 export * from './Variable__';
+export * from './BackendVariable__';
+export * from './FrontendVariable__';
 export * from './Constant__';
 export * from './LogicItem__';
 export * from './Function__';
@@ -105,3 +111,5 @@ export * from './SelectMembers__';
 export * from './AssignmentLine__';
 export * from './FrontendLibrary__';
 export * from './ViewBlock__';
+export * from './AuthInterface__';
+export * from './CallAuthInterface__';

package/src/enums/KEYWORDS.ts

@@ -23,7 +23,6 @@ export const KEYWORDS = [
     'catch',
     'char',
     'class',
-    'code',
     'collection',
     'com',
     'component',

package/src/generator/genBundleFiles.ts

@@ -1,3 +1,5 @@
+import { genBreakpoints, clearBreakpoints } from '../breakpoint';
+
 import { App, Module, View, Frontend } from '../concepts';
 import * as utils from '../utils';
 import { genHash, RawOptions } from '.';
@@ -18,6 +20,7 @@ export interface Route {
 interface Config {
     tenant: string;
     env: string;
+    debug: boolean;
     nuimsDomain: string;
     STATIC_URL: string;
     USER_STATIC_URL: string;
@@ -48,6 +51,9 @@ export function genBundleFiles(app: App, frontend: Frontend,
     const componentMap: {
         [name: string]: RawOptions;
     } = {};
+
+    config?.debug && genBreakpoints(app);
+
     utils.traverse((current) => {
         if (current.node.toVueOptions)
             componentMap[current.node.id] = current.node.toVueOptions();
@@ -57,6 +63,8 @@ export function genBundleFiles(app: App, frontend: Frontend,
         } as View,
     });
 
+    config?.debug && clearBreakpoints(app);
+
     /**
      * vue.config.js page options
      */
@@ -206,6 +214,7 @@ export function genBundleFiles(app: App, frontend: Frontend,
 
     const platformConfig = JSON5.stringify({
         appConfig: {
+            id: app.id,
             project: app.name,
             domainName: app.name,
             nuimsDomain: fnNuimsDomain,
@@ -263,6 +272,27 @@ export function genBundleFiles(app: App, frontend: Frontend,
         }`;
     }
 
+    if (frontend.globalScaleEnabled) {
+        content += `{
+            const body = document.body;
+            const rootElement = document.documentElement;
+
+            function scalePage() {
+                const windowWidth = window.innerWidth;
+                const baseWidth = ${frontend.canvasWidth};
+                const scale = windowWidth / baseWidth;
+                body.style.transform = \`scale(\${scale})\`;
+                body.style.transformOrigin = '0 0';
+                body.style.width = baseWidth + 'px';
+                rootElement.style.height = '100vh';
+                rootElement.style.overflow = 'auto';
+                rootElement.style.setProperty('--scrollbar-size', 0);
+            }
+            window.addEventListener('resize', scalePage);
+            scalePage()
+        }`;
+    }
+
     content += `
     var customNames = ${customNames};
     for(var i=0;i<customNames.length;i++){
@@ -375,9 +405,13 @@ export function genBundleFiles(app: App, frontend: Frontend,
         bundleMinPath = `${baseUrl}${frontend.basePath}/bundle.${genHash(content)}.min.js`;
     }
     const otherJsList = (frontend as any)?.appletsConfig?.enable ? ['//res.wx.qq.com/open/js/jweixin-1.3.2.js'] : [];
-    
+
     const microAppIntegration = integrateMicroApp(frontend);
-    
+
+    if (config?.debug) {
+        otherJsList.push(`${config.STATIC_URL}/packages/@lcap/breakpoint-client@1.0.0/dist/index.js?time=${Date.now()}`);
+    }
+
     const assetsContent = `(function() {
     const loadAssets = () => {
         LazyLoad.js(${JSON5.stringify(assetsInfo.basic.js.concat(assetsInfo.custom.js, otherJsList).concat([bundleMinPath]))});

package/src/generator/genMetaData.ts

@@ -94,11 +94,15 @@ export function genMetaData(app: App, frontend: Frontend) {
         [id: string]: BaseNode;
     } = {};
     const frontendVariables = frontend.variables;
+    const frontendEvents = frontend.bindEvents;
+    const frontendEventsMap: { [id: string]: string } = {};
+
     const enumsMap: {
         [name: string]: {
             [label: string]: string;
         };
     } = {};
+
     const logicsMap: {
         [id: string]: {
             config: {
@@ -243,6 +247,12 @@ export function genMetaData(app: App, frontend: Frontend) {
             collectTypeAnnotation(typeAnnotation);
         });
     }
+    if (Array.isArray(frontendEvents)) {
+        frontendEvents.forEach((item) => {
+            const typeAnnotation = (item as any)?.typeAnnotation || item.__TypeAnnotation;
+            collectTypeAnnotation(typeAnnotation);
+        });
+    }
 
     function collectTypeAnnotation(typeAnnotation: any) {
         if (typeAnnotation) {
@@ -263,8 +273,13 @@ export function genMetaData(app: App, frontend: Frontend) {
             }
         }
     }
-
+    frontendEvents.forEach((logic) => {
+        const name = logic.getViewEventName();
+        const fn = (logic as any).toFunction();
+        frontendEventsMap[name] = fn;
+    });
     return {
+        frontendEvents: frontendEventsMap,
         frontendVariables,
         dataTypesMap,
         enumsMap,

package/src/generator/genReleaseBody.ts

@@ -5,14 +5,16 @@ import * as utils from '../utils';
 
 export async function genReleaseBody(app: App, {
     env,
+    debug,
     replicas,
     realRelease,
     appInfo,
     staticUrl,
     frontends = [],
-    logPublishFunc = () => {},
+    logPublishFunc = () => { },
 }: {
     env: string,
+    debug: boolean,
     replicas: number,
     realRelease: boolean,
     appInfo: {
@@ -79,6 +81,7 @@ export async function genReleaseBody(app: App, {
         logPublishFunc(`[代码] "[${app.title}]" 生成页面代码：开始`);
         files = genFrontendBundleFiles(app, frontends, Object.assign({}, appInfo, {
             env,
+            debug,
             appid: app.id,
             devDnsAddr: (app as any).devDnsAddr,
             miniEnable: (app as any).miniEnable,

package/src/index.ts

@@ -8,7 +8,8 @@ export * as genBlock from './templator';
 export * as utils from './utils';
 export * from './config';
 export * from './eventBus';
-export { loadApp, loadAppSync, handleApp, batchAction, batchQuery } from './service/storage/init';
+export * as breakpoint from './breakpoint';
+export { loadApp, loadAppSync, handleApp, batchAction, batchQuery, mountDatabaseTypes } from './service/storage/init';
 export { createService } from './service/creator';
 export * from './manager/stepRecorder';
 import './automate/engine';

package/src/server/extendBaseNode.ts

@@ -1,7 +1,7 @@
 import { FileNode, NaslServer } from './naslServer';
 import * as tsProtocol from 'typescript/lib/protocol';
 import { MinRange } from './translator';
-import { BaseNode, CallLogic, Destination, EnumItem, Interface, Logic, Param, Process, Role, Structure, View, ViewElement, Frontend, TypeAnnotation, StructureProperty, App } from '../concepts';
+import { BaseNode, CallLogic, Destination, EnumItem, Interface, Logic, Param, Process, Role, Structure, View, ViewElement, Frontend, TypeAnnotation, StructureProperty, App, AuthInterface, CallAuthInterface } from '../concepts';
 import { EventPayload, invokeCommand, registerCommand } from '../common';
 import { getNodeByNodeCallee, getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
@@ -99,6 +99,9 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
          * @returns 找到的引用
          */
         const res = naslServer._renamePrepare(this, refsList, newValue);
+        // 针对外部接口的鉴权方式，sourceMap 定位仅仅 定位到 CallAuthInterfacer
+        // 因此这里需要保存this来做上下文判断
+        const _this = this;
         if (res.length <= 1) {
             if (this.concept === 'enumItem') {
                 (this as any).setValue(newValue);
@@ -118,7 +121,15 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
                             // 如果有指定的修改方法，就用那个，没有就修改名字
                             item.setTypeMethods ? itemNode[item.setTypeMethods](item.newValue) : itemNode.setName?.(item.newValue);
                         } else {
-                            item.setTypeMethods ? itemNode[item.setTypeMethods](newValue) : itemNode.setName?.(newValue);
+                            if (_this.concept === 'AuthLogicForCallInterface' && itemNode.concept === 'CallAuthInterface') {
+                                const { calleewholeKey } = itemNode;
+                                const targetItf: AuthInterface = getNodeByNodeCallee(App, calleewholeKey);
+                                targetItf.setAuthLogic(newValue);
+                                // FIXME
+                                // itemNode
+                            } else {
+                                item.setTypeMethods ? itemNode[item.setTypeMethods](newValue) : itemNode.setName?.(newValue);
+                            }
                         }
                     });
                     // 结束修改 ，批量操作
@@ -186,7 +197,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
         };
         let callback = null;
         if (refsList.length <= 1 || (node instanceof Param && node.parentNode instanceof Logic && refsList.length <= 2)) {
-            // 页面组件直接删除然后return
+            // 平台类型直接删除然后return
             if (node instanceof ViewElement) {
                 this.delete();
                 return;
@@ -279,7 +290,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                              * 调用方是 调用逻辑或者跳转页面， 去删除对应位置的内容
                              * 如果是跳转页面，因为流程下的特殊翻译，需要过滤下 非页面下的参数修改，查找到页面跳转
                              */
-                            if (minRange.node instanceof CallLogic || (node.parentNode instanceof View && minRange.node instanceof Destination)) {
+                            if (minRange.node instanceof CallLogic || (node.parentNode instanceof View && minRange.node instanceof Destination) || minRange.node instanceof CallAuthInterface) {
                                 minRange.node.deleteCalleeArg(Index);
                             }
                         }
@@ -388,7 +399,7 @@ BaseNode.prototype.addParamsPrepare = async function addParamsPrepare(needAdd =
 /**
  * 在原型上增加方法来调用
  */
-BaseNode.prototype.getCurrentTypeAnnotation = async function getCurrentTypeAnnotation(outTime? :number) {
+BaseNode.prototype.getCurrentTypeAnnotation = async function getCurrentTypeAnnotation(outTime?: number) {
     try {
         /**
          * 查找这个节点是不是有依赖
@@ -418,7 +429,7 @@ BaseNode.prototype.getSelectRef = function getSelectRef(newTypeAnnotation: TypeA
         const parentNode = this;
         let completionChildren: any;
         if (typeKind === 'reference') {
-            if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process' || typeNamespace === 'nasl.auth') {
+            if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process' || typeNamespace === 'nasl.auth' || typeNamespace === 'nasl.http') {
                 const node = newNode(getNaslNodeByNodeCallee(typeNamespace, typeName), parentNode, needNewStructure);
                 const properties = (node as Structure)?.properties || [];
                 completionChildren = properties;
@@ -459,4 +470,4 @@ BaseNode.prototype.getSelectRef = function getSelectRef(newTypeAnnotation: TypeA
     } catch (err) {
         console.log(err);
     }
-}
+};

package/src/server/formatTsUtils.ts

@@ -1,4 +1,4 @@
-import { BaseNode, Identifier, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty, Param, MemberExpression, CompletionProperty, Variable, Return, Logic, ConfigProperty, App } from '..';
+import { BaseNode, Identifier, TypeAnnotation, StructureProperty, Entity, AuthLogic, BackendVariable, Structure, EntityProperty, Param, MemberExpression, CompletionProperty, Variable, Return, Logic, ConfigProperty, AuthLogicForCallInterface, App } from '..';
 import { getNaslNodeByNodeCallee } from '../automate/engine/utils';
 
 interface variableItem {
@@ -522,7 +522,7 @@ function getNodeTypeVariableData(nodeType: any, item: any, node: BaseNode) {
     completionData.icon = getNodeiconFromLogic(completionData, node);
     return completionData;
 }
-function recursionProperty(structureTypeAnnotation: TypeAnnotation, parentCompletion: CompletionProperty, node: BaseNode, typeKeyMap: any) {
+function recursionProperty(structureTypeAnnotation: TypeAnnotation, parentCompletion: CompletionProperty, node: BaseNode, typeKeyMap: Map<string, number>) {
     const app = (node.rootNode) as App;
     let structure;
     if (structureTypeAnnotation.typeArguments) {
@@ -670,7 +670,7 @@ export function formatVariableData(data: unknown | variableItem[], node: BaseNod
 
 // 从logic获取节点的icon
 function getNodeiconFromLogic(completionProperty: CompletionProperty, node: BaseNode): string {
-    const logic = (node as Param).logic;
+    const logic = (node as Param).logic || (node as Param).AuthLogic || (node as Param).AuthLogicForCallInterface;
     const view = (node as Param).view;
     if (view) {
         const { params } = view;
@@ -679,8 +679,19 @@ function getNodeiconFromLogic(completionProperty: CompletionProperty, node: Base
     }
     if (logic) {
         const { params, returns } = logic;
-        if (params.find((item) => item.name === completionProperty.name))
-            return 'param';
+        if (logic instanceof AuthLogicForCallInterface) {
+            const { authParams } = logic;
+            if (authParams.find((item) => item.name === completionProperty.name))
+                return 'api-auth-params';
+            if (params.find((item) => item.name === completionProperty.name))
+                return 'api-auth-params';
+        } else if (logic instanceof AuthLogic) {
+            if (params.find((item) => item.name === completionProperty.name))
+                return 'api-auth-params';
+        } else {
+            if (params.find((item) => item.name === completionProperty.name))
+                return 'param';
+        }
 
         if (returns.find((item) => item.name === completionProperty.name))
             return 'return';
@@ -731,7 +742,28 @@ function sortFirstVariableData(result: CompletionProperty[], node: BaseNode) {
     newResult.push(...result);
     return newResult;
 }
+export function formatBackendVariables(variables: Array<BackendVariable>) {
+    const result = variables.map((itemNode) => {
+        const namespace = itemNode.getNamespace();
+        const newItem: any = {
+            name: itemNode.name,
+            value: itemNode.name,
+            expression: new Identifier({
+                name: itemNode.name,
+                namespace,
+            }),
+        };
+        const noChildType = isNoChildType(itemNode.typeAnnotation.typeKey);
 
+        if (!noChildType) {
+            nextFindTypeChild(itemNode.typeAnnotation.typeKey, newItem, itemNode);
+        }
+        const completionProperty = new CompletionProperty(newItem);
+        completionProperty.icon = 'backendVariable';
+        return completionProperty;
+    });
+    return result;
+}
 export function formatFrontEndVariables(frontEndVariables: Array<Variable>) {
     const result = frontEndVariables.map((itemNode) => {
         const namespace = itemNode.getNamespace();

package/src/server/getExtensionModules.ts

@@ -1,12 +1,27 @@
-import { App, Module, Namespace } from '..';
+import { App, Module, Namespace, OverriddenLogic, Logic } from '..';
 export function getExtensionModules(app: App) {
     return app.dependencies;
 }
 
-export function moduleToLogicNamesapce(m: Module) {
+export function moduleToLogicNamesapce(m: Module, overriddenLogics: Array<OverriddenLogic>) {
+    let logics = m.logics;
+    if (overriddenLogics?.length) {
+        const oLs = overriddenLogics?.length && overriddenLogics?.filter((ol) => ol.overriddenModule === m.name && !ol.getIsEmptyLogic) || [];
+        logics = m.logics.filter((l) => {
+            const ol = overriddenLogics?.length && overriddenLogics?.find((ol) => ol.overriddenModule === m.name && ol.name === l.name);
+            return !l.overridable || (l.overridable && ol && ol.getIsEmptyLogic);
+        });
+        if (oLs && oLs.length > 0) {
+            // 三种状态 1不可覆写 2可覆写未覆写 3 可覆写已覆写
+            // 此处展示 1 2 是原始接口 3 是覆写logic
+            // FIXME
+            logics = logics.concat(oLs as unknown as Array<Logic>);
+        }
+    }
+
     const ns = new Namespace({
         name: m.name,
-        logics: m.logics,
+        logics,
     });
     ns.path = `app.${m.name}.logics`;
     ns.expanded = true;

package/src/server/getLogics.ts

@@ -77,7 +77,7 @@ function javaLogicDataSourceLogics(logics: Logic[]) {
     };
 }
 
-export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic, needAllLogic: boolean = true) {
+export async function getLogics(node: CallLogic | BindEvent | Identifier | Logic, needAllLogic: boolean = true) {
     const app = node?.rootNode as App;
     if (node.concept === 'CallLogic' || node.concept === 'BindEvent' || node.concept === 'Logic') {
         const result = [];
@@ -105,7 +105,7 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
                 return pItem;
             });
             const dependencies = app.dependencies;//.filter((d) => d.enable);
-            const extensions = dependencies.map(moduleToLogicNamesapce).filter((item) => item.logics && item.logics.length);
+            const extensions = app.dependencies.map((dep) => moduleToLogicNamesapce(dep, app.overriddenLogics)).filter((item) => item.logics && item.logics.length);
             const dependEntityNs: Namespace[] = [];
             dependencies.forEach((dep) => {
                 (dep.dataSources || []).forEach((dataSource) => {
@@ -124,7 +124,7 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
             const tree = new Namespace({
                 name: 'category',
                 path: `${app.getNamespace()}.logics`,
-                title: '全局逻辑',
+                title: '服务端逻辑',
                 logics: javaLogicDataSourceLogics(app.logics).globalLogics,
                 children: [
                     ...nc,
@@ -282,7 +282,7 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
             systemTree.children.forEach((child) => (child.expanded = false));
             result.push(systemTree);
         } else {
-            // 增加全局逻辑中的系统逻辑
+            // 增加服务端逻辑中的系统逻辑
             const systemTree = new Namespace({
                 name: 'category',
                 path: `nasl`,
@@ -315,11 +315,11 @@ export async function getLogics(node: CallLogic | BindEvent| Identifier | Logic,
         }
         return result;
     } else if (node.concept === 'Identifier') {
-        const extensions = app.dependencies.map(moduleToLogicNamesapce).filter((item) => item.logics && item.logics.length);
+        const extensions = app.dependencies.map((dep) => moduleToLogicNamesapce(dep, app.overriddenLogics)).filter((item) => item.logics && item.logics.length);
         const tree = new Namespace({
             name: 'category`',
             path: `${app.getNamespace()}.logics`,
-            title: '全局逻辑',
+            title: '服务端逻辑',
             logics: app.logics,
             children: [...extensions],
         });

package/src/server/getMemberIdentifier.ts

@@ -1,5 +1,5 @@
-import { BaseNode, CompletionProperty, App, Variable, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute, LogicItem, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty, Frontend, View } from '..';
-import { formatVariableData, formatFrontEndVariables, formatConfigProperties } from './formatTsUtils';
+import { BaseNode, CompletionProperty, App, Variable, BackendVariable, Identifier, MemberExpression, Enum, NullLiteral, BooleanLiteral, Param, BindAttribute, LogicItem, TypeAnnotation, StructureProperty, Entity, Structure, EntityProperty, Frontend, View } from '..';
+import { formatVariableData, formatFrontEndVariables, formatConfigProperties, formatBackendVariables } from './formatTsUtils';
 
 // 简单实现一版本的格式化nums
 export function formatEnums(enums: Array<Enum>) {
@@ -32,6 +32,7 @@ export function formatEnums(enums: Array<Enum>) {
     });
     return result;
 }
+
 type LiteralDefination = {
     name: string;
     value: string;
@@ -80,7 +81,8 @@ function formatGlobalVariable() {
         value: 'userInfo',
         children: [
             { name: 'Status', value: 'userInfo.Status' },
-            { name: 'UserInfoExtend',
+            {
+                name: 'UserInfoExtend',
                 value: 'userInfo.UserInfoExtend',
                 children: [
                     { name: 'Company', value: 'userInfo.UserInfoExtend.Company' },
@@ -93,7 +95,8 @@ function formatGlobalVariable() {
                     { name: 'Position', value: 'userInfo.UserInfoExtend.Position' },
                     { name: 'Department', value: 'userInfo.UserInfoExtend.Department' },
                     { name: 'EmployeeId', value: 'userInfo.UserInfoExtend.EmployeeId' },
-                ] },
+                ],
+            },
             { name: 'UserName', value: 'userInfo.UserName' },
             { name: 'Email', value: 'userInfo.Email' },
             { name: 'UserId', value: 'userInfo.UserId' },
@@ -198,12 +201,16 @@ export async function getMemberIdentifier(node: BaseNode) {
             { name: '枚举', children: newEnums, expanded: false, icon: 'category' },
             { name: '变量', children: completionData, expanded: true, icon: 'category' },
             { name: '公共变量', children: globalVariable, expanded: false, icon: 'category' },
+            // { name: '服务端全局变量', children: BackEndglobalVariable, expanded: false, icon: 'category' },
             // { name: '流程变量', children: [] },
         ];
-        if ((node as Identifier).view) {
+        if ((node as Identifier).view || (node as Identifier).frontend) {
             // 获取前端全局变量
-            const frontEndVariable = getFrontEndVariablesIdentifier((node as Identifier).view);
+            const frontEndVariable = getFrontEndVariablesIdentifier((node as Identifier).view || (node as Identifier).frontend);
             result.push({ name: '前端全局变量', children: frontEndVariable, expanded: true, icon: 'category' });
+        } else if (!(node as Identifier).frontend) { // 端事件里既不能调用前端变量 也不能调用后端变量
+            const BackEndglobalVariable = getBackendVariablesIdentifier(node);
+            result.push({ name: '服务端全局变量', children: BackEndglobalVariable, expanded: true, icon: 'category' });
         }
         getCurrentLogic(node, result);
         return result;
@@ -211,7 +218,7 @@ export async function getMemberIdentifier(node: BaseNode) {
 }
 
 export function getFrontEndVariablesIdentifier(node: BaseNode) {
-    const frontend = (node as View).frontend as Frontend;
+    const frontend = (node as View).frontend as Frontend || node as Frontend;
     const frontEndVariables = frontend?.variables;
     const newFrontEndVariables = frontEndVariables ? formatFrontEndVariables(frontEndVariables) : [];
     return newFrontEndVariables;
@@ -239,24 +246,43 @@ export function getEnumsIdentifier(node: BaseNode): CompletionProperty[] {
     });
     return newEnums.concat(extensionEnums);
 }
+// 获取后端全局变量
+export function getBackendVariablesIdentifier(node: BaseNode): CompletionProperty[] {
+    const app = node.rootNode as App;
+    const variables = app?.backend.variables;
+    const newvariables = variables ? formatBackendVariables(variables) : [];
 
+    return newvariables;
+}
 // 获取变量
 export async function getVariableIdentifier(node: BaseNode): Promise<CompletionProperty[]> {
     let completionData: CompletionProperty[] = [new CompletionProperty({})];
     // 只获取第一层内容
     const app = node.getAncestor('App');
     const naslServer = (app as any).naslServer;
-    const nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
+    let nextCompletion = await naslServer.getFieldKeySelectCompletion(node, '');
+    const logic = node.getAncestor('AuthLogicForCallInterface');
+    if (logic) {
+        // 祖先节点是 AuthLogicForCallInterface 时，需要过滤掉 api 以及 ${logicName}Result 两个内置参数
+        const filterList = ['api', `${logic.name}Result`];
+        nextCompletion = nextCompletion?.filter((item: any) => {
+            if (item?.text) {
+                return filterList.findIndex((str) => str === item.text) === -1;
+            }
+            return true;
+        });
+    }
     completionData = formatVariableData(nextCompletion, node);
     return completionData;
 }
 
 // 获取公共变量
-export async function getGlobalVariableIdentifier(node: BaseNode):Promise<CompletionProperty[]> {
+export async function getGlobalVariableIdentifier(node: BaseNode): Promise<CompletionProperty[]> {
     let globalVariable: CompletionProperty[] = [];
     // 公共变量修改
     if ((node as any).view) {
         globalVariable = formatGlobalVariable();
+        // globalVariable = [];
     }
     return globalVariable;
 }