@lcap/nasl 3.3.2-beta.4 → 3.3.2-beta.5

package/src/concepts/NewComposite__.ts

@@ -35,6 +35,7 @@ export class NewComposite extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NewComposite';
 
@@ -183,7 +184,7 @@ export class NewComposite extends LogicItem {
 
   getIdentifierExistingNames(excludedList: Array<Identifier> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.properties as Identifier[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.properties as Identifier[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getIdentifierUniqueName(name = 'identifier1') {
     return utils.unique(name, this.getIdentifierExistingNames(), undefined, false);
@@ -336,7 +337,7 @@ export class NewComposite extends LogicItem {
 
   getSelectMembersExistingNames(excludedList: Array<SelectMembers> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.rights as SelectMembers[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.rights as SelectMembers[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getSelectMembersUniqueName(name = 'selectMembers1') {
     return utils.unique(name, this.getSelectMembersExistingNames(), undefined, false);
@@ -491,7 +492,7 @@ export class NewComposite extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.assignmentLines as AssignmentLine[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getAssignmentLineUniqueName(name = 'assignmentLine1') {
     return utils.unique(name, this.getAssignmentLineExistingNames(), undefined, false);
@@ -678,11 +679,16 @@ export class NewComposite extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -726,11 +732,16 @@ export class NewComposite extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -774,11 +785,16 @@ export class NewComposite extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(selectMembers);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = selectMembers.__v_raw || selectMembers;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === selectMembers) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -822,11 +838,16 @@ export class NewComposite extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(assignmentLine);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = assignmentLine.__v_raw || assignmentLine;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === assignmentLine) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -892,7 +913,7 @@ export class NewComposite extends LogicItem {
           }
           members.forEach((rightMember: any, rightSecondIndex: number) => {
             const rightName = rightMember.property.name;
-            if (rightLineSet.has(rightSecondIndex)) return;
+            if (rightLineSet.has(rightSecondIndex) || leftLineSet.has(leftSecondIndex)) return;
 
             if (leftName === rightName) {
               const rightTypeAnnotation = rightMember.__TypeAnnotation;
@@ -1010,7 +1031,7 @@ export class NewComposite extends LogicItem {
     });
     const selectMember = oldNode.parentNode;
     const autoConnectionIndex = this.rights.findIndex((right) => right === selectMember);
-    const newSelectMember = { ...selectMember?.toJSON?.() ?? selectMember, expression, members };
+    const newSelectMember = { ...(selectMember?.toJSON?.() ?? selectMember), expression, members };
     const splitIndex = this.rights.findIndex((right) => selectMember === right);
     const newLines: AssignmentLine[] = this.assignmentLines.filter(({ rightIndex }) => rightIndex[0] !== splitIndex);
     let oldLines: AssignmentLine[] = this.assignmentLines.filter(({ rightIndex }) => rightIndex[0] === splitIndex);
@@ -1019,7 +1040,7 @@ export class NewComposite extends LogicItem {
       if (keepMembers?.has(item.completeName)) {
         const lines = this.findlines(item, selectMember);
         lines.forEach((line) => {
-          const newLine = { ...line?.toJSON()?.toJSON?.() ?? line, rightIndex: [line.rightIndex[0], index] };
+          const newLine = { ...(line?.toJSON()?.toJSON?.() ?? line), rightIndex: [line.rightIndex[0], index] };
           newLines.push(newLine as AssignmentLine);
           oldLines = oldLines.filter(({ leftIndex }) => leftIndex[1] !== line.leftIndex[1]);
         });
@@ -1090,8 +1111,9 @@ export class NewComposite extends LogicItem {
           : this.rights[rightIndex[0]].expression;
       code += `return ${obj};\n`;
     } else if (typeAnnotation.typeKind !== 'anonymousStructure') {
-      code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey
-        }', this.$utils['New'](${typeAnnotation.toUI(shiftState(state, code, { inline: true }))}));\n`;
+      code += `const obj = this.$genInitFromSchema('${
+        typeAnnotation.sortedTypeKey
+      }', this.$utils['New'](${typeAnnotation.toUI(shiftState(state, code, { inline: true }))}));\n`;
       this.assignmentLines.forEach(({ leftIndex, rightIndex }, index) => {
         const leftSecondIndex = leftIndex[1];
         const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
@@ -1137,8 +1159,9 @@ export class NewComposite extends LogicItem {
           : this.rights[rightIndex[0]].expression;
       code += `return ${obj.toJS(shiftState(state, code, { inline: true }))};\n`;
     } else if (typeAnnotation.typeKind !== 'anonymousStructure') {
-      code += `const obj = this.$genInitFromSchema('${typeAnnotation.sortedTypeKey
-        }', this.$utils['New'](${typeAnnotation.toJS(shiftState(state, code, { inline: true }))}));\n`;
+      code += `const obj = this.$genInitFromSchema('${
+        typeAnnotation.sortedTypeKey
+      }', this.$utils['New'](${typeAnnotation.toJS(shiftState(state, code, { inline: true }))}));\n`;
       const rightMap = new Map();
       this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
         const rightIndexJson = JSON.stringify(rightIndex);
@@ -1330,12 +1353,18 @@ export class NewComposite extends LogicItem {
           } else {
             code += `${indent2}let ${temp}${ts === 'null' ? ':void' : ''} = ${ts}; `;
           }
-          code += `const `;
+          code += `let `;
           code += `${property.toEmbeddedTS(shiftState(state, code, { inline: true }))}: `;
-          code += propertyType
-            ? propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))
-            : `nasl.core.Incompatible<typeof ${temp}, void>`;
-          code += ` = ${temp};\n`;
+          if (propertyType) {
+            const typeTs = propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }));
+            code += typeTs;
+            code += ` = ${temp};\n`;
+            // 如果是字段是union类型，且赋值的是当前union允许的类型，会导致property.name类型推断成temp的类型
+            code += `${indent2}${property.name} = ${property.name} as ${typeTs};\n`;
+          } else {
+            code += `nasl.core.Incompatible<typeof ${temp}, void>`;
+            code += ` = ${temp};\n`;
+          }
         } else if (propertyType) {
           code += `${indent2}let ${property.name}: `;
           code += `${propertyType.toEmbeddedTS(shiftState(state, code, { inline: true }))}; `;
@@ -1366,7 +1395,10 @@ export class NewComposite extends LogicItem {
   @withSourceMap()
   toNaturalTS(): string {
     let code = 'nasl.util.';
-    code += this?.typeAnnotation?.typeKind === 'anonymousStructure' ? 'NewAnonymityStructure' : `NewEntity<${this?.typeAnnotation?.typeName || '__IDENTIFIER__'}>`;
+    code +=
+      this?.typeAnnotation?.typeKind === 'anonymousStructure'
+        ? 'NewAnonymityStructure'
+        : `NewEntity<${this?.typeAnnotation?.typeName || '__IDENTIFIER__'}>`;
     let params = '';
     this?.properties?.forEach((item, index) => {
       if (item) {

package/src/concepts/NewList__.ts

@@ -27,6 +27,7 @@ export class NewList extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NewList';
 
@@ -85,7 +86,7 @@ export class NewList extends LogicItem {
 
   getItemExistingNames(excludedList: Array<LogicItem> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.items as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.items as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getItemExistingNames(), undefined, false);
@@ -272,11 +273,16 @@ export class NewList extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -320,11 +326,16 @@ export class NewList extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -448,7 +459,8 @@ export class NewList extends LogicItem {
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
     let code = '';
-    const typeAnnotation = this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
+    const typeAnnotation =
+      this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
     let params = '';
     this?.items?.forEach((item, index) => {
       if (item) {

package/src/concepts/NewMap__.ts

@@ -28,6 +28,7 @@ export class NewMap extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NewMap';
 
@@ -104,7 +105,7 @@ export class NewMap extends LogicItem {
 
   getItemExistingNames(excludedList: Array<LogicItem> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.keys as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.keys as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getItemExistingNames(), undefined, false);
@@ -436,11 +437,16 @@ export class NewMap extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -509,11 +515,16 @@ export class NewMap extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -681,7 +692,8 @@ export class NewMap extends LogicItem {
   @withSourceMap()
   toNaturalTS(): string {
     let code = '';
-    const typeAnnotation = this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
+    const typeAnnotation =
+      this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
     let params = '';
     this?.keys?.forEach((item, index) => {
       if (item) {

package/src/concepts/NullLiteral__.ts

@@ -26,6 +26,7 @@ export class NullLiteral extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NullLiteral';
 

package/src/concepts/NumericLiteral__.ts

@@ -27,6 +27,7 @@ export class NumericLiteral extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'NumericLiteral';
 
@@ -93,11 +94,16 @@ export class NumericLiteral extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/OqlQueryComponent__.ts

@@ -4,6 +4,8 @@ import StructureProperty from './StructureProperty__';
 import Structure from './Structure__';
 import Identifier from './Identifier__';
 import MemberExpression from './MemberExpression__';
+import type { Entity } from './Entity__';
+import type { EntityProperty } from './EntityProperty__';
 import logicService from '../service/logic';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -31,6 +33,7 @@ export class OqlQueryComponent extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'OqlQueryComponent';
 
@@ -122,11 +125,16 @@ export class OqlQueryComponent extends LogicItem {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -304,6 +312,26 @@ export class OqlQueryComponent extends LogicItem {
   // 从服务端获取 SQL -> TS 的翻译和 sourceMap
   async requestEmbeddedTS(): Promise<any> {
     if (this.code) {
+      let dataSourceNasl = this.app.findNodeByCompleteName(this.dataSource)?.toJSON();
+      if (dataSourceNasl) {
+        dataSourceNasl = {
+          concept: 'DataSource',
+          entities: (dataSourceNasl.entities = dataSourceNasl.entities?.map((entity: Entity) => {
+            return {
+              name: entity.name,
+              concept: entity.concept,
+              tableName: entity.tableName,
+              properties: entity.properties?.map((prop: EntityProperty) => {
+                return {
+                  name: prop.name,
+                  concept: prop.concept,
+                  columnName: prop.columnName,
+                };
+              }),
+            };
+          })),
+        };
+      }
       return logicService
         .queryDebugTypescript({
           body: {
@@ -312,7 +340,7 @@ export class OqlQueryComponent extends LogicItem {
             dataSourceName: this.dataSource,
             oql: this.code,
             ideVersion: this.app.ideVersion,
-            dataSourceNasl: this.app.findNodeByCompleteName(this.dataSource)?.toJSON(),
+            dataSourceNasl,
             typeScriptStartLine: 1,
             typeScriptStartLineColumn: 1,
           },

package/src/concepts/OverriddenLogic__.ts

@@ -58,6 +58,7 @@ export class OverriddenLogic extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'OverriddenLogic';
 
@@ -278,7 +279,7 @@ export class OverriddenLogic extends BaseNode {
 
   getTypeParamExistingNames(excludedList: Array<TypeParam> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.typeParams as TypeParam[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getTypeParamUniqueName(name = 'typeParam1') {
     return utils.unique(name, this.getTypeParamExistingNames(), undefined, false);
@@ -1112,11 +1113,16 @@ export class OverriddenLogic extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(transactional);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = transactional.__v_raw || transactional;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === transactional) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1160,11 +1166,16 @@ export class OverriddenLogic extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeParam);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeParam.__v_raw || typeParam;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeParam) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1208,11 +1219,16 @@ export class OverriddenLogic extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(param);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = param.__v_raw || param;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === param) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1256,11 +1272,16 @@ export class OverriddenLogic extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(ret);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = ret.__v_raw || ret;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === ret) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1304,11 +1325,16 @@ export class OverriddenLogic extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(variable);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = variable.__v_raw || variable;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === variable) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1349,11 +1375,16 @@ export class OverriddenLogic extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logicItem);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logicItem.__v_raw || logicItem;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === logicItem) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -1948,7 +1979,7 @@ export class OverriddenLogic extends BaseNode {
   handleForEachCode(code: string, forEachStatement: ForEachStatement): string {
     const { item, index, each } = forEachStatement;
     if (code.includes(item.name)) {
-      const eachTSCode = each ? each.toEmbeddedTS() : '__IDENTIFIER__'
+      const eachTSCode = each ? each.toEmbeddedTS() : '__IDENTIFIER__';
       code = this.handleReplaceCode(
         code,
         item.name,

package/src/concepts/Param__.ts

@@ -50,6 +50,7 @@ export class Param extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Param';
 
@@ -246,11 +247,16 @@ export class Param extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(typeAnnotation);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = typeAnnotation.__v_raw || typeAnnotation;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
         ~index && (this as any)[parentKey].splice(index, 1);
         params.index = index;
-      } else if ((this as any)[parentKey] === typeAnnotation) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -327,9 +333,7 @@ export class Param extends BaseNode {
           parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
         }
       }
-      code += `${this.name} || (this.$route.query.hasOwnProperty('${this.name}') ? this.$genInitFromSchema('${
-        typeAnnotation?.sortedTypeKey
-      }', this.$route.query.${this.name}) : ${JSON.stringify(this.defaultValue)})`;
+      code += `${this.name} !== undefined ? ${this.name} : ${JSON.stringify(parsedValue)}`;
 
       if (needGenInitFromSchema) {
         code += `)`;

package/src/concepts/Point__.ts

@@ -22,6 +22,7 @@ export class Point extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Point';