@lcap/nasl 3.3.3-beta.3 → 3.3.3-beta.5

package/src/common/BaseNode.ts

@@ -11,7 +11,7 @@ import { Diagnostic } from '../manager/diagnostic';
 
 import { sentryMonitorNaslNode } from '../sentry';
 import operations from '../breakpoint/shared/operations';
-import type { SynatxNode, SynatxNodeConcept, ViewElement, TypeAnnotation, App, Namespace } from '../concepts';
+import type { SyntaxNode, SyntaxNodeConcept, ViewElement, TypeAnnotation, App, Namespace } from '../concepts';
 import eventBus from '../eventBus';
 
 let actionable = true;
@@ -139,7 +139,7 @@ export class BaseNode extends EventEmitter {
    * 父节点
    */
   @circular()
-  parentNode: SynatxNode = null;
+  parentNode: SyntaxNode = null;
 
   parentKey: string = '';
 
@@ -408,14 +408,14 @@ export class BaseNode extends EventEmitter {
     this.parentNode?.emit('node:Editing', $event);
   }
 
-  createNode({ parentNode, parentKey, index }: { parentNode: SynatxNode; parentKey: string; index: number }) {
+  createNode({ parentNode, parentKey, index }: { parentNode: SyntaxNode; parentKey: string; index: number }) {
     if(!actionable) {
       eventBus.emit('NotActionable')
       return;
     }
 
     if (parentNode) {
-      const property = parentNode[parentKey as keyof SynatxNode];
+      const property = parentNode[parentKey as keyof SyntaxNode];
       if (Array.isArray(property) && index !== -1) {
         property.splice(index, 0, this);
       } else {
@@ -738,13 +738,13 @@ export class BaseNode extends EventEmitter {
   /**
    * 上层节点
    */
-  get upperNode(): SynatxNode {
+  get upperNode(): SyntaxNode {
     // eslint-disable-next-line consistent-this
     let _upperNode: BaseNode = this;
     while (!!_upperNode && _upperNode.concept === this.concept) {
       _upperNode = _upperNode.parentNode;
     }
-    return _upperNode as SynatxNode;
+    return _upperNode as SyntaxNode;
   }
 
   /**
@@ -757,9 +757,9 @@ export class BaseNode extends EventEmitter {
   /**
    * 获取祖先节点
    */
-  getAncestor(concept: SynatxNode['concept']): SynatxNode;
-  getAncestor<Node extends SynatxNode>(concept: Node['concept']): Node;
-  getAncestor<Node extends SynatxNode = SynatxNode>(concept: SynatxNode['concept']): Node {
+  getAncestor(concept: SyntaxNode['concept']): SyntaxNode;
+  getAncestor<Node extends SyntaxNode>(concept: Node['concept']): Node;
+  getAncestor<Node extends SyntaxNode = SyntaxNode>(concept: SyntaxNode['concept']): Node {
     let { upperNode } = this;
     while (upperNode && upperNode.concept && upperNode.concept !== concept) {
       upperNode = upperNode.upperNode;
@@ -835,7 +835,7 @@ export class BaseNode extends EventEmitter {
   instantiate(source: any, parentNode: BaseNode, parentKey: string) {
     if (source instanceof BaseNode) {
       if (!source.parentNode || !source.parentKey) {
-        source.parentNode = parentNode as SynatxNode;
+        source.parentNode = parentNode as SyntaxNode;
         source.parentKey = parentKey;
       }
       return source;
@@ -1168,8 +1168,13 @@ export class BaseNode extends EventEmitter {
     return {};
   }
 
-  public traverseChildren(cb: (ele: SynatxNode) => void): void {
-    function traverse(node: SynatxNode) {
+  /**
+   * 迭代所有属性
+   *
+   * @description 是所有属性！！不是所有子节点！！
+   */
+  traverseChildren(cb: (el: any) => void): void {
+    function traverse(node: any) {
       cb(node);
 
       const propertyMap = getConceptPropertyMap(node?.concept);
@@ -1178,12 +1183,29 @@ export class BaseNode extends EventEmitter {
       for (const property of propertyMap.keys()) {
         const child = node[property as keyof BaseNode];
         if (!child) continue;
-        else if (Array.isArray(child)) child.forEach((node: SynatxNode) => traverse(node));
+        else if (Array.isArray(child)) child.forEach((node: SyntaxNode) => traverse(node));
         else traverse(child);
       }
     }
 
-    traverse(this as unknown as SynatxNode);
+    traverse(this as unknown as SyntaxNode);
+  }
+
+  /**
+   * 迭代所有子节点
+   *
+   * @description 严格迭代所有子节点！排除属性！
+   */
+  traverseStrictChildren(cb: (el: SyntaxNode) => void): void {
+    const isNode = (node: unknown): node is SyntaxNode => {
+      return Boolean(node) && typeof node === 'object' && ('concept' in node) && typeof (node as any).concept === 'string';
+    };
+
+    this.traverseChildren((el) => {
+      if (isNode(el)) {
+        cb(el);
+      }
+    });
   }
 
   /**
@@ -1278,7 +1300,7 @@ export class BaseNode extends EventEmitter {
   /**
    * 使用新的 concept 在当前节点生成新的数据
    */
-  changeConceptNode(concept: SynatxNodeConcept) {
+  changeConceptNode(concept: SyntaxNodeConcept) {
     return new Proxy(this, {
       get(target, p: keyof BaseNode, receiver) {
         if (p === 'concept') {
@@ -1291,20 +1313,20 @@ export class BaseNode extends EventEmitter {
   }
 
   /** 收集所有节点 */
-  collectNodes(): SynatxNode[];
+  collectNodes(): SyntaxNode[];
   /** 收集特定类型的子节点 */
-  collectNodes(concept: SynatxNodeConcept): SynatxNode[];
+  collectNodes(concept: SyntaxNodeConcept): SyntaxNode[];
   /** 收集断言返回`true`的子节点 */
-  collectNodes(pre: (node?: SynatxNode) => boolean): SynatxNode[];
-  collectNodes(input?: SynatxNodeConcept | ((node?: SynatxNode) => boolean)) {
+  collectNodes(pre: (node?: SyntaxNode) => boolean): SyntaxNode[];
+  collectNodes(input?: SyntaxNodeConcept | ((node?: SyntaxNode) => boolean)) {
     const pre =
       typeof input === 'undefined'
-        ? (node: SynatxNode) => node && typeof node.concept === 'string'
+        ? (node: SyntaxNode) => node && typeof node.concept === 'string'
         : typeof input === 'string'
-          ? (node: SynatxNode) => node?.concept === input
+          ? (node: SyntaxNode) => node?.concept === input
           : input;
-    const nodes: SynatxNode[] = [];
-    const self = this as unknown as SynatxNode;
+    const nodes: SyntaxNode[] = [];
+    const self = this as unknown as SyntaxNode;
 
     if (pre(self)) {
       nodes.push(self);

package/src/concepts/BinaryExpression__.ts

@@ -346,7 +346,7 @@ export class BinaryExpression extends LogicItem {
       // return code
       return getOperatorCode(code);
     }
-    if (['>', '>=', '<', '<='].includes(this.operator)) {
+    if (['>', '>=', '<', '<=', '=='].includes(this.operator)) {
       const leftType = this.left?.getCurrentAnnotatedJSON();
       const rightType = this.right?.getCurrentAnnotatedJSON();
       // 如果两边类型一致可以做一些特殊比较

package/src/concepts/CallLogic__.ts

@@ -750,7 +750,7 @@ export class CallLogic extends LogicItem {
         if (index !== completeArguments.length - 1) code += ', ';
       });
     }
-    code += ')}';
+    code += ')';
     return code;
   }
 

package/src/concepts/CallQueryComponent__.ts

@@ -1216,20 +1216,12 @@ export class CallQueryComponent extends LogicItem {
         if (['COUNT', 'COUNTD'].includes(item.aggregateName)) {
           typeName = 'Long';
         } else if (['AVG'].includes(item.aggregateName)) {
-          const { entityAsName, propertyName } = item.aggregateParam;
-          const entity = entities.find((item: Entity) => item.name === entityAsName);
-          const property = entity?.properties.find((item: any) => item.name === propertyName);
-          const propertyTypeName = property?.typeAnnotation?.typeName;
-          if (propertyTypeName === 'Decimal') {
-            typeName = 'Decimal';
-          } else {
-            typeName = 'Decimal';
-          }
+          typeName = 'Decimal';
         } else {
           const { entityAsName, propertyName } = item.aggregateParam;
-          const entity = entities.find((item: Entity) => item.name === entityAsName);
-          const property = entity?.properties.find((item) => item.name === propertyName);
-          typeName = property?.typeAnnotation?.typeName;
+          const entity = entities.find((e: Entity) => e.name === entityAsName);
+          const prop = entity?.properties.find((p) => p.name === propertyName);
+          typeName = prop?.typeAnnotation?.typeName;
         }
         return {
           concept: 'StructureProperty',

package/src/concepts/ViewElement__.ts

@@ -141,6 +141,25 @@ function transAstNodeToNaslNode(astNode: any, namespace?: string): any {
       label: '原子项',
       code: astNode.value,
     };
+  } else if (astNode.type === 'TemplateLiteral') { // 模板字符串翻译成字符串插值
+    const { expressions, quasis } = astNode;
+    node = {
+      concept: 'StringInterpolation',
+      kind: 'Expression',
+      name: '',
+      expressions: [...(quasis || []), ...(expressions || [])].sort((node1, node2) => {
+        return node1.start - node2.start;
+      }).map((node) => {
+        return transAstNodeToNaslNode(node);
+      }),
+    };
+  } else if (astNode.type === 'TemplateElement') {
+    node = {
+      concept: 'StringLiteral',
+      kind: 'Expression',
+      name: '',
+      value: astNode.value?.raw,
+    };
   } else if (astNode.type === 'StringLiteral') {
     // 单独特殊处理枚举因为他不是MemberExpression，而是Identifier_
     if (astNode?.value?.startsWith('__enumTypeAnnotation_')) {

package/src/concepts/View__.ts

@@ -1733,8 +1733,6 @@ export class View extends BaseNode {
           );
           this.addBindEvent(event);
         } else {
-          const index = bindEvent.logics.length;
-          newLogic.name += index;
           bindEvent.addLogic(newLogic);
         }
       });
@@ -1758,6 +1756,13 @@ export class View extends BaseNode {
     if (Array.isArray(this.logics)) {
       varList.push(...this.logics);
     }
+    if (Array.isArray(this.bindEvents)) {
+      this.bindEvents.forEach((bindEvent) => {
+        if (Array.isArray(bindEvent.logics)) {
+          varList.push(...bindEvent.logics);
+        }
+      })
+    }
     return varList.filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
 

package/src/concepts/types__.ts

@@ -38,7 +38,6 @@ import type { Variable } from './Variable__';
 import type { BackendVariable } from './BackendVariable__';
 import type { FrontendVariable } from './FrontendVariable__';
 import type { Constant } from './Constant__';
-import type { LogicItem } from './LogicItem__';
 import type { Function } from './Function__';
 import type { AnonymousFunction } from './AnonymousFunction__';
 import type { Interface } from './Interface__';
@@ -122,7 +121,7 @@ import type { Connector } from './Connector__';
 import type { CallConnector } from './CallConnector__';
 import type { Connection } from './Connection__';
 
-export type SynatxNode =
+export type SyntaxNode =
     | App
     | Module
     | Namespace
@@ -163,7 +162,6 @@ export type SynatxNode =
     | BackendVariable
     | FrontendVariable
     | Constant
-    | LogicItem
     | Function
     | AnonymousFunction
     | Interface
@@ -247,4 +245,4 @@ export type SynatxNode =
     | CallConnector
     | Connection;
 
-export type SynatxNodeConcept = SynatxNode['concept'];
+export type SyntaxNodeConcept = SyntaxNode['concept'];

package/src/decorators/index.ts

@@ -1,5 +1,5 @@
 import BaseNode from '../common/BaseNode';
-import type { SynatxNode, SynatxNodeConcept } from '../concepts';
+import type { SyntaxNode, SyntaxNodeConcept } from '../concepts';
 
 export * from './promise';
 
@@ -73,7 +73,7 @@ export function concept(nodeTitle: string) {
 }
 
 export function property(objectRef?: string) {
-  return function handle(target: SynatxNode | BaseNode, key: string) {
+  return function handle(target: SyntaxNode | BaseNode, key: string) {
     const metaMap = getConceptPropertyMap(target.concept ?? target.constructor.name);
     const prototypeTarget = Object.getPrototypeOf(target);
     const prototypeConstructor = prototypeTarget.constructor;
@@ -90,10 +90,10 @@ export function property(objectRef?: string) {
   };
 }
 
-export function ancestor(concept: SynatxNodeConcept) {
+export function ancestor(concept: SyntaxNodeConcept) {
   return function handle(target: any, key: string, descriptor: PropertyDescriptor) {
     descriptor.get = function () {
-      return (this as SynatxNode).getAncestor(concept);
+      return (this as SyntaxNode).getAncestor(concept);
     };
   };
 }

package/src/enums/KEYWORDS.ts

@@ -37,6 +37,8 @@ export const KEYWORDS = [
   'constructor',
   'continue',
   'core',
+  // 由于conector 作为 连接器的namespace 前缀，导致逻辑命名为 connector 时会出现引用异常问题   
+  'connector',
   'dataSet',
   'dataSource',
   'database',

package/src/generator/genMetaData.ts

@@ -176,12 +176,12 @@ export function genMetaData(app: App, frontend: Frontend) {
       const app = node.getAncestor('App') as App
       nodeJson.properties.forEach((property: any) => {
           const { typeAnnotation = {} } = property;
-          if (typeAnnotation?.typeNamespace.endsWith('.metadataTypes')) {
+          if (typeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
             let originType = {} as TypeAnnotation
             if (typeAnnotation.typeNamespace === 'app.metadataTypes') {
-              originType = app.metadataTypes.find((metadataType: MetadataType) => metadataType.name === typeAnnotation.typeName)?.typeAnnotation;
-            } else if (typeAnnotation.typeNamespace.startsWith('extensions.') && typeAnnotation.typeNamespace.endsWith('.metadataTypes')) {
-              const dependencyName = typeAnnotation.typeNamespace.replace('extensions.', '').replace('.metadataTypes', '')
+              originType = app.metadataTypes?.find((metadataType: MetadataType) => metadataType.name === typeAnnotation.typeName)?.typeAnnotation;
+            } else if (typeAnnotation.typeNamespace?.startsWith('extensions.') && typeAnnotation.typeNamespace?.endsWith('.metadataTypes')) {
+              const dependencyName = typeAnnotation.typeNamespace?.replace('extensions.', '').replace('.metadataTypes', '')
               originType = app.dependencies?.find((dependency: Module) => dependency.name === dependencyName)?.metadataTypes?.find((ele: MetadataType) => ele.name === typeAnnotation.typeName)?.typeAnnotation ?? {} as TypeAnnotation
             }
             typeAnnotation.typeKind = 'primitive'

package/src/generator/genReleaseBody.ts

@@ -107,7 +107,7 @@ async function getCalllogicData(app: App, releaseData: ReleaseData) {
       return {};
     }
 
-    nasl.traverseChildren((node) => {
+    nasl.traverseStrictChildren((node) => {
       if (
           node.concept === 'CallLogic' &&
           'uuid' in node &&
@@ -157,7 +157,7 @@ async function getCalllogicData(app: App, releaseData: ReleaseData) {
     ];
 
     // 获取所有调用加密函数的调用节点 uuid
-    nasl.traverseChildren((node) => {
+    nasl.traverseStrictChildren((node) => {
       if (node.concept !== 'CallLogic' || !('uuid' in node)) {
         return;
       }

package/src/generator/permission.ts

@@ -85,14 +85,14 @@ async function findUIReferences(logic: Logic) {
     if (node instanceof Frontend) usages.push(usage);
   });
 
-  const res: Array<View | ViewElement> = [];
+  const res: Array<View | ViewElement | Frontend> = [];
   function dfs(usage: Usage, parent: Usage = null) {
     if (
       (usage.node instanceof BindEvent ||
         usage.node instanceof BindAttribute ||
         usage.node instanceof BindStyle ||
         usage.node instanceof BindDirective) &&
-      (parent.node instanceof View || parent.node instanceof ViewElement)
+      (parent.node instanceof View || parent.node instanceof ViewElement || parent.node instanceof Frontend)
     )
       res.push(parent.node);
 
@@ -107,7 +107,7 @@ async function findUIReferences(logic: Logic) {
   return res;
 }
 
-function findResourcesOfUI(view: View | ViewElement) {
+function findResourcesOfUI(view: View | ViewElement | Frontend) {
   const res: ResourceNode[] = [];
   let node: BaseNode = view;
   while (node) {
@@ -159,7 +159,7 @@ async function findResourcesOfLogic(logic: Logic, uploaders: Map<string, ViewEle
   const logics = await findViewLogicReferences(logic);
   logics.push(logic);
 
-  let UIs: Array<View | ViewElement> = [];
+  let UIs: Array<View | ViewElement | Frontend> = [];
   for (const logic of logics) {
     UIs = UIs.concat(await findUIReferences(logic));
   }

package/src/server/formatTsUtils.ts

@@ -12,7 +12,7 @@ import {
   Logic,
   ConfigProperty,
   App,
-  SynatxNode,
+  SyntaxNode,
   BindAttribute,
   Interface,
   CallLogic,
@@ -278,7 +278,7 @@ function findNode(typeKey: string, node: BaseNode) {
  * @param item 当前节点的内容
  * @param node 获取变量框的位置
  */
-export function nextFindTypeChild(typeKey: string, item: any, node: SynatxNode) {
+export function nextFindTypeChild(typeKey: string, item: any, node: SyntaxNode) {
   const newType = findNode(typeKey, node);
   if ((newType as Structure)?.properties && (newType as Structure).properties.length) {
     // 处理泛型的内容要取到值
@@ -312,7 +312,7 @@ export function nextFindTypeChild(typeKey: string, item: any, node: SynatxNode)
     lCAPRolePerMapping: dataSources.defaultDS.entities.LCAPRolePerMapping;
 }>`
  */
-function getAStructureScopeType(type: string, parent: any, node: SynatxNode) {
+function getAStructureScopeType(type: string, parent: any, node: SyntaxNode) {
   let newType = type
     .replaceAll(' ', '')
     .replaceAll('\n', '')
@@ -412,7 +412,7 @@ function getAStructureScopeType(type: string, parent: any, node: SynatxNode) {
     total: nasl.core.Long;
 }`
  */
-function getAStructureObjectStringType(type: string, parent: any, node: SynatxNode) {
+function getAStructureObjectStringType(type: string, parent: any, node: SyntaxNode) {
   let newType = type
     .replaceAll(' ', '')
     .replaceAll('\n', '')
@@ -467,7 +467,7 @@ function getAStructureObjectStringType(type: string, parent: any, node: SynatxNo
   completionProperty.icon = getNodeiconFromLogic(completionProperty, node);
   return completionProperty;
 }
-function nextObjectTypeChild(typeKey: string, item: any, node: SynatxNode) {
+function nextObjectTypeChild(typeKey: string, item: any, node: SyntaxNode) {
   const newType = findNode(typeKey, node);
   if ((newType as Structure)?.properties && (newType as Structure).properties.length) {
     // 处理泛型的内容要取到值
@@ -492,7 +492,7 @@ function nextObjectTypeChild(typeKey: string, item: any, node: SynatxNode) {
   }
 }
 
-function getNodeTypeVariableData(nodeType: any, item: any, node: SynatxNode) {
+function getNodeTypeVariableData(nodeType: any, item: any, node: SyntaxNode) {
   item.value = item.text;
   item.name = item.text;
   const parentExpression = new Identifier({ name: item.text });
@@ -589,7 +589,7 @@ function getNextFlag(typeKey: string, typeKeyMap: Map<string, number>) {
   return true;
 }
 // 格式化变量数据
-export function formatVariableData(data: unknown | variableItem[], node: SynatxNode, parent?: any) {
+export function formatVariableData(data: unknown | variableItem[], node: SyntaxNode, parent?: any) {
   if (Array.isArray(data)) {
     let result = data.map((item) => {
       item.children = [];
@@ -688,7 +688,7 @@ export function formatVariableData(data: unknown | variableItem[], node: SynatxN
 }
 
 // 从logic获取节点的icon
-function getNodeiconFromLogic(completionProperty: CompletionProperty, node: SynatxNode): string {
+function getNodeiconFromLogic(completionProperty: CompletionProperty, node: SyntaxNode): string {
   const { name: propName } = completionProperty;
   const { view } = node as Param;
   const logic = (node as Param).logic || (node as Param).OverriddenLogic || (node as Param).AuthLogic || (node as Param).AuthLogicForCallInterface;

package/src/server/getMemberIdentifier.ts

@@ -11,7 +11,7 @@ import {
   LogicItem,
   Frontend,
   View,
-  SynatxNode,
+  SyntaxNode,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
 } from '..';
@@ -173,10 +173,10 @@ function getCurrentLogic(
 ) {
   // 只有data-source check-file可以
   if (
-    (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file')) ||
+    (node instanceof BindAttribute && (node.name === 'data-source' || node.name === 'check-file' || node.name === 'can-dragable-handler' || node.name === 'can-dropin-handler')) ||
     (node instanceof Identifier &&
       node.parentNode instanceof BindAttribute &&
-      (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file'))
+      (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file' || node.parentNode.name === 'can-dragable-handler' || node.parentNode.name === 'can-dropin-handler'))
   ) {
     const { view } = node;
     const viewLogics = view.logics;
@@ -194,7 +194,7 @@ function getCurrentLogic(
   }
 }
 
-export async function getMemberIdentifier(node: SynatxNode) {
+export async function getMemberIdentifier(node: SyntaxNode) {
   if (node) {
     // 获取字面量
     const literals = getLiteralsIdentifier();
@@ -278,7 +278,7 @@ export function getBackendVariablesIdentifier(node: BaseNode): CompletionPropert
   return newvariables;
 }
 // 获取变量
-export async function getVariableIdentifier(node: SynatxNode): Promise<CompletionProperty[]> {
+export async function getVariableIdentifier(node: SyntaxNode): Promise<CompletionProperty[]> {
   let completionData: CompletionProperty[] = [new CompletionProperty({})];
   // 只获取第一层内容
   const app = node.getAncestor('App');
@@ -474,7 +474,7 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
 }
 
 // 获取页面组件
-export function getPageComponentsIdentifier(node: SynatxNode): CompletionProperty[] {
+export function getPageComponentsIdentifier(node: SyntaxNode): CompletionProperty[] {
   const { fileNode } = node.getCurrentSource();
   const stashElements = (fileNode as View).elements;
   const componentList: CompletionProperty[] = []

package/src/server/naslServer.ts

@@ -80,7 +80,7 @@ import {
   AuthLogicForCallInterface,
   Connector,
   AuthInterface,
-  SynatxNode,
+  SyntaxNode,
   Connection,
   TriggerLauncher,
   CallConnector,
@@ -2197,7 +2197,7 @@ class NaslServer {
             }
           }
         }
-     
+
         if (node instanceof Return || node instanceof Variable) {
           const nodeTypeName = node.concept === 'Return' ? '输出参数' : '局部变量';
           if (!node.typeAnnotation && !node.__TypeAnnotation) {
@@ -2320,11 +2320,11 @@ class NaslServer {
 
   _treeMetadataType2CoreType(type: TypeAnnotation, app: App) {
     type.typeArguments?.forEach((item: TypeAnnotation) => {
-      if (item.typeNamespace.endsWith('.metadataTypes')) {
+      if (item.typeNamespace?.endsWith('.metadataTypes')) {
         let originType = {} as TypeAnnotation
         if (item.typeNamespace === 'app.metadataTypes') {
             originType = app.metadataTypes?.find((metadataType) => metadataType.name === item.typeName)?.typeAnnotation;
-        } else if (item.typeNamespace.startsWith('extensions.') && item.typeNamespace.endsWith('.metadataTypes')) {
+        } else if (item.typeNamespace?.startsWith('extensions.') && item.typeNamespace?.endsWith('.metadataTypes')) {
             const dependencyName = item.typeNamespace.replace('extensions.', '').replace('.metadataTypes', '')
             originType = app.dependencies?.find((dependency) => dependency.name === dependencyName)?.metadataTypes?.find((ele) => ele.name === item.typeName)?.typeAnnotation ?? {} as TypeAnnotation
         }

package/src/service/storage/init.ts

@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, SynatxNode, BindDirective, CallLogic } from '../../concepts';
+import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, SyntaxNode, BindDirective, CallLogic } from '../../concepts';
 import { addBreakpointNodesFromApp } from '../../breakpoint';
 import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
@@ -454,7 +454,7 @@ async function doAction(app: any, actionItem: any) {
   try {
     if (Array.isArray(list)) {
       list.forEach((event) => {
-        const emitTarget = event?.originEvent?.target as SynatxNode;
+        const emitTarget = event?.originEvent?.target as SyntaxNode;
         const _path: string = event.originEvent.path;
         const _root = _path.split('.')?.[1] || '';
         if (['backend', 'overriddenLogics', 'dataSources', 'processes', 'roles', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies', 'authLogics', 'authLogicsForCallInterface', 'triggerLaunchers', 'connections'].some((item) => _root.startsWith(item))) {

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -58,8 +58,9 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
               // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
+              let dataSourceValue = `(params) => ${selectNameGroup.logic}(elements.$ce.page, elements.$ce.size)`
               formItem += `
-                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
+                        <u-select clearable placeholder="请选择${label}" :data-source="${dataSourceValue}" :page-size="50"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;

package/src/translator/utils.ts

@@ -72,7 +72,7 @@ export function withSourceMap() {
       if (!state) {
         // 没有状态不生成 SourceMap
         return oldMethod.call(this, state, ...args);
-      } 
+      }
         // state = Object.freeze(Object.assign({
         //   position: { line: 0, character: 0, offset: 0 },
         //   tabSize: 0,
@@ -99,19 +99,18 @@ export function withSourceMap() {
             before += beforeComment;
             state = shiftState(state, beforeComment);
           }
-
         }
 
         // 调用真实方法, 可能有剩余参数
         const code = oldMethod.call(this, state, ...args);
 
-        state.sourceMap?.set(this, Object.freeze({
+        state.sourceMap?.set(this, {
           start: state.position,
           end: shiftPosition(state.position, code),
-        }));
+        });
 
         return before + code;
-      
+
     };
 
     return descriptor;
@@ -148,4 +147,4 @@ export function transfromUnionTypeAnnotation(expTypeAnnotation: TypeAnnotation,
       }
     })
   }
-}
+}