@lcap/nasl 1.0.1 → 2.12.0-beta.1

package/src/templator/genEditTableBlock.ts

@@ -1,5 +1,5 @@
 import * as utils from '../utils';
-import { App, Namespace, Entity, EntityProperty } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, DataSource } from '../concepts';
 import {
     getExpression, filterProperty, NameGroup,
     getFirstDisplayedProperty, getParamFromLogic, genCallComponentLogic,
@@ -15,7 +15,7 @@ import {
  * @param property 实体属性
  */
 export function genEditTableColumnTemplate(entity: Entity, property: EntityProperty, nameGroup: NameGroup, selectNameGroupMap?: Map<string, NameGroup>) {
-    const parentNode = entity.parentNode as App | Namespace;
+    const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const valueExpression = `scope.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
@@ -45,13 +45,15 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
         const propertyTypeName = property.typeAnnotation.typeName;
         if (property.relationEntity && selectNameGroupMap) {
             // 有外键关联
-            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}"
                             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
@@ -135,8 +137,9 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selec
  * @param entity 实体
  */
 export function genEditTableLoadLogic(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'),
@@ -160,7 +163,7 @@ export function genEditTableLoadLogic(entity: Entity, nameGroup: NameGroup, newL
                 name: 'result',
                 typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -174,7 +177,7 @@ export function genEditTableLoadLogic(entity: Entity, nameGroup: NameGroup, newL
                     name: 'result',
                 }),
                 right: NaslLogicItem.CallLogic({
-                    calleeNamespace: `${parentNamespace}.logics`,
+                    calleeNamespace: `${moduleNamespace}.logics`,
                     calleeName: newLogic.name,
                     arguments: params,
                 }),
@@ -190,8 +193,8 @@ export function genEditTableLoadLogic(entity: Entity, nameGroup: NameGroup, newL
  */
 export function genEditTableRemoveLogic(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`);
@@ -208,7 +211,7 @@ export function genEditTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                 name: 'scope',
                 typeAnnotation: NaslUITypeAnnotation.ScopeOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -239,8 +242,8 @@ export function genEditTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
 
 export function genBlurUpdateLogic(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 updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
     return NaslNode.Logic({
@@ -255,7 +258,7 @@ export function genBlurUpdateLogic(entity: Entity, nameGroup: NameGroup) {
                 name: 'scope',
                 typeAnnotation: NaslUITypeAnnotation.ScopeOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),

package/src/templator/genEnumSelectBlock.ts

@@ -10,7 +10,7 @@ import { Enum } from '../concepts';
  */
 export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: string, placeholder?: string, hiddenAll?: boolean) {
     if (config.scope === 'h5')
-        return `<van-cascader ${vModel ? ` v-model="${vModel}"` : ''}${placeholder ? ` title="${placeholder}" placeholder="${placeholder}"` : ''}
+        return `<van-cascader input-align="left" ${vModel ? ` v-model="${vModel}"` : ''}${placeholder ? ` title="${placeholder}" placeholder="${placeholder}"` : ''}
         :data-source="$utils.EnumList('${enumeration.name}', '${enumeration.getNamespace()}')" labelField="${!hiddenAll ? (placeholder || '') : ''}" :notitleblock="${hiddenAll}"></van-cascader>`;
 
     return `<u-select clearable${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${placeholder ? ` placeholder="${placeholder}"` : ''}

package/src/templator/genGetBlock.ts

@@ -24,7 +24,7 @@ export function genGetTemplate(entity: Entity, nameGroup: NameGroup) {
 }
 
 function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
-    const params = [genLogicParam(`${getLogic.params[0].name}`, 'id')];
+    const params = [genLogicParam(`${getLogic.params[0].name}`, nameGroup.viewParamId)];
 
     return NaslNode.Logic({
         name: nameGroup.viewLogicLoad,

package/src/templator/genGridViewBlock.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 {
     getExpression,
     filterProperty,
@@ -21,14 +21,14 @@ import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslCollectionTypeAnnotat
  */
 export function genGridViewCardTemplate(property: EntityProperty) {
     const entity = property.entity;
-    const parentNode = entity.parentNode as App | Namespace;
+    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 relationEntity = parentNode?.findEntityByName(property.relationEntity);
+        const relationEntity = dataSource?.findEntityByName(property.relationEntity);
         if (relationEntity) {
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
@@ -60,14 +60,13 @@ export function genGridViewCardTemplate(property: EntityProperty) {
 
 export function genH5GridViewCardTemplate(property: EntityProperty) {
     const entity = property.entity;
-    const parentNode = entity.parentNode as App | Namespace;
+    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 relationEntity = parentNode?.findEntityByName(property.relationEntity);
+        const relationEntity = dataSource?.findEntityByName(property.relationEntity);
         if (relationEntity) {
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
@@ -149,8 +148,8 @@ export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup) {
  * @param entity 实体
  */
 export function genGridViewLoadLogic(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'),
@@ -174,7 +173,7 @@ export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLo
                 name: 'result',
                 typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -188,7 +187,7 @@ export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLo
                     name: 'result',
                 }),
                 right: NaslLogicItem.CallLogic({
-                    calleeNamespace: `${parentNamespace}.logics`,
+                    calleeNamespace: `${moduleNamespace}.logics`,
                     calleeName: newLogic.name,
                     arguments: params,
                 }),
@@ -204,8 +203,8 @@ export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLo
  */
 export function genGridViewRemoveLogic(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 || property.name === 'id');
@@ -221,7 +220,7 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                 name: 'scope',
                 typeAnnotation: NaslUITypeAnnotation.ScopeOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -260,32 +259,35 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
  */
 // 数据网格（简）
 export function genGridViewBlock(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('gridView');
-    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 `
@@ -308,32 +310,35 @@ export function genGridViewBlock(entity: Entity, view: View) {
 
 export function genGridViewCardBlock(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('gridView');
-    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, true, true, parentNode);
+    const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
     newLogics.push(entityLogic);
 
     return `

package/src/templator/genListViewBlock.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 { getExpression, genUniqueQueryNameGroup, getFirstDisplayedProperty, genQueryLogic, genQueryStructure, genLogicParam } from '.';
 import {
     NameGroup, NaslUITypeAnnotation, NaslCollectionTypeAnnotation,
@@ -39,8 +39,10 @@ export function genH5ListViewTemplate(property: EntityProperty, nameGroup: NameG
 }
 
 export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newStructures: Array<any>, newLogics: Array<any>) {
-    const parentNode = entity.parentNode as App | Namespace;
-    const parentNamespace = parentNode?.getNamespace();
+    const parentNode = entity.parentNode as App | Module | Namespace;
+
+    const moduleNode = utils.findClosestModule(entity) as App | Module;
+    const moduleNamespace = moduleNode?.getNamespace();
 
     // Select 和 table 不一样，直接在内部产生了
     const entityStructure = genQueryStructure([entity], nameGroup);
@@ -61,7 +63,7 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newSt
                 name: 'result',
                 typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
                     NaslTypeAnnotation.Reference({
-                        typeNamespace: `${parentNamespace}.structures`,
+                        typeNamespace: `${moduleNamespace}.structures`,
                         typeName: nameGroup.structure,
                     }),
                 ]),
@@ -75,7 +77,7 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newSt
                     name: 'result',
                 }),
                 right: NaslLogicItem.CallLogic({
-                    calleeNamespace: `${parentNamespace}.logics`,
+                    calleeNamespace: `${moduleNamespace}.logics`,
                     calleeName: entityLogic.name,
                     arguments: [
                         genLogicParam(`${entityLogic.params[0].name}`, 'params.page'),
@@ -92,10 +94,11 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newSt
  * 生成实体选择框区块
  */
 export function genListViewBlock(entity: Entity, view: View, property: EntityProperty) {
-    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('listView');
-    const nameGroup = genUniqueQueryNameGroup(parentNode, view, viewElementMainView, false);
+    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView, false);
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
 

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: [],
             });
         }),
@@ -106,10 +104,13 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
         }),
         right: NaslQueryExpression.CallQueryComponent({
             label: '数据查询',
-            typeAnnotation: NaslTypeAnnotation.Reference({
-                typeNamespace: `${parentNamespace}.structures`,
-                typeName: nameGroup.structure,
-            }),
+            ideVersion: '2.11', // 2.11版本新创建的数据查询组件，返回类型将自动推断
+            typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
+                NaslTypeAnnotation.Reference({
+                    typeNamespace: `${moduleNamespace}.structures`,
+                    typeName: nameGroup.structure,
+                }),
+            ]),
             select: NaslQueryExpression.QuerySelectExpression({
                 label: '查询组件Select子句',
                 distinct: false,
@@ -147,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: '',
@@ -166,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,
                     }),
                 ]),
@@ -185,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',
@@ -199,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,
@@ -15,8 +15,8 @@ import {
  */
 export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     return `<u-select clearable placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
-    text-field="${nameGroup.viewVariableEntity}.${property.name}"
-    value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true">
+    text-field="${nameGroup.lowerEntity}.${property.name}"
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true">
 </u-select>`;
 }
 
@@ -29,14 +29,14 @@ export function genSelectTemplate(property: EntityProperty, nameGroup: NameGroup
 export function genH5SelectTemplate(property: EntityProperty, nameGroup: NameGroup) {
     const label = property.label || property.name;
     return `<van-cascader title="请选择" placeholder="请选择" ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
-    text-field="${nameGroup.viewVariableEntity}.${property.name}"
-    value-field="${nameGroup.viewVariableEntity}.id" :pageable="true" :remote-paging="true"  v-model="${nameGroup.viewVariableEntity}.${property.name}" labelField="${label}">
+    text-field="${nameGroup.lowerEntity}.${property.name}"
+    value-field="${nameGroup.lowerEntity}.id" :pageable="true" :remote-paging="true" labelField="${label}">
 </van-cascader>`;
 }
 
 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,12 +85,13 @@ 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.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+    nameGroup.lowerEntity = utils.firstLowerCase(entity.name);
 
     const displayedProperty = getFirstDisplayedProperty(entity);
 
@@ -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,
     ];
@@ -115,16 +116,6 @@ export function genSelectBlock(entity: Entity, view: View) {
     "viewLogics": [
         ${JSON.stringify(genLoadSelectLogic(entity, nameGroup, newLogic))}
     ],
-    "viewVariables": [
-        {
-            "concept": "Variable",
-            "name": "${nameGroup.viewVariableEntity}",
-            "typeAnnotation":  ${JSON.stringify(NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
-    }))}
-        }
-    ],
     "logics": ${JSON.stringify(newLogics)},
     "structures": ${JSON.stringify(newStructures)}
 }