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

package/src/concepts/QueryOrderByExpression__.ts

@@ -9,6 +9,9 @@ import {
   withGenerator,
   TranslatorGenerator,
 } from '../translator';
+
+import Identifier from './Identifier__';
+import StringLiteral from './StringLiteral__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -209,6 +212,26 @@ export class QueryOrderByExpression extends LogicItem {
     return code;
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let orderElement = this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
+      ? (this.orderElement as Identifier).name
+      : this.orderElement.toNaturalTS(state);
+    let order = this.order.toNaturalTS(state);
+    return `[${orderElement || '__IDENTIFIER__'}, ${order || '__IDENTIFIER__'}]`;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let orderElement = this.orderElement.concept === 'QueryOrderByExpression' 
+      ? this.orderElement.toTextualNASL(state)
+      : this.orderElement.concept === 'Identifier' && (this.orderElement as Identifier).namespace === 'inner'
+      ? (this.orderElement as Identifier).name
+      : `\${${this.orderElement.toTextualNASL(state)}}`;
+    let order = this.order.concept === 'StringLiteral' ? (this.order as StringLiteral).value : `\${${this.order.toTextualNASL(state)}}`;
+    return `${orderElement || '__IDENTIFIER__'} ${order || '__IDENTIFIER__'}`;
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/QuerySelectExpression__.ts

@@ -1,3 +1,13 @@
+import {
+  TranslatorState,
+  withSourceMap,
+  createCompilerState,
+  withSourceMapGenerator,
+  withGenerator,
+  TranslatorGenerator,
+  indent,
+} from '../translator';
+import CallQueryComponent from './CallQueryComponent__';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -547,6 +557,51 @@ export class QuerySelectExpression extends LogicItem {
     return utils.unique(name, this.getQueryFieldExpressionExistingNames(), undefined, false);
   }
 
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    let code = this.distinct ?  `\n${indent(state.tabSize)}.SELECT_DISTINCT(() => ({\n` : `\n${indent(state.tabSize)}.SELECT(() => ({\n`;
+
+    this.selectElements.forEach((element) => {
+      code += indent(state.tabSize + 1);
+      code += element.toNaturalTS(state, true);
+      code += ',\n';
+    });
+
+    if ((this.parentNode as CallQueryComponent)?.groupBy.length) {
+      (this.parentNode as CallQueryComponent)?.groupBy.forEach((groupElement, index) => {
+        code += indent(state.tabSize);
+        code += (groupElement.groupElement as QueryFieldExpression).toNaturalTS(state, true) + ',\n';
+      });
+    }
+
+    code += `${indent(state.tabSize)}}))`;
+
+    return code;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = 'SELECT ';
+    if (this.distinct)
+      code += 'DISTINCT ';
+
+    this.selectElements.forEach((element) => {
+      code += element.toTextualNASL(state);
+      if (element !== this.selectElements[this.selectElements.length - 1])
+        code += ', ';
+    });
+
+    if ((this.parentNode as CallQueryComponent)?.groupBy.length) {
+      (this.parentNode as CallQueryComponent)?.groupBy.forEach((element, index) => {
+        code += element.toTextualNASL(state);
+        if (element !== (this.parentNode as CallQueryComponent)?.groupBy[this.selectElements.length - 1])
+          code += ', ';
+      });
+    }
+
+    return code;
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/SelectMembers__.ts

