@lcap/nasl 3.7.3-beta.1 → 3.8.0-beta.2

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -4,7 +4,7 @@
  * 3. 先简单做后续在看如何优化
  */
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, View, Enum, DataSource, ViewElement, EntityProperty } from '../concepts';
+import { App, Module, Namespace, Entity, View, Enum, DataSource, ViewElement, EntityProperty, NumericLiteral, StringLiteral} from '../concepts';
 import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
   filterProperty,
@@ -506,3 +506,67 @@ export function genEditTableColumnComponent(app: App, entity: Entity, property:
 }
 </definition>`;
 }
+
+// 生成单选、多选、选择器的数据源
+export function genFormDesignerSelectLoadLogic(
+  entity: Entity,
+  nameGroup: NameGroup,
+  newLogic: any,
+  defaultValue: { [key: string]: string | number } = {}
+) {
+  const moduleNode = entity.app;
+  const moduleNamespace = moduleNode?.getNamespace();
+  const params = [] as Array<any>;
+  Object.entries(defaultValue).forEach(([key, value], index) => {
+    params.push(genLogicParamWithDefaultValue(`${newLogic.params[index].name}`, value));
+  });
+
+  return {
+    logic: NaslNode.Logic({
+      name: nameGroup.viewLogicLoad,
+      params: [
+        NaslNode.Param({
+          name: 'params',
+          typeAnnotation: NaslUITypeAnnotation.DataSourceParams,
+        }),
+      ],
+      returns: [
+        NaslNode.Return({
+          name: 'result',
+          typeAnnotation: null,
+        }),
+      ],
+      variables: [] as Array<any>,
+      body: [
+        NaslLogicItem.Start,
+        NaslLogicItem.Assignment({
+          left: NaslLogicItem.Identifier({
+            name: 'result',
+          }),
+          right: NaslLogicItem.CallLogic({
+            calleeNamespace: `${moduleNamespace}.logics`,
+            calleeName: newLogic.name,
+            arguments: params,
+          }),
+        }),
+        NaslLogicItem.End,
+      ],
+    }),
+    params
+  };
+}
+
+export function genLogicParamWithDefaultValue(paramIdOrName: string, defaultValue: string | number) {
+  const genArgumentExpression = (defaultValue: string | number) => {
+    if (typeof defaultValue === 'string') {
+      return new StringLiteral({ value: defaultValue as string });
+    } else if (typeof defaultValue === 'number') {
+      return new NumericLiteral({ value: defaultValue.toString() });
+    }
+  };
+
+  return NaslLogicItem.Argument({
+    keyword: paramIdOrName,
+    expression: genArgumentExpression(defaultValue),
+  });
+}

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -276,7 +276,7 @@ function genInitLogic(nameGroup: NameGroup) {
   });
 }
 
-function genCreateLogic(nameGroup: NameGroup) {
+function genCreateLogic(nameGroup: NameGroup, entity?: Entity ) {
   return NaslNode.Logic({
     name: nameGroup.viewLogicCreate,
     description: '',
@@ -517,7 +517,18 @@ function genDetailLogic(entity: Entity, nameGroup: NameGroup) {
 }
 
 // 列表（全）
-export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
+export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement,
+  localTemplate: {
+    genFilterTemplateLocal?: (entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) => string,
+    genTableTemplateLocal?: (entity: Entity, nameGroup: NameGroup, newLogic: any, modifyable?: boolean, entryFromCall?: string) => string,
+    genSaveModalTemplateLocal?: (entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) => string,
+    genWrapper?: (code: string) => string,
+    genSubmitLogicLocal?: (entity: Entity, nameGroup: NameGroup) => any,
+    genUpdateSubmitLogicLocal?: (entity: Entity, nameGroup: NameGroup) => any
+    genModifyLogicLocal?: (entity: Entity, nameGroup: NameGroup) => any,
+    genCreateLogicLocal?: (nameGroup: NameGroup, entity?: Entity) => any,
+    genReloadLogicLocal?: (nameGroup: NameGroup) => any,
+  } = {}) {
   const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
@@ -525,6 +536,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
   const viewElementMainView = likeComponent.getViewElementUniqueName('tableView');
   const nameGroup = genUniqueQueryNameGroup(module, likeComponent, viewElementMainView);
   nameGroup.viewElementMainView = viewElementMainView;
+  nameGroup.viewElementFilterForm =  likeComponent.getViewElementUniqueName('filterform');
   nameGroup.viewElementSaveModal = likeComponent.getViewElementUniqueName('saveModal');
   nameGroup.viewElementSaveModalForm = likeComponent.getViewElementUniqueName('saveModalForm');
   nameGroup.viewLogicRemove = likeComponent.getLogicUniqueName('remove');
@@ -539,6 +551,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
   nameGroup.viewVariableFilter = likeComponent.getVariableUniqueName('filter');
   nameGroup.viewVariableIsUpdate = likeComponent.getVariableUniqueName('isUpdate');
 
+
   // 收集所有和本实体关联的实体
   const entitySet: Set<Entity> = new Set();
   entitySet.add(entity);
@@ -569,13 +582,14 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
   const allEntities = [...entitySet];
   const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
   newLogics.push(entityLogic);
-
+  const genFilter = localTemplate.genFilterTemplateLocal || genFilterTemplate;
+  const genTable = localTemplate.genTableTemplateLocal || genTableTemplate;
+  const genSaveModal = localTemplate.genSaveModalTemplateLocal || genSaveModalTemplate;
+  const wrapper = localTemplate.genWrapper || (code => `<u-linear-layout direction="vertical">${code}</u-linear-layout>`);
   return `<template>
