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

package/src/concepts/Attribute__.ts

@@ -26,6 +26,7 @@ export class Attribute extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Attribute';
 
@@ -179,11 +180,16 @@ export class Attribute 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;
       }

package/src/concepts/AuthInterface__.ts

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

package/src/concepts/AuthLogicForCallInterface__.ts

@@ -43,6 +43,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'AuthLogicForCallInterface';
 
@@ -67,7 +68,7 @@ export class AuthLogicForCallInterface extends AuthLogic {
 
   getParamExistingNames(excludedList: Array<Param> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.authParams as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.authParams as Param[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getParamUniqueName(name = 'param1') {
     return utils.unique(name, this.getParamExistingNames(), undefined, false);
@@ -254,11 +255,16 @@ export class AuthLogicForCallInterface extends AuthLogic {
     };
     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;
       }

package/src/concepts/AuthLogic__.ts

@@ -5,6 +5,9 @@
 import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
 import Module from './Module__';
 import View from './View__';
 import ProcessElement from './ProcessElement__';
@@ -26,6 +29,7 @@ export class AuthLogic extends Logic {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'AuthLogic' | 'AuthLogicForCallInterface';
 

package/src/concepts/BackendVariable__.ts

@@ -45,6 +45,7 @@ export class BackendVariable extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BackendVariable';
 
@@ -223,11 +224,16 @@ export class BackendVariable 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;
       }

package/src/concepts/Backend__.ts

@@ -27,6 +27,7 @@ export class Backend extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'Backend';
 
@@ -91,7 +92,7 @@ export class Backend extends BaseNode {
     const excludedSet = new Set(excludedList);
     return ((this.variables as BackendVariable[]) || [])
       .filter((item) => !excludedSet.has(item))
-      .map((item) => item.name);
+      .map((item) => item?.name);
   }
   getBackendVariableUniqueName(name = 'backendVariable1') {
     return utils.unique(name, this.getVarExistingNames(), undefined, true);
@@ -278,11 +279,16 @@ export class Backend extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(backendVariable);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = backendVariable.__v_raw || backendVariable;
+      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] === backendVariable) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }

package/src/concepts/BatchAssignment__.ts

@@ -30,6 +30,7 @@ export class BatchAssignment extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BatchAssignment';
 
@@ -130,7 +131,7 @@ export class BatchAssignment 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);
@@ -285,7 +286,7 @@ export class BatchAssignment 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);
@@ -497,11 +498,16 @@ export class BatchAssignment 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;
       }
@@ -545,11 +551,16 @@ export class BatchAssignment 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;
       }
