@lcap/nasl 3.3.0-beta.2 → 3.3.2-beta.2

package/src/concepts/Logic__.ts

@@ -24,10 +24,10 @@ import CallLogic from './CallLogic__';
 import ViewElement from './ViewElement__';
 import { SynatxNode } from './types__';
 
-//= ===============================================================================
+//================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-//= ===============================================================================
+//================================================================================
 import { EventPayload, Params } from '../common/EventEmitter';
 import { concept, excludedInJSON, property, className } from '../decorators';
 
@@ -1396,10 +1396,10 @@ export class Logic extends BaseNode {
     return params;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
-  //= ===============================================================================
+  //================================================================================
   // 用于calllogic树中定位是那个logic，回显
   get calleewholeKey() {
     return `${this.getNamespace()}.${this.name}`;
@@ -1985,24 +1985,6 @@ ${indent(state.tabSize)} */\n`;
 
     code += ')';
 
-    // 需要类型推导的局部变量/返回值需要调整申明顺序
-    const advanceMap: Map<Return | Variable, Assignment | BatchAssignment> = new Map();
-    this.traverseChildren((el) => {
-      if (el && (el instanceof BatchAssignment || (el instanceof Assignment && el.left?.name))) {
-        const jsCode = el.toJS();
-        const advanceVar = this.variables?.find((variable) =>
-          !variable.typeAnnotation && jsCode.includes(`${variable.name} = `));
-        if (advanceVar && !advanceMap.get(advanceVar)) {
-          advanceMap.set(advanceVar, el);
-        }
-        const advanceRn = this.returns?.find((ret) =>
-          !ret.typeAnnotation && jsCode.includes(`${ret.name} = `));
-        if (advanceRn && !advanceMap.get(advanceRn)) {
-          advanceMap.set(advanceRn, el);
-        }
-      }
-    });
-
     // 兼容 return 没有类型情况
     if (this.returns.length && this.returns[0].typeAnnotation) {
       code += ': ';
@@ -2025,12 +2007,16 @@ ${indent(state.tabSize)} */\n`;
         code += ';\n';
       });
   
