@lcap/nasl 1.0.0-alpha → 1.0.0-alpha.3

package/src/templator/genCreateBlock.ts

@@ -1,18 +1,22 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Namespace, Entity, Logic, View } from '../concepts';
+import { App, Namespace, Entity, Logic, View, Enum } from '../concepts';
+import { NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem,
-    NaslNode,
-} from './utils';
-import {
-    NameGroup, genUniqueQueryNameGroup, filterProperty, genLogicParam,
-    getFirstDisplayedProperty, genCallComponentLogic,
-    genLoadSelectLogic, genQueryStructure, genQueryLogic,
+    NameGroup,
+    genUniqueQueryNameGroup,
+    filterProperty,
+    genLogicParam,
+    getFirstDisplayedProperty,
+    genCallComponentLogic,
+    genEnumSelectBlock,
+    genLoadSelectLogic,
+    genQueryStructure,
+    genQueryLogic,
 } from '.';
 
 export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
-    const parentNode = (entity.parentNode as App | Namespace);
+    const parentNode = entity.parentNode as App | Namespace;
     const properties = entity.properties.filter(filterProperty('inForm'));
 
     return `<u-form ref="${nameGroup.viewElementMainView}">
@@ -31,13 +35,14 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 
             let formItem = `            <u-form-item label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -65,9 +70,14 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
-
             formItem += `            </u-form-item>\n`;
             return formItem;
         })
