@lcap/nasl 2.12.0-beta → 2.12.0-beta.1

package/src/templator/genQueryComponent.ts

@@ -73,28 +73,26 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
         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: [],
             });
         }),
@@ -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',

package/src/templator/genTableBlock.ts

@@ -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') {
@@ -202,7 +206,8 @@ export function genTableBlock(entity: Entity, view: View) {
     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) => {
@@ -212,10 +217,11 @@ export function genTableBlock(entity: Entity, view: View) {
             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, module);
@@ -251,7 +257,8 @@ export function genTableColumnBlock(property: EntityProperty, view: View) {
     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];
@@ -262,11 +269,11 @@ export function genTableColumnBlock(property: EntityProperty, view: View) {
             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, module);

package/src/templator/genUpdateBlock.ts

@@ -46,7 +46,9 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                     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}">
@@ -121,40 +123,42 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                     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(module.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>`;
                 }
             }
 
@@ -282,7 +286,9 @@ export function genUpdateBlock(entity: Entity, view: View) {
                     const viewElementSelect = view.getViewElementUniqueName('select');
                     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, module);
                     newStructures.push(newStructure);

package/src/utils/index.ts

@@ -37,6 +37,25 @@ export function findConceptKeyWordIndexFromNamespace(namespace: string, keyword:
     });
 }
 
+// 从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;
 }