@lcap/nasl 1.0.2 → 2.12.0-beta

package/src/server/naslServer.ts

@@ -44,6 +44,7 @@ import {
     Namespace,
     Theme,
     Variable,
+    DataSource,
     Assignee,
 } from '../concepts';
 import { lsp2tspNumber, SourceMap, SourceMapItem, embeddedTSEmitter } from '../translator';
@@ -142,17 +143,30 @@ const naslServer = {
                 console.log(err);
             }
         });
-        module.entities.forEach((entity) => {
+        (module as App).dataSources?.forEach((dataSource) => {
+            // 本身dataSource也要生成一个文件用于改名
             try {
-                const result = entity.toEmbeddedTSFile();
+                const result = dataSource.toEmbeddedTSFile();
                 results.push(result);
                 // sourceMap都存在目录级别内容下，在页面层级下去找
-                entity.sourceMap = result.sourceMap;
-                this.file2NodeMap.set(result.filePath, entity);
+                dataSource.sourceMap = result.sourceMap;
+                this.file2NodeMap.set(result.filePath, dataSource);
             } catch (err) {
                 console.log(err);
             }
+            dataSource.entities.forEach((entity) => {
+                try {
+                    const result = entity.toEmbeddedTSFile();
+                    results.push(result);
+                    // sourceMap都存在目录级别内容下，在页面层级下去找
+                    entity.sourceMap = result.sourceMap;
+                    this.file2NodeMap.set(result.filePath, entity);
+                } catch (err) {
+                    console.log(err);
+                }
+            });
         });
+
         module.interfaces.forEach((_interface) => {
             try {
                 const result = _interface.toEmbeddedTSFile();
@@ -529,6 +543,32 @@ const naslServer = {
                 }
             }, { node: { children: fileNode.elements } as ViewElement });
         }
+        if (fileNode instanceof DataSource) {
+            const dataSourceGroup = (fileNode.rootNode as App).configuration?.getGroup('dataSource');
+            if (dataSourceGroup) {
+                const property = dataSourceGroup.getProperty(fileNode.name);
+                if (property && property.values) {
+                    property.values.forEach((propertyValue) => {
+                        if (!propertyValue.value) {
+                            const diagnostic = {
+                                node: fileNode,
+                                severity: 'error',
+                                message: `数据源配置：数据源${property.name}${propertyValue.env === 'dev' ? '开发环境' : '生产环境'}未配置数据信息`,
+                                // 保留原来的内容方便查询一些问题
+                                originalDiagnostic: {
+                                    fileName: '',
+                                    start: <any>null,
+                                    end: <any>null,
+                                    category: 'error',
+                                    text: `Data Source is not config`,
+                                },
+                            };
+                            diagnostics.push(diagnostic);
+                        }
+                    });
+                }
+            }
+        }
 
         return diagnostics;
     },
@@ -625,6 +665,33 @@ const naslServer = {
             }
         }
 
