@lcap/nasl 1.0.0-alpha.13 → 1.0.0-alpha.16

package/src/service/storage/init.ts

@@ -65,13 +65,14 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
             break;
     }
 
-    return logicItems;
+    return logicItems.filter((item: LogicItem) => !!item);
 }
 
 /**
  *  执行更新
  */
 async function doAction(app: any, actionItem: any) {
+    app.emit('saving');
     let hasFrontEnd = false;
     let hasBackEnd = false;
     const actionList: any[] = [];
@@ -80,11 +81,10 @@ async function doAction(app: any, actionItem: any) {
         list.forEach((event) => {
             const emitTarget = event?.originEvent?.target;
             const _path: string = event.originEvent.path;
-            const _root = _path.split('.')[1];
-            if (['entities', 'processes', 'logics'].some((item) => _root.startsWith(item))) {
+            const _root = _path.split('.')?.[1] || '';
+            if (['entities', 'processes', 'logics', 'enums', 'structures', 'interfaces'].some((item) => _root.startsWith(item))) {
                 hasBackEnd = true;
             }
-            // console.log(emitTarget, action, actionItem);
             const itemloop = (_i: LogicItem, app: any, diffArr: string[]) => {
                 const _l = getStatement(_i, app, diffArr);
                 if (_l.length) {
@@ -173,16 +173,22 @@ async function doAction(app: any, actionItem: any) {
     } else if (hasBackEnd) {
         ChangedNASLType = 'backend';
     }
+    let err;
     if (config.storage.protocol === 'http') {
-        storageService.batchAction({
-            body: actionList,
-            headers: {
-                appId: app.id,
-                ChangedNASLType,
-                'request-appBaseVersion': (window as any).appData?.baseVersion || '',
-                'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
-            },
-        });
+        try {
+            await storageService.batchAction({
+                body: actionList,
+                headers: {
+                    appId: app.id,
+                    ChangedNASLType,
+                    'request-appBaseVersion': (window as any).appData?.baseVersion || '',
+                    'request-versionChangedTime': (window as any).appData?.versionChangedTime || '',
+                },
+            });
+        } catch (error) {
+            err = error;
+            app.emit('refresh');
+        }
     } else if (config.storage.protocol === 'mock') {
         // Do nothing
     } else {
@@ -192,7 +198,7 @@ async function doAction(app: any, actionItem: any) {
             spaces: 4,
         });
     }
-
+    app.emit('saved', err);
     if (!app._historying) {
         if (app._historyIndex !== app._historyList.length) {
             app._historyList = app._historyList.splice(0, app._historyIndex);
@@ -233,9 +239,11 @@ function handleApp(app: any) {
      * 开启收集
      */
     app.on('collect:start', (event: any) => {
+        if (!app._isCollectingCount) {
+            app._actionMsg = event?.actionMsg;
+            app._action = event?.action;
+        }
         app._isCollectingCount++;
-        app._actionMsg = event?.actionMsg;
-        app._action = event?.action;
     });
 
     /**
@@ -258,6 +266,9 @@ function handleApp(app: any) {
             app._collectingList = [];
             app._actionMsg = '';
             app._action = '';
+        } else if (app._isCollectingCount < 0) {
+            app._isCollectingCount = 0;
+            throw Error('关闭收集有问题，请排查');
         }
     });
 

package/src/templator/genCreateBlock.ts

@@ -59,7 +59,7 @@ export function genCreateFormTemplate(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>`;
@@ -122,6 +122,7 @@ export function genH5CreateFormTemplate(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
@@ -132,13 +133,12 @@ export function genH5CreateFormTemplate(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="请输入${property.label || property.name}"></van-stepper></template>`;
-            } else if (propertyTypeName === 'Decimal') {
+            } else if (propertyTypeName === 'Double') {
                 formItem += `<template #input><van-stepper v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-stepper></template>`;
             } else if (propertyTypeName === 'Text') {
-                formItem = formItem.replace(/other/g, '');
-                formItem += `<template #input><van-input v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-input></template>`;
+                formItem += `<template #input><van-fieldtextarea v-model="${vModel}" placeholder="请输入${property.label || property.name}"></van-fieldtextarea></template>`;
             } else if (propertyTypeName === 'Date') {
-                formItem += `<template #input><van-calendar v-model="${vModel}" title="请输入${property.label || property.name}"></van-calendar></template>`;
+                formItem += `<template #input><van-calendar :default-date.sync="${vModel}" title="选择日期"></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>`;
             } else if (propertyTypeName === 'DateTime') {

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -5,14 +5,23 @@
  */
 import * as utils from '../utils';
 import { App, Namespace, Entity, View, Enum } from '../concepts';
+import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 import {
-    NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslTypeAnnotation,
-    NaslLogicItem, NaslNode,
-} from './utils';
-import {
-    filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty, genCallComponentLogic,
-    genQueryLogic, genEditTableTemplate, genEditTableLoadLogic, genTableRemoveLogic, genEnumSelectBlock,
-    genLoadSelectLogic, genBlurUpdateLogic, genEditQueryStructure, genQueryStructure, genLogicParam,
+    filterProperty,
+    NameGroup,
+    genUniqueQueryNameGroup,
+    getFirstDisplayedProperty,
+    genCallComponentLogic,
+    genQueryLogic,
+    genEditTableTemplate,
+    genEditTableLoadLogic,
+    genTableRemoveLogic,
+    genEnumSelectBlock,
+    genLoadSelectLogic,
+    genBlurUpdateLogic,
+    genEditQueryStructure,
+    genQueryStructure,
+    genLogicParam,
 } from '.';
 
 function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>) {
@@ -29,10 +38,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
             let formItem = `<u-form-item label="${label}">`;
 
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
@@ -60,7 +66,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                     `;
             } 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>`;
@@ -90,7 +96,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>
     `;
 }
@@ -127,10 +133,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                                 >`;
 
             const { typeAnnotation } = property || {};
-            const {
-                typeName: propertyTypeName,
-                typeNamespace: propertyTypeNamespace,
-            } = typeAnnotation || {};
+            const { typeName: propertyTypeName, typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
             if (property.relationEntity) {
                 // 有外键关联
                 const relationEntity = parentNode?.findEntityByName(property.relationEntity);
@@ -157,7 +160,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                         </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>`;
@@ -306,18 +309,14 @@ function genSubmitLogic(entity: Entity, nameGroup: NameGroup) {
                             NaslLogicItem.CallLogic({
                                 calleeNamespace: updateLogic.getNamespace(),
                                 calleeName: updateLogic.name,
-                                arguments: [
-                                    genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableInput),
-                                ],
+                                arguments: [genLogicParam(`${updateLogic.params[0].name}`, nameGroup.viewVariableInput)],
                             }),
                         ],
                         alternate: [
                             NaslLogicItem.CallLogic({
                                 calleeNamespace: createLogic.getNamespace(),
                                 calleeName: createLogic.name,
-                                arguments: [
-                                    genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableInput),
-                                ],
+                                arguments: [genLogicParam(`${createLogic.params[0].name}`, nameGroup.viewVariableInput)],
                             }),
                         ],
                     }),
@@ -382,7 +381,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
     const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, parentNode);
     newLogics.push(entityLogic);
 
-    console.log(entityStructure);
+    // console.log(entityStructure);
 
     return `<template>
     <u-linear-layout direction="vertical">
@@ -439,7 +438,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -61,7 +61,7 @@ function genFilterTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroup
                     `;
             } 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>
     `;
 }
@@ -159,7 +159,7 @@ function genSaveModalTemplate(entity: Entity, nameGroup: NameGroup, selectNameGr
                         </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()}.${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()}.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],

package/src/templator/genEditTableBlock.ts

@@ -70,7 +70,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
             </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>

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,10 +55,11 @@ 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 += `<template  #title>${temptitle}</template>`;
             formItem += `<template>{{ ${getExpression(property, `${nameGroup.viewVariableEntity}.${property.name}`)} }}</template>            </van-cell>\n`;
             return formItem;
         })
@@ -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

@@ -13,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';
 
 /**
  * 根据实体属性生成表格列模板
@@ -102,7 +99,7 @@ export function genH5GridViewCardTemplate(property: EntityProperty) {
  * @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}"
@@ -121,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>

package/src/templator/genQueryComponent.ts

@@ -6,6 +6,7 @@ export function genQueryStructure(allEntities: Array<Entity>, nameGroup: NameGro
     allEntities = Array.from(new Set(allEntities));
     return NaslNode.Structure({
         name: nameGroup.structure,
+        origin: 'CallQueryComponent',
         properties: allEntities.map((entity) =>
             NaslNode.StructureProperty({
                 name: utils.firstLowerCase(entity.name),

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>

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,7 +150,7 @@ 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 += `<template #input><van-fieldinput v-model="${vModel}" placeholder="请输入${label}"></van-fieldinput></template>`;
                 }
@@ -323,7 +322,7 @@ export function genUpdateBlock(entity: Entity, view: View) {
             "concept": "BindEvent",
             "arguments": [],
             "name": "created",
-            "calleeNamespace": "${view.getNamespace()}.${view.name}.logics",
+            "calleeNamespace": "",
             "calleeName": "${nameGroup.viewLogicLoad}"
         }
     ],

package/src/templator/utils.ts

@@ -497,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/utils/index.ts

@@ -2,6 +2,7 @@ export * from './string';
 export * from './traverse';
 export * from './logger';
 
+import { compare } from 'compare-versions';
 import { traverse } from './traverse';
 
 export function getGlobalEnv() {
@@ -34,6 +35,24 @@ export function clearObjectDeep(obj: any) {
 
 export const waitPromise = (wait: number) => new Promise((res) => setTimeout(() => res(wait), wait));
 
+// 官方扩展组件暂时不包含 css 文件
+export const officialCustoms = [
+    'lcap-login',
+    'lcap-video',
+    'lcap-amap-nav',
+    'lcap-amap-poi',
+    'lcap-echarts-bar',
+    'lcap-echarts-line',
+    'lcap-echarts-pie',
+    'lcap-report',
+    'lcap-h5-iframe',
+    'lcap-wang-editor',
+];
+// 特殊官方组件，部分低版本有 css，高版本没有 css
+export const specialOfficialCustoms = [{ name: 'lcap-rich-text-editor', version: '1.3.10' }];
+export const shouldLoadCss = (name: string, version: string): boolean => (!officialCustoms.includes(name)
+  && !specialOfficialCustoms.find((extra) => extra.name === name && compare(version, extra.version, '>=')));
+
 // https://github.com/Microsoft/TypeScript/issues/27024#issuecomment-421529650
 export type IfEquals<X, Y, A, B> = (<T>() => T extends X ? 1 : 2) extends <T>() => T extends Y ? 1 : 2 ? A : B;