@lcap/nasl 2.16.1 → 2.17.1

package/src/server/translator.ts

@@ -43,6 +43,8 @@ import {
     ProcessOutcome,
     Function,
     Anchor,
+    BatchAssignment,
+    AnonymousFunction,
 } from '../concepts';
 import { SourceMapItem } from '../translator';
 import { Diagnostic } from '../manager/diagnostic';
@@ -108,7 +110,7 @@ function transformType(tsType: string): string {
         const types = tsType.split(' | ');
         let tsStr = '';
         types.forEach((item, index) => {
-            tsStr += index === 0 ? transformType(item) : ' | ' + transformType(item);
+            tsStr += index === 0 ? transformType(item) : ' 或 ' + transformType(item);
         });
         return tsStr;
     } else {
@@ -208,7 +210,7 @@ const TS_RULES: Array<{
     },
     {
         re: /Cannot find name '__(?:QueryFieldExpression)__'/,
-        result: '数据查询：实体字段不能为空。',
+        result: '数据查询：实体属性不能为空。',
     },
     {
         re: /Cannot find name '__(?:WHERE_MULTIPLE_CONDITION)__'/,
@@ -226,6 +228,14 @@ const TS_RULES: Array<{
         re: /Cannot find name '__(?:EMPTY_AGGREGATE_ALIAS)__'/,
         result: '数据查询：聚合函数别名不能为空。',
     },
+    {
+        re: /Cannot find name '__(?:EMPTY_GROUP_BY_NAME)__'/,
+        result: '数据查询：分组属性不能为空。',
+    },
+    {
+        re: /Cannot find name '__(?:EMPTY_GROUP_BY_ALIAS)__'/,
+        result: '分组属性别名不能为空。',
+    },
     {
         re: /Cannot find name '__(?:SQL_GRAMMAR_ERROR)__'/,
         result: 'SQL查询：语句可能有异常。',
@@ -234,6 +244,10 @@ const TS_RULES: Array<{
         re: /Cannot find name '__UsersEmpty__'./,
         result: '任务完成人为空',
     },
+    {
+        re: /Cannot find name '__assignmentLineEmpty__'./,
+        result: '批量赋值没有连线',
+    },
     {
         re: /No value exists in scope for the shorthand property '__(?:IDENTIFIER|LEFT|RIGHT)__'. Either declare one or provide an initializer./,
         result: '用户任务未关联页面',
@@ -344,6 +358,11 @@ const POST_RULES: Array<{
         re: /never/g,
         result: '未知类型',
     },
+    // 匿名数据结构去掉冗余展示 __name: "AStructure_\w{8}"
+    {
+        re: /__name: "AStructure_\w{8}";/g,
+        result: '',
+    },
 ];
 Object.keys(NAMESPACE_CONCEPT_MAP).forEach((key) => {
     POST_RULES.push({
@@ -448,6 +467,11 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         }
     }
 
+    if (node instanceof AnonymousFunction) {
+        if (node.body)
+            node = node.body;
+    }
+
     // 处理一些复制过来的内容 Identifier或者MemberExpression内容缺失，错误要像上冒
     if (node instanceof Identifier || node instanceof MemberExpression) {
         if (node.parentNode instanceof MemberExpression) {
@@ -489,6 +513,8 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
             tsErrorDetail.message = '!：参数不能为空！';
         } else if (node instanceof Assignment) {
             tsErrorDetail.message = '赋值：参数不能为空！';
+        } else if (node instanceof BatchAssignment) {
+            tsErrorDetail.message = '批量赋值：参数不能为空';
         } else if ((node instanceof Argument && node.parentNode instanceof CallInterface) || node instanceof CallInterface) {
             tsErrorDetail.message = '调用接口：参数不能为空！';
         } else if ((node instanceof Argument && node.parentNode instanceof CallFunction) || node instanceof CallFunction) {
@@ -533,6 +559,13 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         let str = tsErrorDetail.message;
         str = (node.parentNode as any).constructor.nodeTitle + '：' + str;
         tsErrorDetail.message = str;
+
+        if(node.parentNode instanceof AnonymousFunction) {
+            // 匿名函数：左右参数类型不一致！左边类型：布尔值，右边类型：整数。
+            tsErrorDetail.message = tsErrorDetail.message.replace('左右参数', '返回值')
+                .replace('左边类型', '接收类型')
+                .replace('右边类型', '传入类型');
+        }
     }
 
     // 左右类型不一致的，把上级信息带上

package/src/service/storage/init.ts

@@ -1,5 +1,5 @@
 import { embeddedTSEmitter } from '../../translator';
-import { App, LogicItem, Logic, Module, View, ViewElement } from '../../concepts';
+import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers } from '../../concepts';
 import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
 import Vue from 'vue';
@@ -61,8 +61,14 @@ function getStatement(state: any, app: any, diffLogicList: string[]) {
             logicItems = [state.test, ...state.body];
             break;
         case 'CallLogic':
-            getLogic(state.calleeKey, app, diffLogicList);
+            logicItems = state.arguments?.map((item:Argument) => item.expression);
+            getLogic(state.calleewholeKey, app, diffLogicList);
             break;
+        case 'CallInterface':
+            logicItems = state.arguments?.map((item:Argument) => item.expression);
+            break;
+        case 'BatchAssignment':
+            logicItems = [state.left?.expression, ...state.left?.members, ...state.rights.map((item:SelectMembers) => [item?.expression, ...item?.members]).flat(1)];
         default:
             break;
     }
@@ -123,10 +129,7 @@ async function doAction(app: any, actionItem: any) {
                 const emitTarget = event?.originEvent?.target;
                 const _path: string = event.originEvent.path;
                 const _root = _path.split('.')?.[1] || '';
-                if (
-                    ['dataSources', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'componentDependencies', 'configuration', 'dependencies'].some((item) =>
-                        _root.startsWith(item))
-                ) {
+                if (['dataSources', 'processes', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies'].some((item) => _root.startsWith(item))) {
                     hasBackEnd = true;
                 }
                 if (emitTarget.concept === 'Logic') {

package/src/service/storage/jsoner.ts

@@ -43,7 +43,7 @@ export function queryNodeByPath(json: any, path: string): any {
         const arrayPropertyKey = pathItem.split('[')[0];
         const arrOption = matchArr && matchArr[1] && matchArr[1].split('=');
         if (arrayPropertyKey && arrayPropertyKey !== 'app') {
-            node = node[arrayPropertyKey];
+            node = node?.[arrayPropertyKey];
             if (Array.isArray(arrOption) && arrOption.length && Array.isArray(node)) {
                 if (arrOption.length === 2) {
                     node = node.filter((nodeItem) => nodeItem[arrOption[0]] === arrOption[1])[0];

package/src/service/video/VideoTranscribe.js

@@ -61,7 +61,6 @@ class VideoTranscribe {
             // 录屏结束，并且数据可用
             this.recordBtn.style.display = 'block';
             this.stopBtn.style.display = 'none';
-            console.log('dataavailable------------');
             this.videoUrl = URL.createObjectURL(event.data, {
                 type: 'video/mp4',
             });

package/src/templator/genCreateBlock.ts

@@ -11,7 +11,6 @@ import {
     genCallComponentLogic,
     genEnumSelectBlock,
     genLoadSelectLogic,
-    genQueryStructure,
     genQueryLogic,
 } from '.';
 
@@ -250,7 +249,6 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement) {
 
     // 收集所有和本实体关联的实体
     const selectNameGroupMap: Map<string, NameGroup> = new Map();
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     const newLoadSelectLogics: any[] = [];
     entity.properties.forEach((property) => {
@@ -266,9 +264,7 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement) {
                     // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
                     const key = [property.name, relationEntity.name].join('-');
                     selectNameGroupMap.set(key, selectNameGroup);
-                    const newStructure = genQueryStructure([relationEntity], selectNameGroup);
                     const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
-                    newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
                 }
@@ -295,8 +291,7 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement) {
         ${JSON.stringify(genSubmitLogic(createLogic, nameGroup))}
         ${newLoadSelectLogics.map((logic) => ',' + JSON.stringify(logic)).join('\n')}
     ],
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;

package/src/templator/genCurdEditMultipleKeyBlock.ts

@@ -20,7 +20,6 @@ import {
     genLoadSelectLogic,
     genBlurUpdateLogic,
     genEditQueryStructure,
-    genQueryStructure,
     genLogicParam,
     genReloadLogic,
     genSubmitLogic,
@@ -287,7 +286,6 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
     const entitySet: Set<Entity> = new Set();
     entitySet.add(entity);
     const selectNameGroupMap: Map<string, NameGroup> = new Map();
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     const newLoadSelectLogics: any[] = [];
     entity.properties.forEach((property) => {
@@ -304,9 +302,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
                     // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
                     const key = [property.name, relationEntity.name].join('-');
                     selectNameGroupMap.set(key, selectNameGroup);
-                    const newStructure = genQueryStructure([relationEntity], selectNameGroup);
                     const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
-                    newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
                 }
@@ -314,8 +310,6 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         }
     });
     const allEntities = [...entitySet];
-    const entityStructure = genEditQueryStructure(allEntities, nameGroup);
-    newStructures.push(entityStructure);
     const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
     newLogics.push(entityLogic);
     return `<template>
@@ -374,8 +368,7 @@ export function genCurdEditMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         }
     ],
 
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;

package/src/templator/genCurdMultipleKeyBlock.ts

@@ -12,7 +12,7 @@ import {
 } from './utils';
 import {
     filterProperty, NameGroup, genUniqueQueryNameGroup, getFirstDisplayedProperty,
-    genCallComponentLogic, genQueryLogic, genQueryStructure, genTableTemplate, genEnumSelectBlock,
+    genCallComponentLogic, genQueryLogic, genTableTemplate, genEnumSelectBlock,
     genTableLoadLogic, genTableRemoveLogic, genLoadSelectLogic, genGridViewTemplate,
     genGridViewLoadLogic, genGridViewRemoveLogic, genLogicParam,
 } from '.';
@@ -405,7 +405,7 @@ function genModifyLogic(entity: Entity, nameGroup: NameGroup) {
                             expression: NaslLogicItem.MemberExpression({
                                 object: NaslLogicItem.MemberExpression({
                                     object: NaslLogicItem.Identifier({
-                                        name: 'scope',
+                                        name: 'current',
                                     }),
                                     property: NaslLogicItem.Identifier({
                                         name: 'item',
@@ -453,7 +453,6 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
     const entitySet: Set<Entity> = new Set();
     entitySet.add(entity);
     const selectNameGroupMap: Map<string, NameGroup> = new Map();
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     const newLoadSelectLogics: any[] = [];
     entity.properties.forEach((property) => {
@@ -470,9 +469,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
                     // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
                     const key = [property.name, relationEntity.name].join('-');
                     selectNameGroupMap.set(key, selectNameGroup);
-                    const newStructure = genQueryStructure([relationEntity], selectNameGroup);
                     const newLogic = genQueryLogic([relationEntity], selectNameGroup, false, false, module);
-                    newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
                 }
@@ -480,8 +477,6 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
         }
     });
     const allEntities = [...entitySet];
-    const entityStructure = genQueryStructure(allEntities, nameGroup);
-    newStructures.push(entityStructure);
     const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
     newLogics.push(entityLogic);
 
@@ -547,8 +542,7 @@ export function genCurdMultipleKeyBlock(entity: Entity, oldNode: ViewElement) {
         }
     ],
 
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;
@@ -581,7 +575,6 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
     const entitySet: Set<Entity> = new Set();
     entitySet.add(entity);
     const selectNameGroupMap: Map<string, NameGroup> = new Map();
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     const newLoadSelectLogics: any[] = [];
     entity.properties.forEach((property) => {
@@ -598,13 +591,9 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
                     // 存在多个属性关联同一个实体的情况，因此加上属性名用以唯一标识
                     const key = [property.name, relationEntity.name].join('-');
                     selectNameGroupMap.set(key, selectNameGroup);
-                    const newStructure = genQueryStructure([
-                        relationEntity,
-                    ], selectNameGroup);
                     const newLogic = genQueryLogic([
                         relationEntity,
                     ], selectNameGroup, false, false, module);
-                    newStructures.push(newStructure);
                     newLogics.push(newLogic);
                     newLoadSelectLogics.push(genLoadSelectLogic(relationEntity, selectNameGroup, newLogic));
                 }
@@ -612,8 +601,6 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
         }
     });
     const allEntities = [...entitySet];
-    const entityStructure = genQueryStructure(allEntities, nameGroup);
-    newStructures.push(entityStructure);
     const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
     newLogics.push(entityLogic);
 
@@ -678,8 +665,7 @@ export function genGridViewMultipleKeyBlock(entity: Entity, oldNode: ViewElement
             "calleeName": "${nameGroup.viewLogicInit}"
         }
     ],
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;

package/src/templator/genEditTableBlock.ts

@@ -17,10 +17,10 @@ import {
 export function genEditTableColumnTemplate(entity: Entity, property: EntityProperty, nameGroup: NameGroup, selectNameGroupMap?: Map<string, NameGroup>) {
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const valueExpression = `scope.item.${lowerEntityName}.${property.name}`;
+    const valueExpression = `current.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
-    const expression = getExpression(property, `scope.item.${lowerEntityName}.${property.name}`);
+    const expression = getExpression(property, `current.item.${lowerEntityName}.${property.name}`);
 
     const canEditable = (property: EntityProperty) => !property.readonly;
 
@@ -91,7 +91,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
                 <u-input :value.sync="${valueExpression}" placeholder="请输入${label}" :autofocus="true" size="full"></u-input>
             </u-validator>`;
         }
-        return `<template #editcell="scope">
+        return `<template #editcell="current">
             <u-linear-layout gap="small">
                 ${formItem}
             </u-linear-layout>
@@ -100,7 +100,7 @@ export function genEditTableColumnTemplate(entity: Entity, property: EntityPrope
 
     return `<u-table-view-column field="${utils.firstLowerCase(entity.name)}.${property.name}" ${canEditable(property) ? 'type="editable"' : ''}>
     <template #title><u-text text="${title}"></u-text></template>
-    <template #cell="scope">
+    <template #cell="current">
         <u-linear-layout gap="small">
             ${getText(property)}
         </u-linear-layout>
@@ -126,7 +126,7 @@ export function genEditTableTemplate(entity: Entity, nameGroup: NameGroup, selec
 
     <u-table-view-column>
     <template #title><u-text text="操作"></u-text></template>
-        <template #cell="scope">
+        <template #cell="current">
             <u-linear-layout gap="small">
                 <u-link @click="${nameGroup.viewLogicRemove}">删除</u-link>
             </u-linear-layout>
@@ -165,12 +165,7 @@ export function genEditTableLoadLogic(entity: Entity, nameGroup: NameGroup, newL
         returns: [
             NaslNode.Return({
                 name: 'result',
-                typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
-                    NaslTypeAnnotation.Reference({
-                        typeNamespace: `${moduleNamespace}.structures`,
-                        typeName: nameGroup.structure,
-                    }),
-                ]),
+                typeAnnotation: null,
             }),
         ],
         variables: [] as Array<any>,
@@ -220,7 +215,7 @@ export function genEditTableRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                     if (!paramFromLogic) {
                         paramFromLogic = getParamFromLogic(deleteLogic, 'id');
                     }
-                    return genLogicParam(paramFromLogic.name, `scope.item.${lowerEntityName}.${paramFromLogic.name}`);
+                    return genLogicParam(paramFromLogic.name, `current.item.${lowerEntityName}.${paramFromLogic.name}`);
                 }),
             }),
             genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
@@ -241,7 +236,7 @@ export function genBlurUpdateLogic(entity: Entity, nameGroup: NameGroup) {
         body: [
             NaslLogicItem.Start,
             NaslLogicItem.Assignment({
-                left: genMemberExpression(`scope.item.editing`, ['', '', `${nameGroup.structure}.editing`]),
+                left: genMemberExpression(`current.item.editing`, ['', '', `${nameGroup.structure}.editing`]),
                 right: NaslLogicItem.StringLiteral({
                     value: '',
                 }),
@@ -250,7 +245,7 @@ export function genBlurUpdateLogic(entity: Entity, nameGroup: NameGroup) {
                 calleeNamespace: updateLogic.getNamespace(),
                 calleeName: updateLogic.name,
                 arguments: [
-                    genLogicParam(`${updateLogic.params[0].name}`, `scope.item.${lowerEntityName}`),
+                    genLogicParam(`${updateLogic.params[0].name}`, `current.item.${lowerEntityName}`),
                 ],
             }),
             NaslLogicItem.End,

package/src/templator/genGridViewBlock.ts

@@ -11,7 +11,6 @@ import {
     genLogicParam,
     genCallComponentLogic,
     genQueryLogic,
-    genQueryStructure,
 } from '.';
 import { NaslCoreTypeAnnotation, NaslUITypeAnnotation, NaslCollectionTypeAnnotation, NaslTypeAnnotation, NaslLogicItem, NaslNode } from './utils';
 
@@ -23,8 +22,8 @@ export function genGridViewCardTemplate(property: EntityProperty, nameGroup: Nam
     const entity = property.entity;
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
-    const scopeName = nameGroup.scopeName || 'scope';
-    let expression = `${scopeName}.item.${lowerEntityName}.${property.name}`;
+    const currentName = nameGroup.currentName || 'current';
+    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
     const title = property.label || property.name;
 
     if (property.relationEntity) {
@@ -34,13 +33,13 @@ export function genGridViewCardTemplate(property: EntityProperty, nameGroup: Nam
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
                 const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                expression = getExpression(property, `${scopeName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
+                expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
             } else
                 return '';
         } else
             return '';
     } else
-        expression = getExpression(property, `${scopeName}.item.${lowerEntityName}.${property.name}`);
+        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
 
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
@@ -64,8 +63,8 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
     const dataSource = entity.parentNode as DataSource;
     const lowerEntityName = utils.firstLowerCase(entity.name);
 
-    const scopeName = nameGroup.scopeName || 'scope';
-    let expression = `${scopeName}.item.${lowerEntityName}.${property.name}`;
+    const currentName = nameGroup.currentName || 'current';
+    let expression = `${currentName}.item.${lowerEntityName}.${property.name}`;
 
     if (property.relationEntity) {
         // 有外键关联
@@ -74,13 +73,13 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
             const displayedProperty = getFirstDisplayedProperty(relationEntity);
             if (displayedProperty) {
                 const relationLowerEntityName = utils.firstLowerCase(relationEntity.name);
-                expression = getExpression(property, `${scopeName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
+                expression = getExpression(property, `${currentName}.item.${relationLowerEntityName}.${displayedProperty.name}`);
             } else
                 return '';
         } else
             return '';
     } else
-        expression = getExpression(property, `${scopeName}.item.${lowerEntityName}.${property.name}`);
+        expression = getExpression(property, `${currentName}.item.${lowerEntityName}.${property.name}`);
 
     const getText = (property: EntityProperty) => {
         const propertyTypeName = property.typeAnnotation.typeName;
@@ -102,7 +101,7 @@ export function genH5GridViewCardTemplate(property: EntityProperty, nameGroup?:
  * @param nameGroup 命名组
  */
 export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modifyable?: boolean) {
-    const scopeName = nameGroup.scopeName || 'scope';
+    const currentName = nameGroup.currentName || 'current';
     const properties = entity.properties.filter(filterProperty('inTable'));
     return `<u-grid-view ref="${nameGroup.viewElementMainView}" :data-source="${nameGroup.viewLogicLoad}" data-schema="${nameGroup.structure}"
         value-field="${nameGroup.viewVariableEntity}.id"
@@ -115,7 +114,7 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modify
         :readonly="true"
         :show-foot="true"
         style="height:auto">
-        <template #item="${scopeName}">
+        <template #item="${currentName}">
             <u-card title="">
                 <u-linear-layout direction="vertical" gap="small">
                     ${properties.map((property) => genGridViewCardTemplate(property, nameGroup) + '\n').join('')}
@@ -131,14 +130,14 @@ export function genGridViewTemplate(entity: Entity, nameGroup: NameGroup, modify
 }
 
 export function genH5GridViewTemplate(entity: Entity, nameGroup: NameGroup) {
-    const scopeName = nameGroup.scopeName || 'scope';
+    const currentName = nameGroup.currentName || 'current';
     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="${scopeName}">
+    <template #item="${currentName}">
         <van-cardu no-title>
             ${properties.map((property) => genH5GridViewCardTemplate(property, nameGroup) + '\n').join('')}
         </van-cardu>
@@ -175,12 +174,7 @@ export function genGridViewLoadLogic(entity: Entity, nameGroup: NameGroup, newLo
         returns: [
             NaslNode.Return({
                 name: 'result',
-                typeAnnotation: NaslCollectionTypeAnnotation.PageOf([
-                    NaslTypeAnnotation.Reference({
-                        typeNamespace: `${moduleNamespace}.structures`,
-                        typeName: nameGroup.structure,
-                    }),
-                ]),
+                typeAnnotation: null,
             }),
         ],
         variables: [] as any[],
@@ -210,7 +204,7 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
     const ns = entity.ns;
     const deleteLogic = ns?.logics?.find((logic) => logic.name === `delete`);
     const idPropertys = entity.properties.filter((property) => property.primaryKey || property.name === 'id');
-    const scopeName = nameGroup.scopeName || 'scope';
+    const currentName = nameGroup.currentName || 'current';
 
     return NaslNode.Logic({
         name: nameGroup.viewLogicRemove,
@@ -229,7 +223,7 @@ export function genGridViewRemoveLogic(entity: Entity, nameGroup: NameGroup) {
                     if (!paramFromLogic) {
                         paramFromLogic = getParamFromLogic(deleteLogic, 'id');
                     }
-                    return genLogicParam(paramFromLogic.name, `${scopeName}.item.${lowerEntityName}.${paramFromLogic.name}`);
+                    return genLogicParam(paramFromLogic.name, `${currentName}.item.${lowerEntityName}.${paramFromLogic.name}`);
                 }),
             }),
             genCallComponentLogic(nameGroup.viewElementMainView, 'reload'),
@@ -259,12 +253,11 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
     nameGroup.viewVariableEntity = view.getVariableUniqueName(utils.firstLowerCase(entity.name));
     nameGroup.viewLogicRemove = view.getLogicUniqueName('remove');
 
-    // 当前节点的scopeName
-    nameGroup.scopeName = oldNode.getScopeName();
+    // 当前节点的currentName
+    nameGroup.currentName = oldNode.getCurrentName();
     // 收集所有和本实体关联的实体
     const entitySet: Set<Entity> = new Set();
     entitySet.add(entity);
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     entity.properties.forEach((property) => {
         if (property.relationEntity) {
@@ -278,8 +271,6 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
         }
     });
     const allEntities = [...entitySet];
-    const entityStructure = genQueryStructure(allEntities, nameGroup);
-    newStructures.push(entityStructure);
     const entityLogic = genQueryLogic(allEntities, nameGroup, false, true, module);
     newLogics.push(entityLogic);
 
@@ -294,8 +285,7 @@ export function genGridViewBlock(entity: Entity, oldNode: ViewElement) {
         ${JSON.stringify(genGridViewRemoveLogic(entity, nameGroup))}
     ],
 
-    "logics": ${JSON.stringify(newLogics)},
-    "structures": ${JSON.stringify(newStructures)}
+    "logics": ${JSON.stringify(newLogics)}
 }
 </definition>
 `;
@@ -316,7 +306,6 @@ export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElem
     // 收集所有和本实体关联的实体
     const entitySet: Set<Entity> = new Set();
     entitySet.add(entity);
-    const newStructures: any[] = [];
     const newLogics: any[] = [];
     entity.properties.forEach((property) => {
         if (property.relationEntity) {
@@ -330,8 +319,6 @@ export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElem
         }
     });
     const allEntities = [...entitySet];
-    const entityStructure = genQueryStructure(allEntities, nameGroup);
-    newStructures.push(entityStructure);
     const entityLogic = genQueryLogic(allEntities, nameGroup, true, true, module);
     newLogics.push(entityLogic);
 
@@ -345,8 +332,7 @@ export function genGridViewCardBlock(property: EntityProperty, oldNode: ViewElem
             ${JSON.stringify(genGridViewLoadLogic(entity, nameGroup, entityLogic, false))},
             ${JSON.stringify(genGridViewRemoveLogic(entity, nameGroup))}
         ],
-        "logics": ${JSON.stringify(newLogics)},
-        "structures": ${JSON.stringify(newStructures)}
+        "logics": ${JSON.stringify(newLogics)}
     }
     </definition>
     `;