@lcap/nasl 3.3.3-beta.7 → 3.3.5-beta.1

package/src/concepts/JSBlock__.ts

@@ -83,66 +83,8 @@ export class JSBlock extends LogicItem {
     /**
      * 生成 JS 脚本
      */
-    let boxVariablesCode = '\n';
-    let logicVariableList: any[] = [];
-    let viewVariableList: any[] = [];
-    let currentLogic = this.logic;
-    let currentView;
-    if (currentLogic) {
-      // logic能使用的所有变量: View.variables params  Logic.variables params returns
-      let { variables, params, returns } = currentLogic;
-      logicVariableList = [...variables, ...params, ...returns];
-      currentView = currentLogic.view;
-      if (currentView) {
-        let { variables, params } = currentView;
-        viewVariableList = [...variables, ...params];
-      }
-    }
-    const getBoxCode = (variable: any, context?: string) => {
-      let boxClass = '';
-      const defaultValue = variable.defaultValue;
-      const typeAnnotation = variable?.typeAnnotation || variable?.__TypeAnnotation;
-      if (typeAnnotation) {
-        const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
-        const defaultValueType = Object.prototype.toString.call(defaultValue);
-
-        // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
-        let parsedValue = defaultValue ?? undefined;
-        const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
-        const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
-        // typeKind： 'union'
-        // typeName： 'Union'
-        // typeKey： 'nasl.core.Long | nasl.core.Decimal'
-        if (isInteger) {
-          boxClass = 'NaslLong';
-        }
-        if (isDecimal) {
-          boxClass = 'NaslDecimal';
-        }
-        if (!isInteger && !isDecimal) {
-          // 不是数值类型就不用做box转换 但是有可能 字符串类型被代码块使用并强行赋值 这个情况暂时不考虑
-          return '';
-        }
-        let variableName = context ? `${context}.${variable.name}` : variable.name;
-        return `${variableName} = new ${boxClass}(${variableName});`;
-      }
-    };
-    logicVariableList.map((variable) => {
-      let variableCode = getBoxCode(variable);
-      if (variableCode && variableCode?.length > 0) {
-        boxVariablesCode += `${variableCode}\n`;
-      }
-    });
-    viewVariableList.map((variable) => {
-      let variableCode = getBoxCode(variable, 'this');
-      if (variableCode && variableCode?.length > 0) {
-        boxVariablesCode += `${variableCode}\n`;
-      }
-    });
-
     return `await (async () => {
             ${this.code}
-            ${boxVariablesCode}
         })();`;
   }
 

package/src/concepts/Match__.ts

@@ -775,7 +775,7 @@ export class Match extends LogicItem {
       code += item.toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }), index, parentCode);
     });
     code += indent(state.tabSize);