-      code += `${indent(state.tabSize + 1)}// 当前位置\n`;
       if (!this.body.length && this.returns.length) {
+        if (!state.focusedNodePath || `${this.nodePath}.body[0]` === state.focusedNodePath)
+          code += `${indent(state.tabSize + 1)}// 当前位置\n`;
         code += `${indent(state.tabSize + 1)}return ${this.returns[0].name};\n`;
       } else {
         this.body.forEach((item) => {
           let partialCode = '';
+
+          if (!state.focusedNodePath && item.concept === 'End')
+            code += `${indent(state.tabSize + 1)}// 当前位置\n`;
           if (item.toNaturalTS) {
             partialCode = item.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
           } else if (item.toEmbeddedTS) {
@@ -2442,14 +2428,14 @@ ${indent(state.tabSize)} */\n`;
     return findHasError;
   }
 
-  //= ===============================================================================
+  //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
-  //= ===============================================================================
+  //================================================================================
 }
 
 export default Logic;
-//= ===============================================================================
+//================================================================================
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
-//= ===============================================================================
+//================================================================================

package/src/concepts/MatchCase__.ts

@@ -1,4 +1,5 @@
 // @ts-nocheck
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 import Match from './Match__';
 import MemberExpression from './MemberExpression__';
@@ -13,7 +14,6 @@ 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__';
 import TypeAnnotation from './TypeAnnotation__';
@@ -56,7 +56,7 @@ export class MatchCase extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<MatchCase>) {
-    source = Object.assign({}, MatchCase.getDefaultOptions(), source);
+    source = { ...MatchCase.getDefaultOptions(), ...source};
     super(source);
     super.subConstructor(source);
   }
@@ -93,6 +93,7 @@ export class MatchCase extends LogicItem {
     const excludedSet = new Set(excludedList);
     return ((this.patterns as LogicItem[]) || []).filter((item) => !excludedSet.has(item)).map((item) => item.name);
   }
+
   getLogicItemUniqueName(name = 'logicItem1') {
     return utils.unique(name, this.getLogicItemExistingNames(), undefined, false);
   }
@@ -348,6 +349,7 @@ export class MatchCase extends LogicItem {
       .filter((item) => !excludedSet.has(item))
       .map((item) => item.name);
   }
+
   getTypeAnnotationUniqueName(name = 'typeAnnotation1') {
     return utils.unique(name, this.getTypeAnnotationExistingNames(), undefined, false);
   }
@@ -514,7 +516,7 @@ export class MatchCase extends LogicItem {
     if (typeof options === 'string') {
       logicItem = (this.patterns as LogicItem[]).find((item) => item.name === options);
       if (!logicItem) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${  options}`);
       }
     } else {
       logicItem = options;
@@ -529,12 +531,12 @@ export class MatchCase extends LogicItem {
   removeItemInBody(logicItem: LogicItem): void;
 
   removeItemInBody(options: LogicItem) {
-    let logicItem: LogicItem = options;
+    const logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const {parentKey} = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -573,7 +575,7 @@ export class MatchCase extends LogicItem {
     if (typeof options === 'string') {
       typeAnnotation = (this.patterns as TypeAnnotation[]).find((item) => item.name === options);
       if (!typeAnnotation) {
-        throw new Error('找不到类型标注 ' + options);
+        throw new Error(`找不到类型标注 ${  options}`);
       }
     } else {
       typeAnnotation = options;
@@ -582,7 +584,7 @@ export class MatchCase extends LogicItem {
   }
 
   __removeTypeAnnotation(typeAnnotation: TypeAnnotation) {
-    const parentKey = typeAnnotation.parentKey;
+    const {parentKey} = typeAnnotation;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -893,6 +895,8 @@ export class MatchCase extends LogicItem {
                 tabSize: state.tabSize + 1,
               }))}\n`;
           });
+          if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
+            code += `${indent(state.tabSize + 1)}// 当前位置\n`;
         }
         code += `${indent(state.tabSize)}}`;
       } else {
@@ -907,6 +911,8 @@ export class MatchCase extends LogicItem {
             tabSize: state.tabSize + 1,
           }))}\n`;
         });
+        if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
+          code += `${indent(state.tabSize + 1)}// 当前位置\n`;
         code += `${indent(state.tabSize)}}\n`;
       }
     } else {
@@ -920,6 +926,8 @@ export class MatchCase extends LogicItem {
             tabSize: state.tabSize,
           }))}\n`;
       });
+      if (state.focusedNodePath === `${this.nodePath}.body[${this.body.length}]`)
+        code += `${indent(state.tabSize + 1)}// 当前位置\n`;
       code += '\n';
     }
 

package/src/concepts/MemberExpression__.ts

@@ -176,13 +176,16 @@ export class MemberExpression extends LogicItem {
       } else {
         elementName = this.object.name;
       }
+      if (['size', 'page', 'sort', 'order', 'filterText'].includes(this.property.name)) {
+        return `this['__${elementName}_params']?.${this.property.name}`;
+      }
       let propertyName = '';
       let subProperty = '';
       if (this.property instanceof Identifier) {
         const namespace = this.property.namespace;
         const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace];
         propertyName = namespaceList[0];
