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

package/src/concepts/Param__.ts

@@ -361,17 +361,25 @@ export class Param extends BaseNode {
   toJS(state?: TranslatorState): string {
     if (this.view) {
       const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+      let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+      if (typeNamespace?.endsWith('.metadataTypes')) {
+        const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+        const typeAn = referenceNode.typeAnnotation || {};
+        sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+        typeKind = typeAn.typeKind;
+        typeName = typeAn.typeName;
+      }
       const needGenInitFromSchema =
         typeAnnotation &&
-        (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+        (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
       let code = `${this.name} = `;
       if (needGenInitFromSchema) {
-        code += `this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+        code += `this.$genInitFromSchema('${sortedTypeKey}',`;
       }
 
       const expressionJS = this.defaultValue?.toJS?.();
 
-      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
+      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${sortedTypeKey}', this.$route.query.${this.name}) : ${expressionJS})`;
       if (needGenInitFromSchema) {
         code += `)`;
       }

package/src/concepts/ProcessElement__.ts

@@ -1915,7 +1915,14 @@ export class ProcessElement extends BaseNode {
         if (Array.isArray(self.bindEvents)) {
           yield* wrapForEach(self.bindEvents, function* warpForEachGenerator(bindEvent) {
             // 任务完成时可以拿到输出参数
-            const currentPrevCode = bindEvent.name === 'OnClose' ? prevCodeClose : prevCode;
+            let currentPrevCode: any;
+            if(bindEvent.name !== 'OnClose') {
+              currentPrevCode = prevCode;
+              // 除了任务完成时的逻辑，其他逻辑拿不到自己任务下的输出参数，所以不需要__ProcessIdentification__标注
+              currentPrevCode = currentPrevCode.replace('__ProcessIdentification__', '');
+            } else {
+              currentPrevCode = prevCodeClose;
+            }
             code += `${tab1}${bindEvent.name}: () => [\n`;
             yield* wrapForEach(bindEvent.logics, function* warpForEachGenerator(logic) {
               code += `${yield* logic.toEmbeddedTSInProcess(

package/src/concepts/Return__.ts

@@ -322,12 +322,20 @@ export class Return extends BaseNode {
   toJS(state?: TranslatorState): string {
     const context = this.view ? 'this' : 'Vue.prototype';
     const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
     const needGenInitFromSchema =
       typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     let code = `${this.name} = `;
     if (needGenInitFromSchema) {
-      code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
     }
 
     if (this.defaultValue?.expression) {
@@ -401,18 +409,13 @@ export class Return extends BaseNode {
     let code = this.name;
     if (this.typeAnnotation) {
       code += `: `;
-      if (
-        this.defaultValue?.expression &&
-        !(
-          this.typeAnnotation &&
-          ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)
-        )
-      ) {
-        code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
-      } else {
-        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation?.typeKey)) {
+      if (this.defaultValue?.expression) {
+        if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(this.typeAnnotation.typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
+        } else {
+          code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
         }
+      } else {
         code += 'undefined';
       }
       code += ' as ';

package/src/concepts/ValidationRule__.ts

@@ -500,7 +500,12 @@ export class ValidationRule extends LogicItem {
     const { calleeName, target, calleeKey, arguments: args, errorMessage, view } = self;
     if (calleeName) {
       // 调用逻辑时绑定的验证器
-      if (self?.parentNode?.parentKey !== 'metadataTypes' && (self.getAncestor('CallLogic') || !view)) {
+      if (
+        self?.parentNode?.parentKey !== 'metadataTypes'
+        && (
+          self.getAncestor('CallLogic') || !(view || this.getAncestor('BusinessComponent'))
+        )
+      ) {
         code += yield* target.toEmbeddedTS(shiftState(state, code));
         code += ';\n';
       }

package/src/concepts/Variable__.ts

@@ -342,12 +342,20 @@ export class Variable extends BaseNode {
   toJS(state?: TranslatorState): string {
     const context = this.view ? 'this' : 'Vue.prototype';
     const typeAnnotation = this.typeAnnotation || this.__TypeAnnotation;
+    let { sortedTypeKey, typeKind, typeName, typeNamespace } = typeAnnotation || {};
+    if (typeNamespace?.endsWith('.metadataTypes')) {
+      const referenceNode = this.app.findNodeByCompleteName(typeNamespace + '.' + typeName) || {};
+      const typeAn = referenceNode.typeAnnotation || {};
+      sortedTypeKey = `${typeAn.typeNamespace}.${typeAn.typeName}`;
+      typeKind = typeAn.typeKind;
+      typeName = typeAn.typeName;
+    }
     const needGenInitFromSchema =
       typeAnnotation &&
-      (!['primitive', 'union'].includes(typeAnnotation.typeKind) || typeAnnotation.typeName === 'DateTime');
+      (!['primitive', 'union'].includes(typeKind) || typeName === 'DateTime');
     let code = `${this.name} = `;
     if (needGenInitFromSchema) {
-      code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
+      code += `${context}.$genInitFromSchema('${sortedTypeKey}',`;
     }
 
     if (this.defaultValue?.expression) {
@@ -457,7 +465,9 @@ export class Variable extends BaseNode {
    * @param name 一般不用传，用于 rename
    */
   getEmbeddedFilePath(name = this.name) {
-    return `/embedded/${this.app.name}/frontends/${this.parentNode.name}/variables/${name}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${
+      this.getAncestor('FrontendType')?.name
+    }/frontends/${this.getAncestor('Frontend')?.name}/variables/${name}.ts`;
   }
 
   *toEmbeddedTSFile(): EmbeddedTSFileGenerator {
@@ -490,15 +500,13 @@ export class Variable extends BaseNode {
     }
     if (this.typeAnnotation) {
       code += `: `;
-      if (
-        this.defaultValue?.expression &&
-        !(this.typeAnnotation && ['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey))
-      ) {
-        code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
-      } else {
+      if (this.defaultValue?.expression) {
         if (['nasl.core.DateTime', 'nasl.core.Time', 'nasl.core.Date'].includes(typeKey)) {
           code += yield* this.defaultValue.toEmbeddedTS(shiftState(state, code), true);
+        } else {
+          code += `${yield* this.defaultValue.toEmbeddedTS(shiftState(state, code))}`;
         }
+      } else {
         code += 'undefined';
       }
       code += ' as ';

package/src/concepts/ViewElement__.ts

@@ -21,6 +21,8 @@ import { config } from '../config';
 import type MemberExpression from './MemberExpression__';
 import type Identifier from './Identifier__';
 import { PAGE_COMPONENT_INCLUDE_TAG_MAP } from './View__';
+import type BusinessComponent from './BusinessComponent__';
+import type FrontendType from './FrontendType__';
 
 import { kebab2Camel } from '../utils';
 export interface ParseContext {
@@ -72,6 +74,8 @@ function genArgumentMemberExpression(arr: string[]) {
   return expressionNode;
 }
 export interface ElementToVueOptions {
+  isRoot?: boolean;
+  asCompontent?: boolean;
   indentStyle?: 'space' | 'tab';
   tabSize?: number;
   indentLevel?: number;
@@ -1551,6 +1555,10 @@ export class ViewElement extends BaseNode {
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
 
+  get likeComponent(): View | BusinessComponent {
+    return this.view || (this?.getAncestor('BusinessComponent') as BusinessComponent);
+  }
+
   /* 主页面有没有权限 */
   get parentAuth() {
     const _nameSpace = this.view.getNamespace();
@@ -1577,11 +1585,11 @@ export class ViewElement extends BaseNode {
   }
 
   getViewElementUniqueName(name = 'viewElement1') {
-    return this.view?.getViewElementUniqueName(name);
+    return this.likeComponent?.getViewElementUniqueName(name);
   }
 
   getViewElementUniqueNameOld(name = 'viewElement1') {
-    return this.view?.getViewElementUniqueNameOld(name);
+    return this.likeComponent?.getViewElementUniqueNameOld(name);
   }
 
   public static readonly TAG_NAME_PREFIX_REG?: RegExp = /^([lieu]|van)[-_]/;
@@ -1627,16 +1635,16 @@ export class ViewElement extends BaseNode {
     const self = this;
     let code = '';
     code += indent((state?.tabSize || 0) + 1);
-    // 登录组件不翻译
-    if (self.toHump(self.tag) === 'lcapLogin' || self.staticClass === 'login-form') {
+    if (self.isCorrespondingBusinessComponent) {
+      code += `${self.name}: ${self.correspondingBusinessComponentNamespace}.${self.tag.replace('bs-', '')};\n`;
+    } else if (self.toHump(self.tag) === 'lcapLogin' || self.staticClass === 'login-form') {  // 登录组件不翻译
       code += `${self.name}: nasl.ui.div<any>;\n`;
     } else if (self.tag === 'u-table-view-column-dynamic') {
       code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any, any>;\n`;
     } else if (Object.keys(PAGE_COMPONENT_INCLUDE_TAG_MAP).includes(self.tag)) {
       if (self.bindAttrs?.findIndex((attr) => attr.name === 'data-source') > -1) {
-        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<__elements_completionProperty['${
-          self.name
-        }']['dataSource']>;\n`;
+        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<__elements_completionProperty['${self.name
+          }']['dataSource']>;\n`;
       } else {
         code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any>;\n`;
       }
@@ -1722,12 +1730,11 @@ export class ViewElement extends BaseNode {
       const _this = self.parentNode;
       let genericity = '';
       if (_this.tag === 'u-table-view-column-dynamic') {
-        genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${
-          (_this as any).__tsVariableDataSourceTypeName
-        }>`;
+        genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${(_this as any).__tsVariableDataSourceTypeName
+          }>`;
       } else {
         let targetNode: any = _this;
-        while (!targetNode.__tsVariableDataSourceTypeName && asserts.isViewElement(targetNode?.parentNode)) {
+        while ((!targetNode.__tsVariableDataSourceTypeName || targetNode.__tsVariableDataSourceTypeName === 'any') && asserts.isViewElement(targetNode?.parentNode)) {
           targetNode = targetNode.parentNode;
         }
         genericity += `<${(targetNode as any).__tsVariableDataSourceTypeName ?? 'any'}>`;
@@ -1866,10 +1873,39 @@ export class ViewElement extends BaseNode {
     code += indent((state?.tabSize || 0) + 2);
     return code;
   }
+
+  // 获取端类型
+  get frontendType() {
+    return this.getAncestor('FrontendType') as FrontendType;
+  }
+
+  // 对应业务组件
+  get isCorrespondingBusinessComponent() {
+    return this.tag.startsWith('bs-');
+  }
+
+  // 对应的业务组件的Namespace
+  get correspondingBusinessComponentNamespace() {
+    return `${this.frontendType?.getNamespace()}.${this.frontendType?.name}.businessComponents`;
+  }
+
+  // 获取对应的业务组件
+  get correspondingBusinessComponent() {
+    if (this.isCorrespondingBusinessComponent) {
+      // 端下的业务组件
+      const businessComponents = this.frontendType?.businessComponents;
+      const businessComponent = businessComponents.find((businessComponent) => {
+        return `bs-${businessComponent?.name}` === this.tag;
+      });
+      return businessComponent;
+    }
+  }
+
+
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState(), parentLevel?: number): TranslatorGenerator {
     const self = this;
-    const { parentNode, app, tag, staticClass, name, bindDirectives, bindRoles, bindEvents, children } = self;
+    const { parentNode, app, tag, staticClass, name, bindRoles, bindEvents, children } = self;
     const chineseTsName = (name: string) => {
       let tsName = name;
       // 匹配所有特殊字符都转为_
@@ -1945,8 +1981,12 @@ export class ViewElement extends BaseNode {
       code += '},\n';
       return code;
     }
+    let namespace = `nasl.ui.${self.toHump(tag)}`;
+    if (self.isCorrespondingBusinessComponent) {
+      namespace = `${self.correspondingBusinessComponentNamespace}.${self.tag.replace('bs-', '')}`;
+    }
     // 后面那个name是为了查找引用的时候用的
-    let code = `new nasl.ui.${self.toHump(tag)}${self.getTypeArgmentsStr(state)}({name: __elements.${name},\n`;
+    let code = `new ${namespace}${self.getTypeArgmentsStr(state)}({name: __elements.${name},\n`;
     // 是否开启权限
     // const hasAuth = Array.isArray(bindDirectives)
     //     ? !!bindDirectives.filter((directive) => directive.name === 'auth').length
@@ -1978,8 +2018,18 @@ export class ViewElement extends BaseNode {
     if (Array.isArray(children)) {
       code += indent((state?.tabSize || 0) + 1);
       if (Array.isArray(self.bindAttrs)) {
-        code += `bindAttr: () => [\n`;
+        code += `bindAttr: `;
+        if (self.isCorrespondingBusinessComponent) {
+          code += `{\n`;
+        } else {
+          code += `() => [\n`;
+        }
         yield* wrapForEach(self.bindAttrs, function* warpForEachGenerator(attr) {
+          // 过滤自由布局的key
+          const shouldFilter = self.isCorrespondingBusinessComponent && (attr.name === 'key' && !attr.expression);
+          if (shouldFilter) {
+            return;
+          }
           code += (yield* attr.toEmbeddedTS(shiftState(state, code, { tabSize: 1 }))) + ',\n';
         });
         yield* wrapForEach(self.bindDirectives, function* warpForEachGenerator(directive) {
@@ -1988,7 +2038,12 @@ export class ViewElement extends BaseNode {
         yield* wrapForEach(self.bindStyles, function* warpForEachGenerator(bindStyle) {
           code += (yield* bindStyle.toEmbeddedTS(shiftState(state, code, { tabSize: 1 }))) + ',\n';
         });
-        code += indent((state?.tabSize || 0) + 2) + '],\n';
+        code += indent((state?.tabSize || 0) + 2)
+        if (self.isCorrespondingBusinessComponent) {
+          code += '},\n';
+        } else {
+          code += '],\n';
+        }
       }
       // 如果子集中有插槽的就
       if (children.find((item) => item.tag === 'template' && item.slotTarget)) {
@@ -2049,7 +2104,7 @@ export class ViewElement extends BaseNode {
     }
     code += indent(state?.tabSize || 0) + '})';
     // 顶层元素是单独的表达式
-    if (parentNode.concept === 'View') {
+    if (parentNode.concept === 'View' || asserts.isBusinessComponent(parentNode)) {
       code += ';\n';
     } else {
       code += ',\n';
@@ -2162,10 +2217,20 @@ export class ViewElement extends BaseNode {
       { mode: 'anyObject', excludedKeySet: element.JSON_EXCLUDED_KEYS },
     );
 
-    this.view.existingViewElement.clear();
+    this.likeComponent?.existingViewElement.clear();
     return element;
   }
 
+  setTag(tag: string) {
+    const object = {
+      tag,
+    };
+    this.update({
+      ...object,
+
+    });
+  }
+
   // 递归遍历组件
   public traverseChildren(cb: (ele: ViewElement) => void): void {
     utils.traverse(
@@ -2224,7 +2289,7 @@ export class ViewElement extends BaseNode {
           expression: transAstNodeToNaslNode(Object.assign({}, argument)),
         }));
       }
-    } catch (error) {}
+    } catch (error) { }
 
     return {
       concept: 'ValidationRule',
@@ -2519,8 +2584,10 @@ export class ViewElement extends BaseNode {
    * 转换成设计器中使用的 Vue 文件
    * @param options
    */
-  toDesignerVue() {
+  toDesignerVue(options?: { isRoot: boolean; asCompontent?: boolean }) {
     return this.toVue({
+      isRoot: options?.isRoot,
+      asCompontent: options?.asCompontent,
       finalCode: false,
       nodePathAttr: true,
       attrFormat: (attr: BindAttribute | BindEvent | BindDirective, element?: ViewElement, defaultResult?: string) => {
@@ -2655,12 +2722,16 @@ export class ViewElement extends BaseNode {
     });
   }
 
+  isLikeComponent(node: types.SyntaxNode) {
+    return ['View', 'BusinessComponent'].includes(node?.concept);
+  }
+
   // 获取currentList
   getCurrentList() {
     const argsList: string[] = [];
     let parent = this.parentNode;
     let index = 0;
-    while (parent && parent.concept !== 'View') {
+    while (parent && !this.isLikeComponent(parent)) {
       if ((parent as ViewElement).slotScope) {
         argsList.push(index === 0 ? 'current' : 'current' + index);
         index++;
@@ -2700,6 +2771,10 @@ export class ViewElement extends BaseNode {
     return null;
   }
 
+  get businessComponent() {
+    return this.getAncestor('BusinessComponent');
+  }
+
   /**
    * 转换成 Vue 的模板格式
    */
@@ -2710,6 +2785,65 @@ export class ViewElement extends BaseNode {
       return ``;
     }
 
+    const { finalCode, asCompontent } = options || {};
+    const parts: string[] = [];
+    if (finalCode === false) {
+      if (this.tag === 'slot') {
+        if (asCompontent) {
+          return `<div vusion-slot-name="${this.name}">
+            <slot name="${this.name}">
+              <div s-empty="true" bs-empty="true" style="background: #f7f8fa;
+                border: 1px dashed #c3c3c3;
+                text-align: center;
+                color: #999;
+                min-height: 32px;
+                min-width: 32px;
+                width: 100%;
+                align-items: center;
+                display: inline-flex;
+                justify-content: center;">
+                +
+              </div>
+            </slot>
+          </div>`;
+        } else {
+          return `<div vusion-node-path="${this.nodePath}"
+            style="background: linear-gradient(-45deg,#fff 25%,#f3f5fa 0,#f3f5fa 50%,#fff 0,#fff 75%,#f3f5fa 0);
+            background-size: 45px 45px;
+            background-repeat: repeat;
+            line-height: 32px;
+            min-height: 32px;
+            color: var(--font-second-color);
+            text-align: center;">
+            组件占位，可在使用业务组件时插入任意组件
+          </div>`;
+        }
+      } else if (this.businessComponent?.name === this.tag) {
+        // 组件内部使用自身的情况
+        return `<div vusion-node-path="${this.nodePath}"
+          style="background: linear-gradient(-45deg,#fff 25%,#f3f5fa 0,#f3f5fa 50%,#fff 0,#fff 75%,#f3f5fa 0);
+          background-size: 45px 45px;
+          background-repeat: repeat;
+          line-height: 32px;
+          min-height: 32px;
+          color: var(--font-second-color);
+          text-align: center;">
+          在组件内部使用自身可能会导致循环引用，请谨慎使用
+        </div>`;
+      }
+      const isRoot = options.isRoot;
+      if (isRoot && !options?.asCompontent) {
+        parts.push('type="root"');
+        if (this.frontendType?.kind === 'h5') {
+          parts.push('class="l-root-h5"');
+        } else {
+          parts.push('style="height:100%; --custom-start: auto; min-height: 200px;"');
+        }
+      }
+    }
+    if (options) {
+      options.isRoot = false;
+    }
     let currentList: string[] = [];
     if (Array.isArray(options?.currentList)) {
       currentList = [...options?.currentList];
@@ -2748,16 +2882,15 @@ export class ViewElement extends BaseNode {
     const content: string = !this.children
       ? ''
       : this.children
-          .map((element) => {
-            const childOptions = Object.assign({}, newOptions);
-            childOptions.indentLevel++;
-            return (shouldIndent ? '\n' + insideTabString : '') + element?.toVue(childOptions);
-          })
-          .join('');
+        .map((element) => {
+          const childOptions = Object.assign({}, newOptions);
+          childOptions.indentLevel++;
+          return (shouldIndent ? '\n' + insideTabString : '') + element?.toVue(childOptions);
+        })
+        .join('');
     if (!content.length) {
       shouldIndent = false;
     }
-    const parts: string[] = [];
     if (newOptions.aslIdAttr) {
       if (newOptions.aslIdAttr === true) {
         newOptions.aslIdAttr = 'asl-id';
@@ -2772,9 +2905,9 @@ export class ViewElement extends BaseNode {
     this.slotTarget &&
       parts.push(
         `#${this.slotTarget}` +
-          (this.slotScope
-            ? `="${currentList.length > 1 ? this.slotScope + (currentList.length - 1) : this.slotScope}"`
-            : ''),
+        (this.slotScope
+          ? `="${currentList.length > 1 ? this.slotScope + (currentList.length - 1) : this.slotScope}"`
+          : ''),
       );
     this.refName && parts.push(`:ref="\`${this.refName}\`"`);
     this.keyName && parts.push(`:key="\`${this.keyName}\`"`);
@@ -2820,7 +2953,9 @@ export class ViewElement extends BaseNode {
     ) {
       this.name && parts.push(`key="${this.name}"`);
     }
-
+    if (this.tag === 'slot') {
+      this.name && parts.push(`name="${this.name}"`);
+    }
     let partsLength = 0;
     let partsString = '';
     parts.forEach((part) => {
@@ -2853,7 +2988,7 @@ export class ViewElement extends BaseNode {
     super.delete();
     if (this.parentNode) {
       this.traverseChildren((ele: ViewElement) => {
-        (this.view as any)?.removeExistingViewElement(ele);
+        (this.likeComponent as any)?.removeExistingViewElement(ele);
       });
     }
   }
@@ -2891,7 +3026,7 @@ export class ViewElement extends BaseNode {
     let current = 'current';
     let parent = this.parentNode;
     let index = 0;
-    while (parent && parent.concept !== 'View') {
+    while (parent && !this.isLikeComponent(parent)) {
       if ((parent as ViewElement).slotScope) {
         index++;
       }

package/src/concepts/View__.ts

@@ -1690,7 +1690,7 @@ export class View extends BaseNode {
       newName = name.replace(/\d*$/, (m) => `_${BranchCopyUniCode}_${m}`);
     }
     // 主分支无 BranchCopyUniCode
-    if (!BranchCopyUniCode && prefix.at(-1) !== '_') {
+    if (!BranchCopyUniCode && prefix?.at(-1) !== '_') {
       newName = name.replace(/\d*$/, (m) => `_${m}`);
     }
     const newPrefix = newName.replace(/\d*$/, '');
@@ -1836,22 +1836,6 @@ export class View extends BaseNode {
       });
     }
 
-    // 页面逻辑
-    if (Array.isArray(definition.viewLogics)) {
-      definition.viewLogics.forEach((logicOption: any) => {
-        // 页面逻辑只有load函数的走之前的逻辑其余不用创建
-        if (logicOption.name.startsWith('load')) {
-          // const logic = Logic.from(
-          //   {
-          //     ...logicOption,
-          //   },
-          //   this,
-          //   'logics'
-          // );
-          // this.addLogic(logic);
-        }
-      });
-    }
     // 页面事件
     if (Array.isArray(definition.viewBindEvents)) {
       definition.viewBindEvents.forEach((eventOption: any) => {
@@ -1867,7 +1851,7 @@ export class View extends BaseNode {
               logics: [newLogic],
             },
             this,
-            'events',
+            'bindEvents',
           );
           this.addBindEvent(event);
         } else {
@@ -1935,6 +1919,23 @@ export class View extends BaseNode {
         }
       });
     }
+    this.traverseChildren((node) => {
+      switch (node?.concept) {
+        case 'ForEachStatement':
+          if (node.item) {
+            varList.push(node?.item);
+          }
+          if (node.index) {
+            varList.push(node?.index);
+          }
+          break;
+        case 'AnonymousFunction':
+          node.params?.forEach((param: Param) => {
+            varList.push(param);
+          });
+          break;
+      }
+    });
     return varList.filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
 
@@ -1990,7 +1991,7 @@ export class View extends BaseNode {
                       .join('\n')}
                 }
             }
-        };`;
+        };\n`;
     code += keyboardEventMixinCode;
     if (this.script) {
       mixin = this.script.trim().replace(/export default |module\.exports +=/, 'const mixin = ');
@@ -2069,7 +2070,9 @@ export class View extends BaseNode {
         parent = parent.parentNode;
       }
     }
-    return `/embedded/${this.app.name}/frontends/${this.frontend.name}/views/${pathName}.ts`;
+    return `/embedded/${this.getAncestor('App')?.name}/frontendTypes/${
+      this.getAncestor('FrontendType')?.name
+    }/frontends/${this.getAncestor('Frontend')?.name}/views/${pathName}.ts`;
   }
 
   getNamespace(): string {

package/src/concepts/index__.ts

@@ -1,6 +1,7 @@
 export * from './App__';
 export * from './Module__';
 export * from './Namespace__';
+export * from './FrontendType__';
 export * from './Frontend__';
 export * from './Backend__';
 export * from './Integration__';
@@ -24,6 +25,7 @@ export * from './BindDirective__';
 export * from './BindEvent__';
 export * from './BindStyle__';
 export * from './ViewComponent__';
+export * from './BusinessComponent__';
 export * from './Attribute__';
 export * from './Event__';
 export * from './Slot__';
@@ -31,10 +33,12 @@ export * from './Theme__';
 export * from './StaticString__';
 export * from './Logic__';
 export * from './AuthLogic__';
+export * from './BusinessLogic__';
 export * from './AuthLogicForCallInterface__';
 export * from './OverriddenLogic__';
 export * from './AbstractInterface__';
 export * from './Param__';
+export * from './ParamWithGroup__';
 export * from './Return__';
 export * from './Variable__';
 export * from './BackendVariable__';
@@ -60,6 +64,7 @@ export * from './Assignment__';
 export * from './BatchAssignment__';
 export * from './Comment__';
 export * from './CallLogic__';
+export * from './CallEvent__';
 export * from './CallFunction__';
 export * from './CallInterface__';
 export * from './Destination__';