@@ -1,3 +1,4 @@
+import { runGeneratorSync as runSync } from '../utils/time-slicing';
 import { wrapForEachToGenerator as wrapForEach } from '../utils/time-slicing';
 import {
   TranslatorState,
@@ -402,6 +403,12 @@ export class SelectMembers extends BaseNode {
     const code = '';
     return code;
   }
+  
+  @withSourceMap()
+  toNaturalTS(state = createCompilerState()): string {
+    return runSync(this.toEmbeddedTS(state));
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/SqlQueryComponent__.ts

@@ -290,8 +290,10 @@ export class SqlQueryComponent extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const code: string = `nasl.oql.query(\`${this.code}\`)`;
-    return code;
+    const code = this.code
+      .replace(/\.(\d+)\}/g, '[$1]}')
+      .replace(/`/g, '\\`'); // 处理枚举 TS 转不回来的情况 ${app.enums.NetStatusEnum.1}
+      return `nasl.oql.query(\`${code}\`)`;
   }
 
   /**

package/src/concepts/StringInterpolation__.ts

@@ -360,14 +360,30 @@ export class StringInterpolation extends LogicItem {
     let code = '`';
     this.expressions.forEach((exp) => {
       if (exp.concept === 'StringLiteral') {
-        code += (exp as StringLiteral).value;
+        code += (exp as StringLiteral).toNaturalTS(shiftState(state, code));
       } else {
         code += '${';
         code += exp.toNaturalTS(shiftState(state, code));
         code += '}';
       }
     });
-    code += '`\n';
+    code += '`';
+    return code;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = 's"';
+    this.expressions.forEach((exp) => {
+      if (exp.concept === 'StringLiteral') {
+        code += (exp as StringLiteral).toNaturalTS(shiftState(state, code));
+      } else {
+        code += '${';
+        code += exp.toNaturalTS(shiftState(state, code));
+        code += '}';
+      }
+    });
+    code += '"';
     return code;
   }
 

package/src/concepts/StringLiteral__.ts

@@ -141,7 +141,26 @@ export class StringLiteral extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState(), isRequired?: boolean): string {
-    return `'${this.value}'`;
+    
+    if (this.parentNode?.concept === 'StringInterpolation') {
+      const code = this.value.replace(/[`$\\]/g, '\\$&');
+      return code;
+    } else {
+      const code = this.value.replace(/['\\]/g, '\\$&');
+      // if (code.includes("'"))
+      //   return `"${code}"`;
+      // else
+      return `'${code}'`;
+    }
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    const code = this.value;
+    if (this.parentNode?.concept === 'StringInterpolation')
+      return code;
+    else
+      return `'${code}'`;
   }
 
   /**

package/src/concepts/StructureProperty__.ts

@@ -7,6 +7,8 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  indent,
+  createDecoratorCode,
 } from '../translator';
 
 interface defaultCode {
@@ -353,6 +355,26 @@ export class StructureProperty extends BaseNode {
     return code;
   }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = '';
+
+    const index = (this.parentNode as Structure)?.properties.indexOf(this);
+    if (index > 0) code += `\n${indent(state.tabSize)}`;
+
+    code += createDecoratorCode(state, this, ['label', 'description', 'jsonName']);
+
+    code += this.name;
+    if (this.typeAnnotation) {
+      code += ': ';
+      code += this.typeAnnotation.toTextualNASL(shiftState(state, code, { inline: true }));
+    }
+    if (this.defaultValue) {
+      code += ` = ${this.defaultValue}`;
+    }
+    return code;
+  }
+
   /**
    * 设置数据类型
    * @param typeAnnotation 类型标注对象

package/src/concepts/Structure__.ts

@@ -9,6 +9,7 @@ import {
   withSourceMapGenerator,
   withGenerator,
   TranslatorGenerator,
+  createDecoratorCode,
 } from '../translator';
 import type Namespace from './Namespace__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
@@ -614,24 +615,24 @@ export class Structure extends BaseNode {
   *toEmbeddedTS(state = createCompilerState()): TranslatorGenerator {
     const self = this;
     let code = `export class ${self.tsName} {\n`;
-    code += indent((state?.tabSize || 0) + 1);
+    code += indent(state.tabSize + 1);
     code += `__name: '${self.getTsNamespace()}.${self.tsName}';\n`;
     yield* wrapForEach(self.properties, function* warpForEachGenerator(property) {
-      code += indent((state?.tabSize || 0) + 1);
+      code += indent(state.tabSize + 1);
       code += yield* property.toEmbeddedTS(shiftState(state, code, { tabSize: 0 }));
       code += ';\n';
     });
 
     /* 默认值草稿区 */
-    code += `${indent((state?.tabSize || 0) + 1)}playground = () => {\n`;
+    code += `${state.tabSize + 1}playground = () => {\n`;
     for (const prop of this.properties) {
       for (const item of prop.defaultValue?.playground ?? []) {
         code += yield* item.toEmbeddedTS(shiftState(state, code));
         code += ';\n';
       }
     }
-    code += `${indent((state?.tabSize || 0) + 1)}}\n`;
-    code += `${indent(state?.tabSize || 0)}}\n`;
+    code += `${state.tabSize + 1}}\n`;
+    code += `${state.tabSize}}\n`;
     return code;
   }
 
