@lcap/nasl 3.4.0-beta.5 → 3.4.0-beta.6

package/src/server/translator.ts

@@ -470,7 +470,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
   let node = minRange?.node;
   const logicAncestor = node.getAncestor('Logic') || ({} as any);
   const { parentNode = { concept: '' } } = logicAncestor;
-  const isFELogic = ['BindEvent', 'View'].includes(parentNode.concept);
+  // const isFELogic = ['BindEvent', 'View'].includes(parentNode.concept);
 
   // 有一些节点报错信息不向外暴露,缺失一些原生标签等等的展示
   if (node instanceof View || node instanceof ViewElement) {

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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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') {
@@ -178,15 +176,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"  :decimal-length="${decimalLength}" 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"  :decimal-length="${decimalLength}" 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,
@@ -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,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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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') {
@@ -110,9 +107,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>
     `;
 }
 
@@ -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"  :decimalLength="0" :decimal-places="{ places:0, omit:false }" 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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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"  :decimalLength="0" :decimal-places="{ places:0, omit:false }" 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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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>

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;
+        const label = (property.label || property.name).replace(/"/g, '&quot;');
         let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
         const { typeAnnotation } = property || {};
@@ -64,10 +64,8 @@ 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}">
@@ -76,12 +74,11 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                         </u-select>
                     `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"  :decimalLength="0" :decimal-places="{ places:0, omit:false }" 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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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') {
@@ -110,9 +107,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>
     `;
 }
 
@@ -185,13 +182,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 :highPrecision="true" :step="0"  :decimalLength="0" :decimal-places="{ places:0, omit:false }" v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
+          formItem += `<u-number-input 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') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="${step}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" 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,13 +79,11 @@ 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}" :highPrecision="true" :step="0"  :decimalLength="0" :decimal-places="{ places:0, omit:false }" 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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"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>

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,12 +72,11 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 </u-select>
             `;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-          formItem += `<u-number-input v-model="${vModel}" :highPrecision="true" :step="0"  :decimalLength="0" :decimal-places="{ places:0, omit:false }" 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}"  :decimalLength="${decimalLength}" :decimal-places="{ places:${decimalLength}, omit:false }"  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') {
@@ -181,13 +180,11 @@ 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') {
-          let decimalLength = 0, step = 1
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new :highPrecision="true" :decimal-length="${decimalLength}" step="${step}"   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 === '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') {
-          let { step, decimalLength } = getDecimalInfo(property)
-          formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new :highPrecision="true" :decimal-length="${decimalLength}" step="${step}"  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 === '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,7 +591,6 @@ export const NaslNode = {
   }),
 };
 