-        subProperty = namespaceList?.[1] ? `['${namespaceList?.[1]}']` : '';
+        subProperty = namespaceList?.[1] ? `?.()['${namespaceList?.[1]}']` : '';
       }
       return `this['__${elementName}_${propertyName}']${subProperty}`;
     } else if (
@@ -269,13 +272,16 @@ export class MemberExpression extends LogicItem {
       } else {
         elementName = this.object.name;
       }
+      if (['size', 'page', 'sort', 'order', 'filterText'].includes(this.property.name)) {
+        return `this['__${elementName}_params']?.${this.property.name}`;
+      }
       let propertyName = '';
       let subProperty = '';
       if (this.property instanceof Identifier) {
         const namespace = this.property.namespace;
         const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace];
         propertyName = namespaceList[0];
-        subProperty = namespaceList?.[1] ? `['${namespaceList?.[1]}']` : '';
+        subProperty = namespaceList?.[1] ? `?.()['${namespaceList?.[1]}']` : '';
       }
       return `this['__${elementName}_${propertyName}']${subProperty}`;
     } else if (
@@ -386,16 +392,7 @@ export class MemberExpression extends LogicItem {
   }
   transfromAtrrLogic() {
     let elementName = this.getAncestor('ViewElement')?.name;
-    let propertyName = '';
-    let subProperty = '';
-    let name = this.property.name;
-    if (atrrParamsMap[this.property.name]) {
-      name = atrrParamsMap[this.property.name];
-    }
-    const namesList = name.includes('.') ? name.split('.') : [name];
-    propertyName = namesList[0];
-    subProperty = namesList?.[1] ? `['${namesList?.[1]}']` : '';
-    return `this['__${elementName}_${propertyName}']${subProperty}`;
+    return `this['__${elementName}_params']?.${this.property.name}`;
   }
 
   get completeName() {
@@ -470,12 +467,12 @@ export class MemberExpression extends LogicItem {
           });
         }
       } else {
-        newCode += `__elements.${this.object?.name}`;
+        newCode += `__elements_completionProperty.${this.object?.name}`;
         if (this.property instanceof Identifier) {
           const namespace = this.property.namespace;
           const namespaceList = namespace.includes('.') ? namespace.split('.') : [namespace];
           namespaceList.forEach((item) => {
-            newCode += `['${item}']`;
+            newCode += `.${attrConvertCamelCase(item)}`;
           });
         }
       }

package/src/concepts/NewComposite__.ts

