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

package/src/server/naslServer.ts

@@ -39,10 +39,11 @@ import {
     CallInterface,
     Return,
     ProcessElement,
+    NullLiteral,
 } from '../concepts';
 import { lsp2tspNumber, SourceMap, SourceMapItem, embeddedTSEmitter } from '../translator';
 import axios from '../service/storage';
-import { transformType, translateDiagnosticMessage } from './translator';
+import { translateDiagnosticMessage } from './translator';
 import { EventPayload, invokeCommand, registerCommand } from '../common';
 import { DiagnosticRecord, Diagnostic, default as diagnosticManager } from '../manager/diagnostic';
 import formatUiTs from './createUiTs';
@@ -66,7 +67,6 @@ interface setNameNode extends BaseNode {
     [propname: string]: any;
 }
 
-export { transformType, translateDiagnosticMessage };
 const worker = new Worker('/ts-worker.js');
 const messager = new Messager({
     protocol: 'ts-worker',
@@ -110,12 +110,18 @@ const naslServer = {
         return this.messager.requestCommand('start');
     },
     async createUiTs(allComponent: any) {
-        const { code, elementsLogic } = await formatUiTs(allComponent);
+        const { code, elementsLogic, naslStdlibMap } = await formatUiTs(allComponent);
         // 放入生產的uits文件
         await naslServer.addFile({
             file: 'nasl.ui.definition.ts',
             fileContent: code,
         });
+        Object.keys(naslStdlibMap).forEach(async (libFileName: string) => {
+            await naslServer.addFile({
+                file: '/' + libFileName,
+                fileContent: naslStdlibMap[libFileName],
+            });
+        });
         naslServer.elementsLogic = elementsLogic;
         // 全部文件加载完毕开始初始化
         await naslServer.getDiagnosticRecordsAndPushAll();
@@ -294,20 +300,18 @@ const naslServer = {
         return this.messager.requestCommand('updateFiles', args);
     },
     _debugInFileStorage(node: BaseNode, openFiles: Array<tsProtocol.OpenRequestArgs>) {
-        try {
-            if (window && window.location.host.includes('localhost')) {
-                let app = node;
-                if (node.concept !== 'App') {
-                    app = (node as any).rootNode || (node as any).app;
-                }
-                return Promise.all(openFiles.map(async (file) => {
-                    const res = await axios.post('/api/App/debugEmbedded?id=' + app.id, file);
-                    return res.data;
-                }));
-            }
-        } catch (err) {
-            console.log(err);
+        /// #if process.env.NODE_ENV === 'development'
+        let app = node;
+        if (node.concept !== 'App') {
+            app = (node as any).rootNode || (node as any).app;
         }
+        return Promise.all(openFiles.map(async (file) => {
+            const res = await axios.post('/api/App/debugEmbedded?id=' + app.id, file);
+            return res.data;
+        })).catch((e) => {
+            console.error(e);
+        });
+        /// #endif
     },
     open() {
         return this.messager.requestCommand('open');
@@ -398,6 +402,11 @@ const naslServer = {
                 }> = [{ title: '基础类型', children: res }];
                 return dataTypeList;
             }
+        } else if (node instanceof NullLiteral) {
+            return [{ title: '基础类型', children: primitiveTypeList }];
+        } else {
+            // 字符串 和 inter
+            return [{ title: '基础类型', children: [primitiveTypeList[1], primitiveTypeList[4]] }];
         }
     },
     _getTypeQuickinfo(args: any) {
@@ -446,7 +455,7 @@ const naslServer = {
 
             // 语义诊断
             record.semanticDiagnostics = record.semanticDiagnostics
-                .map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, (node as FileNode)))
+                .map((diag) => this._resolveDiagnostic(diag as unknown as tsProtocol.DiagnosticWithFileName, node as FileNode))
                 .filter((diag) => !!diag);
 
             // 建议诊断
@@ -480,7 +489,6 @@ const naslServer = {
         };
 
         if (minRange) {
-            // let message = this.translateDiagnosticMessage(diagnostic.text);
             // 节点的error要置为true
             return naslServer._diagnosticSpecialTreatment(minRange, tsErrorDetail);
         } else {
@@ -531,6 +539,16 @@ const naslServer = {
             }
         }
 
+        if (minRange.node instanceof Identifier || minRange.node instanceof MemberExpression) {
+            if (/Cannot find name '(.+?)'. Did you mean '(.+?)'\?/.exec(text) && minRange.node.parentNode instanceof MemberExpression) {
+                let parentNode: BaseNode = minRange.node;
+                while (parentNode && parentNode.concept && parentNode.parentNode.concept === 'MemberExpression') {
+                    parentNode = parentNode.parentNode;
+                }
+                minRange.node = parentNode || minRange.node;
+            }
+        }
+
         if (/'(.+?)' has no exported member(?: named)? '(.+?)'/.exec(text) || /Property '(.+?)' does not exist on type '(.+?)'./.exec(text)) {
             if (minRange.node instanceof TypeAnnotation) {
                 // 变量type的报错放到内部
@@ -611,7 +629,7 @@ const naslServer = {
 
         if (node instanceof Return) {
             // 过滤一下最后出去的值
-            refsList = refsList.filter((item) => !(item.lineText.includes('return ')));
+            refsList = refsList.filter((item) => !item.lineText.includes('return '));
         }
 
         // 如果是参数, 就需要把logic的引用 都查找出来就需要把他的父级的引用全部查找出来
@@ -701,7 +719,7 @@ const naslServer = {
                 const fileNode = this.file2NodeMap.get(record.file);
                 if (!fileNode)
                     return null;
-                const minRange: reNameMinRange = this._findMinRange(record, (fileNode as FileNode));
+                const minRange: reNameMinRange = this._findMinRange(record, fileNode as FileNode);
                 if (minRange) {
                     // 如果节点是TypeAnnotation类型,
                     // 很复杂，可能是多级嵌套结构
@@ -906,14 +924,14 @@ const naslServer = {
                         const newBindRoles = str.split(',');
                         minRange.newValue = newBindRoles;
                     }
-                    if ((minRange.node instanceof QueryFieldExpression) && (node instanceof Entity)) {
+                    if (minRange.node instanceof QueryFieldExpression && node instanceof Entity) {
                         minRange.setTypeMethods = 'setEntityAsName';
                     }
 
-                    if ((minRange.node instanceof QueryFromExpression) && (node instanceof Entity)) {
+                    if (minRange.node instanceof QueryFromExpression && node instanceof Entity) {
                         minRange.setTypeMethods = 'setEntityName';
                     }
-                    if ((minRange.node instanceof QueryFieldExpression) && (node instanceof EntityProperty)) {
+                    if (minRange.node instanceof QueryFieldExpression && node instanceof EntityProperty) {
                         minRange.setTypeMethods = 'setPropertyName';
                     }
                     if (minRange.node instanceof Destination && node instanceof Process) {
@@ -969,7 +987,7 @@ const naslServer = {
             const fileNode = this.file2NodeMap.get(record.file);
             if (!fileNode)
                 return null;
-            const minRange: MinRange = this._findMinRange(record, (fileNode as FileNode));
+            const minRange: MinRange = this._findMinRange(record, fileNode as FileNode);
             if (minRange) {
                 // 如果找到节点是callLogic就去更新
                 if (minRange.node instanceof CallLogic && node instanceof Param) {
@@ -998,7 +1016,7 @@ const naslServer = {
                 const fileNode = this.file2NodeMap.get(record.file);
                 if (!fileNode)
                     return;
-                const minRange = this._findMinRange(record, (fileNode as FileNode));
+                const minRange = this._findMinRange(record, fileNode as FileNode);
                 // 过滤一把不需要改的信息
                 if (minRange) {
                     // 拼装树
@@ -1034,7 +1052,9 @@ const naslServer = {
             // 排除一些不放入集合的节点
             let isNeedPush = true;
             // 如果不是ViewElement 或者 Assignment ， 或者如果是的话， 排除l-root
-            if (currentNode instanceof ViewElement && (currentNode as ViewElement).tag !== 'l-root')
+            if (currentNode instanceof ViewElement && (currentNode as ViewElement).tag === 'l-root')
+                isNeedPush = false;
+            else if (currentNode instanceof Argument)
                 isNeedPush = false;
             else if (currentNode instanceof Assignment)
                 isNeedPush = false;
@@ -1137,6 +1157,8 @@ const naslServer = {
      *  当前this上下文 的Source 和 父级文件级别的节点
      */
     getCurrentSource(node: BaseNode) {
+        if (node instanceof App)
+            return { fileNode: null };
         let sourceMap = node.sourceMap;
         let fileNode = node;
         // 如果没有sourceMap,就继续向上找 ,或者到module结束
@@ -1327,6 +1349,21 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
             // 如果有依赖就有一个查找引用提示
             confirmParms.tipFlag = true;
             const node = this;
+
+            // 删除页面或者流程
+            if (node instanceof View || node instanceof Process) {
+                /**
+                 * 查找这个页面是不是有依赖
+                 */
+                let viewPath = (this as FileNode).getEmbeddedFilePath();
+                viewPath = viewPath.slice(0, viewPath.length - 3);
+                const find = refsList.find((record) => !record.file.includes(viewPath));
+                // 如果没有别的文件的依赖，就直接delete
+                if (!find) {
+                    this.delete();
+                    return;
+                }
+            }
             callback = () => {
                 // removeParam
                 // 跟rename 还不太一样，部分修改依赖修改好的值，然后在下面的修改需要把自己传递进去
@@ -1342,7 +1379,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                         const fileNode = naslServer.file2NodeMap.get(record.file);
                         if (!fileNode)
                             return null;
-                        const minRange: MinRange = naslServer._findMinRange(record, (fileNode as FileNode));
+                        const minRange: MinRange = naslServer._findMinRange(record, fileNode as FileNode);
                         if (minRange) {
                             if (minRange.node instanceof CallLogic) {
                                 minRange.node.setCalleeArgName(logicNode as Logic);
@@ -1365,7 +1402,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                         const fileNode = naslServer.file2NodeMap.get(record.file);
                         if (!fileNode)
                             return null;
-                        const minRange: MinRange = naslServer._findMinRange(record, (fileNode as FileNode));
+                        const minRange: MinRange = naslServer._findMinRange(record, fileNode as FileNode);
                         if (minRange) {
                             if (minRange.node instanceof Interface) {
                                 minRange.node.delete();
@@ -1387,7 +1424,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                         const fileNode = naslServer.file2NodeMap.get(record.file);
                         if (!fileNode)
                             return null;
-                        const minRange: MinRange = naslServer._findMinRange(record, (fileNode as FileNode));
+                        const minRange: MinRange = naslServer._findMinRange(record, fileNode as FileNode);
                         if (minRange) {
                             if (minRange.node instanceof View || minRange.node instanceof ViewElement) {
                                 // oldName旧的节点存的值
@@ -1404,6 +1441,10 @@ BaseNode.prototype.prepareDelete = async function prepareDelete() {
                     return;
                 }
 
+                // 删除页面或者流程,如果上一步没有return 就说明他是有别的引用的，会有引用弹框
+                if (node instanceof View || node instanceof Process) {
+                    this.delete();
+                }
                 // 其余的都直接调用删除
                 // Structure 和 Interface是内部有delete方法
                 if (node instanceof Structure || node instanceof Interface) {
@@ -1434,30 +1475,6 @@ BaseNode.prototype.addParamsPrepare = async function addParamsPrepare() {
     }
 };
 
-/**
- * 页面的删除同步他的子页面要一起删除
- */
-BaseNode.prototype.viewPrepareDelete = async function viewPrepareDelete() {
-    try {
-        /**
-         * 查找这个页面是不是有依赖
-         */
-        const refsList = await naslServer._isHaveRef(this);
-        let viewPath = (this as FileNode).getEmbeddedFilePath();
-        viewPath = viewPath.slice(0, viewPath.length - 3);
-        const find = refsList.find((record) => !record.file.includes(viewPath));
-        // 如果有别的文件的依赖
-        if (find) {
-            // 就展示弹框
-            this.prepareDelete();
-        } else {
-            this.delete();
-        }
-    } catch (err) {
-        console.log(err);
-    }
-};
-
 /**
  * 除去rename场景下的更新
  * @param fileNode 文件级别的节点
@@ -1482,14 +1499,19 @@ async function handleChange(fileNode: BaseNode, targetNode: BaseNode, result: Re
     newRefs.refs.forEach((ref) => filesToCheck.add(ref.file));
     // 唤起建立连接弹框
     // 文件级别的建立连接采取提醒
-    if (fileNode === targetNode && action === 'create' && filesToCheck.size > 1) {
-        const confirmParms = {
-            actionType: 'createEstablishConnection',
-            node: fileNode,
-            icon: 'success',
-        };
-        invokeCommand('tsConfirm.open', confirmParms, () => { });
+    if (action === 'create' && (targetNode as any).__init) {
+        // 清除临时状态, 完成本次创建
+        delete (targetNode as any).__init;
+        if (fileNode === targetNode && filesToCheck.size > 1) {
+            const confirmParms = {
+                actionType: 'createEstablishConnection',
+                node: fileNode,
+                icon: 'success',
+            };
+            invokeCommand('tsConfirm.open', confirmParms, () => {});
+        }
     }
+
     // console.log('filesToCheck', filesToCheck, filesToCheck.size);
     await naslServer.getDiagnosticRecordsAndPushAll(Array.from(filesToCheck));
 }
@@ -1546,7 +1568,7 @@ async function handleRename(fileNode: BaseNode, targetNode: BaseNode, result: Re
                 node: fileNode,
                 icon: 'success',
             };
-            invokeCommand('tsConfirm.open', confirmParms, () => { });
+            invokeCommand('tsConfirm.open', confirmParms, () => {});
         }
     } else {
         // 查一下当前属性依赖的文件
@@ -1582,7 +1604,7 @@ async function receiveHandleChange($event: EventPayload) {
     // 当前操作的文件节点
     const { fileNode } = naslServer.getCurrentSource(targetNode);
     // 如果是导入模块就，就引入对应模块,先不处理module和Configuration，下面的内容会自动创建
-    if (fileNode instanceof Module || fileNode instanceof Configuration) {
+    if (!fileNode || fileNode instanceof Module || fileNode instanceof Configuration) {
         return;
     }
 

package/src/server/translator.ts

@@ -1,5 +1,5 @@
 import naslServer from './naslServer';
-export function transformType(tsType: string): string {
+function transformType(tsType: string): string {
     if (tsType === 'string' || tsType === 'String')
         return '字符串';
     else if (tsType === 'number')
@@ -24,6 +24,8 @@ export function transformType(tsType: string): string {
         return '枚举';
     else if (tsType === 'views')
         return '页面';
+    else if (tsType === 'void')
+        return '无返回值';
     else if (tsType === '__elements')
         return '页面元素';
     else if (tsType === 'Promise<void>')
@@ -44,7 +46,7 @@ export function transformType(tsType: string): string {
     }
 }
 
-export function transformNamespace(tsNamespace: string): string {
+function transformNamespace(tsNamespace: string): string {
     if (tsNamespace.endsWith('.structures'))
         return '数据结构';
     else if (tsNamespace.endsWith('.logics'))
@@ -53,7 +55,7 @@ export function transformNamespace(tsNamespace: string): string {
         return tsNamespace;
 }
 
-export function transformMethod(tsMethod: string): string {
+function transformMethod(tsMethod: string): string {
     if (tsMethod === 'forEach')
         return 'ForEach';
     return tsMethod;
@@ -79,9 +81,14 @@ export function translateDiagnosticMessage(message: string) {
             transforms: [transformType, transformType],
         },
         {
-            re: /^This condition will always return 'false' since the types '(.+?)' and '(.+?)' have no overlap\.$/,
-            result: '类型不一致！左边类型：$1，右边类型：$2。',
-            transforms: [transformType, transformType],
+            re: /^This condition will always return '(.+?)' since the types '(.+?)' and '(.+?)' have no overlap./,
+            result: '类型不一致！左边类型：$2，右边类型：$3。',
+            transforms: [transformType, transformType, transformType],
+        },
+        {
+            re: /(.+?) Argument of type '(.+?)' is not assignable to parameter of type '(.+?)'.$/,
+            result: '类型不一致！传入类型：$2，接收类型：$3。',
+            transforms: [transformType, transformType, transformType],
         },
         {
             re: /^Type '(.+?)' is missing the following properties from type '(.+?)'/,
@@ -160,6 +167,11 @@ export function translateDiagnosticMessage(message: string) {
             result: '找不到 $1，您是想要 $2 吗？',
             transforms: [outOriginalvalue, outOriginalvalue],
         },
+        {
+            re: /Expected (.+?) type arguments, but got (.+?)./,
+            result: '预期 $1 个类型参数，但传入了 $2 个。',
+            transforms: [outOriginalvalue, outOriginalvalue],
+        },
         {
             re: /Expected (.+?) arguments, but got (.+?)./,
             result: '预期 $1 个参数，但传入了 $2 个。',

package/src/service/storage/init.ts

@@ -72,6 +72,7 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
  *  执行更新
  */
 async function doAction(app: any, actionItem: any) {
+    app.emit('saving');
     let hasFrontEnd = false;
     let hasBackEnd = false;
     const actionList: any[] = [];
@@ -84,7 +85,6 @@ async function doAction(app: any, actionItem: any) {
             if (['entities', 'processes', 'logics'].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,21 @@ 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;
+        }
     } else if (config.storage.protocol === 'mock') {
         // Do nothing
     } else {
@@ -192,7 +197,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 +238,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;
     });
 
     /**

package/src/templator/genCreateBlock.ts

@@ -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
@@ -135,10 +136,9 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             } else if (propertyTypeName === 'Decimal') {
                 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);
@@ -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);
@@ -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

@@ -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}"
         }
     ],
@@ -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/genGetBlock.ts

@@ -109,7 +109,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/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/genUpdateBlock.ts

@@ -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
@@ -137,12 +138,10 @@ export function genH5UpdateFormTemplate(entity: Entity, nameGroup: NameGroup, se
             } else if (propertyTypeName === 'Decimal') {
                 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}"
         }
     ],