@@ -633,7 +644,7 @@ export class BatchAssignment extends LogicItem {
           members.forEach((rightMember: any, rightSecondIndex: number) => {
             const rightValue = rightMember.getValue();
             const rightName = rightMember.property?.name;
-            if (rightLineSet.has(rightSecondIndex)) return;
+            if (rightLineSet.has(rightSecondIndex) || leftLineSet.has(leftSecondIndex)) return;
 
             if (leftName === rightName && leftValue.split('.').length === rightValue.split('.').length) {
               const rightTypeAnnotation = rightMember.__TypeAnnotation;
@@ -847,14 +858,14 @@ export class BatchAssignment extends LogicItem {
     const [firstIndex, secondIndex] = [arrIndex[0], arrIndex[1]];
     if (place === 'left') {
       if (secondIndex === undefined) {
-        return this.left.expression;
+        return this.left?.expression;
       }
-      return this.left.members[secondIndex];
+      return this.left?.members?.[secondIndex];
     }
     if (secondIndex === undefined) {
-      return this.rights[firstIndex].expression;
+      return this.rights?.[firstIndex]?.expression;
     }
-    return this.rights[firstIndex].members[secondIndex];
+    return this.rights?.[firstIndex]?.members?.[secondIndex];
   }
 
   findlines(member: any, selectMember: any) {
@@ -1048,10 +1059,16 @@ export class BatchAssignment extends LogicItem {
     let code = '';
     // 根据连线状态，拆分成多个单赋值
     this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
-      const leftValue = leftIndex.length === 1 ? this.left.expression.toNaturalTS(shiftState(state, code, { inline: true })) : this.left.members[leftIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
+      const leftValue =
+        leftIndex.length === 1
+          ? this.left.expression.toNaturalTS(shiftState(state, code, { inline: true }))
+          : this.left.members[leftIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
       code += `${leftValue}`;
       code += ' = ';
-      const rightValue = rightIndex.length === 1 ? this.rights[rightIndex[0]]?.expression?.toNaturalTS(shiftState(state, code, { inline: true })) : this.rights[rightIndex[0]]?.members[rightIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
+      const rightValue =
+        rightIndex.length === 1
+          ? this.rights[rightIndex[0]]?.expression?.toNaturalTS(shiftState(state, code, { inline: true }))
+          : this.rights[rightIndex[0]]?.members[rightIndex[1]]?.toNaturalTS(shiftState(state, code, { inline: true }));
       code += `${rightValue}`;
       code += ';';
       code += '\n';
@@ -1059,7 +1076,7 @@ export class BatchAssignment extends LogicItem {
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/BinaryExpression__.ts

@@ -1,4 +1,3 @@
-import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, createCompilerState } from '../translator';
 import { ElementToVueOptions } from './ViewElement__';
 
@@ -10,6 +9,7 @@ import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
 import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
 import BaseNode from '../common/BaseNode';
 import LogicItem from './LogicItem__';
 
@@ -26,6 +26,7 @@ export class BinaryExpression extends LogicItem {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BinaryExpression';
 
@@ -71,7 +72,7 @@ export class BinaryExpression extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<BinaryExpression>) {
-    source = { ...BinaryExpression.getDefaultOptions(), ...source};
+    source = Object.assign({}, BinaryExpression.getDefaultOptions(), source);
     super(source);
     super.subConstructor(source);
   }
@@ -158,7 +159,7 @@ export class BinaryExpression extends LogicItem {
     if (typeof options === 'string') {
       left = this.left;
       if (!left) {
-        throw new Error(`找不到逻辑项 ${  options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       left = options;
@@ -183,7 +184,7 @@ export class BinaryExpression extends LogicItem {
     if (typeof options === 'string') {
       right = this.right;
       if (!right) {
-        throw new Error(`找不到逻辑项 ${  options}`);
+        throw new Error('找不到逻辑项 ' + options);
       }
     } else {
       right = options;
@@ -192,7 +193,7 @@ export class BinaryExpression extends LogicItem {
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const {parentKey} = logicItem;
+    const parentKey = logicItem.parentKey;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -202,11 +203,16 @@ export class BinaryExpression 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;
       }
@@ -439,7 +445,7 @@ export class BinaryExpression extends LogicItem {
     return code;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
   //================================================================================

package/src/concepts/BindAttribute__.ts

@@ -25,7 +25,6 @@ import Module from './Module__';
 import App from './App__';
 import Frontend from './Frontend__';
 import Process from './Process__';
-import Identifier from './Identifier__';
 
 /**
  * 元素绑定属性
@@ -40,6 +39,7 @@ export class BindAttribute extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BindAttribute';
 
@@ -271,7 +271,7 @@ export class BindAttribute extends BaseNode {
 
   getValidationRuleExistingNames(excludedList: Array<ValidationRule> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.rules as ValidationRule[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.rules as ValidationRule[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getValidationRuleUniqueName(name = 'validationRule1') {
     return utils.unique(name, this.getValidationRuleExistingNames(), undefined, false);
@@ -669,11 +669,16 @@ export class BindAttribute 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;
       }
@@ -1088,22 +1093,25 @@ export class BindAttribute extends BaseNode {
     return code;
   }
 
-  toEmbeddedTSVariableDefinition(state?: TranslatorState, attrList?: string[], elementName?: string, currentLevel?: string): string {
+  toEmbeddedTSVariableDefinition(
+    state?: TranslatorState,
+    attrList?: string[],
+    elementName?: string,
+    currentLevel?: string,
+  ): string {
     let code = '';
     let arrCode = '';
     code += indent((state?.tabSize || 0) + 3);
     code += `${attrConvertCamelCase(this.name)}: `;
     if (this.expression) {
       if (this.name === 'data-source') {
-        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(
-          this.name,
-        )}>`;
+        code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}>`;
       } else {
         code += `ReturnType<typeof __elements_stashFunctionVariable.${elementName}_${attrConvertCamelCase(this.name)}>`;
       }
       arrCode = `() => {
         return __elements_variable_function.${currentLevel}?.${attrConvertCamelCase(this.name)}?.()
-      }`
+      }`;
     } else if (this.name === 'sorting') {
       code += `{
               field: nasl.core.String
@@ -1144,24 +1152,34 @@ export class BindAttribute extends BaseNode {
       } else {
         stashVariable = `${this.expression.toEmbeddedTS()}`;
       }
-      code += `() => {\n`
+      code += `() => {\n`;
       code += indent((state?.tabSize || 0) + 5);
-      code += `return ${stashVariable}\n`
+      code += `return ${stashVariable}\n`;
       code += indent((state?.tabSize || 0) + 4);
-      code += `},\n`
+      code += `},\n`;
     }
     return code;
   }
 
   findCurrentElementParent(node: any): ViewElement | undefined {
     if (node.parentNode instanceof ViewElement) {
-      if (['u-table-view', 'u-list-view', 'u-grid-view', 'u-list-components', 'van-list-view', 'van-grid-view', 'van-for-components'].includes(node.parentNode.tag)) {
-        return node.parentNode
+      if (
+        [
+          'u-table-view',
+          'u-list-view',
+          'u-grid-view',
+          'u-list-components',
+          'van-list-view',
+          'van-grid-view',
+          'van-for-components',
+        ].includes(node.parentNode.tag)
+      ) {
+        return node.parentNode;
       } else {
-        return this.findCurrentElementParent(node.parentNode)
+        return this.findCurrentElementParent(node.parentNode);
       }
     } else {
-      return undefined
+      return undefined;
     }
   }
   @withSourceMap()
@@ -1247,4 +1265,3 @@ export function attrConvertCamelCase(str: string) {
   });
   return strList.join('');
 }
-

package/src/concepts/BindDirective__.ts

@@ -31,6 +31,7 @@ export class BindDirective extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BindDirective';
 
@@ -306,11 +307,16 @@ export class BindDirective 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;
       }
@@ -526,7 +532,21 @@ export class BindDirective extends BaseNode {
   toVue(options?: ElementToVueOptions) {
     let str = '';
     // eslint-disable-next-line no-nested-ternary
-    let value = (this.type ?? 'string') !== 'string' ? this.value : this.value ? `'${this.value}'` : '';
+    let value = this.value;
+    if (this.type === 'string') {
+      value = value.replace(/['"`\\]/g, (m) => {
+        let escape = '\\\\';
+        escape = '\\\\';
+        /// #if process.env.BUILD_TARGET === 'node'
+        escape = '\\';
+        /// #endif
+        if (m === '\\') {
+          return `${escape}${escape}`;
+        }
+        return `${escape}${m}`;
+      });
+    }
+    value = (this.type ?? 'string') !== 'string' ? this.value : value ? `\`${value}\`` : '';
     // 需要用标识符替换
     // if (options.finalCode !== false && this.needReplaceWithIdentifier) {
     //    const argsList = this.getArgsList();
@@ -537,6 +557,8 @@ export class BindDirective extends BaseNode {
       if (this.expression.concept === 'StringLiteral') {
         value = `${value}`;
       }
+    }
+    if (value !== undefined && value !== null && typeof value === 'string') {
       value = value?.replace(/"/g, "'");
     }
     if (this.name === 'auth' && !!this.value) {

package/src/concepts/BindEvent__.ts

@@ -38,6 +38,7 @@ export class BindEvent extends BaseNode {
   /**
    * 产品概念
    */
+  @property('concept')
   // @ts-ignore
   readonly concept!: 'BindEvent';
 
@@ -168,7 +169,7 @@ export class BindEvent extends BaseNode {
 
   getLogicExistingNames(excludedList: Array<Logic> = []) {
     const excludedSet = new Set(excludedList);
-    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
+    return ((this.logics as Logic[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item?.name);
   }
   getLogicUniqueName(name = 'logic1') {
     return utils.unique(name, this.getLogicExistingNames(), undefined, true);
@@ -455,11 +456,16 @@ export class BindEvent extends BaseNode {
     };
     if (parentKey) {
       params.parentKey = parentKey;
-      if (Array.isArray((this as any)[parentKey])) {
-        const index = (this as any)[parentKey].indexOf(logic);
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = logic.__v_raw || logic;
+      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] === logic) {
+      } else if ((t as any)[parentKey] === n) {
         params.index = 0;
         (this as any)[parentKey] = undefined;
       }
@@ -489,11 +495,16 @@ export class BindEvent 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;
       }
@@ -677,9 +688,13 @@ export class BindEvent extends BaseNode {
       this.logics.forEach((logic, index) => {
         const logicName = `viewLogic_${logic.name}${index}`;
         // logic.name = logic.view.name + logic.name + index;
-        code += logic.toNaturalTS(shiftState(state, code, {
-          tabSize: state.tabSize,
-        }), 'noExport', logicName);
+        code += logic.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: state.tabSize,
+          }),
+          'noExport',
+          logicName,
+        );
 
         // logic.name = logicName;
         // code += indent(state.tabSize);
@@ -704,17 +719,23 @@ export class BindEvent extends BaseNode {
         // logic.name = '__' + logic.view.name + (logic.parentNode as BindEvent).element.name + logic.name;
         logic.name = logic.name.replace(/-/g, '');
         try {
-          code += logic.toNaturalTS(shiftState(state, code, {
-            tabSize: state.tabSize,
-          }), 'noExport');
+          code += logic.toNaturalTS(
+            shiftState(state, code, {
+              tabSize: state.tabSize,
+            }),
+            'noExport',
+          );
         } finally {
           // 翻译logic可能出错
           logic.name = logicName;
         }
       } else {
-        code += logic.toNaturalTS(shiftState(state, code, {
-          tabSize: state.tabSize,
-        }), 'noExport');
+        code += logic.toNaturalTS(
+          shiftState(state, code, {
+            tabSize: state.tabSize,
+          }),
+          'noExport',
+        );
       }
 
       code += indent(state.tabSize);