@lcap/nasl 1.0.2 → 2.12.0

package/src/templator/genQueryComponent.ts

@@ -1,5 +1,5 @@
 import * as utils from '../utils';
-import { App, Namespace, Entity, Structure, QueryJoinExpression, CallQueryComponent, StructureProperty } from '../concepts';
+import { App, Module, Namespace, Entity, Structure, QueryJoinExpression, CallQueryComponent, StructureProperty, DataSource } from '../concepts';
 import { NameGroup, NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslTypeAnnotation, NaslQueryExpression, NaslLogicItem, NaslNode } from './utils';
 
 export function genQueryStructure(allEntities: Array<Entity>, nameGroup: NameGroup) {
@@ -66,35 +66,33 @@ function genWhereExpression(entity: Entity) {
 export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGroup, supportFilter: boolean, supportSort: boolean) {
     allEntities = Array.from(allEntities);
     const entity = allEntities.shift();
-    const parentNode = entity.parentNode as App | Namespace;
-    const parentNamespace = parentNode.getNamespace();
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    const moduleNamespace = moduleNode?.getNamespace();
 
     const from = NaslQueryExpression.QueryFromExpression({
         entityNamespace: entity.getNamespace(),
         entityName: entity.name,
         joinParts: allEntities.map((relationEntity) => {
-            const leftProperty = entity.properties.find((property) => property.relationEntity === relationEntity.name);
+            const onExpressions = entity.properties?.filter((property) => property.relationEntity === relationEntity.name).map((leftProperty) => NaslLogicItem.BinaryExpression({
+                operator: '==',
+                left: NaslQueryExpression.QueryFieldExpression({
+                    label: '查询组件实体属性',
+                    isDotStar: false,
+                    entityAsName: entity.name,
+                    propertyName: leftProperty.name,
+                }),
+                right: NaslQueryExpression.QueryFieldExpression({
+                    label: '查询组件实体属性',
+                    isDotStar: false,
+                    entityAsName: relationEntity.name,
+                    propertyName: leftProperty.relationProperty,
+                }),
+            }));
             return NaslQueryExpression.QueryJoinExpression({
                 entityNamespace: relationEntity.getNamespace(),
                 entityName: relationEntity.name,
                 joinType: 'LEFT',
-                onExpressions: [
-                    NaslLogicItem.BinaryExpression({
-                        operator: '==',
-                        left: NaslQueryExpression.QueryFieldExpression({
-                            label: '查询组件实体属性',
-                            isDotStar: false,
-                            entityAsName: entity.name,
-                            propertyName: leftProperty.name,
-                        }),
-                        right: NaslQueryExpression.QueryFieldExpression({
-                            label: '查询组件实体属性',
-                            isDotStar: false,
-                            entityAsName: relationEntity.name,
-                            propertyName: leftProperty.relationProperty,
-                        }),
-                    }),
-                ],
+                onExpressions,
                 joinParts: [],
             });
         }),
@@ -109,7 +107,7 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
             ideVersion: '2.11', // 2.11版本新创建的数据查询组件，返回类型将自动推断
             typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                 NaslTypeAnnotation.Reference({
-                    typeNamespace: `${parentNamespace}.structures`,
+                    typeNamespace: `${moduleNamespace}.structures`,
                     typeName: nameGroup.structure,
                 }),
             ]),
@@ -150,7 +148,10 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
 }
 
 export function genQueryLogic(allEntities: Array<Entity>, nameGroup: NameGroup, supportFilter: boolean, supportSort: boolean, parentNode: any) {
-    const parentNamespace = parentNode?.getNamespace();
+    const entity = allEntities?.[0];
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    const moduleNamespace = moduleNode?.getNamespace();
+
     const logic = NaslNode.Logic({
         name: nameGroup.logic,
         description: '',
@@ -169,7 +170,7 @@ export function genQueryLogic(allEntities: Array<Entity>, nameGroup: NameGroup,
                 name: 'result',
                 typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -188,7 +189,7 @@ export function genQueryLogic(allEntities: Array<Entity>, nameGroup: NameGroup,
             typeAnnotation: NaslCoreTypeAnnotation.String,
         }));
     }
-    const entity = allEntities?.[0];
+
     if (supportFilter && entity) {
         logic.params.push(NaslNode.Param({
             name: 'filter',
@@ -202,11 +203,11 @@ export function genQueryLogic(allEntities: Array<Entity>, nameGroup: NameGroup,
 }
 
 export async function joinEntity(callQueryComponent: CallQueryComponent, entity: Entity, recordStructure: Structure) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
     const from = callQueryComponent.from;
     let joinInfo;
     // 无法判断用户行为，优先加有关系的
-    const lastEntity = parentNode.findEntityByName(from.entityName);
+    const lastEntity = dataSource.findEntityByName(from.entityName);
     // lastEntity 和 entity Join
     // 判断要不要自动关联 onExpression
     // 一般左联是自动有的了

package/src/templator/genSelectBlock.ts

@@ -1,6 +1,6 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Namespace, Entity, EntityProperty, View } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, View, DataSource } from '../concepts';
 import { NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genQueryStructure, genLogicParam } from '.';
 import {
     NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslLogicItem,
@@ -35,8 +35,8 @@ export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGro
 }
 
 export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogic: any) {
-    const parentNode = entity.parentNode as App | Namespace;
-    const parentNamespace = parentNode?.getNamespace();
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    const moduleNamespace = moduleNode?.getNamespace();
     const params = [
         genLogicParam(`${newLogic.params[0].name}`, 'params.page'),
         genLogicParam(`${newLogic.params[1].name}`, 'params.size'),
@@ -54,7 +54,7 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
                 name: 'result',
                 typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -68,7 +68,7 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
                     name: 'result',
                 }),
                 right: NaslLogicItem.CallLogic({
-                    calleeNamespace: `${parentNamespace}.logics`,
+                    calleeNamespace: `${moduleNamespace}.logics`,
                     calleeName: newLogic.name,
                     arguments: params,
                 }),
@@ -85,10 +85,11 @@ export function genLoadSelectLogic(entity: Entity, nameGroup: NameGroup, newLogi
  * @returns
  */
 export function genSelectBlock(entity: Entity, view: View) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
 
     const viewElementMainView = view.getViewElementUniqueName('select');
-    const nameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementMainView, false);
+    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
 
@@ -101,7 +102,7 @@ export function genSelectBlock(entity: Entity, view: View) {
     const newStructures: Array<any> = [
         genQueryStructure(allEntities, nameGroup),
     ];
-    const newLogic = genQueryLogic(allEntities, nameGroup, false, false, parentNode);
+    const newLogic = genQueryLogic(allEntities, nameGroup, false, false, module);
     const newLogics: Array<any> = [
         newLogic,
     ];

package/src/templator/genTableBlock.ts

@@ -1,5 +1,5 @@
 import * as utils from '../utils';
-import { App, Namespace, Entity, EntityProperty, View } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, View, DataSource } from '../concepts';
 import {
     getExpression,
     filterProperty,
@@ -20,16 +20,20 @@ import { NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslUITypeAnnotat
  */
 export function genTableColumnTemplate(property: EntityProperty) {
     const entity = property.entity;
+    const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     let expression = `scope.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
     if (property.relationEntity) {
         const relationLowerEntityName = utils.firstLowerCase(property.relationEntity);
+        const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+        const displayedProperty = getFirstDisplayedProperty(relationEntity);
         // 有外键关联
-        expression = getExpression(property, `scope.item.${relationLowerEntityName}.${property.relationProperty}`);
-    } else
+        expression = getExpression(property, `scope.item.${relationLowerEntityName}.${displayedProperty?.name || property.relationProperty}`);
+    } else {
         expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
+    }
 
     const getText = (property: EntityProperty) => {
         if (property.typeAnnotation.typeName === 'Boolean') {
@@ -83,8 +87,8 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyabl
  * @param entity 实体
  */
 export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic: any, supportFilter: boolean) {
-    const parentNode = entity.parentNode as App | Namespace;
-    const parentNamespace = parentNode?.getNamespace();
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    const moduleNamespace = moduleNode?.getNamespace();
     const params = [
         genLogicParam(`${newLogic.params[0].name}`, 'params.page'),
         genLogicParam(`${newLogic.params[1].name}`, 'params.size'),
@@ -108,7 +112,7 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
                 name: 'result',
                 typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -122,7 +126,7 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
                     name: 'result',
                 }),
                 right: NaslLogicItem.CallLogic({
-                    calleeNamespace: `${parentNamespace}.logics`,
+                    calleeNamespace: `${moduleNamespace}.logics`,
                     calleeName: newLogic.name,
                     arguments: params,
                 }),
@@ -138,8 +142,8 @@ export function genTableLoadLogic(entity: Entity, nameGroup: NameGroup, newLogic
  */
 export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const parentNode = entity.parentNode as App | Namespace;
-    const parentNamespace = parentNode?.getNamespace();
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    const moduleNamespace = moduleNode?.getNamespace();
     const ns = entity.ns;
     const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
     const idPropertys = entity.properties.filter((property) => property.primaryKey);
@@ -154,7 +158,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                 name: 'scope',
                 typeAnnotation: NaslUITypeAnnotation.ScopeOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -192,32 +196,35 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
  *        load_select_student -> load_someView_select_student
  */
 export function genTableBlock(entity: Entity, view: View) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
 
     const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementMainView);
+    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
 
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet: Set<Entity> = new Set();
+    entitySet.add(entity);
     const newStructures: any[] = [];
     const newLogics: any[] = [];
     entity.properties.forEach((property) => {
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
+    const allEntities = [...entitySet];
     const entityStructure = genQueryStructure(allEntities, nameGroup);
     newStructures.push(entityStructure);
-    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, parentNode);
+    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
 
     return `
@@ -240,34 +247,36 @@ export function genTableBlock(entity: Entity, view: View) {
 
 export function genTableColumnBlock(property: EntityProperty, view: View) {
     const entity = property.entity;
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
 
     const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementMainView);
+    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
 
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet: Set<Entity> = new Set();
+    entitySet.add(entity);
     const newStructures: any[] = [];
     const newLogics: any[] = [];
     const properties = [property];
     properties.forEach((property) => {
         if (property.relationEntity) {
             // 有外键关联
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty)
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
             }
         }
     });
-
+    const allEntities = [...entitySet];
     const entityStructure = genQueryStructure(allEntities, nameGroup);
     newStructures.push(entityStructure);
-    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, parentNode);
+    const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
 
     return `

package/src/templator/genUpdateBlock.ts

@@ -1,6 +1,6 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Namespace, Entity, Logic, View, Enum } from '../concepts';
+import { App, Module, Namespace, Entity, Logic, View, Enum, DataSource } from '../concepts';
 import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
     NameGroup,
@@ -16,7 +16,8 @@ import {
 } from '.';
 
 export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<u-form ref="${nameGroup.viewElementMainView}">
@@ -39,13 +40,15 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
-                const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+                const relationEntity = dataSource?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
                     const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                        const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
+                        // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                        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}" :pageable="true" :remote-paging="true" v-model="${vModel}">
@@ -73,7 +76,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 const namespaceArr = propertyTypeNamespace.split('.');
                 const type = namespaceArr.pop();
                 if (type === 'enums') {
-                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                    formItem += genEnumSelectBlock(module.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
                 } else {
                     formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
                 }
@@ -90,7 +93,8 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 }
 
 export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<van-form ref="${nameGroup.viewElementMainView}">
@@ -107,55 +111,58 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 rules.push('required');
             const rulesStr = rules.join(' | ');
 
-            let formItem = `            <van-field drole="other" label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
+            let formItem = `            <van-field drole="other" ${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
             const { typeAnnotation } = property || {};
             const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
-                const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+                const relationEntity = dataSource?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
                     const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
-                        const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
+                        // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                        const key = [property.name, relationEntity.name].join('-');
+                        const selectNameGroup = selectNameGroupMap.get(key);
                         formItem += `
-                        <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
+                        <template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${vModel}" :data-source="${selectNameGroup.viewLogicLoad}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
                             :notitleblock="true"
-                            :pageable="true" :remote-paging="true"></van-cascader></template>
+                            :pageable="true" input-align="left" :remote-paging="true"></van-cascader></van-linear-layout></template>
                     `;
                     } else
                         return '';
                 } else
                     return '';
             } else if (propertyTypeName === 'Boolean') {
-                formItem += `<template #input><van-switch v-model="${vModel}"></van-switch></template>`;
+                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-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></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-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></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-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></template>`;
+                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
             } else if (propertyTypeName === 'Date') {
-                formItem += `<template #input><van-calendar clearable :default-date.sync="${vModel}" placeholder="请输入${label}"></van-calendar></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar clearable :default-date.sync="${vModel}" placeholder="请输入${label}" input-align="left"></van-calendar></van-linear-layout></template>`;
             } else if (propertyTypeName === 'Time') {
-                formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
             } else if (propertyTypeName === 'DateTime') {
-                formItem += `<template #input><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field="" input-align="left"></van-datetime-picker></van-linear-layout></template>`;
             } else {
                 const namespaceArr = propertyTypeNamespace.split('.');
                 const type = namespaceArr.pop();
                 if (type === 'enums') {
-                    formItem += '<template #input>' + genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</template>';
+                    formItem += '<template #input><van-linear-layout style="width:100%;" direction="horizontal">' + genEnumSelectBlock(module.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</van-linear-layout></template>';
                 } else {
-                    formItem += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></template>`;
+                    formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></van-linear-layout></template>`;
                 }
             }
 
+            formItem += `<template #title><van-text text="${label}"><van-text></template>`;
             formItem += `            </van-field>\n`;
 
             formItem = formItem.replace(/>\n<van-input|<\/van-input>/g, '');
@@ -251,7 +258,8 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 }
 
 export function genUpdateBlock(entity: Entity, view: View) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
+    const module = dataSource.parentNode as App | Module | Namespace;
     const ns = entity.ns;
     const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
     const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
@@ -271,16 +279,18 @@ export function genUpdateBlock(entity: Entity, view: View) {
     entity.properties.forEach((property) => {
         // 有外键关联
         if (property.relationEntity) {
-            const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty) {
                     const viewElementSelect = view.getViewElementUniqueName('select');
-                    const selectNameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementSelect, false, relationEntity.name);
+                    const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
                     selectNameGroup.viewElementSelect = viewElementSelect;
-                    selectNameGroupMap.set(relationEntity.name, selectNameGroup);
+                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+                    const key = [property.name, relationEntity.name].join('-');
+                    selectNameGroupMap.set(key, selectNameGroup);
                     const newStructure = genQueryStructure([relationEntity], selectNameGroup);
-                    const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, parentNode);
+                    const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
                     newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));

package/src/templator/utils.ts

@@ -1,5 +1,5 @@
 import { utils } from '..';
-import { App, Namespace, Entity, EntityProperty, Logic, View } from '../concepts';
+import { App, Module, Entity, EntityProperty, Logic, View, Namespace } from '../concepts';
 
 export const filterProperty = (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') => (property: EntityProperty) => {
     if (property.display) {
@@ -136,7 +136,7 @@ function capFirstLetter(word: string) {
  * @param suffix 其它后缀，比如实体名等等
  * @param defaultInView 是否在页面逻辑中用 load 简写
  */
-export function genUniqueQueryNameGroup(scope: App | Namespace, view: View, componentName: string = '', defaultInView: boolean = true, suffix: string = '') {
+export function genUniqueQueryNameGroup(scope: App | Module | Namespace, view: View, componentName: string = '', defaultInView: boolean = true, suffix: string = '') {
     const result: NameGroup = {};
     result.viewLogicLoad = view.getLogicUniqueName(`load${defaultInView ? '' : capFirstLetter(componentName)}${suffix ? capFirstLetter(suffix) : ''}`);
     result.logic = scope.getLogicUniqueName(`load${capFirstLetter(view.name)}${componentName ? capFirstLetter(componentName) : ''}${suffix ? capFirstLetter(suffix) : ''}`);

package/src/test/integration/connect-file.ts

@@ -12,13 +12,13 @@ describe('connect-file', () => {
     it('batchAction', async () => {
         await nasl.connect('file', path.join(__dirname, '../examples/app1.json'));
         const app = await nasl.loadApp();
-        if (app.entities.length > 0) {
-            const oldLength = app.entities.length;
-            await app.entities[0].delete();
-            expect(app.entities.length).to.equal(oldLength - 1);
+        if (app.dataSources.length > 0) {
+            const oldLength = app.dataSources.length;
+            await app.dataSources[0].delete();
+            expect(app.dataSources.length).to.equal(oldLength - 1);
         } else {
-            await app.addEntity();
-            expect(app.entities.length).to.equal(1);
+            await app.addDataSource();
+            expect(app.dataSources.length).to.equal(1);
         }
     });
 });

package/src/translator/index.ts

@@ -97,7 +97,7 @@ export function withSourceMap() {
 
                 let before: string = '';
                 if (!state.inline) {
-                    before = indent(state.tabSize);
+                    before = indent((state?.tabSize || 0));
                     state = shiftState(state, before);
                 } else {
                     state = shiftState(state, before, {

package/src/utils/index.ts

@@ -3,8 +3,59 @@ export * from './traverse';
 export * from './logger';
 
 import { compare } from 'compare-versions';
+import { BaseNode } from '..';
 import { traverse } from './traverse';
 
+// 查找最近的模块
+export function findClosestModule(node: BaseNode) {
+    let moduleNode = node;
+    while (moduleNode && !['App', 'Module'].includes(moduleNode.concept)) {
+        moduleNode = moduleNode.parentNode;
+    }
+    return moduleNode;
+}
+
+// 从namespace获取关键字
+export function findConceptKeyWordByNamespace(namespace: string) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const keywordViews = namespaceArr.filter((namespaceItem, index) => index % 2 === mod);
+    return keywordViews.pop();
+}
+
+// 从namespace中查找concept关键字
+export function findConceptKeyWordIndexFromNamespace(namespace: string, keyword: string) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    return namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+}
+
+// 从namespace中查找concept，返回找到类型对应的值
+// 如 namespace : app.datasource.defaultDS  keyword: datasource
+// 返回 defaultDS
+export function findConceptValueFromNamespace(namespace: string, keyword: string) {
+    const namespaceArr = namespace?.split('.') || [];
+    const start = namespaceArr[0];
+    const mod = start === 'app' ? 1 : 0;
+    const findIndex = namespaceArr.findIndex((namespaceItem, index) => {
+        if (index % 2 === mod) {
+            return namespaceItem === keyword;
+        }
+        return false;
+    });
+
+    if (findIndex)
+        return namespaceArr[findIndex + 1];
+    return '';
+}
+
 export function getGlobalEnv() {
     return typeof window !== 'undefined' ? (window as any).appInfo.env : (global as any).appInfoEnv;
 }