@lcap/nasl 3.5.0-alpha.1 → 3.5.0-beta.2

package/src/server/naslServer.ts

@@ -88,6 +88,7 @@ import {
   UnaryExpression,
   types,
   asserts,
+  BusinessComponent,
 } from '../concepts';
 
 import * as utils from '../utils';
@@ -429,7 +430,7 @@ class NaslServer {
     const {
       structures = [],
       metadataTypes = [],
-      frontends = [],
+      frontendTypes = [],
       interfaces = [],
       enums = [],
       logics = [],
@@ -449,6 +450,10 @@ class NaslServer {
       namespaces = [],
     } = module as Connector;
 
+    const {
+      frontends = []
+    } = module as Module;
+
     yield* getTsFiles(structures, 'structure');
     yield* getTsFiles(metadataTypes, 'metadataType');
 
@@ -456,20 +461,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 +820,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) => {
@@ -2179,7 +2189,7 @@ class NaslServer {
       const diagnostic = {
         node: fileNode,
         severity: 'error',
-        message: `连接器 ${fileNode.name} 参数配置缺失`,
+        message: `连接器 ${fileNode.name} 参数配置有更新`,
         // 保留原来的内容方便查询一些问题
         originalDiagnostic: {
           fileName: '',
@@ -2460,6 +2470,7 @@ class NaslServer {
       node.parentKey !== 'playground' &&
       node.parentKey !== 'consequent' &&
       node.parentNode?.parentNode?.concept !== 'CallInterface' &&
+      node.parentNode.concept !== 'Block' &&
       !node.__TypeAnnotation
     ) {
       let showErr = false;
@@ -3563,6 +3574,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 +3860,7 @@ class NaslServer {
       !(fileNode.parentNode instanceof Backend) &&
       !isConnectorLogic &&
       !(fileNode instanceof View) &&
+      !(fileNode instanceof BusinessComponent) &&
       !(fileNode instanceof ConfigProperty)
     ) {
       fileNode = fileNode.parentNode as FileNode & types.SyntaxNode;
@@ -4089,7 +4104,7 @@ class NaslServer {
 
       // 位置计算偏移
       if ('getQuickInfoOffset' in node) {
-        Object.assign(fileDetail, (node as any).getQuickInfoOffset(fileDetail, getCode(item)));
+        Object.assign(fileDetail, (node as any).getQuickInfoOffset(item, () => getCode(item)));
       }
 
       yield;
@@ -4097,30 +4112,6 @@ class NaslServer {
       // 位置计算偏移2
       // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
       if (
-        node.concept === 'BinaryExpression' ||
-        node.concept === 'CallFunction' ||
-        node.concept === 'CallInterface'
-      ) {
-        const code = getCode(item);
-        // 如果没有括号 ，括号就在外面，就 -1
-        // 有括号就找到括号的位置 然后 -1
-        let indexOf = 0;
-        if (!code.includes('(')) {
-          indexOf = -1;
-        } else {
-          // 如果有泛型先往前找一找
-          if (code.includes('<')) {
-            indexOf = Math.min(code.indexOf('<'), code.indexOf('('));
-          } else {
-            indexOf = code.indexOf('(');
-          }
-          const subStr = code.substring(0, indexOf);
-          const codeArr = subStr?.split('.');
-          const lastLen = codeArr?.[codeArr.length - 1]?.length;
-          indexOf = subStr.length - lastLen;
-        }
-        fileDetail.offset += indexOf;
-      } else if (
         node.concept === 'MemberExpression' ||
         node.concept === 'Identifier' ||
         node.concept === 'QueryFieldExpression' ||
@@ -4146,26 +4137,6 @@ class NaslServer {
         let newCode = code.substring(0, indexOf);
         newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
         fileDetail.offset = newCode.length + 'return '.length;
-      } else if (['NewComposite', 'NewList', 'NewMap'].includes(node.concept)) {
-        let type;
-        switch (node.concept) {
-          case 'NewComposite':
-            type = '__newComposite';
-            break;
-          case 'NewList':
-            type = '__newList';
-            break;
-          case 'NewMap':
-            type = '__newMap';
-            break;
-          default:
-        }
-        const code = getCode(item);
-        fileDetail.line = item.end.line;
-        const indexOf = code.indexOf(`return ${type}`);
-        let newCode = code.substring(0, indexOf);
-        newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
-        fileDetail.offset = newCode.length + 'return '.length;
       } else if (['OqlQueryComponent'].includes(node.concept)) {
         fileDetail.offset += 10;
       }

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 {
@@ -1183,7 +1182,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

@@ -447,26 +447,26 @@ function genModifyLogic(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();
@@ -482,8 +482,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('-');
@@ -575,26 +575,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();
@@ -610,8 +610,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,14 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 }
 
 export function genGetBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   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)}

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,7 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 
 // 生成修改区块
 export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
-  const { view } = oldNode;
+  const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
@@ -315,11 +315,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 +332,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('-');

package/src/templator/utils.ts

@@ -1,5 +1,5 @@
 import { utils } from '..';
-import { App, Module, Entity, EntityProperty, Logic, View, Namespace, TypeAnnotation } from '../concepts';
+import { App, Module, Entity, EntityProperty, Logic, View, Namespace, TypeAnnotation, BusinessComponent } from '../concepts';
 
 export const filterProperty = (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') => (property: EntityProperty) => {
   if (property.display) {
@@ -131,7 +131,7 @@ function capFirstLetter(word: string) {
  */
 export function genUniqueQueryNameGroup(
   scope: App | Module | Namespace,
-  view: View,
+  view: View | BusinessComponent,
   componentName: string = '',
   defaultInView: boolean = true,
   suffix: string = ''