@@ -1090,9 +1090,8 @@ 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]];
@@ -1138,9 +1137,8 @@ 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);
@@ -1366,85 +1364,19 @@ export class NewComposite extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state = createCompilerState()): string {
-    const indent0 = indent((state?.tabSize || 0));
-    const indent1 = indent((state?.tabSize || 0) + 1);
-    const indent2 = indent((state?.tabSize || 0) + 2);
-    let code = '';
-    if (!this.typeAnnotation) {
-      code += '__IDENTIFIER__';
-    } else if (this.typeAnnotation.typeKind !== 'anonymousStructure') {
-      const rightMap = new Map();
-      // 提供sourcemap，获取类型标注和上下文可选变量
-      this.rights.forEach((right) => {
-        code += indent1;
-        rightMap.set(right.expression, right.expression.toNaturalTS(shiftState(state, code, { inline: true })));
-        code += rightMap.get(right.expression);
-        code += ';\n';
-        if (right.members?.length) {
-          code += indent2;
+  toNaturalTS(): string {
+    let code = 'nasl.util.';
+    code += this?.typeAnnotation?.typeKind === 'anonymousStructure' ? 'NewAnonymityStructure' : `NewEntity<${this?.typeAnnotation?.typeName || '__IDENTIFIER__'}>`;
+    let params = '';
+    this?.properties?.forEach((item, index) => {
+      if (item) {
+        params += `${item?.toNaturalTS()}: ${this?.rights?.[index]?.expression?.toNaturalTS()}`;
+        if (index !== this.properties.length - 1) {
+          params += ';';
         }
-        right.members.forEach((member) => {
-          rightMap.set(member, member.toNaturalTS(shiftState(state, code, { inline: true })));
-          code += rightMap.get(member);
-          code += '; ';
-        });
-        code += right.members.length ? '\n' : '';
-      });
-      // 方便ts报错检查
-      // 是否是左边的顶层连线
-      const leftTopIndex = this.assignmentLines.findIndex(({ leftIndex }) => leftIndex[1] === undefined);
-      if (leftTopIndex !== -1) {
-        // const rightIndex = this.assignmentLines[leftTopIndex].rightIndex;
-        // const rightExpression = rightIndex[1] !== undefined ? this.rights[rightIndex[0]].members[rightIndex[1]] : this.rights[rightIndex[0]].expression;
-        // code += `__obj = ${rightExpression.toNaturalTS(shiftState(state, code, { inline: true }))};`;
-        // code += '\n';
-      } else {
-        code += `${indent0}new ${this.typeAnnotation.typeName}({\n`;
-        this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
-          const leftSecondIndex = leftIndex[1];
-          const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
-          const leftItem = this.properties[leftSecondIndex];
-          const rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
-          const rightTs = rightMap.get(rightItem);
-          code += `${indent1}${leftItem.toNaturalTS(shiftState(state, code, { inline: true }))}: ${['__IDENTIFIER__', '__IDENTIFIER__()'].includes(rightTs) ? 'null' : rightMap.get(rightItem)},\n`;
-        });
-        code += `${indent0}})`;
       }
-    } else {
-      const nameMap = new Map();
-      const rightMap = new Map();
-      this.assignmentLines.forEach(({ leftIndex, rightIndex }) => {
-        const leftSecondIndex = leftIndex[1];
-        const [rightFirst, rightSecond] = [rightIndex[0], rightIndex[1]];
-        const leftItem = this.properties[leftSecondIndex];
-        const rightItem = rightSecond !== undefined ? this.rights[rightFirst].members[rightSecond] : this.rights[rightFirst].expression;
-        nameMap.set(leftItem.name, rightItem);
-        rightMap.set(rightItem, null);
-      });
-      code += `${indent0}{\n`;
-      this.properties.forEach((property, index) => {
-        const temp = `temp${index}`;
-        const propertyType = this.typeAnnotation.properties[index]?.typeAnnotation;
-        const { name } = property;
-        const rightItem = nameMap.get(name);
-        const ts = rightMap.get(rightItem);
-        if (ts !== undefined) {
-          if (['__IDENTIFIER__', '__IDENTIFIER__()'].includes(ts)) {
-            code += `${indent1}${temp}: null,\n`;
-          } else {
-            code += `${indent1}${temp}: ${ts},\n`;
-          }
-        } else if (propertyType) {
-          code += `${indent1}${property.name}: ${propertyType.toNaturalTS(shiftState(state, code, { inline: true }))},\n`;
-        } else {
-          code += `${indent1}`;
-          code += property.toNaturalTS(shiftState(state, code, { inline: true }));
-          code += ',\n';
-        }
-      });
-      code += `${indent0}}`;
-    }
+    });
+    code += `(${params ? `{${params}}` : '__IDENTIFIER__'})`;
     return code;
   }
 

package/src/concepts/NewList__.ts

@@ -447,16 +447,18 @@ export class NewList extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const indent0 = indent((state?.tabSize || 0));
     let code = '';
-    if (this.typeAnnotation) {
-      code += `new ${this.typeAnnotation.typeName}(\n`;
-      this.items.forEach((item) => {
-        code += item.toNaturalTS(shiftState(state, code, { inline: true }));
-        code += ',\n';
-      });
-      code += `${indent0})\n`;
-    }
+    const typeAnnotation = this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
+    let params = '';
+    this?.items?.forEach((item, index) => {
+      if (item) {
+        params += item.toNaturalTS(shiftState(state, code, { inline: true }));
+        if (index !== this.items.length - 1) {
+          params += ', ';
+        }
+      }
+    });
+    code += `nasl.util.NewList<${typeAnnotation}>(${params ? `{${params}}` : '__IDENTIFIER__'})`;
     return code;
   }
 

package/src/concepts/NewMap__.ts

@@ -679,11 +679,19 @@ export class NewMap extends LogicItem {
   }
 
   @withSourceMap()