-    code += `})(${this.expression.toNaturalTS(shiftState(state, code, { inline: true }))})`;
+    code += `})(${this.expression?.toNaturalTS(shiftState(state, code, { inline: true }))})`;
 
     if (
       this.parentNode?.concept !== 'Argument' &&

package/src/concepts/NumericLiteral__.ts

@@ -138,8 +138,7 @@ export class NumericLiteral extends LogicItem {
   }
 
   toJS(): string {
-    // const code = this.value ? `new window.NaslDecimal("${String(this.value)}")` : '';
-    const code = this.value ? `"${String(this.value)}"` : '';
+    const code = this.value ? String(this.value) : '';
     return code;
   }
 

package/src/concepts/Param__.ts

@@ -325,9 +325,6 @@ export class Param extends BaseNode {
       const { defaultValue } = this;
       const defaultValueType = Object.prototype.toString.call(defaultValue);
       const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
-      const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
-      const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
-
       // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
       let parsedValue = defaultValue ?? undefined;
       if (
@@ -345,27 +342,10 @@ export class Param extends BaseNode {
         if ([''].includes(defaultValue)) {
           parsedValue = undefined;
         } else {
-          function parseNumberValue(defaultValue: any, typeAnnotation: any) {
-            const { typeKind, typeName } = typeAnnotation;
-            const isNaslNumber = typeKind === 'primitive' && ['Decimal', 'Long', 'Double', 'Int'].includes(typeName);
-            if (isNaslNumber) {
-              return String(defaultValue);
-            } else {
-              return tryJSONParse(defaultValue) ?? defaultValue;
-            }
-          }
-          parsedValue = parseNumberValue(defaultValue, typeAnnotation);
+          parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
         }
       }
-      let valueCode = '';
-      if (isDecimal) {
-        valueCode = `new NaslDecimal('${defaultValue}')`;
-      } else if (isInteger) {
-        valueCode = `new NaslLong('${defaultValue}')`;
-      } else {
-        valueCode = `${JSON.stringify(parsedValue)}`;
-      }
-      code += `${this.name} !== undefined ? ${this.name} : ${valueCode}`;
+      code += `${this.name} !== undefined ? ${this.name} : ${JSON.stringify(parsedValue)}`;
 
       if (needGenInitFromSchema) {
         code += `)`;
@@ -581,5 +561,3 @@ export default Param;
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
 //================================================================================
-
-

package/src/concepts/Return__.ts

@@ -17,7 +17,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) {}
+  } catch (e) { }
 
   return result;
 }
@@ -282,9 +282,6 @@ export class Return extends BaseNode {
     const { defaultValue } = this;
     const defaultValueType = Object.prototype.toString.call(defaultValue);
     const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
-    const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
-    const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
-
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
     if (
@@ -298,27 +295,10 @@ export class Return extends BaseNode {
       if ([''].includes(defaultValue)) {
         parsedValue = undefined;
       } else {
-        function parseNumberValue(defaultValue: any, typeAnnotation: any) {
-          const { typeKind, typeName } = typeAnnotation;
-          const isNaslNumber = typeKind === 'primitive' && ['Decimal', 'Long', 'Double', 'Int'].includes(typeName);
-          if (isNaslNumber) {
-            return String(defaultValue);
-          } else {
-            return tryJSONParse(defaultValue) ?? defaultValue;
-          }
-        }
-        parsedValue = parseNumberValue(defaultValue, typeAnnotation);
+        parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
       }
     }
-    if (isDecimal) {
-      parsedValue = `new NaslDecimal('${defaultValue}')`;
-      code += `${parsedValue}`;
-    } else if (isInteger) {
-      parsedValue = `new NaslLong('${defaultValue}')`;
-      code += `${parsedValue}`;
-    } else {
-      code += `${JSON.stringify(parsedValue)}`;
-    }
+    code += JSON.stringify(parsedValue);
     if (needGenInitFromSchema) {
       code += `)`;
     }

package/src/concepts/Variable__.ts

@@ -22,7 +22,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) {}
+  } catch (e) { }
 
   return result;
 }
