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

package/src/server/naslServer.ts

@@ -88,6 +88,8 @@ import {
   UnaryExpression,
   types,
   asserts,
+  BusinessComponent,
+  CallEvent,
 } from '../concepts';
 
 import * as utils from '../utils';
@@ -429,7 +431,7 @@ class NaslServer {
     const {
       structures = [],
       metadataTypes = [],
-      frontends = [],
+      frontendTypes = [],
       interfaces = [],
       enums = [],
       logics = [],
@@ -449,6 +451,10 @@ class NaslServer {
       namespaces = [],
     } = module as Connector;
 
+    const {
+      frontends = []
+    } = module as Module;
+
     yield* getTsFiles(structures, 'structure');
     yield* getTsFiles(metadataTypes, 'metadataType');
 
@@ -456,20 +462,25 @@ class NaslServer {
       yield* getTsFiles(overriddenLogics, 'overriddenLogic', OverriddenLogic);
       yield* getTsFiles(backend?.variables ?? [], 'backend_variable');
 
-      for (const frontend of frontends) {
-        yield* getTsFile(frontend, 'frontend');
-        yield* getTsFiles(frontend.variables, 'frontend_variable');
-        yield* getTsFiles(concat(frontend.bindEvents, 'logics'), 'frontend_bindEvent_logic');
-
-        if (!config.closeViews) {
-          yield* view2TSFile(frontend.views);
+      for (const frontendType of frontendTypes) {
+        yield* getTsFile(frontendType, 'frontendType');
+        for (const dep of frontendType.componentDependencies) {
+          results.push(...(yield* self.contentToFile(dep)));
         }
+        for (const frontend of frontendType.frontends) {
+          yield* getTsFile(frontend, 'frontend');
+          yield* getTsFiles(frontend.variables, 'frontend_variable');
+          yield* getTsFiles(concat(frontend.bindEvents, 'logics'), 'frontend_bindEvent_logic');
 
-        for (const dep of frontend.componentDependencies) {
-          results.push(...(yield* self.contentToFile(dep)));
+          if (!config.closeViews) {
+            yield* view2TSFile(frontend.views);
+          }
         }
+        // 业务组件
+        yield* getTsFiles(frontendType.businessComponents, 'businessComponents');
       }
     } else {
+      // 依赖库
       yield* getTsFiles(concat(frontends, 'logics' as any), 'frontend_logic');
     }
 
@@ -810,7 +821,7 @@ class NaslServer {
 
       const types = /<([^()]+)>/g.exec(displayString);
       const typeStr = types && types[1];
-      const {app} = node;
+      const app = node.getAncestor('App') as App;
       if (typeStr.includes('__name: "AStructure_')) {
         const properties: StructureProperty[] = [];
         typeStr.replace(/([^:\s]+):\s+([^;]+);/g, ($1, name, typeKey) => {
@@ -1593,9 +1604,10 @@ class NaslServer {
     const self = this;
     const diagnostics: Diagnostic[] = [];
 
-    if (fileNode instanceof View) {
+    if (fileNode instanceof View || fileNode instanceof BusinessComponent) {
       yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* attachView([node, value]) {
-        if (node instanceof ViewElement && node.view === fileNode) {
+        const likeComponent = node.getAncestor('View') || node.getAncestor('BusinessComponent');
+        if (node instanceof ViewElement && likeComponent === fileNode) {
           if (node.tag) {
             yield* utils.wrapForEachToGenerator(node.bindAttrs, (bindAttr) => {
               if ((bindAttr.model || bindAttr.sync) && bindAttr.expression) {
@@ -1636,14 +1648,14 @@ class NaslServer {
               }
             });
           }
-        } else if ((node instanceof Variable || node instanceof Return) && node.view === fileNode) {
+        } else if ((node instanceof Variable || node instanceof Return) && likeComponent === fileNode) {
           if (!node.typeAnnotation && !node.__TypeAnnotation) {
             const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
             let msg;
             yield* fileNode.traverseChildrenGenerator((nodeIn) => {
               if (nodeIn && (nodeIn instanceof BatchAssignment || (nodeIn instanceof Assignment && nodeIn.left?.name))) {
                 // 子页面内部逻辑过滤
-                if (nodeIn.view !== fileNode) return;
+                if ((nodeIn.view || nodeIn.getAncestor('BusinessComponent')) !== fileNode) return;
                 // 当局部变量、输出参数属于页面内逻辑时，需过滤同页面下不同逻辑下的同名变量
                 if (node.logic && node.logic !== nodeIn.logic) return;
                 // 跟变量无关的赋值过滤
@@ -2179,7 +2191,7 @@ class NaslServer {
       const diagnostic = {
         node: fileNode,
         severity: 'error',
-        message: `连接器 ${fileNode.name} 参数配置缺失`,
+        message: `连接器 ${fileNode.name} 参数配置有更新`,
         // 保留原来的内容方便查询一些问题
         originalDiagnostic: {
           fileName: '',
@@ -2460,6 +2472,7 @@ class NaslServer {
       node.parentKey !== 'playground' &&
       node.parentKey !== 'consequent' &&
       node.parentNode?.parentNode?.concept !== 'CallInterface' &&
+      node.parentNode.concept !== 'Block' &&
       !node.__TypeAnnotation
     ) {
       let showErr = false;
@@ -2719,7 +2732,7 @@ class NaslServer {
     }
 
     if (!minRange) {
-      if (fileNode instanceof View) {
+      if (fileNode instanceof View || fileNode instanceof BusinessComponent) {
         return { node: fileNode, item: sourceMap.get(fileNode) } as MinRange;
       }
       if (process.env.NODE_ENV === 'development') {
@@ -3120,6 +3133,9 @@ class NaslServer {
         );
         const results = await Promise.all(promises);
         results.forEach((constRefs) => {
+          if(constRefs.symbolDisplayString.includes('(parameter)')) {
+            return;
+          }
           refsList = [...refsList, ...constRefs.refs];
         });
       }
@@ -3170,6 +3186,9 @@ class NaslServer {
             minRange.setTypeMethods = 'setCalleeNamespace';
             minRange.newValue = `elements.${  newValue  }.logics`;
           }
+          if (minRange.node instanceof CallEvent) {
+            minRange.setTypeMethods = 'setCalleeName';
+          }
           // 如果节点是实体修改引发calllogic修改
           if (
             minRange.node instanceof CallLogic &&
@@ -3540,11 +3559,12 @@ class NaslServer {
           if (node instanceof Param && minRange.node instanceof Interface) {
             return null;
           }
-          // 如果是被影响的是页面
-          if (minRange.node instanceof View) {
-            if (node instanceof View) {
+          // 如果是被影响的是页面/业务组件
+          if (minRange.node instanceof View || minRange.node instanceof BusinessComponent) {
+            if (node instanceof View || node instanceof BusinessComponent) {
               // 如果是子页面修改
               // 父页面引起子页面改名，就可以不改了，自动同步
+              // 页面中的业务组件，业务组件中的业务组件等都需要忽略
               if (minRange.node !== node) {
                 return null;
               }
@@ -3563,6 +3583,9 @@ class NaslServer {
               if (minRange.node !== node) {
                 return null;
               }
+            } else if (node instanceof BusinessComponent) {
+              minRange.setTypeMethods = 'setTag';
+              minRange.newValue = `bs-${newValue}`;
             } else if (!(node instanceof Role)) {
               /**
                * 无论是逻辑还是实体中的key，修改都不应该触发
@@ -3846,6 +3869,7 @@ class NaslServer {
       !(fileNode.parentNode instanceof Backend) &&
       !isConnectorLogic &&
       !(fileNode instanceof View) &&
+      !(fileNode instanceof BusinessComponent) &&
       !(fileNode instanceof ConfigProperty)
     ) {
       fileNode = fileNode.parentNode as FileNode & types.SyntaxNode;

package/src/server/translator.ts

@@ -11,6 +11,7 @@ import {
   EntityProperty,
   EntityIndex,
   View,
+  BusinessComponent,
   Destination,
   Enum,
   BindEvent,
@@ -172,6 +173,11 @@ const TS_RULES: Array<{
     result: '找不到配置参数$2',
     transforms: [transformType, transformType],
   },
+  {
+    re: /Property '(.+?)' is private and only accessible within class '(.+?)'./,
+    result: '“$1”是私有的，只能在“$2”中访问。',
+    transforms: [transformType, transformType],
+  },
   {
     re: /Object literal may only specify known properties, and '(.+?)' does not exist in type/,
     result: '当前参数$1，不可用。',
@@ -473,7 +479,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
   // const isFELogic = ['BindEvent', 'View'].includes(parentNode.concept);
 
   // 有一些节点报错信息不向外暴露,缺失一些原生标签等等的展示
-  if (node instanceof View || node instanceof ViewElement) {
+  if (node instanceof View || node instanceof BusinessComponent || node instanceof ViewElement) {
     if (text.startsWith(`'nasl.ui' has no exported member named `)) {
       return null;
     } else if (text.startsWith(`Property '`) && text.includes(`does not exist on type 'typeof ui'.`)) {

package/src/service/storage/init.ts

@@ -88,7 +88,6 @@ async function deleteExpiredRecords() {
       expiredRecordsRequest.onsuccess = (event: any) => {
         const cursor = event.target.result;
         if (cursor) {
-          console.log(cursor);
           objectStore.delete(cursor.primaryKey);
           cursor.continue();
         } else {
@@ -1213,7 +1212,7 @@ export async function loadApp(appId?: string) {
       roles: [],
       dependencies: [],
       interfaceDependencies: [],
-      frontends: [],
+      frontendTypes: [],
       metadataTypes: []
     });
   } else {

package/src/templator/genCreateBlock.ts

@@ -287,16 +287,16 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
  * @param resolver 实体创建 Action
  */
 export function genCreateBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
   const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
   const nameGroup: NameGroup = {};
-  nameGroup.viewElementMainView = view.getViewElementUniqueName('form1');
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
+  nameGroup.viewElementMainView = likeComponent.getViewElementUniqueName('form1');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');
 
   // 收集所有和本实体关联的实体
   const selectNameGroupMap: Map<string, NameGroup> = new Map();
@@ -309,8 +309,8 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement) {
       if (relationEntity) {
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         if (displayedProperty) {
-          const viewElementSelect = view.getViewElementUniqueName('select');
-          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
+          const viewElementSelect = likeComponent.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);
           selectNameGroup.viewElementSelect = viewElementSelect;
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -275,24 +275,24 @@ function genCreateLogic(nameGroup: NameGroup) {
 }
 
 export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('tableView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('tableView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
-  nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
-  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-  nameGroup.viewLogicInit = view.getLogicUniqueName('init');
-  nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
-  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-  nameGroup.viewLogicBlurUpdate = view.getLogicUniqueName('blurUpdate');
-  nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewVariableInput = view.getVariableUniqueName('input');
-  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
+  nameGroup.viewElementSaveModal = likeComponent.getViewElementUniqueName('saveModal');
+  nameGroup.viewElementSaveModalForm = likeComponent.getViewElementUniqueName('saveModalForm');
+  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
+  nameGroup.viewLogicInit = likeComponent.getLogicUniqueName('init');
+  nameGroup.viewLogicCreate = likeComponent.getLogicUniqueName('create');
+  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');
+  nameGroup.viewLogicBlurUpdate = likeComponent.getLogicUniqueName('blurUpdate');
+  nameGroup.viewLogicReload = likeComponent.getLogicUniqueName('reload');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewVariableInput = likeComponent.getVariableUniqueName('input');
+  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');
 
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();
@@ -308,8 +308,8 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         if (displayedProperty) {
           entitySet.add(relationEntity);
-          const viewElementSelect = view.getViewElementUniqueName('select');
-          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
+          const viewElementSelect = likeComponent.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);
           selectNameGroup.viewElementSelect = viewElementSelect;
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -518,26 +518,26 @@ function genDetailLogic(entity: Entity, nameGroup: NameGroup) {
 
 // 列表（全）
 export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('tableView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('tableView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
-  nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
-  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-  nameGroup.viewLogicInit = view.getLogicUniqueName('init');
-  nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
-  nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
-  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-  nameGroup.viewLogicUpdateSubmit = view.getLogicUniqueName('updateSubmit');
-  nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewVariableInput = view.getVariableUniqueName('input');
-  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
-  nameGroup.viewVariableIsUpdate = view.getVariableUniqueName('isUpdate');
+  nameGroup.viewElementSaveModal = likeComponent.getViewElementUniqueName('saveModal');
+  nameGroup.viewElementSaveModalForm = likeComponent.getViewElementUniqueName('saveModalForm');
+  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
+  nameGroup.viewLogicInit = likeComponent.getLogicUniqueName('init');
+  nameGroup.viewLogicCreate = likeComponent.getLogicUniqueName('create');
+  nameGroup.viewLogicModify = likeComponent.getLogicUniqueName('modify');
+  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');
+  nameGroup.viewLogicUpdateSubmit = likeComponent.getLogicUniqueName('updateSubmit');
+  nameGroup.viewLogicReload = likeComponent.getLogicUniqueName('reload');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewVariableInput = likeComponent.getVariableUniqueName('input');
+  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');
+  nameGroup.viewVariableIsUpdate = likeComponent.getVariableUniqueName('isUpdate');
 
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();
@@ -553,8 +553,8 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         if (displayedProperty) {
           entitySet.add(relationEntity);
-          const viewElementSelect = view.getViewElementUniqueName('select');
-          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
+          const viewElementSelect = likeComponent.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);
           selectNameGroup.viewElementSelect = viewElementSelect;
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');
@@ -646,26 +646,26 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
 
 // 数据网格（全）
 export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('gridView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('gridView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
-  nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
-  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-  nameGroup.viewLogicInit = view.getLogicUniqueName('init');
-  nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
-  nameGroup.viewLogicModify = view.getLogicUniqueName('modify');
-  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-  nameGroup.viewLogicUpdateSubmit = view.getLogicUniqueName('updateSubmit');
-  nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewVariableInput = view.getVariableUniqueName('input');
-  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
-  nameGroup.viewVariableIsUpdate = view.getVariableUniqueName('isUpdate');
+  nameGroup.viewElementSaveModal = likeComponent.getViewElementUniqueName('saveModal');
+  nameGroup.viewElementSaveModalForm = likeComponent.getViewElementUniqueName('saveModalForm');
+  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
+  nameGroup.viewLogicInit = likeComponent.getLogicUniqueName('init');
+  nameGroup.viewLogicCreate = likeComponent.getLogicUniqueName('create');
+  nameGroup.viewLogicModify = likeComponent.getLogicUniqueName('modify');
+  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');
+  nameGroup.viewLogicUpdateSubmit = likeComponent.getLogicUniqueName('updateSubmit');
+  nameGroup.viewLogicReload = likeComponent.getLogicUniqueName('reload');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewVariableInput = likeComponent.getVariableUniqueName('input');
+  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');
+  nameGroup.viewVariableIsUpdate = likeComponent.getVariableUniqueName('isUpdate');
 
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();
@@ -681,8 +681,8 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         if (displayedProperty) {
           entitySet.add(relationEntity);
-          const viewElementSelect = view.getViewElementUniqueName('select');
-          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
+          const viewElementSelect = likeComponent.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);
           selectNameGroup.viewElementSelect = viewElementSelect;
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');

package/src/templator/genGetBlock.ts

@@ -68,14 +68,15 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 }
 
 export function genGetBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
+  const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const { ns } = entity;
   const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
 
   const nameGroup: NameGroup = {};
-  nameGroup.viewParamId = view.getParamUniqueName('id');
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewLogicLoad = view.getLogicUniqueName('load');
+  nameGroup.viewParamId = likeComponent.getParamUniqueName('id');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicLoad = likeComponent.getLogicUniqueName('load');
 
   return `<template>
     ${config.scope === 'h5' ? genH5GetTemplate(entity, nameGroup) : genGetTemplate(entity, nameGroup)}
@@ -85,7 +86,7 @@ export function genGetBlock(entity: Entity, oldNode: ViewElement) {
 {
     "viewParams": [
         {
-            "concept": "Param",
+            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }

package/src/templator/genGridViewBlock.ts

@@ -245,16 +245,16 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
  */
 // 数据网格（简）
 export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('gridView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('gridView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
+  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');
 
   // 当前节点的currentName
   nameGroup.currentName = oldNode.getCurrentName();
@@ -294,17 +294,17 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
 }
 
 export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const { entity } = property;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('gridView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('gridView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
+  nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');
 
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();

package/src/templator/genListViewBlock.ts

@@ -94,14 +94,14 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newLo
  * 生成实体选择框区块
  */
 export function genListViewBlock(entity: Entity, oldNode: ViewElement, property: EntityProperty) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('listView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('listView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView, false);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
   // 当前节点的currentName
   nameGroup.currentName = oldNode.getCurrentName();
   const displayedProperty = property || getFirstDisplayedProperty(entity);

package/src/templator/genSelectBlock.ts

@@ -104,12 +104,12 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
  * @returns
  */
 export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('select');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('select');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView, false);
   nameGroup.viewElementMainView = viewElementMainView;
   nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
 

package/src/templator/genTableBlock.ts

@@ -198,15 +198,15 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
  *        load_select_student -> load_someView_select_student
  */
 export function genTableBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('tableView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('tableView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
   // 当前节点的currentName
   nameGroup.currentName = oldNode.getCurrentName();
   // 收集所有和本实体关联的实体
@@ -245,16 +245,16 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
 }
 
 export function genTableColumnBlock(property: EntityProperty, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const { entity } = property;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
 
-  const viewElementMainView = view.getViewElementUniqueName('tableView');
-  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  const viewElementMainView = likeComponent.getViewElementUniqueName('tableView');
+  const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
 
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();

package/src/templator/genUpdateBlock.ts

@@ -307,7 +307,8 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 
 // 生成修改区块
 export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
+  const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
@@ -315,11 +316,11 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
   const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
 
   const nameGroup: NameGroup = {};
-  nameGroup.viewElementMainView = view.getViewElementUniqueName('form1');
-  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-  nameGroup.viewParamId = view.getParamUniqueName('id');
-  nameGroup.viewLogicLoad = view.getLogicUniqueName('load');
-  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
+  nameGroup.viewElementMainView = likeComponent.getViewElementUniqueName('form1');
+  nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewParamId = likeComponent.getParamUniqueName('id');
+  nameGroup.viewLogicLoad = likeComponent.getLogicUniqueName('load');
+  nameGroup.viewLogicSubmit = likeComponent.getLogicUniqueName('submit');
 
   // 收集所有和本实体关联的实体
   const selectNameGroupMap: Map<string, NameGroup> = new Map();
@@ -332,8 +333,8 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
       if (relationEntity) {
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
         if (displayedProperty) {
-          const viewElementSelect = view.getViewElementUniqueName('select');
-          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
+          const viewElementSelect = likeComponent.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementSelect, false, relationEntity.name);
           selectNameGroup.viewElementSelect = viewElementSelect;
           // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
           const key = [property.name, relationEntity.name].join('-');
@@ -357,7 +358,7 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
 {
     "viewParams": [
         {
-            "concept": "Param",
+            "concept": "${isBusinessComponent ? 'ParamWithGroup' : 'Param'}",
             "name": "${nameGroup.viewParamId}",
             "typeAnnotation": ${JSON.stringify(NaslCoreTypeAnnotation.Long)}
         }