@lcap/nasl 3.2.0-beta.4 → 3.3.0-alpha

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -7,96 +7,100 @@ import * as utils from '../utils';
 import { App, Module, Namespace, Entity, View, Enum, DataSource, ViewElement, EntityProperty } from '../concepts';
 import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    filterProperty,
-    NameGroup,
-    genUniqueQueryNameGroup,
-    getFirstDisplayedProperty,
-    genCallComponentLogic,
-    genQueryLogic,
-    genEditTableTemplate,
-    genEditTableLoadLogic,
-    genTableRemoveLogic,
-    genEnumSelectBlock,
-    genLoadSelectLogic,
-    genBlurUpdateLogic,
-    genEditQueryStructure,
-    genLogicParam,
-    genReloadLogic,
-    genSubmitLogic,
+  filterProperty,
+  NameGroup,
+  genUniqueQueryNameGroup,
+  getFirstDisplayedProperty,
+  genCallComponentLogic,
+  genQueryLogic,
+  genEditTableTemplate,
+  genEditTableLoadLogic,
+  genTableRemoveLogic,
+  genEnumSelectBlock,
+  genLoadSelectLogic,
+  genBlurUpdateLogic,
+  genEditQueryStructure,
+  genLogicParam,
+  genReloadLogic,
+  genSubmitLogic,
 } from '.';
 
 function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const dataSource = entity.parentNode as DataSource;
-    const properties = entity.properties.filter(filterProperty('inFilter'));
+  const dataSource = entity.parentNode as DataSource;
+  const properties = entity.properties.filter(filterProperty('inFilter'));
 
