@lcap/nasl 1.0.0-alpha.8 → 1.0.1

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -55,13 +55,13 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}">
-                            <u-select-item :value="true">是</u-select-item>
-                            <u-select-item :value="false">否</u-select-item>
+                            <u-select-item :value="true" text="是">是</u-select-item>
+                            <u-select-item :value="false" text="否">否</u-select-item>
                         </u-select>
                     `;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Text') {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
@@ -91,7 +91,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
         </u-form-item>
     </u-form>
 
-    <u-button color="primary" @click="${nameGroup.viewLogicCreate}($event)">创建</u-button>
+    <u-button color="primary" @click="${nameGroup.viewLogicCreate}">创建</u-button>
 </u-linear-layout>
     `;
 }
@@ -154,12 +154,12 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
             } else if (propertyTypeName === 'Boolean') {
                 formItem += `
                         <u-select clearable v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}>
-                            <u-select-item :value="true">是</u-select-item>
-                            <u-select-item :value="false">否</u-select-item>
+                            <u-select-item :value="true" text="是">是</u-select-item>
+                            <u-select-item :value="false" text="否">否</u-select-item>
                         </u-select>`;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}" ${property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''}></u-number-input>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}" ${
                     property.primaryKey ? `:disabled="${nameGroup.viewVariableIsUpdate}"` : ''
                 }></u-number-input>`;
@@ -459,7 +459,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genTableTemplate(entity, nameGroup)}
+        ${genTableTemplate(entity, nameGroup, true)}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -511,7 +511,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],
@@ -581,7 +581,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
     return `<template>
     <u-linear-layout direction="vertical">
         ${genFilterTemplate(entity, nameGroup, selectNameGroupMap)}
-        ${genGridViewTemplate(entity, nameGroup)}
+        ${genGridViewTemplate(entity, nameGroup, true)}
         ${genSaveModalTemplate(entity, nameGroup, selectNameGroupMap)}
     </u-linear-layout>
 </template>
@@ -633,7 +633,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],

package/src/templator/genEditTableBlock.ts

@@ -65,12 +65,12 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
         } else if (propertyTypeName === 'Boolean') {
             formItem += `<u-select clearable :value.sync="${valueExpression}" placeholder="请输入${label}"
             :autofocus="true" :opened="true" append-to="body" @blur="${nameGroup.viewLogicBlurUpdate}" @select="${nameGroup.viewLogicBlurUpdate}">
-                <u-select-item :value="true">是</u-select-item>
-                <u-select-item :value="false">否</u-select-item>
+                <u-select-item :value="true" text="是">是</u-select-item>
+                <u-select-item :value="false" text="否">否</u-select-item>
             </u-select>`;
         } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
             formItem = `<u-number-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
-        } else if (propertyTypeName === 'Decimal') {
+        } else if (propertyTypeName === 'Double') {
             formItem = `<u-number-input :value.sync="${valueExpression}" :precision="0" :step="0" placeholder="请输入${label}" :autofocus="true" @blur="${nameGroup.viewLogicBlurUpdate}"></u-number-input>`;
         } else if (propertyTypeName === 'Text') {
             formItem = `<u-validator placement="bottom" display="appear" @blur-valid="${nameGroup.viewLogicBlurUpdate}" style="width:100%">
@@ -122,7 +122,7 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selec
     <u-table-view-column title="操作">
         <template #cell="scope">
             <u-linear-layout gap="small">
-                <u-link @click="${nameGroup.viewLogicRemove}($event, scope)">删除</u-link>
+                <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
             </u-linear-layout>
         </template>
     </u-table-view-column>
@@ -228,7 +228,7 @@ export function genEditTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                     if (!paramFromLogic) {
                         paramFromLogic = getParamFromLogic(deleteLogic, 'id');
                     }
-                    return genLogicParam(paramFromLogic.name, `scope.item.${lowerEntityName}.id`);
+                    return genLogicParam(paramFromLogic.name, `scope.item.${lowerEntityName}.${paramFromLogic.name}`);
                 }),
             }),
             genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),

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="$utils.EnumList('${enumeration.name}')" labelField="${!hiddenAll ? (placeholder || '') : ''}" :notitleblock="${hiddenAll}"></van-cascader>`;
+        :data-source="$utils.EnumList('${enumeration.name}', '${enumeration.getNamespace()}')" labelField="${!hiddenAll ? (placeholder || '') : ''}" :notitleblock="${hiddenAll}"></van-cascader>`;
 
     return `<u-select clearable${vModel ? ` v-model="${vModel}"` : ''}${size ? ` size="${size}"` : ''}${placeholder ? ` placeholder="${placeholder}"` : ''}
-            :data-source="$utils.EnumList('${enumeration.name}')">
+            :data-source="$utils.EnumList('${enumeration.name}', '${enumeration.getNamespace()}')">
                 ${hiddenAll ? '' : '<u-select-item text="全部"></u-select-item>'}
             </u-select>`;
 }