+        // 如果是DataSource就需要在单独，查一边来修改名字
+        if (node instanceof DataSource) {
+            // 过滤一把不需要改的信息
+            refsList = refsList.filter((item) => {
+                const dataSourceFile = (fileNode as FileNode).getEmbeddedFilePath();
+                const entityFilePrefix = dataSourceFile.replace('.ts', '');
+                /**
+                 * 特殊处理,因为关联属性或者关联实体等等都是在实体里,在实体中因为自己不可以是自己的类型
+                 * 所以全部过滤掉了,
+                 * 但是在datasource里面在实体里会有大量的引用,不需要全部修改.只需要处理除了8个函数之外的引用
+                 * 所以底部内容是8个函数,所以这里就 用entity的行数 减去8个函数的行数,然后其余的在进行处理
+                 * 进行过滤
+                 */
+                // 不要数据源下面的实体里的引用 ,保留原始的节点内容
+                let flag = false;
+                if (item.file.includes(entityFilePrefix)) {
+                    const entity = this.file2NodeMap.get(item.file);
+                    const { currentSource } = naslServer.getCurrentSource(entity);
+                    // 32 8个函数的总行数
+                    if (item.end.line < (currentSource.range.end.line - 32) && item.start.line > 1) {
+                        flag = true;
+                    }
+                }
+                // 属于实体而且需要修改和查到  ||  不是实体前缀的 || 他本身
+                return flag || !item.file.includes(entityFilePrefix) || dataSourceFile === item.file;
+            });
+        }
         // 如果是entity就需要在单独，查一边来修改名字
         if (node instanceof Entity) {
             // 过滤一把不需要改的信息
@@ -983,6 +1050,40 @@ const naslServer = {
                     if (minRange.node instanceof QueryFieldExpression && node instanceof Entity) {
                         minRange.setTypeMethods = 'setEntityAsName';
                     }
+                    // 如果修改的是dataSource字段
+                    if (node instanceof DataSource) {
+                        const setTypeNamespace = (typeNamespace: string, record: any) => {
+                            // 先看下标位置
+                            const lineText = record.lineText;
+                            const index = lineText.indexOf(typeNamespace);
+                            // 在把开始结束位置的-开始位置，来知道是哪里要替换
+                            const start = record.start.offset - index - 1;
+                            const end = record.end.offset - index - 1;
+                            // 新的完整的value
+                            const newTextValue = typeNamespace.substring(0, start) + newValue + typeNamespace.substring(end, typeNamespace.length);
+                            minRange.newValue = newTextValue;
+                            return newTextValue;
+                        };
+                        if (minRange.node instanceof TypeAnnotation) {
+                            minRange.setTypeMethods = 'setTypeNamespace';
+                            const newValue = setTypeNamespace(minRange.node.typeNamespace, record);
+                            minRange.newValue = newValue;
+                        } else if (minRange.node instanceof QueryFromExpression || minRange.node instanceof QueryJoinExpression) {
+                            minRange.setTypeMethods = 'setEntityNamespace';
+                            const newValue = setTypeNamespace(minRange.node.entityNamespace, record);
+                            minRange.newValue = newValue;
+                        } else if (minRange.node instanceof QueryFieldExpression) {
+                            return null;
+                        } else if (minRange.node instanceof CallLogic) {
+                            minRange.setTypeMethods = 'setCalleeNamespace';
+                            const newValue = setTypeNamespace(minRange.node.calleeNamespace, record);
+                            minRange.newValue = newValue;
+                        } else if (minRange.node instanceof EntityProperty) {
+                            minRange.setTypeMethods = 'setRelationNamespace';
+                            const newValue = setTypeNamespace(minRange.node.relationNamespace, record);
+                            minRange.newValue = newValue;
+                        }
+                    }
                     if (minRange.node instanceof QueryGroupByExpression && node instanceof Entity) {
                         minRange.setTypeMethods = 'setEntityAsName';
                     }
@@ -1276,8 +1377,9 @@ const naslServer = {
         let sourceMap = node.sourceMap;
         let fileNode = node;
         // 如果没有sourceMap,就继续向上找 ,或者到module结束
-        // 如果 节点找到 app 或者module 停止
-        while (!sourceMap && fileNode && !(fileNode.parentNode instanceof App) && !(fileNode.parentNode instanceof Module) && !(fileNode instanceof View)) {
+        // 如果 节点找到 app 或者module 停止 或者entity找到DataSource为止
+        // 如果当前节点是view就不要向上查找了
+        while (!sourceMap && fileNode && !(fileNode.parentNode instanceof App) && !(fileNode.parentNode instanceof Module) && !(fileNode.parentNode instanceof DataSource) && !(fileNode instanceof View)) {
             fileNode = fileNode.parentNode;
             sourceMap = fileNode?.sourceMap;
         }
@@ -1523,6 +1625,22 @@ async function incidentalAction(action: string, fileNode: BaseNode, targetNode:
                 }
             }
         }
+        /**
+         * DataSource只会重命名时候，需要把子集全部重新生成一下
+         */
+        if (fileNode instanceof DataSource) {
+            (fileNode as DataSource).entities.forEach(async(entity) => {
+                try {
+                    const result = entity.toEmbeddedTSFile();
+                    const parentPath = oldpath.replace('.ts', '/');
+                    const currentOldPath = parentPath + '/entities/' + entity.name + '.ts';
+                    // 因为重命名这里只有当前修改父级的 旧名称, 所以他的子集也要根据旧名称去查依赖 更新内容
+                    await handleRename(entity, entity, result, currentOldPath);
+                } catch (err) {
+                    console.log(err);
+                }
+            });
+        }
     }
 }
 

package/src/server/process2LogicNamespace.ts

@@ -3,8 +3,8 @@ import { genLaunchProcess, genUserTaskLogic } from './getProcesses';
 
 /**
  * 给调用逻辑用
- * @param process 
- * @returns 
+ * @param process
+ * @returns
  */
 export function process2LogicNamespace(process: Process) {
     const children: Array<Namespace> = [];
@@ -18,13 +18,13 @@ export function process2LogicNamespace(process: Process) {
             });
             // 与process 中 toEmbededTS 所设置的 namespace 相关
             const path = `app.processes.${process.name}.elements.${e.name}.logics`;
-            l.getNamespace = function() {
+            l.getNamespace = function () {
                 return path;
-            }
+            };
             const api = `/api/${process.name}/${e.name}/${l.name}`;
-            l.getPath = function() {
+            l.getPath = function () {
                 return api;
-            }
+            };
             children.push(ns);
             ns.path = `app.processes.${process.name}.elements.${e.name}`;
             ns.expanded = true;
@@ -38,12 +38,12 @@ export function process2LogicNamespace(process: Process) {
     });
     ns.path = `app.processes.${process.name}.logics`;
     const api = `/api/${process.name}/${launchLogic.name}`;
