@lcap/nasl 3.8.0-beta.6 → 3.8.0-beta.7

package/src/natural/getContext/index.ts

@@ -428,7 +428,7 @@ export function getFrontendViews(frontend: Frontend, state: TranslatorState, cur
   return { code: wrapTSBlock(code), views: { namespace, data } };
 }
 
-export function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: string) {
+export function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: string, experimental?: boolean) {
   let code = '';
   let view: View;
   if (currentNode?.concept === 'View') {
@@ -456,16 +456,22 @@ export function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: s
       }),
       function (state) {
         let code = '';
-        code += `\n${indent(state.tabSize + 1)}const $refs = {\n`;
-        // 生成所有的name和类型定义
-        this.elements.forEach((element) => {
-          code += element.toNaturalTSDefinition(
-            shiftState(state, code, {
-              tabSize: state.tabSize + 1,
-            })
-          );
-        });
-        code += `${indent(state.tabSize + 1)}}\n`;
+        code += `\n${indent(state.tabSize)}`;
+        
+        if (experimental) {
+          code += this.elements[0].toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+        } else {
+          code += `const $refs = {\n`;
+          // 生成所有的name和类型定义
+          this.elements.forEach((element) => {
+            code += element.toNaturalTSDefinition(
+              shiftState(state, code, {
+                tabSize: state.tabSize + 1,
+              })
+            );
+          });
+          code += `${indent(state.tabSize + 1)}}\n`;
+        }
         // 逻辑
         if (currentNode?.concept === 'Logic') {
           code += '\n';

package/src/natural/transformTS2UI.ts

@@ -103,7 +103,7 @@ function transformTypeAnnotation(node: babelTypes.TSType): naslTypes.TypeAnnotat
       if (node?.typeName?.type === 'TSQualifiedName') {
         const allTypeName = generate(node?.typeName?.left as any)?.code;
         // 实体、枚举、结构体
-        if (/^app.dataSources|.enums|.structures/.test(allTypeName)) {
+        if (/^app.dataSources|.enums|.structures|nasl.ui/.test(allTypeName)) {
           const curTypeName = (node?.typeName as any)?.right?.name;
           return naslTypes.TypeAnnotation.createReference(curTypeName, {
             typeNamespace: allTypeName,
@@ -141,6 +141,8 @@ function transformTypeAnnotation(node: babelTypes.TSType): naslTypes.TypeAnnotat
 // 处理参数
 function transformParam(node: babelTypes.Identifier): naslTypes.Param {
   const typeAnnotation = (node.typeAnnotation as babelTypes.TSTypeAnnotation)?.typeAnnotation;
+  const exclude = ['event'];
+  if (exclude.includes(node.name)) return null;
   return new naslTypes.Param({
     name: node.name,
     typeAnnotation: typeAnnotation ? transformTypeAnnotation(typeAnnotation) : null,
@@ -243,7 +245,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
         if (arg?.value) {
           assignmentLines.push(new naslTypes.AssignmentLine({
             leftIndex: [0, index],
-            rightIndex: [index, index],
+            rightIndex: [index, members.length - 1],
           }));
         }
       } else {
@@ -300,7 +302,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
         if (arg?.value) {
           assignmentLines.push(new naslTypes.AssignmentLine({
             leftIndex: [0, index],
-            rightIndex: [index, index],
+            rightIndex: [index, members.length - 1],
           }));
         }
       } else {
@@ -358,7 +360,7 @@ function handleNewExpression(calleeName: String, node: any, type?: string) {
         if (arg?.value) {
           assignmentLines.push(new naslTypes.AssignmentLine({
             leftIndex: [0, index],
-            rightIndex: [index, index],
+            rightIndex: [index, members.length - 1],
           }));
         }
       } else {
@@ -928,14 +930,29 @@ function transformNode2Expression(node: babelTypes.Node, type?: string): any {
     const assignmentLines: any = [];
     node?.properties?.forEach((arg: any, index: number) => {
       properties.push(transformNode2Expression(arg.key, type));
-      rights.push(new naslTypes.SelectMembers({
-        expression: transformNode2Expression(arg?.value, type)
-      }));
-      if (arg?.value) {
-        assignmentLines.push(new naslTypes.AssignmentLine({
-          leftIndex: [0, index],
-          rightIndex: [index],
+      if (arg.value.type === 'MemberExpression') {
+        const expression = flatMemberExpression(arg.value);
+        const members = flatMembers(transformNode2Expression(arg.value, type) as any);
+        rights.push(new naslTypes.SelectMembers({
+          expression: transformNode2Expression(expression[0]),
+          members,
+        }));
+        if (arg?.value) {
+          assignmentLines.push(new naslTypes.AssignmentLine({
+            leftIndex: [0, index],
+            rightIndex: [index, members.length - 1],
+          }));
+        }
+      } else {
+        rights.push(new naslTypes.SelectMembers({
+          expression: transformNode2Expression(arg?.value, type)
         }));
+        if (arg?.value) {
+          assignmentLines.push(new naslTypes.AssignmentLine({
+            leftIndex: [0, index],
+            rightIndex: [index],
+          }));
+        }
       }
       structureProperties.push(new naslTypes.StructureProperty({
         name: arg?.key?.name,

package/src/natural/transformTSCode.ts

@@ -117,7 +117,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
         if (node?.typeName?.type === 'TSQualifiedName') {
           const allTypeName = generate(node?.typeName?.left as any)?.code;
           // 实体、枚举、结构体
-          if (/^app.dataSources|.enums|.structures/.test(allTypeName)) {
+          if (/^app.dataSources|.enums|.structures|nasl.ui/.test(allTypeName)) {
             const curTypeName = (node?.typeName as any)?.right?.name;
             return naslTypes.TypeAnnotation.createReference(curTypeName, {
               typeNamespace: allTypeName,
@@ -153,6 +153,8 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
   }
   function transformParam(node: babelTypes.Identifier): naslTypes.Param {
     const typeAnnotation = (node.typeAnnotation as babelTypes.TSTypeAnnotation)?.typeAnnotation;
+    const exclude = ['event'];
+    if (exclude.includes(node.name)) return null;
     return new naslTypes.Param({
       name: node.name,
       typeAnnotation: typeAnnotation ? transformTypeAnnotation(typeAnnotation) : null,
@@ -228,7 +230,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           if (arg?.value) {
             assignmentLines.push(new naslTypes.AssignmentLine({
               leftIndex: [0, index],
-              rightIndex: [index, index],
+              rightIndex: [index, members.length - 1],
             }));
           }
         } else {
@@ -285,7 +287,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           if (arg?.value) {
             assignmentLines.push(new naslTypes.AssignmentLine({
               leftIndex: [0, index],
-              rightIndex: [index, index],
+              rightIndex: [index, members.length - 1],
             }));
           }
         } else {
@@ -343,7 +345,7 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
           if (arg?.value) {
             assignmentLines.push(new naslTypes.AssignmentLine({
               leftIndex: [0, index],
-              rightIndex: [index, index],
+              rightIndex: [index, members.length - 1],
             }));
           }
         } else {
@@ -1001,14 +1003,29 @@ export function transformTSCode(tsCode: string, contextLogicName: string, type?:
       const assignmentLines: any = [];
       node?.properties?.forEach((arg: any, index: number) => {
         properties.push(transformLogicNode(arg.key));
-        rights.push(new naslTypes.SelectMembers({
-          expression: transformLogicNode(arg?.value)
-        }));
-        if (arg?.value) {
-          assignmentLines.push(new naslTypes.AssignmentLine({
-            leftIndex: [0, index],
-            rightIndex: [index],
+        if (arg.value.type === 'MemberExpression') {
+          const expression = flatMemberExpression(arg.value);
+          const members = flatMembers(transformLogicNode(arg.value) as any);
+          rights.push(new naslTypes.SelectMembers({
+            expression: transformLogicNode(expression[0]),
+            members,
           }));
+          if (arg?.value) {
+            assignmentLines.push(new naslTypes.AssignmentLine({
+              leftIndex: [0, index],
+              rightIndex: [index, members.length - 1],
+            }));
+          }
+        } else {
+          rights.push(new naslTypes.SelectMembers({
+            expression: transformLogicNode(arg?.value)
+          }));
+          if (arg?.value) {
+            assignmentLines.push(new naslTypes.AssignmentLine({
+              leftIndex: [0, index],
+              rightIndex: [index],
+            }));
+          }
         }
         structureProperties.push(new naslTypes.StructureProperty({
           name: arg?.key?.name,

package/src/server/entity2LogicNamespace.ts

@@ -15,7 +15,17 @@ import {
   NewList,
 } from '..';
 
+const entityNsMap = new Map();
+
 export function entity2LogicNamespace(entity: Entity) {
+  let nsInfo = entityNsMap.get(entity);
+  if (!nsInfo) {
+    nsInfo = {
+      contentUniqueKey: entity.contentUniqueKey
+    };
+    entityNsMap.set(entity, nsInfo);
+  }
+  if (!nsInfo.ns || nsInfo.contentUniqueKey !== entity.contentUniqueKey) {
   const { properties } = entity;
   const keys = properties.filter((item) => item.primaryKey);
   const params = keys.map(
@@ -368,7 +378,9 @@ export function entity2LogicNamespace(entity: Entity) {
     ],
   });
   ns.parentNode = entity;
-  return ns;
+  nsInfo.ns = ns;
+  }
+  return nsInfo.ns;
 }
 
 interface entityTreeFragment {

package/src/server/extendBaseNode.ts

@@ -643,6 +643,37 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
 
       // 删除页面或者流程
       if (node instanceof View || node instanceof Process || node instanceof Frontend) {
+        if ( node instanceof Frontend || node instanceof View) {
+          (this as any).app.emit('collect:start', {
+            actionMsg: `删除节点`,
+          });
+
+          // 删除页面或端的时候，如果存在表单设计器，需要同步删除分组内容
+          const excludedKeySet = new Set([
+            'parentNode',
+            'sourceMap',
+            'storageJSON',
+            'tsErrorDetail',
+            'NaslAnnotatedJSON',
+            'calledFrom',
+            '_events',
+            '_collectingList',
+            '_historyList',
+          ]);
+          traverse(
+            (current) => {
+              const currentNode: any = current.node;
+              if (currentNode && currentNode?.concept === 'ViewElement' && currentNode?.name === currentNode?.composedBy?.[0]) {
+                currentNode.app.deleteCompose(currentNode.composedBy);
+              }
+            },
+            { node: this },
+            { mode: 'anyObject', excludedKeySet }
+          );
+          this.delete();
+          (this as any).app.emit('collect:end');
+        }
+
         /**
          * 查找这个页面是不是有依赖
          */

package/src/server/naslServer.ts

@@ -4736,7 +4736,7 @@ class NaslServer {
       const item = (resultMap as any)?.[file]?.[line]?.[offset];
       const itemType = item?.[0]?.nodeType;
       const nodeTypeAnnotation = yield* type2TypeAnnotation(itemType);
-      const {node} = newQuickInfoNodes[index];
+      const { node } = newQuickInfoNodes[index];
 
       types.set(node, Object.freeze(nodeTypeAnnotation) as TypeAnnotation);
 
@@ -4919,7 +4919,13 @@ class NaslServer {
     });
     const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
 
-    const json = app.toJSON();
+    console.time('app toJSON');
+    const jsonMap = new Map();
+    const json = app._toJSON((source, instance) => {
+      jsonMap.set(instance, source);
+      return source;
+    });
+    console.timeEnd('app toJSON');
 
     this.logger.timeEnd('全量标注');
 
@@ -4929,8 +4935,10 @@ class NaslServer {
     }
 
     if (releaseFlag) {
+      console.time('annotationToJson');
       // 全量标注后对json进行一些修改，为了服务端翻译处理
-      this.annotationToJson(typesMap, json);
+      this.annotationToJson(typesMap, json, jsonMap);
+      console.timeEnd('annotationToJson');
     }
 
     return json;
@@ -4974,31 +4982,32 @@ class NaslServer {
       BaseNode,
       | TypeAnnotation
       | {
-          typeAnnotation: TypeAnnotation;
-          option: any;
-        }
+        typeAnnotation: TypeAnnotation;
+        option: any;
+      }
     >,
-    json: {}
+    json: {},
+    jsonMap: Map<BaseNode, any>,
   ) {
     typesMap.forEach((value, node) => {
       // 如果节点本身有类型就不去在塞一遍了
       // 有值而且没有类型再去设置
       // 但是Identifier 和 MemberExpression 都用标注出来的因为本身是变量，有类型也需要覆盖一下
-      if (value && (node instanceof Argument ) && node.getAncestor('Connector')?.concept === 'Connector') {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+      if (value && (node instanceof Argument) && node.getAncestor('Connector')?.concept === 'Connector') {
+        const jsonNode = jsonMap.get(node);
         if (jsonNode) {
-            jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
+          jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
         }
       }
       if (value && (!(node as any).typeAnnotation || node instanceof Identifier || node instanceof MemberExpression)) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         if (jsonNode) {
-            jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
+          jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
         }
       }
       // 旧版本数据查询需要确认是匿名数据结构的 ListTotal 类型
       if (node instanceof CallQueryComponent && !node.isAutoInfer()) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         jsonNode.typeAnnotation = {
           concept: 'TypeAnnotation',
           typeKind: 'anonymousStructure',
@@ -5047,7 +5056,7 @@ class NaslServer {
       if (node instanceof Param) {
         // index在nasl foreach上有脏数据
         if (node.parentKey === 'index' && node.parentNode instanceof ForEachStatement) {
-          const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+          const jsonNode = jsonMap.get(node);
           jsonNode.typeAnnotation = TypeAnnotation.createPrimitive('Long').toJSON();
         }
       }
@@ -5064,7 +5073,7 @@ class NaslServer {
             const itemCode = this.getNodeCode(fileNode, item);
 
             if (itemNode.concept === matchExpression.concept && itemCode === currentCode) {
-              const jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
+              const jsonNode = jsonMap.get(itemNode);
               jsonNode.typeAnnotation = matchExpression.__TypeAnnotation;
             }
           });
@@ -5074,12 +5083,12 @@ class NaslServer {
       if (value && (node instanceof Param)) {
         // index在nasl foreach上有脏数据
         if (node.parentKey === 'index' && node.parentNode instanceof ForEachStatement) {
-          const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+          const jsonNode = jsonMap.get(node);
           jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
         }
       }
       if (value && (node instanceof NewComposite) && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
       }
 
@@ -5099,7 +5108,7 @@ class NaslServer {
         * 特殊处理，不想去查两次类型, 因为是从函数签名上拿类型，所以直接合并在一起，先这样
         */
         if (node instanceof CallLogic && node.__TypeArguments?.length) {
-          const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+          const jsonNode = jsonMap.get(node);
           jsonNode.typeArguments = node.__TypeArguments.map((type) => type?.toJSON());
           jsonNode.typeAnnotation = node.__TypeAnnotation?.toJSON();
         }
@@ -5135,13 +5144,13 @@ class NaslServer {
               if (itemExpression) {
                 const listTypeArgument = list.__TypeAnnotation?.typeArguments?.[0]?.toJSON();
                 if (listTypeArgument) {
-                  const jsonNode = jsoner.queryNodeByPath(json, item.getNodePath(false));
+                  const jsonNode = jsonMap.get(item);
                   jsonNode.typeAnnotation = listTypeArgument;
                 }
               }
             } else {
               const mapParamIndex = mapFunctionParamIndexMaps.get(calleeName);
-              if(mapParamIndex){
+              if (mapParamIndex) {
                 const map = node.arguments[mapParamIndex.collection];
                 const key = node.arguments[mapParamIndex.key];
                 const value = node.arguments[mapParamIndex.value];
@@ -5150,14 +5159,14 @@ class NaslServer {
                 if (keyExpression) {
                   const mapKeyTypeArgument = map.__TypeAnnotation?.typeArguments?.[0]?.toJSON();
                   if (mapKeyTypeArgument) {
-                    const jsonNode = jsoner.queryNodeByPath(json, key.getNodePath(false));
+                    const jsonNode = jsonMap.get(key);
                     jsonNode.typeAnnotation = mapKeyTypeArgument;
                   }
                 }
                 if (valueExpression) {
                   const mapValueTypeArgument = map.__TypeAnnotation?.typeArguments?.[1]?.toJSON();
                   if (mapValueTypeArgument) {
-                    const jsonNode = jsoner.queryNodeByPath(json, value.getNodePath(false));
+                    const jsonNode = jsonMap.get(value);
                     jsonNode.typeAnnotation = mapValueTypeArgument;
                   }
                 }
@@ -5169,7 +5178,7 @@ class NaslServer {
 
       // 服务端需要默认值节点有类型来判断父节点是否是日期类型
       if (node instanceof DefaultValue && !value) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         const parentNodeType = (node.parentNode as any)?.typeAnnotation || (node.parentNode as any)?.__TypeAnnotation;
         if (parentNodeType && jsonNode) {
           jsonNode.typeAnnotation = (parentNodeType as TypeAnnotation)?.toJSON();

package/src/server/translator.ts

@@ -328,6 +328,10 @@ const TS_RULES: Array<{
     re: /Cannot find name '__UNCERTAIN__INTERMEDIATE__FIELDS__'./,
     result: '来自不确定结构或实体的字段',
   },
+  {
+    re: /Cannot find name '__UNSUPPORTED__ENTITY__FIELDS__'./,
+    result: '可能为实体属性别名，动态条件中仅支持使用变量',
+  },
   {
     re: /No value exists in scope for the shorthand property '__(?:IDENTIFIER|LEFT|RIGHT)__'. Either declare one or provide an initializer./,
     result: '用户任务未关联页面',
@@ -900,6 +904,17 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       });
     }
   }
+
+  if (node instanceof BindAttribute && node.parentNode instanceof ViewElement) {
+    const reg = /左边类型：\s*(.*)[,，]\s*右边类型：\s*(.*)[.。]/
+    const left = reg.exec(tsErrorDetail.message)?.[1];
+    const right = reg.exec(tsErrorDetail.message)?.[2];
+
+    if (left && right) {
+      tsErrorDetail.message = `页面组件：属性类型不一致！接收类型：${left}，传入类型：${right}。`;
+    }
+  }
+
   if (node && tsErrorDetail) {
     node.tsErrorDetail = tsErrorDetail;
   }

package/src/templator/genCreateBlock.ts

@@ -94,7 +94,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
         } else if (propertyTypeName === 'DateTime') {
           formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
-          const namespaceArr = propertyTypeNamespace.split('.');
+          const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
@@ -211,7 +211,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
           formItem += `<template #input><van-linear-layout style="width:100%;" direction="horizontal"><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${property.label || property.name
             }" labelField="" inputAlign="left"></van-datetime-picker></van-linear-layout></template>`;
         } else {
-          const namespaceArr = propertyTypeNamespace.split('.');
+          const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
@@ -428,7 +428,7 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement, appointKeys
   const module = dataSource.app;
   const { ns } = entity;
   const { disabledRelationEntity } = extra;
-  const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
+  const createLogic = ns?.logics?.find((logic : Logic) => logic.name === `create`);
 
   const nameGroup: NameGroup = {};
   nameGroup.viewElementMainView = likeComponent.getViewElementUniqueName('form1');
@@ -518,7 +518,7 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement, appointKeys
             })
           )}}` : ''
       }
-        
+
     ]
     ${appointKeys.length ? '' : `,"viewLogics": [
       ${JSON.stringify(submitLogic)}

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -88,7 +88,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         } else if (propertyTypeName === 'DateTime') {
           formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
-          const namespaceArr = propertyTypeNamespace.split('.');
+          const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
@@ -191,7 +191,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
         } else if (propertyTypeName === 'DateTime') {
           formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
         } else {
-          const namespaceArr = propertyTypeNamespace.split('.');
+          const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -97,7 +97,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         } 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 namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             const Enum = dataSource.app.findNodeByCompleteName(propertyTypeNamespace + '.' + propertyTypeName) as Enum;
@@ -222,7 +222,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
           }></u-date-time-picker>`;
         } else {
-          const namespaceArr = propertyTypeNamespace.split('.');
+          const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
           const type = namespaceArr.pop();
           if (type === 'enums') {
             const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
@@ -318,7 +318,7 @@ function genCreateLogic(nameGroup: NameGroup, entity?: Entity ) {
 
 export function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
   const { ns } = entity;
-  const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
+  const createLogic = ns?.logics?.find((logic : Logic) => logic.name === `create`);
 
   return NaslNode.Logic({
     name: nameGroup.viewLogicSubmit,
@@ -353,7 +353,7 @@ export function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
 
 export function genUpdateSubmitLogic(entity: Entity, nameGroup: NameGroup) {
   const { ns } = entity;
-  const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
+  const updateLogic = ns?.logics?.find((logic : Logic) => logic.name === `update`);
 
   return NaslNode.Logic({
     name: nameGroup.viewLogicUpdateSubmit,
@@ -929,7 +929,7 @@ function genCloseDelModalLogic(nameGroup: NameGroup) {
 
 function genDelModalSubmitLogic(entity: Entity, nameGroup: NameGroup) {
   const { ns } = entity;
-  const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
+  const deleteLogic = ns?.logics?.find((logic : Logic) => logic.name === 'delete');
   return NaslNode.Logic({
     name: nameGroup.viewLogicDelModalSubmit,
     params: [],
@@ -1041,7 +1041,7 @@ export function genFilterTemplateTableDesigner(entity: Entity, nameGroup: NameGr
               } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker :clearable="true" :value.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
               } else {
-                const namespaceArr = propertyTypeNamespace.split('.');
+                const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
                 const type = namespaceArr.pop();
                 if (type === 'enums') {
                   const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
@@ -1160,7 +1160,7 @@ function genSaveModalTemplateDesigner(
           property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
         }></u-date-time-picker>`;
       } else {
-        const namespaceArr = propertyTypeNamespace.split('.');
+        const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
         const type = namespaceArr.pop();
         if (type === 'enums') {
           const Enum = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;

package/src/templator/genEditTableBlock.ts

@@ -1,5 +1,5 @@
 import * as utils from '../utils';
-import { Entity, EntityProperty, DataSource, Enum } from '../concepts';
+import { Entity, EntityProperty, DataSource, Enum, Logic } from '../concepts';
 import {
   filterProperty,
   NameGroup,
@@ -95,7 +95,7 @@ export function genEditTableColumnTemplate(
     } else if (propertyTypeName === 'DateTime') {
       formItem = `<u-date-time-picker :clearable="true" :value.sync="${valueExpression}" placeholder="请输入${label}" appendTo="body" :autofocus="true" :opened="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-date-time-picker>`;
     } else {
-      const namespaceArr = propertyTypeNamespace.split('.');
+      const namespaceArr = propertyTypeNamespace?.split?.('.') || [];
       const type = namespaceArr.pop();
       if (type === 'enums') {
         const enumeration = dataSource.app.findNodeByCompleteName(`${propertyTypeNamespace}.${propertyTypeName}`) as Enum;
@@ -240,7 +240,7 @@ export function genEditTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
   const lowerEntityName = utils.firstLowerCase(entity.name);
 
   const { ns } = entity;
-  const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
+  const deleteLogic = ns?.logics?.find((logic : Logic) => logic.name === `delete`);
   const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
 
   return NaslNode.Logic({
@@ -274,7 +274,7 @@ export function genBlurUpdateLogic(entity: Entity, nameGroup: NameGroup) {
   if (entity.concept === 'Entity') {
     const lowerEntityName = utils.firstLowerCase(entity.name);
     const { ns } = entity;
-    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
+    const updateLogic = ns?.logics?.find((logic : Logic) => logic.name === `update`);
     const valuePrefixExpression = nameGroup.valuePrefixExpression ? nameGroup.valuePrefixExpression : `current.item.${lowerEntityName}`;
     callLogics.push(
       NaslLogicItem.CallLogic({

package/src/templator/genGetBlock.ts

@@ -70,7 +70,7 @@ export function genGetBlock(entity: Entity, oldNode: ViewElement,
   const likeComponent = oldNode?.likeComponent;
   const isBusinessComponent = likeComponent.concept === 'BusinessComponent';
   const { ns } = entity;
-  const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
+  const getLogic = ns?.logics?.find((logic : Logic) => logic.name === `get`);
 
   const nameGroup: NameGroup = {};
   nameGroup.viewParamId = likeComponent.getParamUniqueName('id');

package/src/templator/genGridViewBlock.ts

@@ -1,6 +1,6 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Module, Namespace, Entity, EntityProperty, DataSource, ViewElement } from '../concepts';
+import { App, Module, Namespace, Entity, EntityProperty, DataSource, ViewElement, Logic } from '../concepts';
 import {
   filterProperty,
   NameGroup,
@@ -203,7 +203,7 @@ export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLo
 export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
   const lowerEntityName = utils.firstLowerCase(entity.name);
   const { ns } = entity;
-  const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
+  const deleteLogic = ns?.logics?.find((logic : Logic) => logic.name === `delete`);
   const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
   const currentName = nameGroup.currentName || 'current';