-
 export const getDecimalInfo = (property: any) => {
   let step
   let typeAnnotation = property?.typeAnnotation
@@ -604,11 +603,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/src/translator/types.ts

@@ -1,8 +1,11 @@
 import type { BaseNode } from '../concepts';
 
-export interface Position {
+export interface PositionWithoutOffset {
 	line: number;
 	character: number;
+}
+
+export interface Position extends PositionWithoutOffset {
 	offset: number;
 }
 
@@ -11,6 +14,11 @@ export interface Range {
 	end: Position;
 }
 
+export interface RangeOffsetOnly {
+	start: number;
+	end: number;
+}
+
 export interface TSPPosition {
   line: number;
   offset: number;
@@ -26,10 +34,11 @@ export interface TSP1DRange {
   length: number;
 }
 
-export type SourceMapItem = Range;
-
-export type SourceMap = Map<BaseNode, SourceMapItem>;
-
+/**
+ * 翻译机上下文状态
+ *
+ * @description 旧的翻译方法上下文，现在推荐使用
+ */
 export interface TranslatorState {
   position?: Position;
   tabSize?: number;
@@ -39,3 +48,9 @@ export interface TranslatorState {
   finalCode?: boolean;
   focusedNodePath?: string;
 }
+
+export type SourceMapItem = Range;
+export type SourceMap = Map<BaseNode, SourceMapItem>;
+
+export type TranslatorGenerator = Generator<any, string, string>;
+export type TranslatorMethod = (state: TranslatorState) => TranslatorGenerator;

package/src/translator/utils.ts

@@ -1,4 +1,4 @@
-import type { TranslatorState, SourceMapItem, Position, Range } from './types';
+import type { SourceMapItem, Position, Range, TranslatorMethod, TranslatorState } from './types';
 import type { BaseNode } from '../concepts';
 import TypeAnnotation from '../concepts/TypeAnnotation__';
 import App from '../concepts/App__';
@@ -48,16 +48,39 @@ export function shiftPosition(pos: Position, code: string = ''): Position {
  * 根据代码移动状态
  */
 export function shiftState(state: TranslatorState, code?: string, options?: Partial<TranslatorState>): TranslatorState {
-  state = { ...state};
+  state = { ...state };
   state.position = shiftPosition(state.position, code);
   Object.assign(state, options); // 优先 options
-  return Object.freeze(state);
+  return state;
 }
 
 export function isSameRange(rangeA: Range, rangeB : Range) {
   return rangeA.start.offset === rangeB.start.offset && rangeA.end.offset === rangeB.end.offset;
 }
 
+const statementMap = [
+  "Assignment",
+  "BatchAssignment",
+  "IfStatement",
+  "ForEachStatement",
+  "SwitchStatement",
+  // "SwitchCase",
+  "WhileStatement",
+  "Match",
+  "Comment",
+  "CallLogic",
+  "CallInterface",
+  "Destination",
+  "JSBlock",
+  'JavaLogic'
+];
+
+/**
+ * 翻译方法修饰器
+ *
+ * @deprecated
+ * @description 旧的翻译方法修饰器，现在用`withSourceMapGenerator`
+ */
 export function withSourceMap() {
   return function handleAction(target: any, key: string | number | symbol, descriptor: PropertyDescriptor) {
     const oldMethod = descriptor.value;
@@ -72,7 +95,7 @@ export function withSourceMap() {
       if (!state) {
         // 没有状态不生成 SourceMap
         return oldMethod.call(this, state, ...args);
-      } 
+      }
         // state = Object.freeze(Object.assign({
         //   position: { line: 0, character: 0, offset: 0 },
         //   tabSize: 0,
@@ -109,14 +132,86 @@ export function withSourceMap() {
           end: shiftPosition(state.position, code),
         });
 
+        if (isNatural && statementMap?.includes(this.concept) && code) {
+          before += `// ${this.nodePath} \n`;
+        }
+
         return before + code;
-      
     };
 
     return descriptor;
   };
 }
 
+/**
+ * 翻译方法修饰器
+ *
+ * @description 翻译方法修饰器，会将翻译方法包装为生成器
+ */
+export function withSourceMapGenerator(target: any, key: string, descriptor: PropertyDescriptor) {
+  const oldMethod = descriptor.value as TranslatorMethod;
+  const newMethod: TranslatorMethod = function* withSourceMapGenerator(this: BaseNode, state?: TranslatorState, ...args: any[]) {
+    // 重新生成ts代码就先把类型清除掉
+    // 注意排查错误的时候，调用了这个方法，就会把节点上缓存的__TypeAnnotation清除
+    try {
+      this.__isCorrectTypeAnnotation = false;
+    } catch (err) {
+      // ..
+    }
+
+    // 没有状态不生成 SourceMap
+    if (!state) {
+      yield;
+      const code = yield* oldMethod.call(this, state, ...args);
+      yield;
+      return code;
+    }
+
+    let before: string = '';
+    if (!state.inline) {
+      before = indent((state?.tabSize || 0));
+      state = shiftState(state, before);
+    } else {
+      state = shiftState(state, before, {
+        inline: undefined,
+      });
+    }
+
+    yield;
+    const code = yield* oldMethod.call(this, state, ...args);
+    yield;
+
+    state.sourceMap?.set(this, {
+      start: state.position,
+      end: shiftPosition(state.position, code),
+    });
+
+    return before + code;
+  };
+
+  descriptor.value = newMethod;
+
+  return descriptor;
+}
+
+/**
+ * 生成器方法修饰器
+ *
+ * @description 翻译方法修饰器，只有停顿，没有源码映射表
+ */
+export function withGenerator(target: any, key: string, descriptor: PropertyDescriptor) {
+  const oldMethod = descriptor.value as TranslatorMethod;
+  const newMethod: TranslatorMethod = function* (this: BaseNode, state?: TranslatorState, ...args: any[]) {
+    yield;
+    const code = yield* oldMethod.call(this, state, ...args);
+    yield;
+    return code;
+  };
+
+  descriptor.value = newMethod;
+  return descriptor;
+}
+
 export function transfromMetadataType(expTypeAnnotation: TypeAnnotation, app: App) {
     let { sortedTypeKey, typeKind, typeNamespace, typeName } = expTypeAnnotation || {};
     if (expTypeAnnotation?.typeNamespace?.endsWith('.metadataTypes')) {

package/src/utils/time-slicing/constant.ts

@@ -0,0 +1,37 @@
+/**
+ * 理论上限的计算系数
+ *
+ * @description 因为这里的时间分片需要让出部分给别的微任务，所以这里的理论上限需要乘以小于 1 的系数来保证不超过限制。
+ */
+export const TheoreticalLimitCalculationCoefficient = 0.4;
+/**
+ * 最小帧剩余时间
+ *
+ * @description 在计算是否在下一帧运行时，空闲时间的阈值，单位“毫秒”
+ */
+export const FrameIdleTime = 2;
+/**
+ * 资源不足的帧数限制
+ *
+ * @description 资源不足的帧数超过总帧数的比例超过此值时，将会强行抢占进程运行后面的所有流程
+ */
+export const LowResourceFrame = 0.8;
+/**
+ * 资源不足的判定限制
+ *
+ * @description 当前帧中，微任务运行的时间占帧总时长的比例
+ */
+export const LowResourceRatio = 0.1;
+
+/**
+ * 最小帧时间
+ *
+ * @description 最大帧率 60Hz，单位“毫秒”
+ */
+export const FrameMinTime = 1 / 60 * 1000;
+
+/** 任务组状态 */
+export enum NextState {
+  MicroTask,
+  NextFrame,
+}