@lcap/nasl 3.6.0-alpha.1 → 3.6.0-alpha.2

package/src/concepts/utils/types.ts

@@ -1,6 +1,7 @@
 import type { App } from '../App__';
 import type { Module } from '../Module__';
 import type { Namespace } from '../Namespace__';
+import type { FrontendType } from '../FrontendType__';
 import type { Frontend } from '../Frontend__';
 import type { Backend } from '../Backend__';
 import type { Integration } from '../Integration__';
@@ -24,6 +25,7 @@ import type { BindDirective } from '../BindDirective__';
 import type { BindEvent } from '../BindEvent__';
 import type { BindStyle } from '../BindStyle__';
 import type { ViewComponent } from '../ViewComponent__';
+import type { BusinessComponent } from '../BusinessComponent__';
 import type { Attribute } from '../Attribute__';
 import type { Event } from '../Event__';
 import type { Slot } from '../Slot__';
@@ -31,10 +33,12 @@ import type { Theme } from '../Theme__';
 import type { StaticString } from '../StaticString__';
 import type { Logic } from '../Logic__';
 import type { AuthLogic } from '../AuthLogic__';
+import type { BusinessLogic } from '../BusinessLogic__';
 import type { AuthLogicForCallInterface } from '../AuthLogicForCallInterface__';
 import type { OverriddenLogic } from '../OverriddenLogic__';
 import type { AbstractInterface } from '../AbstractInterface__';
 import type { Param } from '../Param__';
+import type { ParamWithGroup } from '../ParamWithGroup__';
 import type { Return } from '../Return__';
 import type { Variable } from '../Variable__';
 import type { BackendVariable } from '../BackendVariable__';
@@ -60,6 +64,7 @@ import type { Assignment } from '../Assignment__';
 import type { BatchAssignment } from '../BatchAssignment__';
 import type { Comment } from '../Comment__';
 import type { CallLogic } from '../CallLogic__';
+import type { CallEvent } from '../CallEvent__';
 import type { CallFunction } from '../CallFunction__';
 import type { CallInterface } from '../CallInterface__';
 import type { Destination } from '../Destination__';