-    launchLogic.getNamespace = function() {
+    launchLogic.getNamespace = function () {
         return ns.path;
-    }
-    launchLogic.getPath = function() {
+    };
+    launchLogic.getPath = function () {
         return api;
-    }
+    };
     return ns;
 }
 
@@ -61,8 +61,8 @@ interface processTreeFragment {
 }
 /**
  * 给侧边栏树形用
- * @param process 
- * @returns 
+ * @param process
+ * @returns
  */
 export function processToTreeFragment(process: Process) {
     const fragment: processTreeFragment = {
@@ -71,28 +71,38 @@ export function processToTreeFragment(process: Process) {
         id: process.id,
         logics: [],
         elements: [],
-    }
+    };
     process.elements.forEach((e) => {
         if (e.type === 'UserTask') {
             const l = genUserTaskLogic(e);
-            l.parentKey = 'readonly'
-            l.params.forEach(p => {
+            l.parentKey = 'readonly';
+            l.params.forEach((p) => {
                 p.readonly = true;
-            })
+            });
             l.parentNode = process;
+            // 与process 中 toEmbededTS 所设置的 namespace 相关
+            const path = `app.processes.${process.name}.elements.${e.name}.logics`;
+            l.getNamespace = function () {
+                return path;
+            };
             fragment.elements.push({
                 level: 'processTreeElementFragment',
                 id: e.id,
                 name: e.name,
                 logics: [l],
-            })
+            });
         }
     });
 
     const launchLogic = genLaunchProcess(process);
     launchLogic.parentNode = process;
-    
+
+    const path = `app.processes.${process.name}.logics`;
+    launchLogic.getNamespace = function () {
+        return path;
+    };
+
     fragment.logics.push(launchLogic);
-    launchLogic.parentKey = 'readonly'
+    launchLogic.parentKey = 'readonly';
     return fragment;
 }

package/src/server/translator.ts

@@ -41,6 +41,7 @@ import {
     ForEachStatement,
     CallFunction,
     ProcessOutcome,
+    Function,
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
@@ -226,6 +227,10 @@ const TS_RULES: Array<{
         re: /No value exists in scope for the shorthand property '__(?:IDENTIFIER|LEFT|RIGHT)__'. Either declare one or provide an initializer./,
         result: '用户任务未关联页面',
     },
+    {
+        re: /No value exists in scope for the shorthand property '__(?:outOfProcess)__'. Either declare one or provide an initializer./,
+        result: '节点未关联到流程图',
+    },
     {
         re: /'(.+?)' is declared but its value is never read/,
         result: "已添加'$1'，但从来没有使用过。",
@@ -363,6 +368,22 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         if (node instanceof BindEvent) {
             return null;
         }
+
+        if (node instanceof ProcessElement && (node.type === 'UserTask' || node.type === 'AutoTask')) {
+            let u = '用户任务';
+            if(node.type === 'AutoTask') {
+                u = '自动任务';
+            }
+            tsErrorDetail.message = `${u}出口顺序流个数不能大于1`;
+        }
+
+        if (node instanceof ProcessElement && (node.type === 'ExclusiveGateway' || node.type === 'ParallelGateway')) {
+            let u = '排他网关';
+            if(node.type === 'ParallelGateway') {
+                u = '并行网关';
+            }
+            tsErrorDetail.message = `${u}出口顺序流个数不能小于2`;
+        }
     }
 
     // 因为缺少参数时候有可能有特殊情况,因为原本少的多了就会找到 callLogic上,
@@ -427,7 +448,7 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             tsErrorDetail.message = '调用函数：参数不能为空！';
         } else if ((node instanceof Argument && node.parentNode instanceof CallLogic) || node instanceof CallLogic) {
             tsErrorDetail.message = '调用逻辑：参数不能为空！';
-        } else if (node instanceof ProcessOutcome) {
+        } else if (node instanceof ProcessOutcome || node instanceof Function) {
             tsErrorDetail.message = (node as any).constructor.nodeTitle + '：不能为空！';
         } else if (node instanceof Argument || node instanceof TypeAnnotation) {
             let str = tsErrorDetail.message;

package/src/service/storage/init.ts

@@ -103,7 +103,7 @@ async function doAction(app: any, actionItem: any) {
             const _path: string = event.originEvent.path;
             const _root = _path.split('.')?.[1] || '';
             if (
-                ['entities', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
+                ['dataSources', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
                     _root.startsWith(item))
             ) {
                 hasBackEnd = true;
@@ -392,7 +392,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,7 +40,7 @@ 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);
@@ -73,7 +74,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 +90,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,12 +108,12 @@ 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);
@@ -147,12 +149,12 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 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>' + genEnumSelectBlock(module.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</template>';
                 } else {
                     formItem += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-fieldinput></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 +229,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 +247,16 @@ 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 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,7 +42,7 @@ 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);
@@ -80,7 +81,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 +103,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,7 +138,7 @@ 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);
@@ -174,7 +176,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 +334,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');
@@ -358,17 +361,17 @@ 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);
                     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 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));
@@ -378,7 +381,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
     });
     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);