@lcap/nasl 1.0.2 → 2.12.0

package/src/service/creator/errHandles.js

@@ -26,6 +26,12 @@ export default {
         if (config.noErrorTip)
             return;
 
+        // 检测到当前应用拉取操作已被强制结束
+        if(err.code === 401650) {
+            eventBus.emit('forceCancelPull');
+            return;
+        }
+
         if (versionStatus[err.code])
             eventBus.emit('updateVersionStatus', {
                 status: versionStatus[err.code],

package/src/service/storage/init.ts

@@ -26,10 +26,10 @@ function getLogic(key: string, app: any, diffLogicList: string[]) {
             const _path = _pathArr[3];
             const _list = app.dependencies;
             const _module = _list.find((it: Module) => {
-                const name = it.name.replace('-', '_');
+                const name = it.name.replaceAll('-', '_');
                 return name === _name;
             });
-            const logic = _module.logics.find((item: Logic) => item.name === _path);
+            const logic = _module?.logics?.find((item: Logic) => item.name === _path);
             if (logic && logic.body && logic.body.length > 2) {
                 logic.body.map((item: any) => getStatement(item, app, diffLogicList));
             }
@@ -50,7 +50,7 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
             logicItems = [...state.body, state.each, state.start, state.end];
             break;
         case 'SwitchStatement':
-            logicItems = state.cases.map(getStatement);
+            logicItems = state.cases.map(getStatement).flat(1);
             break;
         case 'SwitchCase':
             logicItems = [state.test, ...state.consequent];
@@ -97,104 +97,110 @@ async function doAction(app: any, actionItem: any) {
             }
         }
     };
-    if (Array.isArray(list)) {
-        list.forEach((event) => {
-            const emitTarget = event?.originEvent?.target;
-            const _path: string = event.originEvent.path;
-            const _root = _path.split('.')?.[1] || '';
-            if (
-                ['entities', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
-                    _root.startsWith(item))
-            ) {
-                hasBackEnd = true;
-            }
-            const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
-                const _l = getStatement(_i, app, diffArr);
-                if (_l.length) {
-                    _l.map((_ii: LogicItem) => itemloop(_ii, app, diffArr));
-                }
-            };
-            if (emitTarget.concept === 'Logic') {
-                const diffArr: string[] = [];
-                if (emitTarget.body.length > 2) {
-                    emitTarget.body.forEach((it: LogicItem) => {
-                        itemloop(it, app, diffArr);
-                    });
-                }
-                const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
-                if (result.length) {
+    try {
+        if (Array.isArray(list)) {
+            list.forEach((event) => {
+                const emitTarget = event?.originEvent?.target;
+                const _path: string = event.originEvent.path;
+                const _root = _path.split('.')?.[1] || '';
+                if (
+                    ['dataSources', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
+                        _root.startsWith(item))
+                ) {
                     hasBackEnd = true;
                 }
-            }
-            if (emitTarget.view) {
-                hasFrontEnd = true;
-            }
-            if (emitTarget.concept === 'View') {
-                const isDelete = event?.originEvent?.action === 'delete';
-                const isUpdateAuth = event?.originEvent?.action === 'update' && event?.originEvent?.object && 'auth' in event?.originEvent?.object;
-                if (isDelete || isUpdateAuth) {
-                    const app = emitTarget.app;
+                const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
+                    const _l = getStatement(_i, app, diffArr);
+                    if (_l.length) {
+                        _l.map((_ii: LogicItem) => itemloop(_ii, app, diffArr));
+                    }
+                };
+                if (emitTarget.concept === 'Logic') {
                     const diffArr: string[] = [];
-                    emitTarget.logics.forEach((logic: Logic) => {
-                        if (logic.body.length > 2) {
-                            logic.body.forEach((it: LogicItem) => {
-                                itemloop(it, app, diffArr);
-                            });
-                        }
-                    });
+                    if (emitTarget.body.length > 2) {
+                        emitTarget.body.forEach((it: LogicItem) => {
+                            itemloop(it, app, diffArr);
+                        });
+                    }
                     const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
                     if (result.length) {
                         hasBackEnd = true;
                     }
-                    emitTarget.children.forEach((item: View | ViewElement) => loopEle(item, isDelete));
-                    emitTarget.elements.forEach((item: View | ViewElement) => loopEle(item, isDelete));
                 }
-                hasFrontEnd = true;
-            }
-            if (emitTarget.concept === 'ViewElement') {
-                loopEle(emitTarget, true);
-            }
-            if (emitTarget.concept === 'BindAttribute' && emitTarget.name === 'url' && emitTarget.value.endsWith('/import')) {
-                if (!emitTarget.view.parentAuth) {
-                    hasBackEnd = true;
-                }
-            }
-            if (emitTarget.concept === 'CallLogic') {
-                const arrlist: string[] = [];
-                getLogic(emitTarget.calleeKey, emitTarget.app, arrlist);
-                const result = arrlist.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
-                // console.log(result, 'CallLogic');
-                if (result.length) {
-                    hasBackEnd = true;
+                if (emitTarget.view) {
+                    hasFrontEnd = true;
                 }
-            }
-            event.eventList.forEach(({ action, path, object: objItem }: { action: string; path: string; object: any }) => {
-                if (Array.isArray(objItem)) {
-                    if (action === 'update') {
-                        actionList.push({
-                            action,
-                            path,
-                            node: objItem[0],
+                if (emitTarget.concept === 'View') {
+                    const isDelete = event?.originEvent?.action === 'delete';
+                    const isUpdateAuth = event?.originEvent?.action === 'update' && event?.originEvent?.object && 'auth' in event?.originEvent?.object;
+                    if (isDelete || isUpdateAuth) {
+                        const app = emitTarget.app;
+                        const diffArr: string[] = [];
+                        emitTarget.logics.forEach((logic: Logic) => {
+                            if (logic.body.length > 2) {
+                                logic.body.forEach((it: LogicItem) => {
+                                    itemloop(it, app, diffArr);
+                                });
+                            }
                         });
-                    } else {
-                        objItem.forEach((item, index) => {
+                        const result = diffArr.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                        if (result.length) {
+                            hasBackEnd = true;
+                        }
+                        emitTarget.children.forEach((item: View | ViewElement) => loopEle(item, isDelete));
+                        emitTarget.elements.forEach((item: View | ViewElement) => loopEle(item, isDelete));
+                    }
+                    hasFrontEnd = true;
+                }
+                if (emitTarget.concept === 'ViewElement') {
+                    loopEle(emitTarget, true);
+                }
+                if (emitTarget.concept === 'BindAttribute' && emitTarget.name === 'url' && emitTarget.value.endsWith('/import')) {
+                    if (!emitTarget.view.parentAuth) {
+                        hasBackEnd = true;
+                    }
+                }
+                if (emitTarget.concept === 'CallLogic') {
+                    const arrlist: string[] = [];
+                    getLogic(emitTarget.calleeKey, emitTarget.app, arrlist);
+                    const result = arrlist.filter((item) => item.startsWith('app') || item.startsWith('extensions'));
+                    // console.log(result, 'CallLogic');
+                    if (result.length) {
+                        hasBackEnd = true;
+                    }
+                }
+                event.eventList.forEach(({ action, path, object: objItem }: { action: string; path: string; object: any }) => {
+                    if (Array.isArray(objItem)) {
+                        if (action === 'update') {
                             actionList.push({
                                 action,
                                 path,
-                                node: item,
+                                node: objItem[0],
                             });
+                        } else {
+                            objItem.forEach((item, index) => {
+                                actionList.push({
+                                    action,
+                                    path,
+                                    node: item,
+                                });
+                            });
+                        }
+                    } else {
+                        actionList.push({
+                            action,
+                            path,
+                            object: objItem,
                         });
                     }
-                } else {
-                    actionList.push({
-                        action,
-                        path,
-                        object: objItem,
-                    });
-                }
+                });
             });
-        });
+        }
+    } catch (error) {
+        console.log(error);
+        app.emit('refresh');
     }
+
     let ChangedNASLType = '';
     if (hasFrontEnd && hasBackEnd) {
         ChangedNASLType = 'both';
@@ -213,11 +219,15 @@ async function doAction(app: any, actionItem: any) {
                     ChangedNASLType,
                     'request-appBaseVersion': (window as any).appData?.baseVersion || '',
                     'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                    operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
                 },
             });
         } catch (error) {
             err = error;
-            app.emit('refresh');
+
+            // 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
+            if (error?.code !== 401650)
+                app.emit('refresh');
         }
     } else if (config.storage.protocol === 'mock') {
         // Do nothing
@@ -250,7 +260,7 @@ async function doAction(app: any, actionItem: any) {
     }
 }
 
-function handleApp(app: any) {
+export function handleApp(app: any) {
     app._isCollectingCount = 0;
     app._collectingList = [];
     app._historyList = [];
@@ -379,6 +389,7 @@ export async function loadApp(appId?: string) {
                 appId,
                 'request-appBaseVersion': (window as any).appData?.baseVersion || '',
                 'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                operateArea: (window as any).appData?.branchStatus === 'merging' ? 'merge_conflict' : '',
             },
         });
         // const data = res?.data?.result;
@@ -392,7 +403,7 @@ export async function loadApp(appId?: string) {
             scope: 'pc',
             envs: 'dev,online',
             hasAuth: true,
-            entities: [],
+            dataSources: [],
             structures: [],
             enums: [],
             logics: [],

package/src/templator/genCreateBlock.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 { NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
     NameGroup,
@@ -16,7 +16,8 @@ import {
 } from '.';
 
 export function genCreateFormTemplate(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 genCreateFormTemplate(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 genCreateFormTemplate(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>`;
                 }
@@ -89,7 +92,8 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 }
 
 export function genH5CreateFormTemplate(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}">
@@ -106,53 +110,55 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 rules.push('required');
             const rulesStr = rules.join(' | ');
 
-            let formItem = `            <van-field drole="other" label="${property.label || property.name}"${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="请输入${property.label || property.name}"></van-stepper></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${property.label || property.name}" :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="请输入${property.label || property.name}"></van-stepper></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-stepper-new v-model="${vModel}" placeholder="请输入${property.label || property.name}" :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="请输入${property.label || property.name}"></van-fieldtextarea></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldtextarea v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-fieldtextarea></van-linear-layout></template>`;
             } else if (propertyTypeName === 'Date') {
-                formItem += `<template #input><van-calendar :default-date.sync="${vModel}" title="选择日期"></van-calendar></template>`;
+                formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-calendar :default-date.sync="${vModel}" title="选择日期" 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="请选择${property.label || property.name}" 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="请选择${property.label || property.name}" 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="请选择${property.label || property.name}" 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="请选择${property.label || property.name}" 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="请输入${property.label || property.name}"></van-fieldinput></template>`;
+                    formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-fieldinput v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-fieldinput></van-linear-layout></template>`;
                 }
             }
-
+            formItem += `<template #title><van-text text="${property.label || property.name}"><van-text></template>`;
             formItem += `            </van-field>\n`;
 
             formItem = formItem.replace(/>\n<van-input|<\/van-input>/g, '');
@@ -227,7 +233,8 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
  * @param resolver 实体创建 Action
  */
 export function genCreateBlock(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 createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
@@ -244,16 +251,18 @@ export function genCreateBlock(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/genCurdEditMultipleKeyBlock.ts

@@ -4,7 +4,7 @@
  * 3. 先简单做后续在看如何优化
  */
 import * as utils from '../utils';
-import { App, Namespace, Entity, View, Enum } from '../concepts';
+import { App, Module, Namespace, Entity, View, Enum, DataSource } from '../concepts';
 import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
     filterProperty,
@@ -25,7 +25,8 @@ import {
 } from '.';
 
 function genFilterTemplate(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('inFilter'));
 
     return `
@@ -41,13 +42,15 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             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}">
@@ -80,7 +83,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                 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>`;
                 }
@@ -102,7 +105,8 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
 }
 
 function genSaveModalTemplate(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 `
@@ -136,13 +140,15 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             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.load}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}" :pageable="true" :remote-paging="true" v-model="${vModel}">
@@ -174,7 +180,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 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>`;
                 }
@@ -332,10 +338,11 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
 }
 
 export function genCurdEditMultipleKeyBlock(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.viewElementSaveModal = view.getViewElementUniqueName('saveModal');
     nameGroup.viewElementSaveModalForm = view.getViewElementUniqueName('saveModalForm');
@@ -350,7 +357,8 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
     nameGroup.viewVariableIsUpdate = view.getVariableUniqueName('isUpdate');
 
     // 收集所有和本实体关联的实体
-    const allEntities = [entity];
+    const entitySet: Set<Entity> = new Set();
+    entitySet.add(entity);
     const selectNameGroupMap: Map<string, NameGroup> = new Map();
     const newStructures: any[] = [];
     const newLogics: any[] = [];
@@ -358,17 +366,19 @@ export function genCurdEditMultipleKeyBlock(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) {
-                    allEntities.push(relationEntity);
+                    entitySet.add(relationEntity);
                     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));
@@ -376,13 +386,11 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
             }
         }
     });
+    const allEntities = [...entitySet];
     const entityStructure = genEditQueryStructure(allEntities, nameGroup);
     newStructures.push(entityStructure);
-    const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, parentNode);
+    const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
     newLogics.push(entityLogic);
-
-    // console.log(entityStructure);
-
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}