@@ -640,11 +641,27 @@ export class Structure extends BaseNode {
     let code = `class ${this.name} {\n`;
     // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
     this.properties.forEach((property) => {
-      code += indent((state?.tabSize || 0) + 1);
+      code += indent(state.tabSize + 1);
       code += property.toNaturalTS(shiftState(state, code, { tabSize: 0 }));
       code += ';\n';
     });
-    code += `${indent(state?.tabSize || 0)}}\n`;
+    code += `${indent(state.tabSize)}}\n`;
+    return code;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    let code = '';
+    
+    code += createDecoratorCode(state, this, ['description']);
+    
+    code += `struct ${this.name} {\n`;
+    // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
+    this.properties.forEach((property) => {
+      code += property.toTextualNASL(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+      code += '\n';
+    });
+    code += `${indent(state.tabSize)}}\n`;
     return code;
   }
 

package/src/concepts/SwitchCase__.ts

@@ -339,7 +339,7 @@ export class SwitchCase extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state = createCompilerState(), isLast?: boolean, isFirst?: boolean): string {
+  toNaturalTS(state = createCompilerState(), isLast?: boolean, isFirst = true): string {
     let code = '\n';
     if (!isLast) {
       code += indent(state.tabSize + 2);

package/src/concepts/TypeAnnotation__.ts

@@ -760,7 +760,7 @@ export class TypeAnnotation extends BaseNode {
       return this.typeName;
     } else if (this.typeKind === 'generic') {
       return `${this.typeName}<${
-        !this.typeArguments.length
+        !this.typeArguments?.length
           ? 'T'
           : this.typeArguments.map((arg) => arg?.typeTitle || arg?.name || 'T').join(', ')
       }>`;
@@ -1081,6 +1081,42 @@ export class TypeAnnotation extends BaseNode {
     return '__IDENTIFIER__';
   }
 
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
+    if (this.typeKind === 'primitive' || this.typeKind === 'reference') {
+      if (this.typeName === 'Long')
+        return `${this.typeNamespace}.Integer`;
+      return `${this.typeNamespace}.${this.typeName}`;
+    } else if (this.typeKind === 'generic') {
+      let code = `${this.typeName}<`;
+      (this.typeArguments || []).forEach((arg, index) => {
+        code += arg?.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.typeArguments.length - 1) code += ', ';
+      });
+      code += '>';
+      return code;
+    } else if (this.typeKind === 'union') {
+      let code = '';
+      (this.typeArguments || []).forEach((arg, index) => {
+        code += arg?.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.typeArguments.length - 1) code += ' | ';
+      });
+      return code;
+    } else if (this.typeKind === 'anonymousStructure') {
+      let code = `{ `;
+      (this.properties || []).forEach((property, i) => {
+        code += `${property.name}: `;
+        code += `${property.typeAnnotation?.toNaturalTS(
+          shiftState(state, code, { inline: true, tabSize: state.tabSize + 1 }),
+        )}`;
+        code += i < this.properties?.length - 1 ? ', ' : ' }';
+      });
+      return code;
+    } else {
+      return this.typeName;
+    }
+  }
+
   /**
    * 用于标准化数据结构，便于计算 anonymousStructure 的 __name
    */

package/src/concepts/TypeParam__.ts

@@ -73,7 +73,12 @@ export class TypeParam extends BaseNode {
   }
 
   @withSourceMap()
-  toNaturalTS(state = createCompilerState(), prefix?: string): string {
+  toNaturalTS(state = createCompilerState()): string {
+    return this.name;
+  }
+
+  @withSourceMap()
+  toTextualNASL(state = createCompilerState()): string {
     return this.name;
   }
 

package/src/concepts/Unparsed__.ts

@@ -98,7 +98,7 @@ export class Unparsed extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(): string {
-    return ``;
+    return '__IDENTIFIER__';
   }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！

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

@@ -1725,7 +1725,7 @@ export class ViewElement extends BaseNode {
           }>`;
       } 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'}>`;
@@ -1747,8 +1747,9 @@ export class ViewElement extends BaseNode {
           tabSize: 4,
           inline: true,
           noNeedParams: true,
+          callLogicNoIife: true,
         };
-        let value = yield* attr.expression.toEmbeddedTS(
+        const value = yield* attr.expression.toEmbeddedTS(
           shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
         );
         code += indent((state?.tabSize || 0) + 3);
@@ -1844,8 +1845,9 @@ export class ViewElement extends BaseNode {
               tabSize: 4,
               inline: true,
               noNeedParams: true,
+              callLogicNoIife: true,
             };
-            let value = yield* attr.expression.toEmbeddedTS(
+            const value = yield* attr.expression.toEmbeddedTS(
               shiftState(state, code, attr.expression.concept === 'CallLogic' ? extraParams : {}),
             );
             code += `type ${datasourceName} = `;
@@ -1892,6 +1894,29 @@ export class ViewElement extends BaseNode {
     }
   }
 
+  // 收集页面元素中的业务组件
+  collectExistingBusinessComponent() {
+    const excludedSet = new Set();
+    utils.traverse(
+      ({ node }) => {
+        const correspondingBusinessComponent = node.correspondingBusinessComponent;
+        if (correspondingBusinessComponent && !excludedSet.has(correspondingBusinessComponent)) {
+          const set = correspondingBusinessComponent.collectExistingBusinessComponent();
+          if (set.size) {
+            set.forEach(value => {
+              if (!excludedSet.has(value)) {
+                excludedSet.add(value);
+              }
+            });
+          }
+        }
+      },
+      {
+        node: this,
+      },
+    );
+    return excludedSet;
+  }
 
   @withSourceMapGenerator
   *toEmbeddedTS(state = createCompilerState(), parentLevel?: number): TranslatorGenerator {
@@ -2016,8 +2041,8 @@ export class ViewElement extends BaseNode {
           code += `() => [\n`;
         }
         yield* wrapForEach(self.bindAttrs, function* warpForEachGenerator(attr) {
-          // 过滤自由布局的key
-          const shouldFilter = self.isCorrespondingBusinessComponent && !(name === 'key' && !attr.expression);
+          // 过滤业务组件的非表达式模式的翻译
+          const shouldFilter = self.isCorrespondingBusinessComponent && (attr.type !== 'dynamic');
           if (shouldFilter) {
             return;
           }
@@ -2768,49 +2793,6 @@ export class ViewElement extends BaseNode {
     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" 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"');
@@ -2859,7 +2841,7 @@ export class ViewElement extends BaseNode {
     const tabString = ' '.repeat(newOptions.tabSize * newOptions.indentLevel);
     const insideTabString = ' '.repeat(newOptions.tabSize * (newOptions.indentLevel + 1));
     let shouldIndent = true;
-    const content: string = !this.children
+    let content: string = !this.children
       ? ''
       : this.children
         .map((element) => {
@@ -2868,9 +2850,6 @@ export class ViewElement extends BaseNode {
           return (shouldIndent ? '\n' + insideTabString : '') + element?.toVue(childOptions);
         })
         .join('');
-    if (!content.length) {
-      shouldIndent = false;
-    }
     if (newOptions.aslIdAttr) {
       if (newOptions.aslIdAttr === true) {
         newOptions.aslIdAttr = 'asl-id';
@@ -2892,7 +2871,6 @@ export class ViewElement extends BaseNode {
     this.refName && parts.push(`:ref="\`${this.refName}\`"`);
     this.keyName && parts.push(`:key="\`${this.keyName}\`"`);
     this.staticClass && parts.push(`class="${this.staticClass}"`);
-    this.staticStyle && parts.push(`style="${this.staticStyle}"`);
 
     const vIfs: string[] = [];
     []
@@ -2933,7 +2911,45 @@ export class ViewElement extends BaseNode {
     ) {
       this.name && parts.push(`key="${this.name}"`);
     }
-
+    let tag = this.tag;
+    let staticStyle = this.staticStyle ?? '';
+    if (this.tag === 'slot') {
+      this.name && parts.push(`name="${this.name}"`);
+      if (finalCode === false) {
+        tag = 'div';
+        if (asCompontent) {
+          parts.push(`vusion-slot-name="${this.name}"`);
+          content = `<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>`;
+        } else {
+          parts.push(`vusion-node-path="${this.nodePath}"`);
+          content = `组件占位，可在使用业务组件时插入任意组件`;
+          staticStyle += `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;`;
+        }
+      }
+    }
+    staticStyle && parts.push(`style="${staticStyle}"`);
+    if (!content.length) {
+      shouldIndent = false;
+    }
     let partsLength = 0;
     let partsString = '';
     parts.forEach((part) => {
@@ -2945,12 +2961,12 @@ export class ViewElement extends BaseNode {
       partsLength += part.length;
     });
     let htmlContent =
-      `<${this.tag}${partsString.length ? partsString : ''}>` +
+      `<${tag}${partsString.length ? partsString : ''}>` +
       content +
       (shouldIndent ? '\n' + tabString : '') +
-      `</${this.tag}>`;
-    if (!content.trim() && selfClosingTag.includes(this.tag)) {
-      htmlContent = `<${this.tag}${partsString.length ? partsString : ''} />`;
+      `</${tag}>`;
+    if (!content.trim() && selfClosingTag.includes(tag)) {
+      htmlContent = `<${tag}${partsString.length ? partsString : ''} />`;
     }
     return htmlContent;
   }

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?.slice(-1) !== '_') {
       newName = name.replace(/\d*$/, (m) => `_${m}`);
     }
     const newPrefix = newName.replace(/\d*$/, '');
@@ -1738,13 +1738,16 @@ export class View extends BaseNode {
 
   public static readonly TAG_NAME_PREFIX_REG?: RegExp = /^([lieu]|van)[-_]/;
 
-  mergeBlock({ code, nodePath, position, cb }: { code: string; nodePath: string; position: string; cb?: Function }) {
+  mergeBlock({ code, nodePath, position, slotTarget, cb }: { code: string; nodePath: string; position: string; slotTarget?: string; cb?: Function }) {
     const ViewElement = getConceptConstructor('ViewElement');
     const Logic = getConceptConstructor('Logic');
     const Param = getConceptConstructor('Param');
     const Variable = getConceptConstructor('Variable');
     const BindEvent = getConceptConstructor('BindEvent');
-    const template = utils.sliceTagContent(code, 'template');
+    let template = utils.sliceTagContent(code, 'template');
+    if (slotTarget) {
+      template = `<template #${slotTarget}>${template}</template>`;
+    }
     let targetNode = this.app.findNodeByPath(nodePath);
     let parentNode = position === 'append' ? targetNode : targetNode.parentNode;
     if (parentNode.concept === 'View') {
@@ -1836,22 +1839,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) => {