-  toNaturalTS(state = createCompilerState()): string {
+  toNaturalTS(): string {
     let code = '';
-    if (this.typeAnnotation) {
-      code += `new ${this.typeAnnotation.sortedTypeKey}()`;
-    }
+    const typeAnnotation = this?.typeAnnotation?.typeArguments?.map((item) => item?.toNaturalTS())?.join(', ') || '__IDENTIFIER__';
+    let params = '';
+    this?.keys?.forEach((item, index) => {
+      if (item) {
+        params += `${item?.toNaturalTS()}: ${this?.values?.[index]?.toNaturalTS()}`;
+        if (index !== this.keys.length - 1) {
+          params += ';';
+        }
+      }
+    });
+    code += `nasl.util.NewMap<${typeAnnotation}>(${params ? `{${params}}` : '__IDENTIFIER__'})`;
     return code;
   }
 

package/src/concepts/New__.ts

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

package/src/concepts/StringInterpolation__.ts

@@ -281,7 +281,7 @@ export class StringInterpolation extends LogicItem {
         let expCode = exp.toVue();
         if (options?.finalCode !== false) {
           const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
-          expCode = `$utils['ToString'](${expCode}, '${expTypeAnnotation?.sortedTypeKey}')`;
+          expCode = `$utils['ToString']('${expTypeAnnotation?.sortedTypeKey}', ${expCode})`;
         }
         return expCode;
       })
@@ -297,7 +297,7 @@ export class StringInterpolation extends LogicItem {
     return this.expressions
       .map((exp: any) => {
         const expTypeAnnotation = exp.typeAnnotation || exp.__TypeAnnotation;
-        return `this.$utils['ToString'](${exp.toJS()}, '${expTypeAnnotation?.sortedTypeKey}')`;
+        return `this.$utils['ToString']('${expTypeAnnotation?.sortedTypeKey}', ${exp.toJS()})`;
       })
       .join(' + ');
   }

package/src/concepts/SwitchCase__.ts

@@ -1,3 +1,4 @@
+import { v4 as uuidv4 } from 'uuid';
 import { TranslatorState, shiftState, withSourceMap, indent, createCompilerState } from '../translator';
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -7,7 +8,6 @@ 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__';
 