-    return `
+  return `
 <u-linear-layout justify="space-between">
     <u-form layout="inline">
     ${properties
-        .map((property) => {
-            const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
-            const label = property.label || property.name;
-            let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
+      .map((property) => {
+        const vModel = `${nameGroup.viewVariableFilter}.${property.name}`;
+        const label = property.label || property.name;
+        let formItem = `<u-form-item layout="center"><template #label><u-text text="${label}"></u-text></template>`;
 
-            const { typeAnnotation } = property || {};
-            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
-            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
-            if (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 key = [property.name, relationEntity.name].join('-');
-                        const selectNameGroup = selectNameGroupMap.get(key);
-                        formItem += `
+        const { typeAnnotation } = property || {};
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const propertyTypeMaxLength: number =
+          Number(
+            property.rules
+              .find((item) => item.indexOf('max') > -1)
+              ?.split('(')[1]
+              .slice(0, -1)
+          ) || 0;
+        if (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 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}">
                         </u-select>
                     `;
-                    } else
-                        return '';
-                } else
-                    return '';
-            } else if (propertyTypeName === 'Boolean') {
-                formItem += `
+            } else return '';
+          } else return '';
+        } else if (propertyTypeName === 'Boolean') {
+          formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
                             <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') {
-                formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Double') {
-                formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Decimal') {
-                formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
-                formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
-            } else if (propertyTypeName === 'Date') {
-                formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
-            } else if (propertyTypeName === 'Time') {
-                formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
-            } else if (propertyTypeName === 'DateTime') {
-                formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
-            } else {
-                const namespaceArr = propertyTypeNamespace.split('.');
-                const type = namespaceArr.pop();
-                if (type === 'enums') {
-                    const Enum = dataSource.app.findNodeByCompleteName(propertyTypeNamespace + '.' + propertyTypeName) as Enum;
-                    formItem += genEnumSelectBlock(Enum, `${vModel}`, '', `请选择${label}`, true);
-                } else {
-                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
-                }
-            }
+        } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
+        } else if (propertyTypeName === 'Double') {
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+        } else if (propertyTypeName === 'Decimal') {
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
+          formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
+        } else if (propertyTypeName === 'Date') {
+          formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+        } else if (propertyTypeName === 'Time') {
+          formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
+        } else if (propertyTypeName === 'DateTime') {
+          formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+        } else {
+          const namespaceArr = propertyTypeNamespace.split('.');
+          const type = namespaceArr.pop();
+          if (type === 'enums') {
+            const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
+            formItem += genEnumSelectBlock(Enum, `${vModel}`, '', `请选择${label}`, true);
+          } else {
+            formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+          }
+        }
 
-            formItem += `</u-form-item>`;
-            return formItem;
-        })
-        .join('')}
+        formItem += `</u-form-item>`;
+        return formItem;
+      })
+      .join('')}
 
         <u-form-item layout="center" label-size="auto">
             <u-button color="primary" @click="${nameGroup.viewLogicReload}">查 询</u-button>
@@ -109,10 +113,10 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
 }
 
 function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const dataSource = entity.parentNode as DataSource;
-    const properties = entity.properties.filter(filterProperty('inForm'));
+  const dataSource = entity.parentNode as DataSource;
+  const properties = entity.properties.filter(filterProperty('inForm'));
 
-    return `
+  return `
     <u-modal ref="${nameGroup.viewElementSaveModal}">
         <template #title>
             <div>创建</div>
@@ -120,83 +124,86 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         <template #body>
             <u-form ref="${nameGroup.viewElementSaveModalForm}">
     ${properties
-        .map((property) => {
-            const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
-            const label = property.label || property.name;
-            const required = !!property.required;
-            const rules = [];
-            if (property.rules && property.rules.length) {
-                property.rules.forEach((rule) => rules.push(rule));
-            }
-            if (required)
-                rules.push('required');
-            const rulesStr = rules.join(' | ');
+      .map((property) => {
+        const vModel = `${nameGroup.viewVariableInput}.${property.name}`;
+        const label = property.label || property.name;
+        const required = !!property.required;
+        const rules = [];
+        if (property.rules && property.rules.length) {
+          property.rules.forEach((rule) => rules.push(rule));
+        }
+        if (required) rules.push('required');
+        const rulesStr = rules.join(' | ');
 
-            let formItem = `<u-form-item
+        let formItem = `<u-form-item
                                     ${required ? 'required' : ''}
                                     ${rulesStr.length ? `rules="${rulesStr}"` : ''}
                                     layout="center"
                                 ><template #label><u-text text="${label}"></u-text></template>`;
 
-            const { typeAnnotation } = property || {};
-            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
-            const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
-            if (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 key = [property.name, relationEntity.name].join('-');
-                        const selectNameGroup = selectNameGroupMap.get(key);
-                        formItem += `
+        const { typeAnnotation } = property || {};
+        const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
+        const propertyTypeMaxLength: number =
+          Number(
+            property.rules
+              .find((item) => item.indexOf('max') > -1)
+              ?.split('(')[1]
+              .slice(0, -1)
+          ) || 0;
+        if (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 key = [property.name, relationEntity.name].join('-');
+              const selectNameGroup = selectNameGroupMap.get(key);
+              formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.load}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
                         </u-select>
                     `;
-                    } else
-                        return '';
-                } else
-                    return '';
-            } else if (propertyTypeName === 'Boolean') {
-                formItem += `
+            } else return '';
+          } else return '';
+        } else if (propertyTypeName === 'Boolean') {
+          formItem += `
                         <u-select clearable 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>`;
-            } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-                formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Double') {
-                formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Decimal') {
-                formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
-                formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
-            } else if (propertyTypeName === 'Date') {
-                formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
-            } else if (propertyTypeName === 'Time') {
-                formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
-            } else if (propertyTypeName === 'DateTime') {
-                formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
-            } else {
-                const namespaceArr = propertyTypeNamespace.split('.');
-                const type = namespaceArr.pop();
-                if (type === 'enums') {
-                    const Enum = dataSource.app.findNodeByCompleteName(propertyTypeNamespace + '.' + propertyTypeName) as Enum;
-                    formItem += genEnumSelectBlock(Enum, `${vModel}`, '', `请选择${label}`, true);
-                } else {
-                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
-                }
-            }
+        } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
+          formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
+        } else if (propertyTypeName === 'Double') {
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+        } else if (propertyTypeName === 'Decimal') {
+          formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
+        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
+          formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
+        } else if (propertyTypeName === 'Date') {
+          formItem += `<u-date-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-picker>`;
+        } else if (propertyTypeName === 'Time') {
+          formItem += `<u-time-picker :value.sync="${vModel}" placeholder="请输入${label}"></u-time-picker>`;
+        } else if (propertyTypeName === 'DateTime') {
+          formItem += `<u-date-time-picker clearable :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
+        } else {
+          const namespaceArr = propertyTypeNamespace.split('.');
+          const type = namespaceArr.pop();
+          if (type === 'enums') {
+            const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
+            formItem += genEnumSelectBlock(Enum, `${vModel}`, '', `请选择${label}`, true);
+          } else {
+            formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+          }
+        }
 
-            formItem += `</u-form-item>\n`;
+        formItem += `</u-form-item>\n`;
 
-            return formItem;
-        })
-        .join('')}
+        return formItem;
+      })
+      .join('')}
             </u-form>
         </template>
         <template #foot>