-    <u-linear-layout direction="vertical">
-        ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genTableTemplate(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
-        ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
-    </u-linear-layout>
+        ${wrapper(`${genFilter(entity, nameGroup, selectNameGroupMap)}
+          ${genTable(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock')}
+          ${genSaveModal(entity, nameGroup, selectNameGroupMap)}`)}
 </template>
 
 <definition>
@@ -621,11 +635,11 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
         ${JSON.stringify(genTableLoadLogic(entity, nameGroup, entityLogic, true))},
         ${JSON.stringify(genTableRemoveLogic(entity, nameGroup))},
         ${JSON.stringify(genInitLogic(nameGroup))},
-        ${JSON.stringify(genCreateLogic(nameGroup))},
-        ${JSON.stringify(genModifyLogic(entity, nameGroup))},
-        ${JSON.stringify(genSubmitLogic(entity, nameGroup))},
-        ${JSON.stringify(genUpdateSubmitLogic(entity, nameGroup))},
-        ${JSON.stringify(genReloadLogic(nameGroup))}
+        ${JSON.stringify((localTemplate.genCreateLogicLocal || genCreateLogic)(nameGroup, entity))},
+        ${JSON.stringify((localTemplate.genModifyLogicLocal || genModifyLogic)(entity, nameGroup))},
+        ${JSON.stringify((localTemplate.genSubmitLogicLocal || genSubmitLogic)(entity, nameGroup))},
+        ${JSON.stringify((localTemplate.genUpdateSubmitLogicLocal || genUpdateSubmitLogic)(entity, nameGroup))},
+        ${JSON.stringify((localTemplate.genReloadLogicLocal || genReloadLogic)(nameGroup))}
         ${newLoadSelectLogics.map((logic) => `,${JSON.stringify(logic)}`).join('\n')}
     ],
     "viewBindEvents": [
@@ -977,7 +991,7 @@ function genDelModalSubmitLogic(entity: Entity, nameGroup: NameGroup) {
   });
 }
 
-export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>, optionsMap?: any) {
+export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>, optionsMap?: any, dataSourcesMap?: any) {
   const dataSource = entity.parentNode as DataSource;
   const properties = entity.properties.filter(filterProperty('inFilter')).filter((it) => it?.typeAnnotation?.typeName !== 'List');
   const getCol = (code: string) => `<u-grid-layout-column span="6" style="padding: 10px 0;">${code}</u-grid-layout-column>`;
@@ -1003,10 +1017,15 @@ export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGr
                 const options = optionsMap?.[property.name];
                 const multiple = property?.typeAnnotation?.typeName === 'List';
                 formItem += `
-                              <u-select :clearable="true" v-model="${vModel}" placeholder="请选择" ${multiple ? 'multiple' : ''}>
-                                ${options.map((option: any) => `<u-select-item value="${option.value}">${option.label}</u-select-item>`).join('')}
+                              <u-select style="height: auto;" :clearable="true" v-model="${vModel}" placeholder="请选择" ${multiple ? 'multiple' : ''}>
+                                ${options.map((option: any) => `<u-select-item value="${option.value}"><u-text text="${option.label}"></u-text></u-select-item>`).join('')}
                               </u-select>
                           `;
+              } else if (dataSourcesMap?.[property.name]) {
+                const { dataSource, multiple, textField, valueField } = dataSourcesMap?.[property.name];
+                formItem += ` <u-select v-model="${vModel}" placeholder="请选择" ${
+                  multiple ? 'multiple' : ''
+                } :dataSource="(params)=>${dataSource?.calleeName}(params)" :textField="${textField}" :valueField="${valueField}"></u-select>`;
               } else if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = dataSource?.findEntityByName(property.relationEntity);