@@ -97,13 +107,14 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             const rulesStr = rules.join(' | ');
 
             let formItem = `            <van-field drole="other" label="${property.label || property.name}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -129,16 +140,20 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             } else if (propertyTypeName === 'Date') {
                 formItem += `<template #input><van-calendar v-model="${vModel}" title="请输入${property.label || property.name}"></van-calendar></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-datetime-picker type="time" v-model="${vModel}" title="请选择${property.label || property.name}" label-field=""></van-datetime-picker></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>`;
             } else {
-                formItem = formItem.replace(/other/g, '');
-                formItem += `<van-input v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem = formItem.replace(/other/g, '');
+                    formItem += `<van-input v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-input>`;
+                }
             }
 
             formItem += `            </van-field>\n`;
@@ -154,9 +169,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
 }
 
 function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
-    const params = [
-        genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableEntity),
-    ];
+    const params = [genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableEntity)];
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
         params: [],
@@ -193,7 +206,7 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
                     NaslLogicItem.CallLogic({
                         label: '弹出消息',
                         shortcut: true,
-                        calleeNamespace: 'nasl.ui.logics',
+                        calleeNamespace: 'nasl.ui',
                         calleeName: 'showMessage',
                         arguments: [
                             NaslLogicItem.Argument({
@@ -219,7 +232,7 @@ function genSubmitLogic(createLogic: Logic, nameGroup: NameGroup) {
 export function genCreateBlock(entity: Entity, view: View) {
     const parentNode = entity.parentNode as App | Namespace;
     const ns = entity.ns;
-    const createLogic = ns?.logics?.find((logic) => logic.name === `create${entity.name}`);
+    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
     const nameGroup: NameGroup = {};
     nameGroup.viewElementMainView = view.getLogicUniqueName('form1');

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -4,14 +4,14 @@
  * 3. 先简单做后续在看如何优化
  */
 import * as utils from '../utils';
-import { App, Namespace, Entity, View } from '../concepts';
+import { App, Namespace, Entity, View, Enum } from '../concepts';
 import {
     NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation,
     NaslLogicItem, NaslNode,
 } from './utils';
 import {
     filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genCallComponentLogic,
-    genQueryLogic, genEditTableTemplate, genEditTableLoadLogic, genTableRemoveLogic,
+    genQueryLogic, genEditTableTemplate, genEditTableLoadLogic, genTableRemoveLogic, genEnumSelectBlock,
     genLoadSelectLogic, genBlurUpdateLogic, genEditQueryStructure, genQueryStructure, genLogicParam,
 } from '.';
 
@@ -28,13 +28,17 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             const label = property.label || property.name;
             let formItem = `<u-form-item label="${label}">`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const {
+                typeName: propertyTypeName,
+                typeNamespace: propertyTypeNamespace,
+            } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inFilter');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -67,7 +71,13 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
 
             formItem += `</u-form-item>`;
@@ -116,13 +126,17 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                                     ${rulesStr.length ? `rules="${rulesStr}"` : ''}
                                 >`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const {
+                typeName: propertyTypeName,
+                typeNamespace: propertyTypeNamespace,
+            } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -154,7 +168,13 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
 
             formItem += `</u-form-item>\n`;
@@ -241,8 +261,8 @@ function genCreateLogic(nameGroup: NameGroup) {
 
 function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
     const ns = entity.ns;
-    const updateLogic = ns?.logics?.find((logic) => logic.name === `update${entity.name}`);
-    const createLogic = ns?.logics?.find((logic) => logic.name === `create${entity.name}`);
+    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
+    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
@@ -419,7 +439,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -5,14 +5,14 @@
  * 4. 主键目前支持 Long String Double 类型接口所以只禁用了对应的三个类型
  */
 import * as utils from '../utils';
-import { App, Namespace, Entity, View } from '../concepts';
+import { App, Namespace, Entity, View, Enum } from '../concepts';
 import {
     NaslCoreTypeAnnotation, NaslUITypeAnnotation,
     NaslTypeAnnotation, NaslLogicItem, NaslNode,
 } from './utils';
 import {
     filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty,
-    genCallComponentLogic, genQueryLogic, genQueryStructure, genTableTemplate,
+    genCallComponentLogic, genQueryLogic, genQueryStructure, genTableTemplate, genEnumSelectBlock,
     genTableLoadLogic, genTableRemoveLogic, genLoadSelectLogic, genGridViewTemplate,
     genGridViewLoadLogic, genGridViewRemoveLogic, genLogicParam,
 } from '.';
@@ -29,13 +29,17 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             const label = property.label || property.name;
             let formItem = `<u-form-item label="${label}">`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const {
+                typeName: propertyTypeName,
+                typeNamespace: propertyTypeNamespace,
+            } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inFilter');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -68,7 +72,13 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
 
             formItem += `</u-form-item>`;
@@ -111,13 +121,18 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                 rules.push('required');
             const rulesStr = rules.join(' | ');
             let formItem = `<u-form-item label="${label}" ${required ? 'required' : ''}  ${rulesStr.length ? `rules="${rulesStr}"` : ''}>`;
-            const propertyTypeName = property.typeAnnotation.typeName;
+
+            const { typeAnnotation } = property || {};
+            const {
+                typeName: propertyTypeName,
+                typeNamespace: propertyTypeNamespace,
+            } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -157,7 +172,13 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-input>`;
+                }
             }
 
             formItem += `</u-form-item>\n`;
@@ -244,8 +265,8 @@ function genCreateLogic(nameGroup: NameGroup) {
 
 function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
     const ns = entity.ns;
-    const updateLogic = ns?.logics?.find((logic) => logic.name === `update${entity.name}`);
-    const createLogic = ns?.logics?.find((logic) => logic.name === `create${entity.name}`);
+    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
+    const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
@@ -490,7 +511,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],
@@ -612,7 +633,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],

package/src/templator/genEditTableBlock.ts

@@ -22,7 +22,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
 
     const expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
 
-    const canEditable = (property: EntityProperty) => property.editable;
+    const canEditable = (property: EntityProperty) => !property.readonly;
 
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
@@ -37,7 +37,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
     };
 
     const genEditComponent = (property: EntityProperty) => {
-        if (!property.editable)
+        if (property.readonly)
             return '';
         const label = property.label || property.name;
         let formItem = '';
@@ -48,7 +48,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
             const relationEntity = parentNode?.findEntityByName(property.relationEntity);
             if (relationEntity) {
                 const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                const displayedProperty = getFirstDisplayedProperty(relationEntity);
                 if (displayedProperty) {
                     const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                     const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -194,7 +194,7 @@ export function genEditTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const parentNamespace = parentNode?.getNamespace();
 
     const ns = entity.ns;
-    const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete${entity.name}`);
+    const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
     const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
 
     return NaslNode.Logic({
@@ -242,7 +242,7 @@ export function genBlurUpdateLogic(entity: Entity, nameGroup: NameGroup) {
     const parentNode = entity.parentNode as App | Namespace;
     const parentNamespace = parentNode?.getNamespace();
     const ns = entity.ns;
-    const updateLogic = ns?.logics?.find((logic) => logic.name === `update${entity.name}`);
+    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
     return NaslNode.Logic({
         name: nameGroup.viewLogicBlurUpdate,
         params: [

package/src/templator/genEnumSelectBlock.ts

@@ -11,10 +11,10 @@ import { Enum } from '../concepts';
 export function genEnumSelectBlock(enumeration: Enum, vModel?: string, size?: string, placeholder?: string, hiddenAll?: boolean) {
     if (config.scope === 'h5')
         return `<van-cascader ${vModel ? ` v-model="${vModel}"` : ''}${placeholder ? ` title="${placeholder}" placeholder="${placeholder}"` : ''}
-        :data-source="ID_ENUM_LIST_${enumeration.id}" labelField="${!hiddenAll ? (placeholder || '') : ''}" :notitleblock="${hiddenAll}"></van-cascader>`;
+        :data-source="$utils.EnumList('${enumeration.name}')" labelField="${!hiddenAll ? (placeholder || '') : ''}" :notitleblock="${hiddenAll}"></van-cascader>`;
 
     return `<u-select clearable${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${placeholder ? ` placeholder="${placeholder}"` : ''}
-            :data-source="ID_ENUM_LIST_${enumeration.id}">
+            :data-source="$utils.EnumList('${enumeration.name}')">
                 ${hiddenAll ? '' : '<u-select-item text="全部"></u-select-item>'}
             </u-select>`;
 }

package/src/templator/genGetBlock.ts

@@ -71,7 +71,7 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
 
 export function genGetBlock(entity: Entity, view: View) {
     const ns = entity.ns;
-    const getLogic = ns?.logics?.find((logic) => logic.name === `get${entity.name}`);
+    const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
 
     const nameGroup: NameGroup = {};
     nameGroup.viewParamId = view.getParamUniqueName('id');
@@ -109,7 +109,7 @@ export function genGetBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ]

package/src/templator/genGridViewBlock.ts

@@ -157,7 +157,7 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const parentNode = entity.parentNode as App | Namespace;
     const parentNamespace = parentNode?.getNamespace();
     const ns = entity.ns;
-    const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete${entity.name}`);
+    const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
     const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
 
     return NaslNode.Logic({

package/src/templator/genListViewBlock.ts

@@ -77,7 +77,7 @@ export function genLoadListViewLogic(entity: Entity, nameGroup: NameGroup, newSt
                     calleeName: entityLogic.name,
                     arguments: [
                         genLogicParam(`${entityLogic.params[0].name}`, 'params.page'),
-                        genLogicParam(`${entityLogic.params[0].name}`, 'params.size'),
+                        genLogicParam(`${entityLogic.params[1].name}`, 'params.size'),
                     ],
                 }),
             }),
@@ -97,7 +97,7 @@ export function genListViewBlock(entity: Entity, view: View, property: EntityPro
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
 
-    const displayedProperty = property || getFirstDisplayedProperty(entity, 'inDetail');
+    const displayedProperty = property || getFirstDisplayedProperty(entity);
 
     const newStructures: Array<any> = [];
     const newLogics: Array<any> = [];

package/src/templator/genSelectBlock.ts

@@ -91,7 +91,7 @@ export function genSelectBlock(entity: Entity, view: View) {
     nameGroup.viewElementMainView = viewElementMainView;
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
 
-    const displayedProperty = getFirstDisplayedProperty(entity, 'inDetail');
+    const displayedProperty = getFirstDisplayedProperty(entity);
 
     const allEntities = [
         entity,

package/src/templator/genTableBlock.ts

@@ -144,7 +144,8 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const parentNode = entity.parentNode as App | Namespace;
     const parentNamespace = parentNode?.getNamespace();
     const ns = entity.ns;
-    const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete${entity.name}`);
+    console.log(ns)
+    const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
     const idPropertys = entity.properties.filter((property) => property.primaryKey);
     return NaslNode.Logic({
         name: nameGroup.viewLogicRemove,

package/src/templator/genUpdateBlock.ts

@@ -1,14 +1,18 @@
 import { config } from '../config';
 import * as utils from '../utils';
-import { App, Namespace, Entity, Logic, View } from '../concepts';
+import { App, Namespace, Entity, Logic, View, Enum } from '../concepts';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation,
-    NaslLogicItem, NaslNode,
-} from './utils';
-import {
-    NameGroup, filterProperty, getFirstDisplayedProperty, genUniqueQueryNameGroup,
-    genLogicParam, genCallComponentLogic, genLoadSelectLogic, genQueryStructure,
+    NameGroup,
+    filterProperty,
+    getFirstDisplayedProperty,
+    genUniqueQueryNameGroup,
+    genLogicParam,
+    genCallComponentLogic,
+    genLoadSelectLogic,
+    genQueryStructure,
     genQueryLogic,
+    genEnumSelectBlock,
 } from '.';
 
 export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
@@ -31,13 +35,14 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 
             let formItem = `            <u-form-item label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -65,7 +70,13 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<u-date-time-picker clearable :date.sync="${vModel}" placeholder="请输入${label}"></u-date-time-picker>`;
             } else {
-                formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem += `<u-input v-model="${vModel}" placeholder="请输入${label}"></u-input>`;
+                }
             }
 
             formItem += `            </u-form-item>\n`;
@@ -98,13 +109,14 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
 
             let formItem = `            <van-field drole="other" label="${label}"${required ? ' required' : ''}${rulesStr.length ? ` rules="${rulesStr}"` : ''}>\n`;
 
-            const propertyTypeName = property.typeAnnotation.typeName;
+            const { typeAnnotation } = property || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
                 if (relationEntity) {
                     const relationProperty = relationEntity.properties.find((prop) => prop.name === property.relationProperty);
-                    const displayedProperty = getFirstDisplayedProperty(relationEntity, 'inForm');
+                    const displayedProperty = getFirstDisplayedProperty(relationEntity);
                     if (displayedProperty) {
                         const lowerEntityName = utils.firstLowerCase(relationEntity.name);
                         const selectNameGroup = selectNameGroupMap.get(relationEntity.name);
@@ -136,8 +148,14 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             } else if (propertyTypeName === 'DateTime') {
                 formItem += `<template #input><van-datetime-picker type="datetime" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
             } else {
-                formItem = formItem.replace(/other/g, '');
-                formItem += `<van-input v-model="${vModel}" placeholder="请输入${label}"></van-input>`;
+                const namespaceArr = propertyTypeNamespace.split('.');
+                const type = namespaceArr.pop();
+                if (type === 'enums') {
+                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                } else {
+                    formItem = formItem.replace(/other/g, '');
+                    formItem += `<van-input v-model="${vModel}" placeholder="请输入${label}"></van-input>`;
+                }
             }
 
             formItem += `            </van-field>\n`;
@@ -153,9 +171,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
 }
 
 function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
-    const params = [
-        genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableEntity),
-    ];
+    const params = [genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableEntity)];
     return NaslNode.Logic({
         name: nameGroup.viewLogicSubmit,
         params: [] as any,
@@ -192,7 +208,7 @@ function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
                     NaslLogicItem.CallLogic({
                         label: '弹出消息',
                         shortcut: true,
-                        calleeNamespace: 'nasl.ui.logics',
+                        calleeNamespace: 'nasl.ui',
                         calleeName: 'showMessage',
                         arguments: [
                             NaslLogicItem.Argument({
@@ -212,9 +228,7 @@ function genSubmitLogic(updateLogic: Logic, nameGroup: NameGroup) {
 }
 
 function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
-    const params = [
-        genLogicParam(`${getLogic.params[0].name}`, 'id'),
-    ];
+    const params = [genLogicParam(`${getLogic.params[0].name}`, 'id')];
     return NaslNode.Logic({
         name: nameGroup.viewLogicLoad,
         description: '',
@@ -241,8 +255,8 @@ function genLoadLogic(getLogic: Logic, nameGroup: NameGroup) {
 export function genUpdateBlock(entity: Entity, view: View) {
     const parentNode = entity.parentNode as App | Namespace;
     const ns = entity.ns;
-    const getLogic = ns?.logics?.find((logic) => logic.name === `get${entity.name}`);
-    const updateLogic = ns?.logics?.find((logic) => logic.name === `update${entity.name}`);
+    const getLogic = ns?.logics?.find((logic) => logic.name === `get`);
+    const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
 
     const nameGroup: NameGroup = {};
     nameGroup.viewElementMainView = view.getLogicUniqueName('form1');
@@ -310,7 +324,7 @@ export function genUpdateBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.View_${view.name}.logics",
+            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ],

package/src/templator/index.ts

@@ -11,6 +11,7 @@ export * from './genGridViewBlock';
 export * from './genEditTableBlock';
 export * from './genCurdMultipleKeyBlock';
 export * from './genCurdEditMultipleKeyBlock';
+export * from './genEnumSelectBlock';
 
 import { Entity, EntityProperty } from '../concepts';