package/src/templator/genGetBlock.ts

@@ -1,10 +1,7 @@
 import { config } from '../config';
 import * as utils from '../utils';
 import { Entity, Logic, View } from '../concepts';
-import {
-    NaslCoreTypeAnnotation, NaslTypeAnnotation, NaslLogicItem,
-    NaslNode,
-} from './utils';
+import { NaslCoreTypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import { NameGroup, filterProperty, getExpression, genLogicParam } from '.';
 
 export function genGetTemplate(entity: Entity, nameGroup: NameGroup) {
@@ -58,11 +55,12 @@ export function genH5GetTemplate(entity: Entity, nameGroup: NameGroup) {
     return `<van-cell-group>
     ${properties
         .map((property) => {
-            let formItem = `            <van-cell isLink title="${property.label || property.name}"`;
+            const temptitle = property.label || property.name;
+            let formItem = `            <van-cell isLink`;
 
             formItem += ' :value="' + getExpression(property, `${nameGroup.viewVariableEntity}.${property.name}`) + '">';
-
-            formItem += `            </van-cell>\n`;
+            formItem += `<template  #title>${temptitle}</template>`;
+            formItem += `<template>{{ ${getExpression(property, `${nameGroup.viewVariableEntity}.${property.name}`)} }}</template>            </van-cell>\n`;
             return formItem;
         })
         .join('')}
@@ -109,7 +107,7 @@ export function genGetBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ]

package/src/templator/genGridViewBlock.ts

