@lcap/nasl 3.3.3-beta.8 → 3.3.6-beta.1

package/src/server/getProcesses.ts

@@ -80,7 +80,8 @@ export function constantToParam(v: Constant) {
 export function genUserTaskLogic(userTask: ProcessElement) {
   const taskId = userTask.constants.find((p) => p.name === 'taskId');
   const { process } = userTask;
-  const l = [
+  let logics = [];
+  const usertaskLogics = [
     new Logic({
       name: `complete`,
       fake: true,
@@ -106,15 +107,73 @@ export function genUserTaskLogic(userTask: ProcessElement) {
       returns: [],
     }),
   ];
-  if (userTask.type === 'InitiateTask') l.pop();
+  const multiTaskLogics = [
+    new Logic({
+      name: `reject`,
+      fake: true,
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'targetTaskDefinitionId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      body: [],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createReference('LCAPOperateProcessResult', {
+            typeNamespace: 'nasl.process',
+          }),
+        }),
+      ],
+    }),
+    new Logic({
+      name: `pass`,
+      fake: true,
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
+    new Logic({
+      name: `fail`,
+      fake: true,
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+    }),
+  ]
+  logics = userTask.type === 'MultiApprovalTask' ? multiTaskLogics : usertaskLogics;
+  if (userTask.type === 'InitiateTask') logics.pop();
   const path = `app.processes.${process.name}.elements.${userTask.name}.logics`;
-  l.forEach((item) => {
+  logics.forEach((item) => {
     item.getNamespace = function () {
       return path;
     };
     item.fake = true;
   });
-  return l;
+  return logics;
 }
 
 export function userTask2LogicNamespace(userTask: ProcessElement) {
@@ -361,12 +420,13 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
 
   const elements: ProcessElement[] = getPreviousTask(processElem, process);
   const prevtasks = elements.map((us) => {
+    const constant = us.type === 'MultiApprovalTask' ? [] : us.constants.map(genCompletionProperty([process.name, us.name]));
     const cp = new CompletionProperty({
       name: us.name,
       value: us.name,
       children: [
         ...us.returns.map(genCompletionProperty([process.name, us.name])),
-        ...(abandonConstant ? [] : us.constants.map(genCompletionProperty([process.name, us.name]))),
+        ...(abandonConstant ? [] : constant),
       ],
     });
     cp.icon = us.type;
@@ -400,7 +460,7 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
   if (processElem.isUserTask) {
     // 任务完成时可以拿到该任务的输出参数
     let returns: CompletionProperty[] = [];
-    if (node.logic && node.logic.parentNode.name === 'OnClose') {
+    if (node.logic && node.logic.parentNode.name === 'OnClose' && processElem.type !== 'MultiApprovalTask') {
       returns = processElem.returns.map(genCompletionProperty([process.name, processElem.name]));
     }
     const scopeVariable = new CompletionProperty({

package/src/server/index.ts

@@ -1,4 +1,4 @@
-import { getLogics, iteratorTree } from './getLogics';
+import { getLogics, iteratorTree, getLogicsSync } from './getLogics';
 import { getConnectorTree, publishConnector } from './getConnector';
 import { getInterfaces } from './getInterfaces';
 import { getFunctions, getBuildInFunction } from './getFunctions';
@@ -21,6 +21,7 @@ import { getAllComponentEventMap } from './createUiTs';
 import { displayString2TypeAnnotation } from './formatTsUtils';
 
 const server: any = {
+  getLogicsSync,
   getLogics,
   iteratorTree,
   getInterfaces,

package/src/server/naslServer.ts

@@ -514,8 +514,8 @@ class NaslServer {
     await this.writeFiles(files);
     this._debugInFileStorage(app, files);
     // 修改名称回调
-    registerCommand('tsRename.change', (value: boolean, callback: Function) => {
-      callback(value);
+    registerCommand('tsRename.change', (value: boolean, callback: Function, toast?: Function) => {
+      callback(value, toast);
     });
     // 删除回调
     registerCommand('tsDelete.change', (callback: Function) => {

package/src/server/translator.ts

@@ -504,6 +504,9 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         case 'ApprovalTask':
           u = '审批任务';
           break;
+        case 'MultiApprovalTask':
+          u = '多人审批任务';
+          break;
         case 'InitiateTask':
           u = '发起任务';
           break;

package/src/service/creator/errHandles.js

@@ -32,10 +32,13 @@ export default {
             return;
         }
 
-        // 检测到当前应用已在新 tab 页打开
-        if (err.code === 500502) {
-            eventBus.emit('multiTabOpened');
-            return;
+        // 检测到当前应用已在新 tab 页操作，或者版本升级，备份还原
+        if (err.code === 500502 || err.code === 500505) {
+          eventBus.emit('multiTabOpened', {
+            refreshBrowser: err.code === 500505,
+            message: err.msg,
+          });
+          return;
         }
 
         if (versionStatus[err.code])

package/src/service/storage/init.ts

@@ -88,7 +88,6 @@ async function deleteExpiredRecords() {
       expiredRecordsRequest.onsuccess = (event: any) => {
         const cursor = event.target.result;
         if (cursor) {
-          console.log(cursor);
           objectStore.delete(cursor.primaryKey);
           cursor.continue();
         } else {
@@ -751,9 +750,10 @@ class TaskQueue {
 
     // code: 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
     // code: 500502  msg: '该应用已在新tab 页打开，请刷新!'      不重试或刷新
+    // code: 500505  需要刷新浏览器
     if (!error)
       this.recover(app);
-    else if (![401650, 500502].includes(error.code)) {
+    else if (![401650, 500502, 500505].includes(error.code)) {
       // 连接失败，或超时，或后端持久化异常
       if ((error.message === 'Network Error' || error.message?.includes('timeout') || error.code === 500500)
         && this.status !== TaskQueueStatus.Retrying) {

package/src/templator/genCreateBlock.ts

@@ -71,11 +71,13 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 </u-select>
             `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
+          let step = 0, decimalLength = 0
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    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') {
-          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+          let { step, decimalLength } = getDecimalInfo(property)
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    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') {
@@ -149,13 +151,15 @@ 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') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${property.label || property.name
+          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
             }" :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') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${property.label || property.name
+          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
             }" :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 } from './utils';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode, getDecimalInfo, transEntityMetadataTypes } from './utils';
 import {
   filterProperty,
   NameGroup,
@@ -30,7 +30,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
   const properties = entity.properties.filter(filterProperty('inFilter'));
 
   return `
-<u-linear-layout justify="space-between">
+<u-linear-layout>
     <u-form layout="inline">
     ${properties
       .map((property) => {
@@ -39,7 +39,8 @@ 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 { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const propertyTypeName = transEntityMetadataTypes(typeAnnotation, dataSource.app);
         const propertyTypeMaxLength: number =
           Number(
             property.rules
@@ -74,11 +75,13 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         </u-select>
                     `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
+          let step = 0, decimalLength = 0
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    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') {
-          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+          let { step, decimalLength } = getDecimalInfo(property)
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    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') {
@@ -107,9 +110,9 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查 询</u-button>
         </u-form-item>
     </u-form>
+    </u-linear-layout>
 
-    <u-linear-layout><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
-</u-linear-layout>
+    <u-linear-layout mode="flex" alignment="start" justify="end"><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
     `;
 }
 
@@ -143,7 +146,8 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                                 ><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
-        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const propertyTypeName = transEntityMetadataTypes(typeAnnotation, dataSource.app);
         const propertyTypeMaxLength: number =
           Number(
             property.rules
@@ -177,11 +181,12 @@ 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}" placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"  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') {
-          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+          let { step, decimalLength } = getDecimalInfo(property)
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    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') {
@@ -408,8 +413,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
@@ -454,11 +459,12 @@ 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}" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      formItem = `<u-number-input :value.sync="${valueExpression}" :highPrecision="true" :step="0"   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') {
-      formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      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>`;
     } 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>

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -29,12 +29,12 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
   const dataSource = entity.parentNode as DataSource;
   const properties = entity.properties.filter(filterProperty('inFilter'));
   return `
-<u-linear-layout justify="space-between">
+<u-linear-layout>
     <u-form layout="inline">
     ${properties
       .map((property) => {
         const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-        const label = (property.label || property.name).replace(/"/g, '&quot;');
+        const label = property.label || property.name;
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
@@ -64,8 +64,10 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
                         </u-select>
                     `;
-            } else return '';
-          } else return '';
+            } else
+              return '';
+          } else
+            return '';
         } else if (propertyTypeName === 'Boolean') {
           formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
@@ -74,11 +76,12 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         </u-select>
                     `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"   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') {
-          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+          let { step, decimalLength } = getDecimalInfo(property)
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"    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') {
@@ -107,9 +110,9 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查 询</u-button>
         </u-form-item>
     </u-form>
+    </u-linear-layout>
 
-    <u-linear-layout><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
-</u-linear-layout>
+    <u-linear-layout mode="flex" alignment="start" justify="end"><u-button color="primary" @click="${nameGroup.viewLogicCreate}">创 建</u-button></u-linear-layout>
     `;
 }
 
@@ -182,13 +185,13 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                             <u-select-item :value="false" text="否"><u-text text="否"></u-text></u-select-item>
                         </u-select>`;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
-            }></u-number-input>`;
+          formItem += `<u-number-input :highPrecision="true" :step="0"   v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
         } else if (propertyTypeName === 'Double') {
           formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
             }></u-number-input>`;
         } else if (propertyTypeName === 'Decimal') {
-          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          let { step, decimalLength } = getDecimalInfo(property)
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"   placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
             }></u-number-input>`;
         } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
           formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''

package/src/templator/genEditTableBlock.ts

@@ -79,11 +79,13 @@ export function genEditTableColumnTemplate(
                 <u-select-item :value="false" text="否">否</u-select-item>
             </u-select>`;
     } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-      formItem = `<u-number-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      formItem = `<u-number-input :value.sync="${valueExpression}" :highPrecision="true" :step="0"   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') {
-      formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+      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>`;
     } 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>

package/src/templator/genUpdateBlock.ts

@@ -28,11 +28,11 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         if (property.rules && property.rules.length) {
           property.rules.forEach((rule) => rules.push(rule));
         }
-        if (required) rules.push('required');
+        if (required)
+          rules.push('required');
         const rulesStr = rules.join(' | ');
 
-        let formItem = `            <u-form-item ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''
-          } layout="center"><template #label><u-text text="${label}"></u-text></template>\n`;
+        let formItem = `            <u-form-item ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''} layout="center"><template #label><u-text text="${label}"></u-text></template>\n`;
 
         const { typeAnnotation } = property || {};
         const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
@@ -56,10 +56,10 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               const key = [property.name, relationEntity.name].join('-');
               const selectNameGroup = selectNameGroupMap.get(key);
               formItem += `
-                  <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
-                      text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
-                  </u-select>
-              `;
+                        <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
+                            text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pagination="true" v-model="${vModel}">
+                        </u-select>
+                    `;
             } else
               return '';
           } else
@@ -72,11 +72,12 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 </u-select>
             `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
+          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"   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') {
-          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+          let { step, decimalLength } = getDecimalInfo(property)
+          formItem += `<u-number-input v-model="${vModel}"   :highPrecision="true" :step="${step}"    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') {
@@ -153,11 +154,13 @@ export function genH5UpdateFormTemplate(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') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
+          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="请输入${label}" :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="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
+          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new   v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
         } else if (propertyTypeName === 'Decimal') {
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${label}" :showPlus="false" :showMinus="false" align="left"></van-stepper-new></van-linear-layout></template>`;
+          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="请输入${label}" :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="请输入${label}"></van-fieldtextarea></van-linear-layout></template>`;
           // @TODO

package/src/templator/utils.ts

@@ -591,6 +591,7 @@ export const NaslNode = {
   }),
 };
 
+
 export const getDecimalInfo = (property: any) => {
   let step
   let typeAnnotation = property?.typeAnnotation
@@ -603,11 +604,11 @@ export const getDecimalInfo = (property: any) => {
   return { step, decimalLength }
 }
 export function transEntityMetadataTypes(typeAnnotation: TypeAnnotation, app: App) {
-  let { typeName: propertyTypeName } = typeAnnotation || {};
-  if (typeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
-    const referenceNode = app.findNodeByCompleteName(typeAnnotation.typeNamespace + '.' + typeAnnotation.typeName) || {}
-    const { typeName } = referenceNode.typeAnnotation || {};
-    propertyTypeName = typeName;
-  }
-  return propertyTypeName;
+    let { typeName: propertyTypeName } = typeAnnotation || {};
+    if (typeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {
+        const referenceNode = app.findNodeByCompleteName(typeAnnotation.typeNamespace + '.' + typeAnnotation.typeName) || {}
+        const { typeName }  = referenceNode.typeAnnotation || {};
+        propertyTypeName = typeName;
+    }
+    return propertyTypeName;
 }

package/test/concepts/anonymous-function/__snapshots__/toJS.spec.ts.snap

@@ -1,3 +1,3 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`anonymous-function:toJS simple 1`] = `"(item) => (((item || {}).length) >= (0))"`;
+exports[`anonymous-function:toJS simple 1`] = `"(item) => (this.$global.greaterThanOrEqual((item || {}).length,\\"0\\"))"`;

package/test/concepts/assignment/__snapshots__/toJS.spec.ts.snap

@@ -2,7 +2,7 @@
 
 exports[`assignment:toJS both-space 1`] = `""`;
 
-exports[`assignment:toJS left-space 1`] = `" = 123"`;
+exports[`assignment:toJS left-space 1`] = `" = new NaslLong(\\"123\\")"`;
 
 exports[`assignment:toJS right-space 1`] = `"result"`;
 

package/test/concepts/batch-assignment/__snapshots__/toJS.spec.ts.snap

@@ -2,8 +2,8 @@
 
 exports[`batch-assignment:toJS muli-var-muli-value 1`] = `
 "param3.property1 = param2;
-param3.createdBy.length = 0;
-param3.id = 0;
+param3.createdBy.length = \\"0\\";
+param3.id = \\"0\\";
 "
 `;
 

package/test/concepts/binary-expression/__snapshots__/toJS.spec.ts.snap

@@ -1,7 +1,7 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`binary-expression:toJS constant-nested 1`] = `
-"(\`123\` || {}).length == 3 && false;
+"this.$global.isEqual((\`123\` || {}).length, \\"3\\") && false;
 "
 `;
 
@@ -11,6 +11,7 @@ exports[`binary-expression:toJS constant-simple 1`] = `
 `;
 
 exports[`binary-expression:toJS variable-nested 1`] = `
-"(param1 || {}).length == 3 || ((param3 || {}).updatedBy || {}).length != 0;
+"this.$global.isEqual((param1 || {}).length, \\"3\\") ||
+  ((param3 || {}).updatedBy || {}).length != \\"0\\";
 "
 `;

package/test/concepts/call-interface/__snapshots__/toJS.spec.ts.snap

@@ -20,7 +20,7 @@ exports[`call-interface:toJS with-body-complex-argument 1`] = `
   },
   query: {
     param1: \`123\`,
-    param2: 123,
+    param2: \\"123\\",
   },
   path: {},
   headers: {},
@@ -39,7 +39,7 @@ exports[`call-interface:toJS with-body-complex-argument 1`] = `
           properties: null,
         })
       );
-      obj.id = 1;
+      obj.id = \\"1\\";
       obj.value = \`val_text\`;
       obj.property1 = \`prop1\`;
       return obj;

package/test/concepts/call-logic/__snapshots__/toJS.spec.ts.snap

@@ -11,7 +11,7 @@ exports[`call-logic:toJS entries-get-with-arguments 1`] = `
       \\"lcap-calllogic-uuid\\": \\"050b4ece455845679874a48344f8540a\\",
     },
     query: {
-      id: 123,
+      id: \\"123\\",
     },
     body: {},
   })
@@ -44,9 +44,9 @@ exports[`call-logic:toJS entries-update-with-arguments 1`] = `
             properties: null,
           })
         );
-        obj.id = 123;
+        obj.id = \\"123\\";
         obj.name = \`测试属性1\`;
-        obj.value = 1234;
+        obj.value = \\"1234\\";
         return obj;
       })(),
     },

package/test/concepts/match/__snapshots__/toJS.spec.ts.snap

@@ -5,7 +5,7 @@ exports[`match:toJS isExpression 1`] = `
   if (this.$isInstanceOf(variable1, \\"nasl.core.Boolean\\")) {
     throw Error(\\"程序中止\\");
   } else if (this.$isInstanceOf(variable1, \\"nasl.core.Long\\")) {
-    return 0;
+    return \\"0\\";
   } else if (this.$isInstanceOf(variable1, \\"nasl.core.String\\")) {
     return \`\`;
   } else {

package/test/concepts/numeric-literal/__snapshots__/toJS.spec.ts.snap

@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`numeric-literal:toJS number 1`] = `
-"0;
+"\\"0\\";
 "
 `;