@@ -298,14 +298,11 @@ export class Variable extends BaseNode {
     if (needGenInitFromSchema) {
       code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
     }
-
     const { defaultValue } = this;
     const defaultValueType = Object.prototype.toString.call(defaultValue);
     const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
-    const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
-    const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
     if (
       defaultValueType === '[object String]' &&
       !(typeKind === 'primitive' && typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) &&
@@ -317,27 +314,10 @@ export class Variable extends BaseNode {
       if ([''].includes(defaultValue)) {
         parsedValue = undefined;
       } else {
-        function parseNumberValue(defaultValue: any, typeAnnotation: any) {
-          const { typeKind, typeName } = typeAnnotation;
-          const isNaslNumber = typeKind === 'primitive' && ['Decimal', 'Long', 'Double', 'Int'].includes(typeName);
-          if (isNaslNumber) {
-            return String(defaultValue);
-          } else {
-            return tryJSONParse(defaultValue) ?? defaultValue;
-          }
-        }
-        parsedValue = parseNumberValue(defaultValue, typeAnnotation);
+        parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
       }
     }
-    if (isDecimal) {
-      parsedValue = `new NaslDecimal('${defaultValue}')`;
-      code += `${parsedValue}`;
-    } else if (isInteger) {
-      parsedValue = `new NaslLong('${defaultValue}')`;
-      code += `${parsedValue}`;
-    } else {
-      code += `${JSON.stringify(parsedValue)}`;
-    }
+    code += JSON.stringify(parsedValue);
     if (needGenInitFromSchema) {
       code += `)`;
     }

package/src/concepts/ViewElement__.ts

@@ -1579,9 +1579,8 @@ export class ViewElement extends BaseNode {
       code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any, any>;\n`;
     } else if (Object.keys(PAGE_COMPONENT_INCLUDE_TAG_MAP).includes(self.tag)) {
       if (self.bindAttrs?.findIndex((attr) => attr.name === 'data-source') > -1) {
-        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<__elements_completionProperty['${
-          self.name
-        }']['dataSource']>;\n`;
+        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<__elements_completionProperty['${self.name
+          }']['dataSource']>;\n`;
       } else {
         code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any>;\n`;
       }
@@ -1660,9 +1659,8 @@ export class ViewElement extends BaseNode {
       const _this = self.parentNode;
       let genericity = '';
       if (_this.tag === 'u-table-view-column-dynamic') {
-        genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${
-          (_this as any).__tsVariableDataSourceTypeName
-        }>`;
+        genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${(_this as any).__tsVariableDataSourceTypeName
+          }>`;
       } else {
         let targetNode: any = _this;
         while (!targetNode.__tsVariableDataSourceTypeName && targetNode?.parentNode instanceof ViewElement) {
@@ -1703,6 +1701,8 @@ export class ViewElement extends BaseNode {
         code += `type ${datasourceName} = nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>;\n`;
         // code += `let current${levelIndex === 0 ? '' : levelIndex}: nasl.ui.${currentType}<nasl.ui.GetItemTypeFromDataSource<ReturnType<typeof __funcName>>>;\n`;
       }
+    } else {
+      (self as any).__tsVariableDataSourceTypeName = 'any';
     }
     code += indent((state?.tabSize || 0) + 3);
     code += `return {\n`;
@@ -2618,13 +2618,6 @@ export class ViewElement extends BaseNode {
     return null;
   }
 
-  // 获取双向绑定的属性
-  getSyncBindAttrs() {
-    return (this.bindAttrs || []).filter((bindAttr) => {
-      return !bindAttr?.shouldExcluded && bindAttr?.sync && bindAttr?.expression;
-    });
-  }
-
   /**
    * 转换成 Vue 的模板格式
    */
@@ -2714,22 +2707,9 @@ export class ViewElement extends BaseNode {
           return;
         }
 
-        result && result !== 'undefined' && parts.push(result);
-      });
-    if (options?.finalCode !== false) {
-      const eventNames: string[] = [];
-      (this.bindEvents || []).forEach((bindEvent) => {
-        eventNames.push(bindEvent?.name);
+        result && parts.push(result);
       });
-      const syncBindAttrs = this.getSyncBindAttrs();
-      (syncBindAttrs || []).forEach((bindAttr) => {
-        const syncEventName = bindAttr.syncEventName;
-        if (!eventNames.includes(syncEventName)) {
-          const argsList = ['$event', ...(bindAttr.getArgsList() || [])];
-          parts.push(`@${syncEventName}="${bindAttr.syncMethodName}(${argsList.join(', ')})"`);
-        }
-      });
-    }
+
     if (vIfs.length === 2) parts.push(`v-if="(${vIfs[0]}) && (${vIfs[1]})"`);
     else if (vIfs.length === 1) parts.push(`v-if="${vIfs[0]}"`);
 
@@ -2737,62 +2717,7 @@ export class ViewElement extends BaseNode {
     if (bindStyles) parts.push(bindStyles);
 
     newOptions.getExtraParts(this).forEach((part) => parts.push(part));
-    if (["u-number-input", 'van-stepper-new'].includes(this.tag)) {
-      // cloudUI
-      // :step="${step}" :decimalLength="${decimalLength}"
-      //  :decimal-places="{ places:${decimalLength}, omit:false }" //这个属性单独存在 需要测试
-      // vant
-      // step="${step}"  :decimal-length="${decimalLength}"
-      const checkAttr = (attrName: string) => {
-        let value = this.bindAttrs?.find(attr => attr?.name === attrName)?.value
-        return value && (value !== 'undefined')
-      }
-      let hasdecimalLength = (checkAttr("decimal-length") || checkAttr("decimalLength"))
-      let valueAttr = this.bindAttrs?.find(attr => attr?.name === "value")
-      const getNumberType = (attr: any) => {
-        let { typeName, typeNamespace } = attr?.expression?.__nodeType || {}
-        return typeName;
-      }
-      let numberType = getNumberType(valueAttr)
-      const pushDecimalLeng = (len: number, variableName?: string) => {
-        if (!(checkAttr("decimal-length") || checkAttr("decimalLength"))) {
-          // 值分 动态 非动态
-          //  1 有默认值 没有设置组件精度 ： 取默认值的length
-          // 2 无默认值无精度 取2
-          // 3 无默认值 有精度  取精度
-          if (variableName && variableName.length > 0) {
-            parts.push(`:decimal-length="${len}"`)
-            // parts.push(`:decimal-length="${variableName}.length"`)
-          } else {
-            parts.push(`:decimal-length="${len}"`)
-          }
-        }
-      };
-      // 许彤需求 不需要 number-input 的精度属性  要跟之前反着写 有就删除 不允许翻译
-      if (hasdecimalLength) {
-        // parts.delete(`:decimal-length="${len}"`)
-      }
 
-      // if (!hasdecimalLength) {
-
-      //   if (valueAttr?.type === "dynamic" && numberType) {
-      //     if (numberType == 'Decimal') {
-      //       let variableName = ''
-      //       if (valueAttr?.expression) {
-      //         variableName = valueAttr?.expression?.name
-      //       }
-      // pushDecimalLeng(2, variableName)
-      //       !checkAttr("step") && parts.push(`:step="0.01"`);
-      //     } else {
-      // pushDecimalLeng(0)
-      //     }
-      //   } else {
-      // pushDecimalLeng(0)
-
-      //   }
-      // }
-      !checkAttr("highPrecision") && parts.push(`:highPrecision="true"`);
-    }
     if (['u-modal', 'u-drawer'].includes(this.tag)) {
       this.children.forEach((citem) => {
         if (citem.tag === 'template' && !citem.children.length) {

package/src/concepts/View__.ts

@@ -25,12 +25,11 @@ import Match from './Match__';
 import BatchAssignment from './BatchAssignment__';
 import CallInterface from './CallInterface__';
 import CallLogic from './CallLogic__';
-import BindAttribute from './BindAttribute__';
-const getBranchCopyUniCode = () => (window as any)?.BranchCopyUniCode
 
-const removedViewElementCache: {
+const getBranchCopyUniCode = () => (window as any)?.BranchCopyUniCode
+const removedViewElementCache : {
   [key: string]: number | bigint;
-} = {} // 临时记录删除的页面元素计数的最大值
+}= {} // 临时记录删除的页面元素计数的最大值
 
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -1583,7 +1582,7 @@ export class View extends BaseNode {
     }
     const newPrefix = newName.replace(/\d*$/, '');
     const newPrefixNum = removedViewElementCache?.[newPrefix] ? removedViewElementCache[newPrefix] : 1
-    const startNum = newPrefixNum < Number.MAX_SAFE_INTEGER ? newPrefixNum as number + 1 : BigInt(newPrefixNum) + BigInt(1);
+    const startNum = newPrefixNum < Number.MAX_SAFE_INTEGER ?  newPrefixNum as number + 1 : BigInt(newPrefixNum) + BigInt(1);
     const viewElementUniqueName = utils.uniqueMax(newName, this.existingViewElement, removedViewElementCache?.[newPrefix] ? startNum : newPrefixNum);
     this.existingViewElement.add(viewElementUniqueName);
     return viewElementUniqueName;
@@ -1835,7 +1834,6 @@ export class View extends BaseNode {
       first: this.children.find((child) => child.isIndex)?.name,
       auth: this.auth ? 'loginAuth' : undefined,
       viewBindEvents: this.getViewBindEvents(),
-      viewBindSyncAttrs: this.getViewBindSyncAttrs(),
       viewExpressions: this.getViewExpressions(),
       elements: componentList,
       elementsAll: componentListExtra,
@@ -1854,15 +1852,15 @@ export class View extends BaseNode {
             methods: {
                 async onKeyDown(e) {
                     ${this.bindEvents
-        .filter((event) => ['keydown'].includes(event.name))
-        .map((event) => `await this.${event.view.name}_${event.name}(e);`)
-        .join('\n')}
+                      .filter((event) => ['keydown'].includes(event.name))
+                      .map((event) => `await this.${event.view.name}_${event.name}(e);`)
+                      .join('\n')}
                 },
                 async onKeyUp(e) {
                     ${this.bindEvents
-        .filter((event) => ['keyup'].includes(event.name))
-        .map((event) => `await this.${event.view.name}_${event.name}(e);`)
-        .join('\n')}
+                      .filter((event) => ['keyup'].includes(event.name))
+                      .map((event) => `await this.${event.view.name}_${event.name}(e);`)
+                      .join('\n')}
                 }
             }
         };`;
@@ -1887,7 +1885,7 @@ export class View extends BaseNode {
     code += translator(definition, this);
     code += '};\n';
     return code;
-  }
+    }
 
   genVueTemplate(options?: ElementToVueOptions) {
     return this.elements?.map((element) => `${element?.toVue(options)}\n`).join('');
@@ -2006,7 +2004,9 @@ export class View extends BaseNode {
   elementsAttrsAll(elements: Array<ViewElement>, componentListExtra: Array<ViewElement>) {
     if (elements) {
       elements.forEach((item: ViewElement) => {
-        componentListExtra.push(item);
+        if (!PAGE_COMPONENT_INCLUDE_TAG_MAP?.[item.tag]) {
+          componentListExtra.push(item);
+        }
         if (item.children.length > 0) {
           this.elementsAttrsAll(item.children, componentListExtra);
         }
@@ -2469,20 +2469,6 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     return bindEvents;
   }
 
-  // 获取页面内所有开启了双向绑定的属性
-  getViewBindSyncAttrs() {
-    const bindSyncAttrs: BindAttribute[] = [];
-    this.elements.forEach((item) => {
-      utils.traverse(
-        (current) => {
-          bindSyncAttrs.push(...(current.node as ViewElement).getSyncBindAttrs())
-        },
-        { node: item },
-      );
-    });
-    return bindSyncAttrs;
-  }
-
   // 获取页面上需要替换的表达式
   getViewExpressions() {
     const bindExpressions: any[] = [];
@@ -2607,7 +2593,7 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
 
     const prefix = viewElement?.name.replace(/\d*$/, '');
     let lastDigit = viewElement?.name.match(/\d+$/)?.[0];
-    if (lastDigit === undefined) return;
+    if(lastDigit === undefined) return;
 
     //@ts-ignore
     lastDigit = lastDigit < Number.MAX_SAFE_INTEGER ? parseInt(lastDigit) : BigInt(lastDigit);
@@ -2615,9 +2601,9 @@ ${indent(state.tabSize)}export function ${this.tsName}_view`;
     if (removedViewElementCache?.[prefix]) {
       //@ts-ignore
       if (lastDigit > removedViewElementCache[prefix])
-        //@ts-ignore
-        removedViewElementCache[prefix] = lastDigit;
-    } else {
+      //@ts-ignore
+      removedViewElementCache[prefix] = lastDigit;
+    }else {
       //@ts-ignore
       removedViewElementCache[prefix] = lastDigit;
     }

package/src/templator/genCreateBlock.ts

@@ -71,13 +71,11 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 </u-select>
             `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          let step = 0, decimalLength = 0
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Double') {
           formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    placeholder="请输入${label}"></u-number-input>`
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
@@ -151,15 +149,13 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         } else if (propertyTypeName === 'Boolean') {
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-switch v-model="${vModel}"></van-switch></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          let decimalLength = 0, step = 1
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new :highPrecision="true"  step="${step}" v-model="${vModel}" placeholder="请输入${property.label || property.name
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${property.label || property.name
             }" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Double') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new  v-model="${vModel}" placeholder="请输入${property.label || property.name
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${property.label || property.name
             }" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new :highPrecision="true"  step="${step}" v-model="${vModel}" placeholder="请输入${property.label || property.name
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${property.label || property.name
             }" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Text') {
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldtextarea v-model="${vModel}" placeholder="请输入${property.label || property.name

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -5,7 +5,7 @@
  */
 import * as utils from '../utils';
 import { App, Module, Namespace, Entity, View, Enum, DataSource, ViewElement, EntityProperty } from '../concepts';
-import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode, getDecimalInfo, transEntityMetadataTypes } from './utils';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
   filterProperty,
   NameGroup,
@@ -39,8 +39,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
-        const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
-        const propertyTypeName = transEntityMetadataTypes(typeAnnotation, dataSource.app);
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         const propertyTypeMaxLength: number =
           Number(
             property.rules
@@ -75,13 +74,11 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         </u-select>
                     `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          let step = 0, decimalLength = 0
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Double') {
           formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    placeholder="请输入${label}"></u-number-input>`
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
@@ -146,8 +143,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                                 ><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
-        const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
-        const propertyTypeName = transEntityMetadataTypes(typeAnnotation, dataSource.app);
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         const propertyTypeMaxLength: number =
           Number(
             property.rules
@@ -181,12 +177,11 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                             <u-select-item :value="false" text="否">否</u-select-item>
                         </u-select>`;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"  placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Double') {
           formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    placeholder="请输入${label}"></u-number-input>`
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
         } else if (propertyTypeName === 'Date') {
@@ -413,8 +408,8 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
     const label = (property.label || property.name).replace(/"/g, '&quot;');
     let formItem = '';
 
+    const propertyTypeName = property.typeAnnotation.typeName;
     const propertyTypeNamespace = property.typeAnnotation.typeNamespace;
-    const propertyTypeName = transEntityMetadataTypes(property.typeAnnotation, dataSource.app);
     const propertyTypeMaxLength: number =
       Number(
         property.rules
@@ -459,12 +454,11 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
                 <u-select-item :value="false" text="否">否</u-select-item>
             </u-select>`;
     } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-      formItem = `<u-number-input :value.sync="${valueExpression}" :highPrecision="true" :step="0"   placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      formItem = `<u-number-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
     } else if (propertyTypeName === 'Double') {
       formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
     } else if (propertyTypeName === 'Decimal') {
-      let { step, decimalLength } = getDecimalInfo(property)
-      formItem = `<u-number-input :value.sync="${valueExpression}" :highPrecision="true" :step="${step}"    placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
     } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
       formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>