@@ -1,3 +1,4 @@
+import { config } from '../config';
 import * as utils from '../utils';
 import { App, Namespace, Entity, EntityProperty, View } from '../concepts';
 import {
@@ -12,10 +13,7 @@ import {
     genQueryLogic,
     genQueryStructure,
 } from '.';
-import {
-    NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslCollectionTypeAnnotation,
-    NaslTypeAnnotation, NaslLogicItem, NaslNode,
-} from './utils';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 
 /**
  * 根据实体属性生成表格列模板
@@ -60,12 +58,48 @@ export function genGridViewCardTemplate(property: EntityProperty) {
             </u-linear-layout>`;
 }
 
+export function genH5GridViewCardTemplate(property: EntityProperty) {
+    const entity = property.entity;
+    const parentNode = entity.parentNode as App | Namespace;
+    const lowerEntityName = utils.firstLowerCase(entity.name);
+    let expression = `scope.item.${lowerEntityName}.${property.name}`;
+    const title = property.label || property.name;
+
+    if (property.relationEntity) {
+        // 有外键关联
+        const relationEntity = parentNode?.findEntityByName(property.relationEntity);
+        if (relationEntity) {
+            const displayedProperty = getFirstDisplayedProperty(relationEntity);
+            if (displayedProperty) {
+                const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
+                expression = getExpression(property, `scope.item.${relationLowerEntityName}.${displayedProperty.name}`);
+            } else
+                return '';
+        } else
+            return '';
+    } else
+        expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
+
+    const getText = (property: EntityProperty) => {
+        const propertyTypeName = property.typeAnnotation.typeName;
+        if (propertyTypeName === 'Boolean') {
+            return `
+                <van-text v-if="${expression}" text="是" display="block"></van-text>
+                <van-text v-if="!${expression}" text="否" display="block"></van-text>
+                `;
+        } else {
+            return `<van-text :text="${expression}" display="block"></van-text>`;
+        }
+    };
+    return `${getText(property)}`;
+}
+
 /**
  * 生成表格模板
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup) {
+export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
     const properties = entity.properties.filter(filterProperty('inTable'));
 
     return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
@@ -84,8 +118,8 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup) {
                 <u-linear-layout direction="vertical" gap="small">
                     ${properties.map((property) => genGridViewCardTemplate(property) + '\n').join('')}
                     <u-linear-layout gap="small">
-                        <u-link @click="${nameGroup.viewLogicModify || 'modify'}($event, scope)">修改</u-link>
-                        <u-link @click="${nameGroup.viewLogicRemove}($event, scope)">删除</u-link>
+                        <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>
+                        <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
                     </u-linear-layout>
                 </u-linear-layout>
             </u-card>
@@ -94,6 +128,22 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup) {
 `;
 }
 
+export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup) {
+    const properties = entity.properties.filter(filterProperty('inTable'));
+    return `<van-grid-view ref="gridView" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
+    pageable="auto-more"
+    :remote-paging="true"
+    :col="2"
+    :iffall="false">
+    <template #item="scope">
+        <van-cardu no-title>
+            ${properties.map((property) => genH5GridViewCardTemplate(property) + '\n').join('')}
+        </van-cardu>
+    </template>
+</van-grid-view>
+`;
+}
+
 /**
  * 生成表格 load 逻辑
  * @param entity 实体
@@ -190,7 +240,7 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                     if (!paramFromLogic) {
                         paramFromLogic = getParamFromLogic(deleteLogic, 'id');
                     }
-                    return genLogicParam(paramFromLogic.name, `scope.item.${lowerEntityName}.id`);
+                    return genLogicParam(paramFromLogic.name, `scope.item.${lowerEntityName}.${paramFromLogic.name}`);
                 }),
             }),
             genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
@@ -240,7 +290,7 @@ export function genGridViewBlock(entity: Entity, view: View) {
 
     return `
 <template>
-    ${genGridViewTemplate(entity, nameGroup)}
+    ${config.scope === 'h5' ? genH5GridViewTemplate(entity, nameGroup) : genGridViewTemplate(entity, nameGroup)}
 </template>
 <definition>
 {

package/src/templator/genQueryComponent.ts

@@ -1,21 +1,20 @@
 import * as utils from '../utils';
 import { App, Namespace, Entity, Structure, QueryJoinExpression, CallQueryComponent, StructureProperty } from '../concepts';
-import {
-    NameGroup, NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation,
-    NaslTypeAnnotation, NaslQueryExpression, NaslLogicItem, NaslNode,
-} from './utils';
+import { NameGroup, NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslTypeAnnotation, NaslQueryExpression, NaslLogicItem, NaslNode } from './utils';
 
 export function genQueryStructure(allEntities: Array<Entity>, nameGroup: NameGroup) {
     allEntities = Array.from(new Set(allEntities));
     return NaslNode.Structure({
         name: nameGroup.structure,
-        properties: allEntities.map((entity) => (NaslNode.StructureProperty({
-            name: utils.firstLowerCase(entity.name),
-            typeAnnotation: NaslTypeAnnotation.Reference({
-                typeNamespace: entity.getNamespace(),
-                typeName: entity.name,
-            }),
-        }))),
+        origin: 'CallQueryComponent',
+        properties: allEntities.map((entity) =>
+            NaslNode.StructureProperty({
+                name: utils.firstLowerCase(entity.name),
+                typeAnnotation: NaslTypeAnnotation.Reference({
+                    typeNamespace: entity.getNamespace(),
+                    typeName: entity.name,
+                }),
+            })),
     });
 }
 
@@ -78,7 +77,7 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
             return NaslQueryExpression.QueryJoinExpression({
                 entityNamespace: relationEntity.getNamespace(),
                 entityName: relationEntity.name,
-                joinType: 'INNER',
+                joinType: 'LEFT',
                 onExpressions: [
                     NaslLogicItem.BinaryExpression({
                         operator: '==',
@@ -100,7 +99,7 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
             });
         }),
     });
-    const where: any = supportFilter && genWhereExpression(entity);
+    const where: any = supportFilter ? genWhereExpression(entity) : undefined;
     return NaslLogicItem.Assignment({
         left: NaslLogicItem.Identifier({
             name: 'result',
@@ -120,7 +119,7 @@ export function genQueryAssignment(allEntities: Array<Entity>, nameGroup: NameGr
             from,
             where,
             groupBy: [],
-            having: [],
+            having: null,
             orderBy: supportSort ? [
                 NaslQueryExpression.QueryOrderByExpression({
                     label: '查询组件OrderBy元素',
@@ -174,11 +173,7 @@ export function genQueryLogic(allEntities: Array<Entity>, nameGroup: NameGroup,
             }),
         ],
         variables: [] as Array<any>,
-        body: [
-            NaslLogicItem.Start,
-            genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort),
-            NaslLogicItem.End,
-        ],
+        body: [NaslLogicItem.Start, genQueryAssignment(allEntities, nameGroup, supportFilter, supportSort), NaslLogicItem.End],
         playground: [] as Array<any>,
     });
     if (supportSort) {
@@ -214,7 +209,7 @@ export async function joinEntity(callQueryComponent: CallQueryComponent, entity:
     // 一般左联是自动有的了
     const rightProperty = entity.properties.find((property) => property.relationEntity === lastEntity.name);
     if (rightProperty) {
-        const leftProperty = lastEntity.properties.find((property) => property.name === rightProperty.name);
+        const leftProperty = lastEntity.properties.find((property) => property.name === rightProperty.relationProperty);
         joinInfo = {
             leftProperty,
             rightProperty,
@@ -222,7 +217,7 @@ export async function joinEntity(callQueryComponent: CallQueryComponent, entity:
     } else {
         const leftProperty = lastEntity.properties.find((property) => property.relationEntity === entity.name);
         if (leftProperty) {
-            const rightProperty = entity.properties.find((property) => property.name === leftProperty.name);
+            const rightProperty = entity.properties.find((property) => property.name === leftProperty.relationProperty);
             joinInfo = {
                 leftProperty,
                 rightProperty,
@@ -260,22 +255,38 @@ export async function joinEntity(callQueryComponent: CallQueryComponent, entity:
             }),
         }), recordStructure, 'properties');
         recordStructure.addProperty(structureProperty);
+    } else {
+        queryJoinExpression.onExpressions.push(NaslLogicItem.BinaryExpression({
+            operator: '==',
+            left: NaslQueryExpression.QueryFieldExpression({
+                label: '查询组件实体属性',
+                isDotStar: false,
+                entityAsName: lastEntity.name,
+            }),
+            right: NaslQueryExpression.QueryFieldExpression({
+                label: '查询组件实体属性',
+                isDotStar: false,
+                entityAsName: entity.name,
+            }),
+        }));
     }
     const newJoinPartLogicItem = QueryJoinExpression.from(queryJoinExpression, callQueryComponent, 'joinParts');
     from.addJoinPart(newJoinPartLogicItem);
+    callQueryComponent.saveStructure();
 }
 
 export default genQueryAssignment;
 
 export function genEditQueryStructure(allEntities: Array<Entity>, nameGroup: NameGroup) {
     allEntities = Array.from(new Set(allEntities));
-    const properties = allEntities.map((entity) => (NaslNode.StructureProperty({
-        name: utils.firstLowerCase(entity.name),
-        typeAnnotation: NaslTypeAnnotation.Reference({
-            typeNamespace: entity.getNamespace(),
-            typeName: entity.name,
-        }),
-    })));
+    const properties = allEntities.map((entity) =>
+        NaslNode.StructureProperty({
+            name: utils.firstLowerCase(entity.name),
+            typeAnnotation: NaslTypeAnnotation.Reference({
+                typeNamespace: entity.getNamespace(),
+                typeName: entity.name,
+            }),
+        }));
     properties.push(NaslNode.StructureProperty({
         name: 'editing',
         typeAnnotation: NaslCoreTypeAnnotation.String,

package/src/templator/genTableBlock.ts

@@ -12,10 +12,7 @@ import {
     genQueryStructure,
     genLogicParam,
 } from '.';
-import {
-    NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslUITypeAnnotation,
-    NaslTypeAnnotation, NaslLogicItem, NaslNode,
-} from './utils';
+import { NaslCoreTypeAnnotation, NaslCollectionTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 
 /**
  * 根据实体属性生成表格列模板
@@ -59,7 +56,7 @@ export function genTableColumnTemplate(property: EntityProperty) {
  * @param entity 实体
  * @param nameGroup 命名组
  */
-export function genTableTemplate(entity: Entity, nameGroup: NameGroup) {
+export function genTableTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
     const properties = entity.properties.filter(filterProperty('inTable'));
 
     return `<u-table-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
@@ -72,8 +69,8 @@ export function genTableTemplate(entity: Entity, nameGroup: NameGroup) {
     <u-table-view-column title="操作">
         <template #cell="scope">
             <u-linear-layout gap="small">
-                <u-link @click="${nameGroup.viewLogicModify || 'modify'}($event, scope)">修改</u-link>
-                <u-link @click="${nameGroup.viewLogicRemove}($event, scope)">删除</u-link>
+                <u-link ${modifyable ? `@click="${nameGroup.viewLogicModify || 'modify'}"` : ''}>修改</u-link>
+                <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
             </u-linear-layout>
         </template>
     </u-table-view-column>
@@ -144,7 +141,6 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const parentNode = entity.parentNode as App | Namespace;
     const parentNamespace = parentNode?.getNamespace();
     const ns = entity.ns;
-    console.log(ns)
     const deleteLogic = ns?.logics?.find((logic) => logic.name === 'delete');
     const idPropertys = entity.properties.filter((property) => property.primaryKey);
     return NaslNode.Logic({
@@ -177,7 +173,7 @@ export function genTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                     if (!paramFromLogic) {
                         paramFromLogic = getParamFromLogic(deleteLogic, 'id');
                     }
-                    return genLogicParam(paramFromLogic.name, `scope.item.${lowerEntityName}.id`);
+                    return genLogicParam(paramFromLogic.name, `scope.item.${lowerEntityName}.${paramFromLogic.name}`);
                 }),
             }),
             genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),

package/src/templator/genUpdateBlock.ts

@@ -59,7 +59,7 @@ export function genUpdateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
                 formItem += `<u-checkbox v-model="${vModel}"></u-checkbox>`;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<u-number-input v-model="${vModel}" placeholder="请输入${label}"></u-number-input>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<u-number-input v-model="${vModel}" :precision="0" :step="0" placeholder="请输入${label}"></u-number-input>`;
             } else if (propertyTypeName === 'Text') {
                 formItem += `<u-textarea v-model="${vModel}" placeholder="请输入${label}"></u-textarea>`;
@@ -124,6 +124,7 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                         <template #input><van-cascader title="请选择${label}" placeholder="请选择${label}"
                             v-model="${vModel}" :data-source="${selectNameGroup.viewLogicLoad}"
                             text-field="${lowerEntityName}.${displayedProperty.name}" value-field="${lowerEntityName}.${relationProperty.name}"
+                            :notitleblock="true"
                             :pageable="true" :remote-paging="true"></van-cascader></template>
                     `;
                     } else
@@ -134,15 +135,13 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 formItem += `<template #input><van-switch v-model="${vModel}"></van-switch></template>`;
             } else if (propertyTypeName === 'Integer' || propertyTypeName === 'Long') {
                 formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></template>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${label}"></van-stepper></template>`;
             } else if (propertyTypeName === 'Text') {
-                formItem = formItem.replace(/other/g, '');
-                formItem += `<van-input v-model="${vModel}" placeholder="请输入${label}"></van-input>`;
-
+                formItem += `<template #input><van-fieldtextarea v-model="${vModel}" placeholder="请输入${label}"></van-fieldtextarea></template>`;
                 // @TODO
             } else if (propertyTypeName === 'Date') {
-                formItem += `<template #input><van-calendar clearable :date.sync="${vModel}" placeholder="请输入${label}"></van-calendar></template>`;
+                formItem += `<template #input><van-calendar clearable :default-date.sync="${vModel}" placeholder="请输入${label}"></van-calendar></template>`;
             } else if (propertyTypeName === 'Time') {
                 formItem += `<template #input><van-datetime-picker type="time" v-model="${vModel}" title="请选择${label}" label-field=""></van-datetime-picker></template>`;
             } else if (propertyTypeName === 'DateTime') {
@@ -151,10 +150,9 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
                 const namespaceArr = propertyTypeNamespace.split('.');
                 const type = namespaceArr.pop();
                 if (type === 'enums') {
-                    formItem += genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true);
+                    formItem += '<template #input>' + genEnumSelectBlock(parentNode.findEnumByName(propertyTypeName) as Enum, `${vModel}`, '', `请选择${label}`, true) + '</template>';
                 } else {
-                    formItem = formItem.replace(/other/g, '');
-                    formItem += `<van-input v-model="${vModel}" placeholder="请输入${label}"></van-input>`;
+                    formItem += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></template>`;
                 }
             }
 
@@ -259,7 +257,7 @@ export function genUpdateBlock(entity: Entity, view: View) {
     const updateLogic = ns?.logics?.find((logic) => logic.name === `update`);
 
     const nameGroup: NameGroup = {};
-    nameGroup.viewElementMainView = view.getLogicUniqueName('form1');
+    nameGroup.viewElementMainView = view.getViewElementUniqueName('form1');
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewParamId = view.getParamUniqueName('id');
     nameGroup.viewLogicLoad = view.getLogicUniqueName('load');
@@ -324,7 +322,7 @@ export function genUpdateBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.views.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ],

package/src/templator/utils.ts

@@ -2,10 +2,11 @@ import { utils } from '..';
 import { App, Namespace, Entity, EntityProperty, Logic, View } from '../concepts';
 
 export const filterProperty = (key: 'inTable' | 'inFilter' | 'inForm' | 'inDetail') => (property: EntityProperty) => {
-    if (property.display)
+    if (property.display) {
         return property.display[key];
-    else
+    } else {
         return !['id', 'createdTime', 'updatedTime'].includes(property.name);
+    }
 };
 
 /**
@@ -17,7 +18,7 @@ export function getExpression(property: EntityProperty, expression: string) {
     const { typeAnnotation } = property || {};
     const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
     if (propertyTypeName === 'DateTime')
-        return `$utils['FormatDate'](${expression}, 'YYYY-MM-DD HH:mm:ss')`;
+        return `$utils['FormatDateTime'](${expression}, 'YYYY-MM-DD HH:mm:ss')`;
     else if (propertyTypeName === 'Date')
         return `$utils['FormatDate'](${expression}, 'YYYY-MM-DD')`;
     else {
@@ -224,6 +225,7 @@ export const NaslUITypeAnnotation = {
     UploadErrorEvent: genNaslUITypeAnnotation('UploadErrorEvent'),
     SortEvent: genNaslUITypeAnnotation('SortEvent'),
     PoiInfo: genNaslUITypeAnnotation('PoiInfo'),
+    File: genNaslUITypeAnnotation('File'),
     ScopeOf: genNaslUIGenericTypeAnnotation('ScopeOf'),
 };
 
@@ -361,7 +363,7 @@ export const NaslLogicItem = {
 };
 
 export const NaslQueryExpression = {
-    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName }: { label: string; isDotStar: boolean; entityAsName: string; propertyName: string }) => ({
+    QueryFieldExpression: ({ label, isDotStar, entityAsName, propertyName }: { label: string; isDotStar: boolean; entityAsName: string; propertyName?: string }) => ({
         concept: 'QueryFieldExpression',
         name: '',
         label,
@@ -446,7 +448,7 @@ export const NaslQueryExpression = {
         where: any;
         limit: any;
         groupBy: any[];
-        having: any[];
+        having: any;
         orderBy: any[];
         logicName: string;
         structureName: string;
@@ -495,10 +497,11 @@ export const NaslNode = {
         description,
         playground,
     }),
-    Structure: ({ name, properties }: { name: string; properties?: any[] }) => ({
+    Structure: ({ name, properties, origin }: { name: string; properties?: any[], origin?: 'CallQueryComponent' }) => ({
         concept: 'Structure',
         name,
         properties,
+        origin,
     }),
     StructureProperty: ({ name, typeAnnotation }: { name: string; typeAnnotation?: any }) => ({
         concept: 'StructureProperty',

package/src/test/fixtures/env.ts

@@ -9,8 +9,6 @@ export async function getApp() {
     await login('admin', 'Admin@123456');
 
     const app = new App({ id: appId });
-    // config.defaultApp = app;
-
     // await app.loadAll();
 
     return app;

package/src/test/units/page/Element.spec.ts

@@ -6,7 +6,7 @@ describe('Block', () => {
         it('简单标签', () => {
             const source = '<u-input size="normal" :checked="var1" v-model="var2" @change="onChange"></u-input>';
             const element = ViewElement.parse(source);
-            const result = element.toVue();
+            const result = element?.toVue();
             console.info(result);
             expect(source).to.equal(result);
         });
@@ -16,7 +16,7 @@ describe('Block', () => {
     <u-input size="normal" :checked="var1" v-model="var2" @change="onChange"></u-input>
 </u-linear-layout>`;
             const element = ViewElement.parse(source);
-            const result = element.toVue();
+            const result = element?.toVue();
             console.info(result);
             expect(source).to.equal(result);
         });
@@ -24,7 +24,7 @@ describe('Block', () => {
         it('去除 text 类型', () => {
             const source = `<u-linear-layout direction="vertical">这是一行文本</u-linear-layout>`;
             const element = ViewElement.parse(source);
-            const result = element.toVue();
+            const result = element?.toVue();
             console.info(result);
             expect(result).to.equal(`<u-linear-layout direction="vertical">
     <u-text text="这是一行文本"></u-text>

package/src/test/units/temp/temp.spec.ts

@@ -59,7 +59,7 @@ describe('Block', () => {
             </l-dashboard>
         `;
             const element = ViewElement.parse(source);
-            const result = element.toVue({ aslIdAttr: true });
+            const result = element?.toVue({ aslIdAttr: true });
             console.info(result);
         });
     });