@@ -1029,8 +1048,8 @@ export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGr
               } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                               <u-select :clearable="true" v-model="${vModel}" placeholder="请输入${label}">
-                                  <u-select-item :value="true" text="是">是</u-select-item>
-                                  <u-select-item :value="false" text="否">否</u-select-item>
+                                  <u-select-item :value="true" text="是"><u-text text="是"></u-text></u-select-item>
+                                  <u-select-item :value="false" text="否"><u-text text="否"></u-text></u-select-item>
                               </u-select>
                           `;
               } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
@@ -1230,7 +1249,7 @@ export const genDelModalTemplate = (nameGroup: NameGroup) => {
     icon="warning"
   >
     <template #title>
-        <div>提示</div>
+        <u-text :text="'删除'"></u-text>
     </template>
     <template #foot>
       <u-linear-layout style="text-align: right" :vusion-disabled-cut="true" justify="center">
@@ -1248,8 +1267,7 @@ export const genDelModalTemplate = (nameGroup: NameGroup) => {
         ></u-text>
       </u-linear-layout>
     </template>
-    <template #title> <u-text></u-text> </template
-  ></u-modal>
+  </u-modal>
   `;
 };
 
@@ -1259,6 +1277,7 @@ export function genCurdMultipleKeyBlockForTableDesigner(
   view: View,
   SaveModalFormTemplate?: string,
   optionsMap?: any,
+  dataSourcesMap?: any,
   composedBy?: string
 ) {
   const dataSource = entity.parentNode as DataSource;
@@ -1332,8 +1351,8 @@ export function genCurdMultipleKeyBlockForTableDesigner(
 
   const code = `<template>
     <u-linear-layout direction="vertical" :bindEntity="" :TableDesignerLocked="true" style="background: #F7F8FA;">
-        ${genFilterTemplateTableDesigner(entity, nameGroup, selectNameGroupMap, optionsMap)}
-        ${genTableTemplateTableDesigner(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock', optionsMap)}
+        ${genFilterTemplateTableDesigner(entity, nameGroup, selectNameGroupMap, optionsMap, dataSourcesMap)}
+        ${genTableTemplateTableDesigner(entity, nameGroup, entityLogic, true, 'genCurdMultipleKeyBlock', optionsMap, dataSourcesMap)}
         ${genSaveModalTemplateDesigner(entity, nameGroup, selectNameGroupMap, SaveModalFormTemplate)}
         ${genDelModalTemplate(nameGroup)}
     </u-linear-layout>

package/src/templator/genGetBlock.ts

@@ -67,7 +67,8 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 </van-cell-group>`;
 }
 
-export function genGetBlock(entity: Entity, oldNode: ViewElement) {
+export function genGetBlock(entity: Entity, oldNode: ViewElement, 
+  getGetTemplate: (entity: Entity, nameGroup: NameGroup) => string) {
   const likeComponent = oldNode?.likeComponent;
   const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const { ns } = entity;
@@ -77,9 +78,9 @@ export function genGetBlock(entity: Entity, oldNode: ViewElement) {
   nameGroup.viewParamId = likeComponent.getParamUniqueName('id');
   nameGroup.viewVariableEntity = likeComponent.getVariableUniqueName(utils.firstLowerCase(entity.name));
   nameGroup.viewLogicLoad = likeComponent.getLogicUniqueName('load');
-
+  const genTemplate = getGetTemplate || (config.scope === 'h5' ? genH5GetTemplate: genGetTemplate);
   return `<template>
-    ${config.scope === 'h5' ? genH5GetTemplate(entity, nameGroup) : genGetTemplate(entity, nameGroup)}
+    ${genTemplate(entity, nameGroup)}
 </template>
 
 <definition>

package/src/templator/genListViewBlock.ts

@@ -93,7 +93,7 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newLo
 /**
  * 生成实体选择框区块
  */
-export function genListViewBlock(entity: Entity, oldNode: ViewElement, property: EntityProperty) {
+export function genListViewBlock(entity: Entity, oldNode: ViewElement, property: EntityProperty, genListTemplate: any) {
   const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
@@ -110,9 +110,9 @@ export function genListViewBlock(entity: Entity, oldNode: ViewElement, property:
 
   const parentNode = entity.parentNode as App | Module | Namespace;
   const entityLogic = genQueryLogic([entity], nameGroup, false, false, parentNode);
-
+  const genTemplate = genListTemplate ? genListTemplate : (config.scope === 'h5' ? genH5ListViewTemplate : genListViewTemplate);
   return `<template>
-    ${config.scope === 'h5' ? genH5ListViewTemplate(displayedProperty, nameGroup, entityLogic) : genListViewTemplate(displayedProperty, nameGroup, entityLogic)}
+    ${genTemplate(displayedProperty, nameGroup, entityLogic)}
 </template>
 
 <definition>

package/src/templator/genSelectBlock.ts

@@ -103,7 +103,8 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
  * @param view
  * @returns
  */
-export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
+export function genSelectBlock(entity: Entity, oldNode: ViewElement, 
+  genSelectTemplateLocal?: (property: EntityProperty, nameGroup: NameGroup, newLogic: any) => string ) {
   const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
@@ -119,9 +120,10 @@ export function genSelectBlock(entity: Entity, oldNode: ViewElement) {
 
   const newLogic = genQueryLogic(allEntities, nameGroup, false, false, module);
   const newLogics: Array<any> = [newLogic];
+  const templateFunc = genSelectTemplateLocal || (config.scope === 'h5' ? genH5SelectTemplate : genSelectTemplate);
 
   return `<template>
-    ${config.scope === 'h5' ? genH5SelectTemplate(displayedProperty, nameGroup, newLogic) : genSelectTemplate(displayedProperty, nameGroup, newLogic)}
+    ${templateFunc(displayedProperty, nameGroup, newLogic)}
 </template>
 
 <definition>

package/src/templator/genTableBlock.ts

@@ -12,11 +12,8 @@ import {
 } from '.';
 import { NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 
-/**
- * 根据实体属性生成表格列模板
- * @param property 实体属性
- */
-export function genTableColumnTemplate(property: EntityProperty, currentName: string = 'current') {
+
+export function genTableColumnTemplateMeta(property: EntityProperty, currentName: string = 'current') {
   const { entity } = property;
 
   const dataSource = entity.parentNode as DataSource;
@@ -30,7 +27,14 @@ export function genTableColumnTemplate(property: EntityProperty, currentName: st
     const displayedProperty = getFirstDisplayedProperty(relationEntity);
     valueExpression = `${currentName}.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`;
   }
-
+  return { lowerEntityName, valueExpression, title};
+}
+/**
+ * 根据实体属性生成表格列模板
+ * @param property 实体属性
+ */
+export function genTableColumnTemplate(property: EntityProperty, currentName: string = 'current') {
+  const { lowerEntityName, valueExpression, title } = genTableColumnTemplateMeta(property, currentName);
   const getText = (property: EntityProperty) => {
     if (property.typeAnnotation.typeName === 'Boolean') {
       return `
@@ -197,7 +201,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
  *        load -> load_someView_tableView
  *        load_select_student -> load_someView_select_student
  */
-export function genTableBlock(entity: Entity, oldNode: ViewElement) {
+export function genTableBlock(entity: Entity, oldNode: ViewElement, genTable: (entity: Entity, nameGroup: NameGroup, newLogic: any) => string) {
   const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
@@ -229,7 +233,7 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
 
   return `
 <template>
-    ${genTableTemplate(entity, nameGroup, entityLogic)}
+    ${genTable ? genTable(entity, nameGroup, entityLogic) : genTableTemplate(entity, nameGroup, entityLogic)}
 </template>
 <definition>
 {
@@ -244,7 +248,7 @@ export function genTableBlock(entity: Entity, oldNode: ViewElement) {
 `;
 }
 
-export function genTableColumnBlock(property: EntityProperty, oldNode: ViewElement) {
+export function genTableColumnBlock(property: EntityProperty, oldNode: ViewElement, genTableColumnTemplate:any) {
   const likeComponent = oldNode?.likeComponent;
   const { entity } = property;
   const dataSource = entity.parentNode as DataSource;
@@ -277,9 +281,12 @@ export function genTableColumnBlock(property: EntityProperty, oldNode: ViewEleme
   let dataSourceValue = `(params) => ${entityLogic.name}(elements.$ce.page, elements.$ce.size,elements.$ce.sort,elements.$ce.order)`;
   return `
 <template>
-    <u-table-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" :pagination="true" :pageSize="20" :pageNumber="1" :showSizer="true" dataSchema="${nameGroup.structure}">
-        ${properties.map((property) => `${genTableColumnTemplate(property)}\n`).join('')}
-    </u-table-view>
+    ${genTableColumnTemplate
+      ? genTableColumnTemplate(nameGroup)
+      : `<u-table-view ref="${nameGroup.viewElementMainView}" :dataSource="${dataSourceValue}" :pagination="true" :pageSize="20" :pageNumber="1" :showSizer="true" dataSchema="${nameGroup.structure}">
+            ${properties.map((property) => `${genTableColumnTemplate(property)}\n`).join('')}
+        </u-table-view>`}
+
 </template>
 <definition>
 {
@@ -301,7 +308,8 @@ export function genTableTemplateTableDesigner(
   newLogic: any,
   modifyable?: boolean,
   entryFromCall?: string,
-  optionsMap?: any
+  optionsMap?: any,
+  dataSourcesMap?: any
 ) {
   const currentName = nameGroup.currentName || 'current';
   const _properties = entity.properties.filter(filterProperty('inTable'));
@@ -371,7 +379,7 @@ export function genTableTemplateTableDesigner(
       valueField="${utils.firstLowerCase(entity.name)}.${entity.properties.find((p) => p.primaryKey)?.name || 'id'}"
       :pagination="true" :showSizer="true" :pageSize="20" :pageNumber="1" style="margin-top: 12px">
       <u-table-view-column type="index" width="60"><template #title><u-text text="序号"></u-text></template><template #cell="current"></template></u-table-view-column>
-      ${properties.map((property) => `${genTableColumnTemplateTableDesigner(property, currentName, optionsMap)}\n`).join('')}
+      ${properties.map((property) => `${genTableColumnTemplateTableDesigner(property, currentName, optionsMap, dataSourcesMap)}\n`).join('')}
         <u-table-view-column title="操作">
             <template #title><u-text text="操作"></u-text></template>
             <template #cell="current">
@@ -386,9 +394,10 @@ export function genTableTemplateTableDesigner(
 `;
 }
 
-export const genTableColumnTemplateTableDesigner = (property: EntityProperty, currentName: string = 'current', optionsMap?: any) => {
+export const genTableColumnTemplateTableDesigner = (property: EntityProperty, currentName: string = 'current', optionsMap?: any, dataSourcesMap?: any) => {
   const { entity } = property;
   const hasOptions = optionsMap?.[property.name];
+  const hasDataSource = dataSourcesMap?.[property.name];
 
   const dataSource = entity.parentNode as DataSource;
   const lowerEntityName = utils.firstLowerCase(entity.name);
@@ -407,8 +416,8 @@ export const genTableColumnTemplateTableDesigner = (property: EntityProperty, cu
     if (hasOptions) {
       const options = optionsMap[property.name];
       return `
-      <u-select :preview="true" :value="${valueExpression}" placeholder="--" ${multiple ? 'multiple  tags-overflow="visible" ' : ''}>
-                    ${options.map((option: any) => `<u-select-item value="${option.value}" text="${option.label}">${option.label}</u-select-item>`)}
+      <u-select style="height: auto;" :preview="true" :value="${valueExpression}" placeholder="--" ${multiple ? 'multiple  tags-overflow="visible" ' : ''}>
+                    ${options.map((option: any) => `<u-select-item value="${option.value}"><u-text text="${option.label}"></u-text></u-select-item>`)}
                   </u-select>
       `;
     } else if (property.typeAnnotation.typeName === 'Boolean') {
@@ -416,6 +425,12 @@ export const genTableColumnTemplateTableDesigner = (property: EntityProperty, cu
             <u-text v-if="${valueExpression}" text="是"></u-text>
             <u-text v-if="!${valueExpression}" text="否"></u-text>
             `;
+    } else if (hasDataSource) {
+      const { dataSource, multiple, textField, valueField } = dataSourcesMap[property.name];
+      return `
+      <u-select :preview="true" :value.sync="${valueExpression}" placeholder="--" ${
+        multiple ? 'multiple  tags-overflow="visible" ' : ''
+      } :dataSource="(params)=>${dataSource?.calleeName}(params)" :textField="${textField}" :valueField="${valueField}"></u-select>`;
     }
     return `<u-text :text="${valueExpression}"></u-text>`;
   };

package/src/templator/genUpdateBlock.ts

@@ -307,7 +307,10 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 }
 
 // 生成修改区块
-export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
+export function genUpdateBlock(entity: Entity, oldNode: ViewElement, useViewVariable = true,
+  genUpdateTemplate?: (entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) => string, 
+  genLoadLogicLocal?: (getLogic: Logic, nameGroup: NameGroup, entity?: Entity) => any,
+  genSubmitLogicLocal?: (updateLogic: Logic, nameGroup: NameGroup) => any) {
   const likeComponent = oldNode?.likeComponent;
   const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const dataSource = entity.parentNode as DataSource;
@@ -347,12 +350,9 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
       }
     }
   });
-
+  const genTemplate = genUpdateTemplate || (config.scope === 'h5' ? genH5UpdateFormTemplate : genUpdateFormTemplate);
   return `<template>
-    ${config.scope === 'h5'
-      ? genH5UpdateFormTemplate(entity, nameGroup, selectNameGroupMap)
-      : genUpdateFormTemplate(entity, nameGroup, selectNameGroupMap)
-    }
+    ${genTemplate(entity, nameGroup, selectNameGroupMap)}
 </template>
 
 <definition>
@@ -365,20 +365,23 @@ export function genUpdateBlock(entity: Entity, oldNode: ViewElement) {
         }
     ],
     "viewVariables": [
-        {
-            "concept": "Variable",
-            "name": "${nameGroup.viewVariableEntity}",
-            "typeAnnotation":  ${JSON.stringify(
-      NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
-      })
-    )}
-        }
+      ${
+        useViewVariable ? `{
+              "concept": "Variable",
+              "name": "${nameGroup.viewVariableEntity}",
+              "typeAnnotation":  ${JSON.stringify(
+        NaslTypeAnnotation.Reference({
+          typeNamespace: entity.getNamespace(),
+          typeName: entity.name,
+        })
+      )}
+      }` : ''
+      }
+        
     ],
     "viewLogics": [
-        ${JSON.stringify(genLoadLogic(getLogic, nameGroup))},
-        ${JSON.stringify(genSubmitLogic(updateLogic, nameGroup))}
+        ${JSON.stringify((genLoadLogicLocal || genLoadLogic)(getLogic, nameGroup, entity))},
+        ${JSON.stringify((genSubmitLogicLocal || genSubmitLogic)(updateLogic, nameGroup))}
         ${newLoadSelectLogics.map((logic) => `,${JSON.stringify(logic)}`).join('\n')}
     ],
     "viewBindEvents": [

package/src/translator/types.ts

@@ -61,10 +61,6 @@ export interface TranslatorState {
    * @description 修改逻辑节点
    */
   nodePathComment?: boolean;
-  /**
-   * 生成时带上 label 和 description 的 comment
-   */
-  descriptionComment?: boolean;
   /**
    * 只生成对应节点的声明信息
    */

package/src/translator/utils.ts

@@ -255,12 +255,6 @@ export function transfromUnionTypeAnnotation(expTypeAnnotation: TypeAnnotation,
   }
 }
 
-export function createDescriptionComment<T extends BaseNode>(state: TranslatorState, node: T, properties: Array<keyof T>) {
-  const content = properties.map((prop) => node[prop]).filter((value) => !!value).join(' ');
-
-  return content.trim() ? `/** ${content} */\n${indent(state.tabSize)}` : '';
-}
-
 export function createDecoratorCode<T extends BaseNode>(state: TranslatorState, node: T, properties: Array<keyof T>, options?: {
   '@'?: boolean;
   concept?: boolean;

package/src/utils/env.ts

@@ -2,9 +2,8 @@
 export const isBrowser = typeof window !== 'undefined' && typeof document !== 'undefined';
 /** Node 环境 */
 export const isNode = process.env.BUILD_TARGET === 'node' || !globalThis.window;
-/** 本地模式 */
-export const isLocalMode = isBrowser && location.hostname.includes('localhost');
-/** 调试模式 */
-export const isDebugMode = isBrowser && (/[?&]debug=true/.test(location.search) || isLocalMode);
 /** 是否是浏览器测试环境 */
-export const isTestBrowser = isBrowser && (/codewave-(test|dev)\.163yun\.com$/.test(location.hostname) || isLocalMode);
+export const isTestBrowser = isBrowser && (
+  /codewave-(test|dev)\.163yun\.com$/.test(location.hostname) ||
+  location.hostname.includes('localhost')
+);

package/src/utils/index.ts

@@ -1,6 +1,6 @@
 import { compare } from 'compare-versions';
 import { BaseNode, LogicItem, AnonymousFunction, Param } from '..';
-import type { ForEachStatement, Logic, TypeAnnotation, View } from '..';
+import type { ForEachStatement, Logic, TypeAnnotation, View, ViewElement } from '..';
 import * as types from '../concepts/utils/types';
 import { getConceptPropertyMap } from '../decorators/index';
 import { traverse } from './traverse';
@@ -16,8 +16,6 @@ export * from './env';
 export * from './file';
 export * from './time-slicing';
 
-export * as LsCache from './language-cache';
-
 // 查找最近的模块
 export function findClosestModule(node: BaseNode) {
   let moduleNode = node;
@@ -485,6 +483,20 @@ export function isSameInType(source: TypeAnnotation[], target: TypeAnnotation[])
   return flag;
 }
 
+// 获取控件，如input等
+export function getControlNode(node: ViewElement){
+  const isH5 = (node: ViewElement) => node?.tag.startsWith('van-');
+  if (isH5(node)) {
+    return node?.children?.find((it) => it?.slotTarget === 'input')?.children?.[0];
+  } else {
+    return node?.children?.[1];
+  }
+};
+
+export function isSelectClassComponent(node: ViewElement){
+  return ['u-select', 'u-radios', 'u-checkboxes', 'van-radio-group', 'van-checkbox-group', 'van-pickerson'].includes(node?.tag);
+};
+
 /**
  * 获取节点对应的注释
  */
@@ -497,4 +509,4 @@ export function getDescription(title: string, description: string) {
     desc += description ? `${description}` : '';
   }
   return desc;
-}
+}

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

@@ -16,6 +16,7 @@ import {
   NextState,
   TheoreticalLimitCalculationCoefficient as Coefficient,
 } from './constant';
+import { delayInWorker } from '../delay';
 
 /** 时间分片控制器 */
 export class TimeSlicingController {

package/src/utils/types.ts

@@ -15,23 +15,3 @@ export interface FileNode extends BaseNode {
 }
 
 export type EmbeddedTSFileGenerator = Generator<void, EmbeddedTSFileResult, string>;
-
-export interface FullResponse<D> {
-  headers: Record<string, string>;
-  data: {
-    code: number;
-    msg: string;
-    success: boolean;
-    result: D[];
-  };
-}
-
-export interface BreakpointStatus {
-  path: string;
-  breakpointStatus: null | 'ENABLED' | 'DISABLED'
-}
-
-export interface BatchInstructResult {
-  globalChangedTime: number;
-  preGlobalChangedTime: number;
-}

package/test/concepts/validation-rule/__snapshots__/toEmbeddedTS.spec.ts.snap

@@ -1,7 +1,8 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
 exports[`validation-rule:toEmbeddedTS argument-without-keyword 1`] = `
-"nasl.validation.max(new nasl.core.Long(10));
+"__IDENTIFIER__;
+nasl.validation.max(new nasl.core.Long(10));
 "
 `;