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

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/genQueryComponent.ts

@@ -162,40 +162,45 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
       })
     ),
   ];
-  const callQueryComponent = NaslQueryExpression.CallQueryComponent({
-    label: '数据查询',
-    // 2.11版本的数据查询，返回类型将自动推断
-    // 2.22版本的数据查询，实体支持列筛选，(select.selectElements 会初始化实体对应的 QueryFieldExpression 节点)
-    ideVersion: '2.22',
-    typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
-    select,
-    from,
-    where,
-    groupBy: [],
-    having: null,
-    orderBy: supportSort
-      ? [
-          NaslQueryExpression.QueryOrderByExpression({
-            label: '查询组件OrderBy元素',
-            order: NaslLogicItem.Identifier({
-              name: 'order',
-            }),
-            orderElement: NaslLogicItem.Identifier({
-              name: 'sort',
-            }),
-          }),
-        ]
-      : [],
-    logicName: nameGroup.logic,
-    structureName: nameGroup.structure,
-    limit: null,
-  });
   return NaslLogicItem.Assignment({
-    left: NaslLogicItem.Identifier({ name: 'result' }),
-    right: NaslLogicItem.Paginate({
-      list: callQueryComponent,
-      page: NaslLogicItem.Identifier({ name: 'page' }),
-      size: NaslLogicItem.Identifier({ name: 'size' }),
+    left: NaslLogicItem.Identifier({
+      name: 'result',
+    }),
+    right: NaslQueryExpression.CallQueryComponent({
+      label: '数据查询',
+      // 2.11版本的数据查询，返回类型将自动推断
+      // 2.22版本的数据查询，实体支持列筛选，(select.selectElements 会初始化实体对应的 QueryFieldExpression 节点)
+      ideVersion: '2.22',
+      typeAnnotation: NaslTypeAnnotation.AnonymousStructure(aStructureProperties),
+      select,
+      from,
+      where,
+      groupBy: [],
+      having: null,
+      orderBy: supportSort
+        ? [
+            NaslQueryExpression.QueryOrderByExpression({
+              label: '查询组件OrderBy元素',
+              order: NaslLogicItem.Identifier({
+                name: 'order',
+              }),
+              orderElement: NaslLogicItem.Identifier({
+                name: 'sort',
+              }),
+            }),
+          ]
+        : [],
+      logicName: nameGroup.logic,
+      structureName: nameGroup.structure,
+      limit: NaslQueryExpression.QueryLimitExpression({
+        label: '查询组件 Limit 子句',
+        pageElement: NaslLogicItem.Identifier({
+          name: 'page',
+        }),
+        pageSizeElement: NaslLogicItem.Identifier({
+          name: 'size',
+        }),
+      }),
     }),
   });
 }

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 = ''
@@ -246,14 +246,34 @@ export const NaslTypeAnnotation = {
   }),
   AnonymousStructure: (properties: any[]) => ({
     concept: 'TypeAnnotation',
-    typeKind: 'generic',
-    typeName: 'List',
-    typeNamespace: 'nasl.collection',
-    typeArguments: [
+    typeKind: 'anonymousStructure',
+    properties: [
+      {
+        concept: 'StructureProperty',
+        name: 'list',
+        typeAnnotation: {
+          concept: 'TypeAnnotation',
+          typeKind: 'generic',
+          typeName: 'List',
+          typeNamespace: 'nasl.collection',
+          typeArguments: [
+            {
+              concept: 'TypeAnnotation',
+              typeKind: 'anonymousStructure',
+              properties,
+            },
+          ],
+        },
+      },
       {
-        concept: 'TypeAnnotation',
-        typeKind: 'anonymousStructure',
-        properties,
+        concept: 'StructureProperty',
+        name: 'total',
+        typeAnnotation: {
+          concept: 'TypeAnnotation',
+          typeKind: 'primitive',
+          typeNamespace: 'nasl.core',
+          typeName: 'Long',
+        },
       },
     ],
   }),
@@ -383,17 +403,6 @@ export const NaslLogicItem = {
     left,
     right,
   }),