@@ -44,7 +44,7 @@ export class SwitchCase extends LogicItem {
    * @param source 需要合并的部分参数
    */
   constructor(source?: Partial<SwitchCase>) {
-    source = Object.assign({}, SwitchCase.getDefaultOptions(), source);
+    source = { ...SwitchCase.getDefaultOptions(), ...source};
     super(source);
     super.subConstructor(source);
   }
@@ -185,7 +185,7 @@ export class SwitchCase extends LogicItem {
     if (typeof options === 'string') {
       test = this.test;
       if (!test) {
-        throw new Error('找不到逻辑项 ' + options);
+        throw new Error(`找不到逻辑项 ${  options}`);
       }
     } else {
       test = options;
@@ -200,12 +200,12 @@ export class SwitchCase extends LogicItem {
   removeItemInConsequent(logicItem: LogicItem): void;
 
   removeItemInConsequent(options: LogicItem) {
-    let logicItem: LogicItem = options;
+    const logicItem: LogicItem = options;
     return logicItem.delete();
   }
 
   __removeLogicItem(logicItem: LogicItem) {
-    const parentKey = logicItem.parentKey;
+    const {parentKey} = logicItem;
     const params: Params = {
       parentNode: this,
       parentKey,
@@ -327,6 +327,8 @@ export class SwitchCase extends LogicItem {
           code += indent(state.tabSize + 3);
           code += `${logicItem.toNaturalTS(shiftState(state, code, { inline: true }))}\n`;
         });
+        if (state.focusedNodePath === `${this.nodePath}.consequent[${this.consequent.length}]`)
+          code += `${indent(state.tabSize + 1)}// 当前位置\n`;
       }
       code += indent(state.tabSize + 2);
       code += '}';
@@ -338,6 +340,8 @@ export class SwitchCase extends LogicItem {
           code += indent(state.tabSize + 2);
           code += `${logicItem.toNaturalTS(shiftState(state, code, { inline: true }))}\n`;
         });
+        if (state.focusedNodePath === `${this.nodePath}.consequent[${this.consequent.length}]`)
+          code += `${indent(state.tabSize + 1)}// 当前位置\n`;
       }
       code += indent(state.tabSize + 2);
       code += '}';

package/src/concepts/ViewElement__.ts

@@ -1562,6 +1562,8 @@ export class ViewElement extends BaseNode {
         if (['u-select', 'van-pickerson'].includes(this.tag)) {
           code += indent((state?.tabSize || 0) + 3);
           code += `pageNumber: nasl.core.Long\n`;
+          code += indent((state?.tabSize || 0) + 3);
+          code += `filterText: nasl.core.String\n`;
         } else if (
           ['u-list-view', 'u-grid-view', 'u-table-view', 'van-list-view', 'van-grid-view'].includes(this.tag) &&
           this.bindAttrs?.findIndex((attr) => attr.name === 'sorting') === -1
@@ -2732,7 +2734,9 @@ export class ViewElement extends BaseNode {
   /**
    * 计算约束样式
    * @param positionData 位置数据
-   * @param doNotRecordLastWidthHeight 是否不记录上一次的宽高
+   * @param ops 配置项
+   * @param ops.beforeSetStyleCb 设置样式前的回调
+   * @param ops.setStaticSize 是否设置静态尺寸，开启此项会将节点的宽高设置为像素值，通常在修改约束规则时候开启
    */
   computeConstraintStyle(
     positionData: {
@@ -2746,8 +2750,8 @@ export class ViewElement extends BaseNode {
       };
     },
     ops: {
-      doNotRecordLastWidthHeight?: boolean;
       beforeSetStyleCb?: (newStyleObj: Record<string, any>) => void;
+      setStaticSize?: boolean;
     } = {},
   ) {
     if (!positionData) {
@@ -2770,12 +2774,8 @@ export class ViewElement extends BaseNode {
     let top = '';
     let bottom = '';
     let transform = '';
-    // 如果宽高被约束规则改成 auto 了，就还原为上次的宽高，防止用户设置的宽高信息在切换约束时候丢失
-    let width = Number(styleObj['--constraint-width-auto']) ? styleObj['--last-width'] : rawWidth;
-    let height = Number(styleObj['--constraint-height-auto']) ? styleObj['--last-height'] : rawHeight;
-    // 用于记录宽高是否被约束规则改成 auto 了
-    let constraintWidthAuto = 0;
-    let constraintHeightAuto = 0;
+    let width = ops.setStaticSize ? `${staticWidth}px`  : rawWidth;
+    let height = ops.setStaticSize ? `${staticHeight}px` : rawHeight;
 
     const parentWidth = staticLeft + staticWidth + staticRight;
     const parentHeight = staticTop + staticHeight + staticBottom;
@@ -2795,12 +2795,10 @@ export class ViewElement extends BaseNode {
       left = (staticLeft * 100) / parentWidth + '%';
       right = '';
       width = (staticWidth * 100) / parentWidth + '%';
-      constraintWidthAuto = 1;
     } else if (constraintX === 'left-right') {
       left = staticLeft + 'px';
       right = staticRight + 'px';
       width = 'auto';
-      constraintWidthAuto = 1;
     }
 
     if (constraintY === 'top') {
@@ -2818,12 +2816,10 @@ export class ViewElement extends BaseNode {
       top = (staticTop * 100) / parentHeight + '%';
       bottom = '';
       height = (staticHeight * 100) / parentHeight + '%';
-      constraintHeightAuto = 1;
     } else if (constraintY === 'top-bottom') {
       top = staticTop + 'px';
       bottom = staticBottom + 'px';
       height = 'auto';
-      constraintHeightAuto = 1;
     }
     const newStyleObj: Record<string, any> = {
       ...styleObj,
@@ -2834,17 +2830,7 @@ export class ViewElement extends BaseNode {
       transform,
       width,
       height,
-      '--constraint-width-auto': constraintWidthAuto,
-      '--constraint-height-auto': constraintHeightAuto,
     };
-    if (!ops.doNotRecordLastWidthHeight) {
-      if (rawWidth !== 'auto') {
-        newStyleObj['--last-width'] = rawWidth;
-      }
-      if (rawHeight !== 'auto') {
-        newStyleObj['--last-height'] = rawHeight;
-      }
-    }
     ops.beforeSetStyleCb?.(newStyleObj);
     const newStaticStyle = this.stringifyStyleAttr(newStyleObj);
     this.setStaticStyle(newStaticStyle);