@@ -136,6 +141,7 @@ export interface ConceptTypeofClassMap {
   App: typeof App;
   Module: typeof Module;
   Namespace: typeof Namespace;
+  FrontendType: typeof FrontendType;
   Frontend: typeof Frontend;
   Backend: typeof Backend;
   Integration: typeof Integration;
@@ -159,6 +165,7 @@ export interface ConceptTypeofClassMap {
   BindEvent: typeof BindEvent;
   BindStyle: typeof BindStyle;
   ViewComponent: typeof ViewComponent;
+  BusinessComponent: typeof BusinessComponent;
   Attribute: typeof Attribute;
   Event: typeof Event;
   Slot: typeof Slot;
@@ -166,10 +173,12 @@ export interface ConceptTypeofClassMap {
   StaticString: typeof StaticString;
   Logic: typeof Logic;
   AuthLogic: typeof AuthLogic;
+  BusinessLogic: typeof BusinessLogic;
   AuthLogicForCallInterface: typeof AuthLogicForCallInterface;
   OverriddenLogic: typeof OverriddenLogic;
   AbstractInterface: typeof AbstractInterface;
   Param: typeof Param;
+  ParamWithGroup: typeof ParamWithGroup;
   Return: typeof Return;
   Variable: typeof Variable;
   BackendVariable: typeof BackendVariable;
@@ -195,6 +204,7 @@ export interface ConceptTypeofClassMap {
   BatchAssignment: typeof BatchAssignment;
   Comment: typeof Comment;
   CallLogic: typeof CallLogic;
+  CallEvent: typeof CallEvent;
   CallFunction: typeof CallFunction;
   CallInterface: typeof CallInterface;
   Destination: typeof Destination;
@@ -272,6 +282,7 @@ export interface ConceptClassMap {
   App: App;
   Module: Module;
   Namespace: Namespace;
+  FrontendType: FrontendType;
   Frontend: Frontend;
   Backend: Backend;
   Integration: Integration;
@@ -295,6 +306,7 @@ export interface ConceptClassMap {
   BindEvent: BindEvent;
   BindStyle: BindStyle;
   ViewComponent: ViewComponent;
+  BusinessComponent: BusinessComponent;
   Attribute: Attribute;
   Event: Event;
   Slot: Slot;
@@ -302,10 +314,12 @@ export interface ConceptClassMap {
   StaticString: StaticString;
   Logic: Logic;
   AuthLogic: AuthLogic;
+  BusinessLogic: BusinessLogic;
   AuthLogicForCallInterface: AuthLogicForCallInterface;
   OverriddenLogic: OverriddenLogic;
   AbstractInterface: AbstractInterface;
   Param: Param;
+  ParamWithGroup: ParamWithGroup;
   Return: Return;
   Variable: Variable;
   BackendVariable: BackendVariable;
@@ -331,6 +345,7 @@ export interface ConceptClassMap {
   BatchAssignment: BatchAssignment;
   Comment: Comment;
   CallLogic: CallLogic;
+  CallEvent: CallEvent;
   CallFunction: CallFunction;
   CallInterface: CallInterface;
   Destination: Destination;
@@ -407,6 +422,7 @@ export type SyntaxNode =
   | App
   | Module
   | Namespace
+  | FrontendType
   | Frontend
   | Backend
   | Integration
@@ -430,6 +446,7 @@ export type SyntaxNode =
   | BindEvent
   | BindStyle
   | ViewComponent
+  | BusinessComponent
   | Attribute
   | Event
   | Slot
@@ -437,9 +454,11 @@ export type SyntaxNode =
   | StaticString
   | Logic
   | AuthLogic
+  | BusinessLogic
   | AuthLogicForCallInterface
   | OverriddenLogic
   | Param
+  | ParamWithGroup
   | Return
   | Variable
   | BackendVariable
@@ -463,6 +482,7 @@ export type SyntaxNode =
   | BatchAssignment
   | Comment
   | CallLogic
+  | CallEvent
   | CallFunction
   | CallInterface
   | Destination
@@ -545,6 +565,7 @@ export type ModuleNodeConcept = ModuleNode['concept'];
 export type LogicNode =
   | Logic
   | AuthLogic
+  | BusinessLogic
   | AuthLogicForCallInterface;
 
 export type LogicNodeConcept = LogicNode['concept'];
@@ -561,6 +582,12 @@ export type AbstractInterfaceNode =
 
 export type AbstractInterfaceNodeConcept = AbstractInterfaceNode['concept'];
 
+export type ParamNode =
+  | Param
+  | ParamWithGroup;
+
+export type ParamNodeConcept = ParamNode['concept'];
+
 export type VariableNode =
   | Variable
   | FrontendVariable;
@@ -581,6 +608,7 @@ export type LogicItemNode =
   | BatchAssignment
   | Comment
   | CallLogic
+  | CallEvent
   | CallFunction
   | CallInterface
   | Destination

package/src/generator/genBundleFiles.ts

@@ -4,7 +4,7 @@ import * as utils from '../utils';
 
 import { genBreakpoints, clearBreakpoints } from '../breakpoint';
 
-import { App, Module, View, Frontend, Connector, FrontendVariable } from '../concepts';
+import { App, Module, View, Frontend, FrontendType, Connector, FrontendVariable } from '../concepts';
 import { genHash, RawOptions } from '.';
 import { compileComponent } from './compileComponent';
 
@@ -44,7 +44,7 @@ function stringifyMetaData(obj: any) {
       // 处理数组类型
       const elements: string[] = obj.map(element => stringifyMetaData(element));
       return `[${elements.join(',')}]`;
-    } 
+    }
     let newObj = obj;
     const properties: string[] = [];
     if (obj instanceof FrontendVariable) {
@@ -64,11 +64,29 @@ function stringifyMetaData(obj: any) {
     return `{
       ${properties.join(',')}
     }`;
-  } 
+  }
   return JSON5.stringify(obj);
 }
 
+// 生成组件
+function genComponetCode(component: RawOptions) {
+  return `(function(){
+          var componentOptions = ${component.script
+    ? `(function(){\n${component.script.trim().replace(/export default |module\.exports +=/, 'return ')}\n})()`
+    : '{}'
+  };
+          Object.assign(componentOptions, {
+              template: \`${component.template.replace(/[`$]/g, (m) => `\\${m}`)}\`,
+          });
+          return componentOptions;
+  })()`;
+}
+
 export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
+  // 获取端类型
+  const frontendType = frontend.getAncestor('FrontendType') as FrontendType;
+  // 获取业务组件
+  const businessComponents = frontendType?.businessComponents || [];
   const configLowcodeDomain = config?.lowcodeDomain;
   const fnNuimsDomain = config?.envNuimsDomain?.[config?.env] || config?.nuimsDomain;
   const fnLowcodeDomain = config?.envLcpDomain?.[config?.env]?.lcpDomain || config?.lowcodeDomain;
@@ -98,6 +116,14 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     }
   );
 
+  // 需要放在清除断点节点之前
+  let compRegStr = '';
+  businessComponents.forEach((businessComponent) => {
+    const vueOptions = businessComponent.toVueOptions();
+    const component = compileComponent(vueOptions);
+    compRegStr += `window.Vue.component('bs-${businessComponent.name}', ${genComponetCode(component)},\n);`;
+  });
+
   config?.debug && clearBreakpoints(app);
 
   /**
@@ -212,17 +238,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
     let content = `{
             path: '${route.path}',\n`;
     if (route?.component?.script) {
-      const { template } = route.component;
-      content += `component: (function(){
-                var componentOptions = ${route.component.script
-          ? `(function(){\n${route.component.script.trim().replace(/export default |module\.exports +=/, 'return ')}\n})()`
-          : '{}'
-        };
-                Object.assign(componentOptions, {
-                    template: \`${template.replace(/[`$]/g, (m) => `\\${m}`)}\`,
-                });
-                return componentOptions;
-            })(),\n`;
+      content += `component: ${genComponetCode(route.component)},\n`;
     }
     if (route?.children?.length) {
       content += `children: [
@@ -338,6 +354,8 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
 
   const assetsInfo = app.genAllAssetsInfo(config.STATIC_URL, frontend.type);
   const customNames = JSON5.stringify(assetsInfo.custom.names);
+
+
   let content = `(function(){
         `;
   if (frontend.globalScaleEnabled) {
@@ -438,7 +456,7 @@ export function genBundleFiles(app: App, frontend: Frontend, config: Config) {
 
         window.createLcapApp = () => {
             appVM = window.cloudAdminDesigner.init(platformConfig.appConfig, platformConfig, routes, metaData);
-
+            ${compRegStr}
             try {
                 var push = appVM.$router.history.push;
                 appVM.$router.history.push = function (a, b) {

package/src/generator/genReleaseBody.ts

@@ -4,12 +4,20 @@ import {
   View,
   ViewElement,
   Frontend,
+  FrontendType,
 } from '../concepts';
 import { genFrontendBundleFiles } from './genBundleFiles';
 import { genPermissionData, genLogicAuthFlag } from './permission';
 
 import * as utils from '../utils';
 
+/**
+ * 获取端类型下的所有端
+ */
+function getFrontendsByTypes(frontendTypes: FrontendType[] = []) {
+  return (frontendTypes?.map((frontendType) => (frontendType?.frontends || [])) || []).flat(2);
+}
+
 interface ServerValidationData {
   rules: object[];
   failureRules: object[];
@@ -50,7 +58,8 @@ async function mergeBodyData(app: App, opt: ReleaseData) {
   const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, opt.frontends);
   opt.logPublishFunc?.(`[权限] "[${app.title}]" 分析权限数据成功！`);
   const logicPageResourceDtoList = await genPermissionData(app);
-  const releaseFrontends = app.frontends.map((frontend) => ({
+  const allFrontends = getFrontendsByTypes(app?.frontendTypes);
+  const releaseFrontends = allFrontends.map((frontend: Frontend) => ({
     name: frontend.name,
     type: frontend.type,
     path: frontend.path,
@@ -247,8 +256,10 @@ async function getNaslAnnotatedJSON(app: App, opt: ReleaseData) {
   }
   // 如果是发布，就排除 views，导出源码就不排除
   if (opt.realRelease) {
-    NaslAnnotatedJSON.frontends.forEach((frontend: Frontend) => {
-      delete (frontend as any).views;
+    NaslAnnotatedJSON.frontendTypes.forEach((frontendType: FrontendType) => {
+      frontendType.frontends.forEach((frontend: Frontend) => {
+        delete (frontend as any).views;
+      });
     });
   }
 

package/src/generator/permission.ts

@@ -1,6 +1,7 @@
 import {
   Logic,
   View,
+  BusinessComponent,
   BaseNode,
   CallLogic,
   ViewElement,
@@ -9,6 +10,7 @@ import {
   App,
   Entity,
   Module,
+  FrontendType,
   Frontend,
   BindStyle,
   BindDirective,
@@ -52,7 +54,7 @@ async function findViewLogicReferences(logic: Logic, vis: Set<Logic> = new Set()
   const usageMap: Map<BaseNode, Usage> = await findUsage(logic);
   const usages: Usage[] = [];
   usageMap.forEach((usage: Usage, node: BaseNode) => {
-    if (node instanceof Frontend) usages.push(usage);
+    if (node instanceof FrontendType) usages.push(usage);
   });
 
   async function dfs(usage: Usage) {
@@ -82,17 +84,17 @@ async function findUIReferences(logic: Logic) {
   const usageMap: Map<BaseNode, Usage> = await findUsage(logic);
   const usages: Usage[] = [];
   usageMap.forEach((usage: Usage, node: BaseNode) => {
-    if (node instanceof Frontend) usages.push(usage);
+    if (node instanceof FrontendType) usages.push(usage);
   });
 
-  const res: Array<View | ViewElement | Frontend> = [];
+  const res: Array<View | BusinessComponent | ViewElement | Frontend | FrontendType> = [];
   function dfs(usage: Usage, parent: Usage = null) {
     if (
       (usage.node instanceof BindEvent ||
         usage.node instanceof BindAttribute ||
         usage.node instanceof BindStyle ||
         usage.node instanceof BindDirective) &&
-      (parent.node instanceof View || parent.node instanceof ViewElement || parent.node instanceof Frontend)
+      (parent.node instanceof View || parent.node instanceof BusinessComponent || parent.node instanceof ViewElement || parent.node instanceof Frontend || parent.node instanceof FrontendType)
     )
       res.push(parent.node);
 
@@ -107,7 +109,7 @@ async function findUIReferences(logic: Logic) {
   return res;
 }
 
-function findResourcesOfUI(view: View | ViewElement | Frontend) {
+function findResourcesOfUI(view: View | BusinessComponent | ViewElement | Frontend | FrontendType) {
   const res: ResourceNode[] = [];
   let node: BaseNode = view;
   while (node) {
@@ -159,7 +161,7 @@ async function findResourcesOfLogic(logic: Logic, uploaders: Map<string, ViewEle
   const logics = await findViewLogicReferences(logic);
   logics.push(logic);
 
-  let UIs: Array<View | ViewElement | Frontend> = [];
+  let UIs: Array<View | BusinessComponent | ViewElement | Frontend | FrontendType> = [];
   for (const logic of logics) {
     UIs = UIs.concat(await findUIReferences(logic));
   }

package/src/natural/transformTSCode.ts

@@ -355,7 +355,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           const viewName = nsArr.pop();
 
           return new naslTypes.Destination({
-            viewNamespace: `app.frontends.pc.views${nsArr.map((item) => `.${item}.views`).join('')}`, // viewNamespace
+            viewNamespace: `app.frontendTypes.pc.frontends.pc.views${nsArr.map((item) => `.${item}.views`).join('')}`, // viewNamespace
             viewName, // viewName
             arguments: node.arguments.slice(1).map((arg) => new naslTypes.Argument({
               expression: transformLogicNode(arg),

package/src/server/extendBaseNode.ts

@@ -64,7 +64,7 @@ BaseNode.prototype.findReadOnlyLogicUsage = function () {
   } else if (this.getAncestor('Connector')) {
     // 如果是连接器下的操作还是用它本身去查找引用
     targetNode = this;
-  }else {
+  } else {
     const sourceMap = this.parentNode.sourceMap;
     for (const item of sourceMap) {
       const logic = item[0] as Logic;
@@ -243,20 +243,20 @@ BaseNode.prototype.removeBindEntityPropertyViewEelment = async function removeBi
 
 /** 删除连接器 */
 function delConnection(node: Connection) {
-    const app = node.rootNode as App;
-    app.emit('collect:start', {
-        actionMsg: '删除连接器',
+  const app = node.rootNode as App;
+  app.emit('collect:start', {
+    actionMsg: '删除连接器',
+  });
+  if (node.connector?.connectorKind === 'kafka') {
+    // 删除相关的触发器
+    app.triggerLaunchers.forEach((launcher) => {
+      if ((launcher as MsgTriggerLauncher).calleeConnectionName === node.name) {
+        launcher.delete();
+      }
     });
-    if (node.connector?.connectorKind === 'kafka') {
-        // 删除相关的触发器
-        app.triggerLaunchers.forEach((launcher) => {
-            if ((launcher as MsgTriggerLauncher).calleeConnectionName === node.name) {
-                launcher.delete();
-            }
-        });
-    }
-    node.delete();
-    app.emit('collect:end');
+  }
+  node.delete();
+  app.emit('collect:end');
 }
 
 /**
@@ -271,12 +271,14 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
     const naslServer = (app as any).naslServer as NaslServer;
     const node = this;
     let refsList = await naslServer._isHaveRef(node);
-    // 删除的时候过滤一把组件删除提示
-    refsList = refsList.filter(
-      (item) =>
-        // 因为ui组件本身会多渲染一次,就先过滤一个
-        !item.lineText.includes(': nasl.ui.')
-    );
+    if (this.concept === 'ViewElement') {
+      // 删除的时候过滤一把组件删除提示
+      refsList = refsList.filter(
+        (item, index) =>
+          // 因为ui组件本身会多渲染一次,就先过滤一个
+          index !== 0
+      );
+    }
     // delete的弹框展示
     const confirmParms = {
       actionType: 'delete',

package/src/server/getLogics.ts

@@ -14,6 +14,9 @@ import {
   ViewElement,
   getStdlibNamespace,
   EnumItem,
+  BusinessComponent,
+  View,
+  FrontendType,
 } from '..';
 import { process2LogicNamespace } from './process2LogicNamespace';
 import { moduleToLogicNamesapce } from './getExtensionModules';
@@ -104,6 +107,56 @@ export async function getLogics(node: CallLogic | BindEvent | Identifier | Logic
   return getLogicsSync(node, needAllLogic)
 }
 
+// 获取页面元素上的方法
+function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeNames: string[]) {
+  // 获取组件逻辑, 获取传入属性的子集
+  const elements: Array<ViewElement> = [];
+  likeComponent.elementsMethods(likeComponent.elements, elements, parentNodeNames);
+  // 获取端类型
+  const frontendType = likeComponent.getAncestor('FrontendType') as FrontendType;
+  // 端下的业务组件
+  const businessComponents = frontendType?.businessComponents;
+  // 获取app
+  const app = likeComponent.getAncestor('App');
+  const viewElements: Array<Namespace> = [];
+  elements.forEach((item) => {
+    let businessComponent;
+    if (item.tag.startsWith('bs-')) {
+      businessComponent = businessComponents.find((businessComponent) => {
+        return `bs-${businessComponent?.name}` === item.tag;
+      });
+    }
+    let eleLogis;
+    if (businessComponent) {
+      eleLogis = businessComponent.logics?.filter((logic) => {
+        return logic.isPublic;
+      });
+    } else {
+      const itemTag = toHump(item.tag);
+      const naslServer = (app as any).naslServer;
+      const elementsLogic = naslServer.elementsLogic;
+      const elementsLogicName = itemTag;
+      eleLogis = elementsLogic[elementsLogicName];
+    }
+    // 看是不是有已经有有参数的函数了
+    if (Array.isArray(eleLogis) && eleLogis.length) {
+      let path = `elements.${toHump(item.name)}.logics`;
+      if (businessComponent) {
+        path = `elements.${toHump(item.name)}`;
+      }
+      const viewElement = new Namespace({
+        title: toHump(item.name),
+        logics: eleLogis.map((item: Logic) => Logic.from(item.toJSON())),
+        path,
+        originConcept: 'ViewElement',
+      });
+      viewElement.expanded = false;
+      viewElements.push(viewElement);
+    }
+  });
+  return viewElements;
+}
+
 export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic, needAllLogic: boolean = true) {
   const app = node?.rootNode as App;
   if (node?.concept === 'CallLogic' || node?.concept === 'BindEvent' || node?.concept === 'Logic') {
@@ -206,39 +259,24 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
       expanded: false,
     });
 
-    if (node.view && node.view.logics) {
+    // 类组件节点
+    const likeComponent: View | BusinessComponent = node.view || node.getAncestor('BusinessComponent') as BusinessComponent;
+    if (likeComponent?.logics) {
       // 遍历node的parentNode，获取viewElement层级节点
       const parentNodeNames: Array<string> = [];
       getViewElementPath(node.parentNode, parentNodeNames);
       // 获取组件逻辑, 获取传入属性的子集
-      const elements: Array<ViewElement> = [];
-      node.view.elementsMethods(node.view.elements, elements, parentNodeNames);
-      const viewElements: Array<Namespace> = [];
-      elements.forEach((item) => {
-        const itemTag = toHump(item.tag);
-        const app = node.getAncestor('App');
-        const naslServer = (app as any).naslServer;
-        const elementsLogic = naslServer.elementsLogic;
-        const elementsLogicName = itemTag;
-        const eleLogis = elementsLogic[elementsLogicName];
-        // 看是不是有已经有有参数的函数了
-        if (Array.isArray(eleLogis) && eleLogis.length) {
-          const viewElement = new Namespace({
-            title: toHump(item.name),
-            logics: eleLogis.map((item: Logic) => Logic.from(item.toJSON())),
-            path: `elements.${toHump(item.name)}.logics`,
-            originConcept: 'ViewElement',
-          });
-          viewElement.expanded = false;
-          viewElements.push(viewElement);
-        }
-      });
+      const viewElements: Namespace[] = getElementsMethods(likeComponent, parentNodeNames);
+      const titleMap = {
+        View: '页面逻辑',
+        BusinessComponent: '业务组件逻辑',
+      };
       // 增加页面逻辑
       const tree = new Namespace({
         name: 'category',
-        path: `${node.view.getNamespace()}.${node.view.name}.logics`,
-        title: '页面逻辑',
-        logics: node.view.logics,
+        path: `${likeComponent.getNamespace()}.${likeComponent.name}.logics`,
+        title: titleMap[likeComponent.concept],
+        logics: likeComponent.logics,
         children: viewElements,
       });
       tree.expanded = false;
@@ -264,19 +302,19 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
               node?.frontend?.type === 'h5'
                 ? filteredBrowserLogics.filter((item) => ['getDistance', 'getLocation', 'getIsMiniApp'].includes(item.name))
                 : filteredBrowserLogics.filter(
-                    (item) =>
-                      ![
-                        'getDistance',
-                        'getLocation',
-                        'getIsMiniApp',
-                        'navigateToUserInfo',
-                        'getWeChatHeadImg',
-                        'getWeChatNickName',
-                        'getWeChatPhone',
-                        'getWeChatOpenid',
-                        'navigateToUserPhone',
-                      ].includes(item.name)
-                  ),
+                  (item) =>
+                    ![
+                      'getDistance',
+                      'getLocation',
+                      'getIsMiniApp',
+                      'navigateToUserInfo',
+                      'getWeChatHeadImg',
+                      'getWeChatNickName',
+                      'getWeChatPhone',
+                      'getWeChatOpenid',
+                      'navigateToUserPhone',
+                    ].includes(item.name)
+                ),
             expanded: false,
           }),
           new Namespace({
@@ -343,7 +381,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
             title: '微信',
             logics: getStdlibNamespace()
               .findChild('browser')
-              .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid','navigateToUserPhone','getWeChatPhone'].includes(item.name)),
+              .logics.filter((item) => ['navigateToUserInfo', 'getWeChatHeadImg', 'getWeChatNickName', 'getWeChatOpenid', 'navigateToUserPhone', 'getWeChatPhone'].includes(item.name)),
             expanded: false,
           })
         );
@@ -363,7 +401,7 @@ export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic,
         // if (!item.enable) {
         //     return;
         // }
-        const fed = item.frontends.find((item) => item.type === node?.frontend?.type);
+        const fed = item.frontends.find((item) => item.type === (node?.getAncestor('FrontendType') as FrontendType)?.kind);
         if (fed?.logics.length > 0) {
           systemTree.children.push(
             new Namespace({

package/src/server/getMemberIdentifier.ts

@@ -11,6 +11,7 @@ import {
   LogicItem,
   Frontend,
   View,
+  BusinessComponent,
   types,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
@@ -206,7 +207,7 @@ function getCurrentLogic(
       node.parentNode instanceof BindAttribute &&
       (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file' || node.parentNode.name === 'can-dragable-handler' || node.parentNode.name === 'can-dropin-handler'))
   ) {
-    const { view } = node;
+    const view = node.view || node.getAncestor('BusinessComponent') as BusinessComponent;
     const viewLogics = view.logics;
     const logicVariable = viewLogics.map((item) => {
       const newLogic: LiteralDefination = {
@@ -258,6 +259,10 @@ export async function getMemberIdentifier(node: types.SyntaxNode) {
       // 获取页面组件
       const pageComponents = await getPageComponentsIdentifier(node);
       result.push({ name: '页面组件', children: pageComponents, expanded: true, icon: 'category' });
+    } else if ((node as Identifier).getAncestor('BusinessComponent')) {
+      // 获取页面组件
+      const pageComponents = await getPageComponentsIdentifier(node);
+      result.push({ name: '组件元素', children: pageComponents, expanded: true, icon: 'category' });
     } else if (!(node as Identifier).frontend && (node as any).concept !== 'BackendVariable') {
       // 端事件里既不能调用前端变量 也不能调用后端变量
       const BackEndglobalVariable = getBackendVariablesIdentifier(node);
@@ -324,6 +329,7 @@ export async function getVariableIdentifier(node: types.SyntaxNode): Promise<Com
     });
   }
   completionData = formatVariableData(nextCompletion, node);
+
   return completionData;
 }
 

package/src/server/getProcesses.ts

@@ -267,7 +267,7 @@ export function syncMemberExpression(elem: ProcessElement | Process, callback: (
         }
       });
     }
-    if (el.type === 'ExclusiveGateway' || el.type === 'AutoTask') {
+    if (['ExclusiveGateway', 'AutoTask', 'InclusiveGateway'].includes(el.type)) {
       travelDown(el.logic, (node) => {
         if (node instanceof MemberExpression) {
           callback(node);
@@ -435,7 +435,7 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
     ],
   });
   processVariables.icon = 'Process';
-  if (processElem.type === 'ExclusiveGateway') {
+  if (['ExclusiveGateway', 'InclusiveGateway'].includes(processElem.type)) {
     const scopeVariable = new CompletionProperty({
       name: processElem.name,
       value: processElem.name,
@@ -589,7 +589,7 @@ export function getProcessVariableSuggestionsAll(node: ProcessElement, exitConst
   });
   processVariables.expanded = true;
   processVariables.icon = 'Process';
-  if (processElem.type === 'ExclusiveGateway') {
+  if (['ExclusiveGateway', 'AutoTask', 'InclusiveGateway'].includes(processElem.type)) {
     const scopeVariable = new CompletionProperty({
       name: processElem.name,
       value: processElem.name,