@@ -208,114 +215,114 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
 }
 
 function genInitLogic(nameGroup: NameGroup) {
-    return NaslNode.Logic({
-        name: nameGroup.viewLogicInit,
-        description: '',
-        params: [] as Array<any>,
-        returns: [] as Array<any>,
-        variables: [] as Array<any>,
-        body: [
-            NaslLogicItem.Start,
-            NaslLogicItem.CallFunction({
-                calleeName: 'Clear',
-                arguments: [
-                    NaslLogicItem.Argument({
-                        keyword: 'struct',
-                        expression: NaslLogicItem.Identifier({
-                            name: nameGroup.viewVariableFilter,
-                        }),
-                    }),
-                ],
+  return NaslNode.Logic({
+    name: nameGroup.viewLogicInit,
+    description: '',
+    params: [] as Array<any>,
+    returns: [] as Array<any>,
+    variables: [] as Array<any>,
+    body: [
+      NaslLogicItem.Start,
+      NaslLogicItem.CallFunction({
+        calleeName: 'Clear',
+        arguments: [
+          NaslLogicItem.Argument({
+            keyword: 'struct',
+            expression: NaslLogicItem.Identifier({
+              name: nameGroup.viewVariableFilter,
             }),
-            NaslLogicItem.End,
+          }),
         ],
-        playground: [] as Array<any>,
-    });
+      }),
+      NaslLogicItem.End,
+    ],
+    playground: [] as Array<any>,
+  });
 }
 
 function genCreateLogic(nameGroup: NameGroup) {
-    return NaslNode.Logic({
-        name: nameGroup.viewLogicCreate,
-        description: '',
-        params: [] as Array<any>,
-        returns: [] as Array<any>,
-        variables: [] as Array<any>,
-        body: [
-            NaslLogicItem.Start,
-            NaslLogicItem.Assignment({
-                left: NaslLogicItem.Identifier({
-                    name: nameGroup.viewVariableInput,
-                }),
-                right: NaslLogicItem.CallFunction({
-                    calleeName: 'Clone',
-                    arguments: [
-                        NaslLogicItem.Argument({
-                            keyword: 'obj',
-                            expression: NaslLogicItem.Identifier({
-                                name: nameGroup.viewVariableEntity,
-                            }),
-                        }),
-                    ],
-                }),
+  return NaslNode.Logic({
+    name: nameGroup.viewLogicCreate,
+    description: '',
+    params: [] as Array<any>,
+    returns: [] as Array<any>,
+    variables: [] as Array<any>,
+    body: [
+      NaslLogicItem.Start,
+      NaslLogicItem.Assignment({
+        left: NaslLogicItem.Identifier({
+          name: nameGroup.viewVariableInput,
+        }),
+        right: NaslLogicItem.CallFunction({
+          calleeName: 'Clone',
+          arguments: [
+            NaslLogicItem.Argument({
+              keyword: 'obj',
+              expression: NaslLogicItem.Identifier({
+                name: nameGroup.viewVariableEntity,
+              }),
             }),
-            genCallComponentLogic(nameGroup.viewElementSaveModal, 'open'),
-            NaslLogicItem.End,
-        ],
-        playground: [] as Array<any>,
-    });
+          ],
+        }),
+      }),
+      genCallComponentLogic(nameGroup.viewElementSaveModal, 'open'),
+      NaslLogicItem.End,
+    ],
+    playground: [] as Array<any>,
+  });
 }
 
 export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
-    const view = oldNode.view;
-    const dataSource = entity.parentNode as DataSource;
-    const module = dataSource.app;
+  const { view } = oldNode;
+  const dataSource = entity.parentNode as DataSource;
+  const module = dataSource.app;
 
-    const viewElementMainView = view.getViewElementUniqueName('tableView');
-    const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
-    nameGroup.viewElementMainView = viewElementMainView;
-    nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
-    nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
-    nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
-    nameGroup.viewLogicInit = view.getLogicUniqueName('init');
-    nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
-    nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
-    nameGroup.viewLogicBlurUpdate = view.getLogicUniqueName('blurUpdate');
-    nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
-    nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
-    nameGroup.viewVariableInput = view.getVariableUniqueName('input');
-    nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
+  const viewElementMainView = view.getViewElementUniqueName('tableView');
+  const nameGroup = genUniqueQueryNameGroup(module, view, viewElementMainView);
+  nameGroup.viewElementMainView = viewElementMainView;
+  nameGroup.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
+  nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
+  nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
+  nameGroup.viewLogicInit = view.getLogicUniqueName('init');
+  nameGroup.viewLogicCreate = view.getLogicUniqueName('create');
+  nameGroup.viewLogicSubmit = view.getLogicUniqueName('submit');
+  nameGroup.viewLogicBlurUpdate = view.getLogicUniqueName('blurUpdate');
+  nameGroup.viewLogicReload = view.getLogicUniqueName('reload');
+  nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
+  nameGroup.viewVariableInput = view.getVariableUniqueName('input');
+  nameGroup.viewVariableFilter = view.getVariableUniqueName('filter');
 
-    // 收集所有和本实体关联的实体
-    const entitySet: Set<Entity> = new Set();
-    entitySet.add(entity);
-    const selectNameGroupMap: Map<string, NameGroup> = new Map();
-    const newLogics: any[] = [];
-    const newLoadSelectLogics: any[] = [];
-    entity.properties.forEach((property) => {
-        // 有外键关联
-        if (property.relationEntity) {
-            const relationEntity = dataSource?.findEntityByName(property.relationEntity);
-            if (relationEntity) {
-                const displayedProperty = getFirstDisplayedProperty(relationEntity);
-                if (displayedProperty) {
-                    entitySet.add(relationEntity);
-                    const viewElementSelect = view.getViewElementUniqueName('select');
-                    const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
-                    selectNameGroup.viewElementSelect = viewElementSelect;
-                    // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
-                    const key = [property.name, relationEntity.name].join('-');
-                    selectNameGroupMap.set(key, selectNameGroup);
-                    const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
-                    newLogics.push(newLogic);
-                    newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
-                }
-            }
+  // 收集所有和本实体关联的实体
+  const entitySet: Set<Entity> = new Set();
+  entitySet.add(entity);
+  const selectNameGroupMap: Map<string, NameGroup> = new Map();
+  const newLogics: any[] = [];
+  const newLoadSelectLogics: any[] = [];
+  entity.properties.forEach((property) => {
+    // 有外键关联
+    if (property.relationEntity) {
+      const relationEntity = dataSource?.findEntityByName(property.relationEntity);
+      if (relationEntity) {
+        const displayedProperty = getFirstDisplayedProperty(relationEntity);
+        if (displayedProperty) {
+          entitySet.add(relationEntity);
+          const viewElementSelect = view.getViewElementUniqueName('select');
+          const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
+          selectNameGroup.viewElementSelect = viewElementSelect;
+          // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
+          const key = [property.name, relationEntity.name].join('-');
+          selectNameGroupMap.set(key, selectNameGroup);
+          const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
+          newLogics.push(newLogic);
+          newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
         }
-    });
-    const allEntities = [...entitySet];
-    const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
-    newLogics.push(entityLogic);
-    return `<template>
+      }
+    }
+  });
+  const allEntities = [...entitySet];
+  const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
+  newLogics.push(entityLogic);
+  return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
         ${genEditTableTemplate(entity, nameGroup, selectNameGroupMap)}
@@ -329,26 +336,32 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableEntity}",
-            "typeAnnotation": ${JSON.stringify(NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
-    }))}
+            "typeAnnotation": ${JSON.stringify(
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableInput}",
-            "typeAnnotation": ${JSON.stringify(NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
-    }))}
+            "typeAnnotation": ${JSON.stringify(
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         },
         {
             "concept": "Variable",
             "name": "${nameGroup.viewVariableFilter}",
-            "typeAnnotation": ${JSON.stringify(NaslTypeAnnotation.Reference({
-        typeNamespace: entity.getNamespace(),
-        typeName: entity.name,
-    }))}
+            "typeAnnotation": ${JSON.stringify(
+              NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+              })
+            )}
         }
     ],
     "viewLogics": [
@@ -359,7 +372,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         ${JSON.stringify(genSubmitLogic(entity, nameGroup))},
         ${JSON.stringify(genBlurUpdateLogic(entity, nameGroup))},
         ${JSON.stringify(genReloadLogic(nameGroup))}
-        ${newLoadSelectLogics.map((logic) => ',' + JSON.stringify(logic)).join('\n')}
+        ${newLoadSelectLogics.map((logic) => `,${JSON.stringify(logic)}`).join('\n')}
     ],
     "viewBindEvents": [
         {
@@ -381,108 +394,111 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
  * 根据实体属性生成表格列模板
  * @param property 实体属性
  */
-export function genEditTableColumnComponent(app:App, entity: Entity, property: EntityProperty, view: View, nameGroup: NameGroup) {
-    const dataSource = entity.parentNode as DataSource;
-    const valueExpression = `${nameGroup.valuePrefixExpression}.${property.name}`;
-    const module = app;
+export function genEditTableColumnComponent(app: App, entity: Entity, property: EntityProperty, view: View, nameGroup: NameGroup) {
+  const dataSource = entity.parentNode as DataSource;
+  const valueExpression = `${nameGroup.valuePrefixExpression}.${property.name}`;
+  const module = app;
 
-    const newLogics: any[] = [];
-    const newLoadSelectLogics: any[] = [];
+  const newLogics: any[] = [];
+  const newLoadSelectLogics: any[] = [];
 
-    const genEditComponent = (property: EntityProperty) => {
-        const label = property.label || property.name;
-        let formItem = '';
+  const genEditComponent = (property: EntityProperty) => {
+    const label = property.label || property.name;
+    let formItem = '';
 
-        const propertyTypeName = property.typeAnnotation.typeName;
-        const propertyTypeNamespace = property.typeAnnotation.typeNamespace;
-        const propertyTypeMaxLength:number = Number(property.rules.find((item) => item.indexOf('max') > -1)?.split('(')[1].slice(0, -1)) || 0;
-        if (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 = {
-                        viewLogicLoad: nameGroup.viewElementSelectLogic,
-                        viewElementSelect: '',
-                    };
-                    if (!nameGroup.viewElementSelectLogic) {
-                        const viewElementSelect = view.getViewElementUniqueName('select');
-                        const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
-                        selectNameGroup.viewElementSelect = viewElementSelect;
-                        const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
-                        newLogics.push(newLogic);
-                        newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
-                    }
-                    formItem += `
+    const propertyTypeName = property.typeAnnotation.typeName;
+    const propertyTypeNamespace = property.typeAnnotation.typeNamespace;
+    const propertyTypeMaxLength: number =
+      Number(
+        property.rules
+          .find((item) => item.indexOf('max') > -1)
+          ?.split('(')[1]
+          .slice(0, -1)
+      ) || 0;
+    if (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 = {
+            viewLogicLoad: nameGroup.viewElementSelectLogic,
+            viewElementSelect: '',
+          };
+          if (!nameGroup.viewElementSelectLogic) {
+            const viewElementSelect = view.getViewElementUniqueName('select');
+            const selectNameGroup = genUniqueQueryNameGroup(module, view, viewElementSelect, false, relationEntity.name);
+            selectNameGroup.viewElementSelect = viewElementSelect;
+            const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
+            newLogics.push(newLogic);
+            newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
+          }
+          formItem += `
                         <u-select clearable placeholder="请选择${label}" :data-source="${selectNameGroup.viewLogicLoad}"
                             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" :value.sync="${valueExpression}">
                         </u-select>
                     `;
-                } else
-                    return '';
-            } else
-                return '';
-        } else if (propertyTypeName === 'Boolean') {
-            formItem += `<u-select clearable :value.sync="${valueExpression}" placeholder="请输入${label}"
+        } else return '';
+      } else return '';
+    } else if (propertyTypeName === 'Boolean') {
+      formItem += `<u-select clearable :value.sync="${valueExpression}" placeholder="请输入${label}"
             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 <u-select-item :value="true" text="是">是</u-select-item>
                 <u-select-item :value="false" text="否">否</u-select-item>
             </u-select>`;
-        } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
-            formItem = `<u-number-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'Double') {
-            formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'Decimal') {
-            formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
-            formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
+    } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
+      formItem = `<u-number-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+    } else if (propertyTypeName === 'Double') {
+      formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+    } else if (propertyTypeName === 'Decimal') {
+      formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
+    } else if (propertyTypeName === 'String' && propertyTypeMaxLength > 256) {
+      formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
             <u-textarea :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-textarea>
             </u-validator>`;
-        } else if (propertyTypeName === 'Date') {
-            formItem = `<u-date-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-picker>`;
-        } else if (propertyTypeName === 'Time') {
-            formItem = `<u-time-picker :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-time-picker>`;
-        } else if (propertyTypeName === 'DateTime') {
-            formItem = `<u-date-time-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
-        } else {
-            const namespaceArr = propertyTypeNamespace && propertyTypeNamespace.split('.') || [];
-            const type = namespaceArr.pop();
-            if (type === 'enums') {
-                const enumeration = app.findNodeByCompleteName(propertyTypeNamespace + '.' + propertyTypeName) as Enum;
-                const namespace = enumeration?.getNamespace() || '';
-                const name = enumeration?.name || '';
-                const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
-                formItem += `<u-select clearable
+    } else if (propertyTypeName === 'Date') {
+      formItem = `<u-date-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-picker>`;
+    } else if (propertyTypeName === 'Time') {
+      formItem = `<u-time-picker :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-time-picker>`;
+    } else if (propertyTypeName === 'DateTime') {
+      formItem = `<u-date-time-picker clearable :value.sync="${valueExpression}" placeholder="请输入${label}" append-to="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
+    } else {
+      const namespaceArr = (propertyTypeNamespace && propertyTypeNamespace.split('.')) || [];
+      const type = namespaceArr.pop();
+      if (type === 'enums') {
+        const enumeration = app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
+        const namespace = enumeration?.getNamespace() || '';
+        const name = enumeration?.name || '';
+        const enumTypeAnnotationStr = `__enumTypeAnnotation_${namespace}.${name}`;
+        formItem += `<u-select clearable
                 :data-source="$utils.EnumToList('${enumTypeAnnotationStr}')"
                 :value.sync="${valueExpression}" placeholder="请输入${label}"
                 :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
                 </u-select>`;
-            } else {
-                formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%" append-to="body">
+      } else {
+        formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%" append-to="body">
                     <u-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-input>
                 </u-validator>`;
-            }
-        }
-        return `<template #editcell="current">
+      }
+    }
+    return `<template #editcell="current">
             <u-linear-layout gap="small">
                 ${formItem}
             </u-linear-layout>
         </template>`;
-    };
+  };
 
-    return `<template>${genEditComponent(property)}</template>
+  return `<template>${genEditComponent(property)}</template>
 <definition>
 {
     "viewLogics": [
         ${JSON.stringify(genBlurUpdateLogic(entity, nameGroup))}
-        ${newLoadSelectLogics.map((logic) => ',' + JSON.stringify(logic)).join('\n')}
+        ${newLoadSelectLogics.map((logic) => `,${JSON.stringify(logic)}`).join('\n')}
     ],
     "logics": ${JSON.stringify(newLogics)}
 }
 </definition>`;
 }
-