-
-  // 分页
-  Paginate: ({ list, page, size }: { list: any, page: any; size: any }) => ({
-    concept: 'Paginate',
-    name: '',
-    kind: 'Expression',
-    label: '分页',
-    list,
-    page,
-    size,
-  }),
 };
 
 export const NaslQueryExpression = {

package/src/translator/utils.ts

@@ -1,7 +1,7 @@
 import type { SourceMapItem, Position, Range, TranslatorMethod, TranslatorState } from './types';
 import type { BaseNode } from '../concepts';
-import TypeAnnotation from '../concepts/TypeAnnotation__';
-import App from '../concepts/App__';
+import type TypeAnnotation from '../concepts/TypeAnnotation__';
+import type App from '../concepts/App__';
 
 export function lsp2tspNumber(num: number) {
   return num + 1;

package/src/utils/i18nInfo.ts

@@ -1,14 +1,19 @@
 export const languageList = [
   {
     id: 'en-US',
-    name: 'English (United States)',
-    title: '英语（美国）',
+    name: 'English',
+    title: '英语',
   },
   {
     id: 'fr-FR',
     name: 'Français',
     title: '法语',
   },
+  {
+    id: 'ko-KR',
+    name: '한국어',
+    title: '韩语',
+  },
   {
     id: 'zh-CN',
     name: '中文 (简体)',

package/src/utils/index.ts

@@ -152,7 +152,7 @@ export function toBriefExpr(expression: LogicItem): string {
   ) {
     expr = expression.toBrief();
   } else if (
-    ['CallFunction', 'CallLogic', 'CallInterface', 'CallQueryComponent', 'SqlQueryComponent', 'OqlQueryComponent', 'Paginate'].includes(expression?.concept)
+    ['CallFunction', 'CallLogic', 'CallInterface', 'CallQueryComponent', 'SqlQueryComponent', 'OqlQueryComponent'].includes(expression?.concept)
   ) {
     expr = expression.label;
   }

package/test/concepts/binary-expression/__snapshots__/getQuickInfoOffset.spec.ts.snap

@@ -0,0 +1,25 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`binary-expression:getQuickInfoOffset constant-nested 1`] = `
+Object {
+  "code": "nasl.core.and(nasl.core.isEqual(new nasl.core.String('StringLiteral').length,new nasl.core.Long(3)),new nasl.core.Boolean(false))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`binary-expression:getQuickInfoOffset constant-simple 1`] = `
+Object {
+  "code": "nasl.core.and(new nasl.core.Boolean(true),new nasl.core.Boolean(false))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`binary-expression:getQuickInfoOffset variable-nested 1`] = `
+Object {
+  "code": "nasl.core.or(nasl.core.isEqual(param1.length,new nasl.core.Long(3)),nasl.core.isNotEqual(param3.updatedBy.length,new nasl.core.Long(0)))",
+  "line": 1,
+  "offset": 11,
+}
+`;

package/test/concepts/binary-expression/getQuickInfoOffset.spec.ts

@@ -0,0 +1,19 @@
+import { expect } from 'chai';
+import type { BinaryExpression } from '../../../src';
+import { runGeneratorSync as runSync } from '../../../src/utils';
+import { getNodeByData, readFixture, getCodeRange } from '../utils';
+import { ConceptName, cases } from './constant';
+
+describe(`${ConceptName}:getQuickInfoOffset`, () => {
+  cases.forEach((name) => {
+    it(name, () => {
+      const data = readFixture(ConceptName, name);
+      const node = getNodeByData<BinaryExpression>(data);
+      const tsCode = runSync(node.toEmbeddedTS());
+      expect({
+        code: tsCode,
+        ...node.getQuickInfoOffset(getCodeRange(tsCode), () => tsCode),
+      }).toMatchSnapshot();
+    });
+  });
+});

package/test/concepts/call-function/__snapshots__/getQuickInfoOffset.spec.ts.snap

@@ -0,0 +1,41 @@
+// Jest Snapshot v1, https://goo.gl/fbAQLP
+
+exports[`call-function:getQuickInfoOffset from-string 1`] = `
+Object {
+  "code": "nasl.util.FromString(str)<nasl.core.Boolean>()",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-global-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(dt, new nasl.core.String('StringLiteral'))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-no-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(str)",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-user-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(dt, new nasl.core.String('StringLiteral'))",
+  "line": 1,
+  "offset": 11,
+}
+`;
+
+exports[`call-function:getQuickInfoOffset to-string-utc-tz 1`] = `
+Object {
+  "code": "nasl.util.ToString(dt, new nasl.core.String('StringLiteral'))",
+  "line": 1,
+  "offset": 11,
+}
+`;