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

package/src/server/getLogics.ts

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

package/src/server/getMemberIdentifier.ts

@@ -11,7 +11,8 @@ import {
   LogicItem,
   Frontend,
   View,
-  Type,
+  BusinessComponent,
+  types,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
 } from '..';
@@ -206,7 +207,7 @@ function getCurrentLogic(
       node.parentNode instanceof BindAttribute &&
       (node.parentNode.name === 'data-source' || node.parentNode.name === 'check-file' || node.parentNode.name === 'can-dragable-handler' || node.parentNode.name === 'can-dropin-handler'))
   ) {
-    const { view } = node;
+    const view = node.view || node.getAncestor('BusinessComponent') as BusinessComponent;
     const viewLogics = view.logics;
     const logicVariable = viewLogics.map((item) => {
       const newLogic: LiteralDefination = {
@@ -222,7 +223,7 @@ function getCurrentLogic(
   }
 }
 
-export async function getMemberIdentifier(node: Type.SyntaxNode) {
+export async function getMemberIdentifier(node: types.SyntaxNode) {
   if (node) {
     // 获取字面量
     const literals = getLiteralsIdentifier();
@@ -258,6 +259,10 @@ export async function getMemberIdentifier(node: Type.SyntaxNode) {
       // 获取页面组件
       const pageComponents = await getPageComponentsIdentifier(node);
       result.push({ name: '页面组件', children: pageComponents, expanded: true, icon: 'category' });
+    } else if ((node as Identifier).getAncestor('BusinessComponent')) {
+      // 获取页面组件
+      const pageComponents = await getPageComponentsIdentifier(node);
+      result.push({ name: '组件元素', children: pageComponents, expanded: true, icon: 'category' });
     } else if (!(node as Identifier).frontend && (node as any).concept !== 'BackendVariable') {
       // 端事件里既不能调用前端变量 也不能调用后端变量
       const BackEndglobalVariable = getBackendVariablesIdentifier(node);
@@ -306,7 +311,7 @@ export function getBackendVariablesIdentifier(node: BaseNode): CompletionPropert
   return newvariables;
 }
 // 获取变量
-export async function getVariableIdentifier(node: Type.SyntaxNode): Promise<CompletionProperty[]> {
+export async function getVariableIdentifier(node: types.SyntaxNode): Promise<CompletionProperty[]> {
   let completionData: CompletionProperty[] = [new CompletionProperty({})];
   // 只获取第一层内容
   const app = node.getAncestor('App');
@@ -324,6 +329,7 @@ export async function getVariableIdentifier(node: Type.SyntaxNode): Promise<Comp
     });
   }
   completionData = formatVariableData(nextCompletion, node);
+
   return completionData;
 }
 
@@ -523,7 +529,7 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
 }
 
 // 获取页面组件
-export function getPageComponentsIdentifier(node: Type.SyntaxNode): CompletionProperty[] {
+export function getPageComponentsIdentifier(node: types.SyntaxNode): CompletionProperty[] {
   const { fileNode } = node.getCurrentSource();
   const stashElements = (fileNode as View).elements;
   const componentList: CompletionProperty[] = []

package/src/server/naslServer.ts

@@ -86,9 +86,9 @@ import {
   I18nInfo,
   MetadataType,
   UnaryExpression,
-  Type,
-  Assert,
-  Paginate,
+  types,
+  asserts,
+  BusinessComponent,
 } from '../concepts';
 
 import * as utils from '../utils';
@@ -272,6 +272,7 @@ class NaslServer {
       protocol: 'ts-worker',
       sender: 'ide',
       context: this,
+      timeout: 120000,
       getReceiver: () => this.worker as any,
       getSender: () => this.worker as any,
       handleMessage: async ({ data }: any) => {
@@ -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) => {
@@ -1009,7 +1019,7 @@ class NaslServer {
             if (diagnostic.severity === 'warning') {
               record.suggestionDiagnostics.push(diagnostic);
               return null;
-            } if (Assert.isStrictOqlQueryComponent(currentNode)) {
+            } if (asserts.isStrictOqlQueryComponent(currentNode)) {
               // OQL别名错误降级为警告
               if (diagnostic.originalDiagnostic && diagnostic.originalDiagnostic?.text.includes('__OQL_ALIAS_WARNING__')) {
                 // 重置 图标和错误等级
@@ -1070,14 +1080,14 @@ class NaslServer {
             // 局部变量和输入变量未使用的警告
             const fromModule = record.node.parentNode.concept === 'Module';
             const fromConnector = record.node.parentNode.concept === 'Connector';
-            if ((Assert.isStrictView(record.node) || Assert.isStrictLogic(record.node)) && !(fromModule || fromConnector)) {
+            if ((asserts.isStrictView(record.node) || asserts.isStrictLogic(record.node)) && !(fromModule || fromConnector)) {
               /**
                * javalogic不用提示
                */
-              if (Assert.isStrictLogic(record.node) && self._isJavalogic(record.node)) {
+              if (asserts.isStrictLogic(record.node) && self._isJavalogic(record.node)) {
                 return null;
               }
-              Assert.assertFileNode(record.node);
+              asserts.assertFileNode(record.node);
               const minRange = yield* self._findMinRangeWithGenerator(diag as unknown as tsProtocol.DiagnosticWithFileName, record.node);
               if (minRange) {
                 /**
@@ -2179,7 +2189,7 @@ class NaslServer {
       const diagnostic = {
         node: fileNode,
         severity: 'error',
-        message: `连接器 ${fileNode.name} 参数配置缺失`,
+        message: `连接器 ${fileNode.name} 参数配置有更新`,
         // 保留原来的内容方便查询一些问题
         originalDiagnostic: {
           fileName: '',
@@ -2434,21 +2444,12 @@ class NaslServer {
         const diagnostic = {
           node,
           severity: 'error',
-          message: `ForEach：循环列表：参数类型不匹配！结束值自动推导失败。`,
+          message: `ForEac1：循环列表：参数类型不匹配！结束值自动推导失败。`,
         };
         node.tsErrorDetail = diagnostic;
         diagnostics.push(diagnostic);
       }
     }
-    if ((node instanceof OqlQueryComponent || node instanceof SqlQueryComponent) && node.parentNode instanceof Paginate && node.parentKey === 'list' && (node as any).codeSourceMap && (node as any).codeSourceMap.containsLimit) {
-        const diagnostic = {
-          node,
-          severity: 'error',
-          message: `SQL 查询已包含分页，请去除 SQL 查询中的 LIMIT 语句。`,
-        };
-        node.tsErrorDetail = diagnostic;
-        diagnostics.push(diagnostic);
-    }
     /**
      * 如果节点是内置函数
      * 穷举在线上的情况，不在线上就void报错， callinterface 因为原来有报错，所以就忽略掉
@@ -2469,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;
@@ -3572,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，修改都不应该触发
@@ -3837,7 +3842,7 @@ class NaslServer {
   getCurrentSource(node: BaseNode) {
     if (node instanceof App || node instanceof Theme) return { fileNode: null };
     let {sourceMap} = node;
-    let fileNode = node as FileNode & Type.SyntaxNode;
+    let fileNode = node as FileNode & types.SyntaxNode;
     // 连接器 操作，上层结构是 Namespace， Namespace 并无含义，因此需要过滤掉
     const isConnectorLogic = node.getAncestor('Connector') && node.concept === 'Logic' && node.parentNode instanceof Namespace;
     // 如果没有sourceMap,就继续向上找 ,或者到module结束
@@ -3855,9 +3860,10 @@ class NaslServer {
       !(fileNode.parentNode instanceof Backend) &&
       !isConnectorLogic &&
       !(fileNode instanceof View) &&
+      !(fileNode instanceof BusinessComponent) &&
       !(fileNode instanceof ConfigProperty)
     ) {
-      fileNode = fileNode.parentNode as FileNode & Type.SyntaxNode;
+      fileNode = fileNode.parentNode as FileNode & types.SyntaxNode;
       sourceMap = fileNode?.sourceMap;
     }
     const currentSource = sourceMap && sourceMap.get(node);
@@ -4078,7 +4084,6 @@ class NaslServer {
           'QueryFieldExpression',
           'QueryGroupByExpression',
           'Param',
-          'Paginate',
           'BackendVariable',
           'CallAuthInterface',
         ].includes(node.concept)
@@ -4099,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;
@@ -4107,31 +4112,6 @@ class NaslServer {
       // 位置计算偏移2
       // TODO: 之后考虑把这些偏移量计算全都挪到节点内部去
       if (
-        node.concept === 'Paginate' ||
-        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' ||
@@ -4157,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,
@@ -51,7 +52,6 @@ import {
   NewList,
   NewComposite,
   ValidationRule,
-  Paginate,
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
@@ -173,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，不可用。',
@@ -319,11 +324,11 @@ const TS_RULES: Array<{
     re: /Unreachable code detected\./,
     result: '逻辑中有未使用的。',
   },
-  // {
-  //   re: /Property '__slice' does not exist on type '(.+?)'/,
-  //   result: 'ForEach：循环列表：参数类型不匹配！所需类型：数组、集合等，提供类型：$1',
-  //   transforms: [transformType],
-  // },
+  {
+    re: /Property '__slice' does not exist on type '(.+?)'/,
+    result: 'ForEach：循环列表：参数类型不匹配！所需类型：数组、集合等，提供类型：$1',
+    transforms: [transformType],
+  },
   {
     re: /Property '(.+?)' does not exist on type 'typeof (.+?)'/,
     result: '找不到$2 $1。',
@@ -474,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'.`)) {
@@ -588,16 +593,6 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       }
     }
   }
-  if (/Property '__slice' does not exist on type '(.+?)'/.exec(text)) {
-    const cap = /Property '__slice' does not exist on type '(.+?)'/.exec(text)
-    if (cap) {
-      if (node instanceof ForEachStatement) {
-        tsErrorDetail.message = `ForEach：循环列表：参数类型不匹配！所需类型：数组、集合等，提供类型：$1`.replace(/\$(\d+)/g, (m, index) => transformType(cap[index]));
-      } else if (node instanceof Paginate) {
-        tsErrorDetail.message = `分页：分页对象类型不匹配！所需类型：数组、集合等，提供类型：$1`.replace(/\$(\d+)/g, (m, index) => transformType(cap[index]));
-      }
-    }
-  }
   if (node instanceof Argument || node instanceof Anchor) {
     // if (/Type '(.+?)' is not assignable to type '(.+?)'./.exec(text)) {
     // }

package/src/service/storage/init.ts

@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, BindDirective, CallLogic, BindAttribute, Type } from '../../concepts';
+import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, BindDirective, CallLogic, BindAttribute, types } from '../../concepts';
 import { addBreakpointNodesFromApp } from '../../breakpoint';
 import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
@@ -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 {
@@ -455,7 +454,7 @@ async function doAction(app: any, actionItem: any) {
   try {
     if (Array.isArray(list)) {
       list.forEach((event) => {
-        const emitTarget = event?.originEvent?.target as Type.SyntaxNode;
+        const emitTarget = event?.originEvent?.target as types.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))) {
@@ -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('-');