@lcap/nasl 3.8.2-beta.3 → 3.8.2-beta.4

package/src/generator/release-body/body.ts

@@ -6,11 +6,11 @@ import {
 import { genFrontendBundleFiles } from '../genBundleFiles';
 import { InternalReleaseData } from './internal';
 import { replaceAssetUrl, getAuthReport, getFrontendByTypes, findAllReportIdList, getProcessFormDefinitions } from './utils';
-import { genPermissionData, genLogicAuthFlag } from '../permission';
+import { genPermissionDataOld, genPermissionData, genLogicAuthFlag, testWithOldPermissionResult } from '../permission';
 import { getCallLogicData } from './validation';
 
 import * as utils from '../../utils';
-import { config as globalConfig } from '../../config'
+import { config as globalConfig } from '../../config';
 import type { Asset } from '../release-body/internal';
 
 /**
@@ -44,6 +44,7 @@ export function replaceFrontendTypesAssets(frontendTypes: FrontendType[], fn: Fu
     });
   });
 }
+
 export function replaceFrontendAssets(frontendTypes: FrontendType[], fn: Function) {
   frontendTypes.forEach((frontendType: FrontendType) => {
     frontendType?.frontends?.forEach((frontend: Frontend) => {
@@ -74,15 +75,12 @@ export function replaceFrontendAssets(frontendTypes: FrontendType[], fn: Functio
   });
 }
 
-
-
-async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
-  await utils.delay(500);
-
+export async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
   let NaslAnnotatedJSON: any;
+
   try {
     NaslAnnotatedJSON = await app.naslServer.getNaslAnnotatedJSON(app, true);
-    await opt.logPublishFunc?.('语言', '获取类型标注成功');
+    await opt.logPublishFunc?.('语言', '获取全量类型标注成功');
 
     // // 打印传给服务端的 nasl,为了服务端排查问题方便
     // if (globalThis.window) {
@@ -92,6 +90,7 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
     console.error(err);
     throw new Error('代码标注失败，请稍后重试！或刷新后重试！');
   }
+
   // 如果是发布，就排除 views，导出源码就不排除
   if (opt.realRelease) {
     NaslAnnotatedJSON.frontendTypes.forEach((frontendType: FrontendType) => {
@@ -102,7 +101,8 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
   }
 
   const assets = opt.assets;
-  app.curDeployEnv  = opt.env
+  app.curDeployEnv  = opt.env;
+
   // 导出前端源码+后端源码
   if (opt.isExport && opt.ignoreFiles && Array.isArray(assets) && assets.length) {
     const assetsMap = opt.assetsMap;
@@ -165,6 +165,8 @@ async function getNaslAnnotatedJSON(app: App, opt: InternalReleaseData) {
     }
   });
 
+  await opt.logPublishFunc?.('资源', '前端静态资源替换完成');
+
   return {
     name: 'nasl-annotated.json',
     content: JSON.stringify(NaslAnnotatedJSON),
@@ -203,12 +205,16 @@ async function getFrontendBundleFiles(app: App, opt: InternalReleaseData) {
   return files;
 }
 
+
 async function mergeBodyData(app: App, opt: InternalReleaseData) {
   await utils.delay(500);
 
   const authReport: ReturnType<typeof getAuthReport> = getAuthReport(app, opt.frontends);
   await opt.logPublishFunc?.('权限', '分析权限数据成功！');
-  const logicPageResourceDtoList = await genPermissionData(app);
+  const logicPageResourceDtoList = genPermissionData(app);
+
+  // 与老板逻辑权限数据对比
+  // await testWithOldPermissionResult(app, logicPageResourceDtoList);
   const allFrontends = getFrontendByTypes(app?.frontendTypes);
   const releaseFrontends = allFrontends.map((frontend: Frontend) => ({
     name: frontend.name,
@@ -217,6 +223,8 @@ async function mergeBodyData(app: App, opt: InternalReleaseData) {
     selected: opt.frontends.includes(frontend),
     title: frontend.title,
   }));
+  const callbackLogicsName = app.getExtensionsCallbackLogics()
+
   const body = {
     ...authReport, // 如果发布需要上报权限，导出源码不需要
     logicPageResourceDtoList,
@@ -228,7 +236,7 @@ async function mergeBodyData(app: App, opt: InternalReleaseData) {
     branchId: opt.branchId,
     replicas: opt.replicas,
     appSpecification: opt.appSpecification,
-    callbackLogicsName: app.getExtensionsCallbackLogics(),
+    callbackLogicsName,
     frontends: releaseFrontends,
     callLogicValidations: {},
     files: [] as Array<{ name: string; content: string }>,
@@ -242,14 +250,25 @@ async function mergeBodyData(app: App, opt: InternalReleaseData) {
 }
 
 export async function genReleaseBody(app: App, opt: InternalReleaseData) {
+  console.time('--backend--');
+  console.time('mergeBodyData');
   const body = await mergeBodyData(app, opt);
+  console.timeEnd('mergeBodyData');
   const callLogicValidations = await getCallLogicData(app, opt.validations);
+  console.timeEnd('--backend--');
+
+  console.time('--frontend--');
+  console.time('getNaslAnnotatedJSON');
   const annotationFile = await getNaslAnnotatedJSON(app, opt);
+  console.timeEnd('getNaslAnnotatedJSON');
+  console.time('getFrontendBundleFiles');
   const files = opt.ignoreFiles ? [] : await getFrontendBundleFiles(app, opt);
+  console.timeEnd('getFrontendBundleFiles');
+  console.timeEnd('--frontend--');
 
   files.push(annotationFile);
 
-  // nodejs 环境下某些情况下字符会发生错误，需要转译
+  // nodejs 环境下的极速开发模式，在某些情况下字符会发生错误，需要转译
   if (utils.isNode) {
     files.forEach((file) => {
       file.name = encodeURIComponent(file.name);

package/src/generator/release-body/data.ts

@@ -18,7 +18,8 @@ import { Logger, File } from '../../utils';
 export async function getReleaseData(app: App, data: ReleaseData, naslServer: NaslServer, inputLogger?: Logger) {
   const { http, logger: defaultLogger } = naslServer;
   const logger = inputLogger ?? defaultLogger;
-  defaultLogger.time('前端构建');
+  console.time('all');
+  console.time('request');
   const appInfo = await getAppInfo(http, data);
   await logger.info('构建环境', '获取环境信息成功');
   const { version, fullVersion, dependencies } = await getVersionDetail(http, app);
@@ -77,7 +78,9 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
       await logger.info('生成器', '服务端验证数据获取成功');
     }
   }
+  console.timeEnd('request');
 
+  console.time('前端构建');
   await logger.info('构建环境', '构建环境完成，开始拼装发布数据');
 
   const releaseBody = await genReleaseBody(app, {
@@ -86,7 +89,9 @@ export async function getReleaseData(app: App, data: ReleaseData, naslServer: Na
   });
 
   await logger.info('前端生成器', '应用发布数据准备完成');
-  defaultLogger.timeEnd('前端构建');
+  console.timeEnd('前端构建');
+
+  console.timeEnd('all');
 
   return releaseBody;
 }

package/src/generator/release-body/index.ts

@@ -1,3 +1,4 @@
 export * from './types';
 export * from './data';
 export * from './utils';
+export * from './body';

package/src/generator/release-body/utils.ts

@@ -80,7 +80,7 @@ export function getAuthReport(app: App, frontends: Array<Frontend>) {
  * 获取页面中所有 分析报告组件 的reportId
  */
 export function findAllReportIdList(app: App, frontends: Array<Frontend>) {
-  const reportIds: string[] = [];
+  const reportIds: Set<string> = new Set();
 
   frontends.forEach((frontend) => {
     frontend.views.forEach((view) => loop(view));
@@ -90,7 +90,7 @@ export function findAllReportIdList(app: App, frontends: Array<Frontend>) {
     if (root.concept === 'ViewElement') {
       root.bindAttrs.forEach((attr) => {
         if (attr.name === 'reportId') {
-          reportIds.push(JSON.parse(attr.value || '{}').id);
+          reportIds.add(JSON.parse(attr.value || '{}').id);
         }
       });
     }
@@ -101,7 +101,7 @@ export function findAllReportIdList(app: App, frontends: Array<Frontend>) {
       root.elements.forEach((item) => loop(item));
     }
   }
-  return [...new Set(reportIds)].filter(Boolean);
+  return Array.from(reportIds).filter(Boolean);
 }
 
 export function replaceAssetUrl(

package/src/generator/release-body/validation.ts

@@ -31,9 +31,9 @@ export async function getCallLogicData(app: App, validations: InputServerValidat
 
     nasl.traverseStrictChildren((node) => {
       if (
-        'uuid' in node &&
         node.concept === 'CallLogic' &&
         node.validation &&
+        'uuid' in node &&
         map.has(node.uuid)
       ) {
         const data = map.get(node.uuid)!;

package/src/index.ts

@@ -8,7 +8,19 @@ export * as utils from './utils';
 export * from './config';
 export * from './eventBus';
 export * as breakpoint from './breakpoint';
-export { getOperationRecords, operationRecordInfoMap, doOperationRecord, operationRecordQuery, operationRecordPlayback, loadApp, loadAppSync, handleApp, batchAction, batchQuery, mountDatabaseTypes } from './service/storage/init';
+export {
+  getOperationRecords,
+  operationRecordInfoMap,
+  doOperationRecord,
+  operationRecordQuery,
+  operationRecordPlayback,
+  loadApp,
+  loadAppSync,
+  handleApp,
+  batchAction,
+  batchQuery,
+  mountDatabaseTypes,
+} from './service/storage/init';
 export { createService } from './service/creator';
 export { stepRecorder } from './manager/stepRecorder';
 export * from './natural';

package/src/natural/genNaturalTS.ts

@@ -52,6 +52,7 @@ export function genNaturalTSContextJSONForLogic(
   app: App,
   currentNode?: BaseNode,
   focusedNodePath?: string,
+  experimental?: boolean,
   material?: {
     moduleInterfaces: any;
     connectors: any;
@@ -60,7 +61,7 @@ export function genNaturalTSContextJSONForLogic(
 ) {
   const frontend = currentNode?.getAncestor('Frontend') as Frontend;
   const logicType = currentNode?.parentNode?.concept === 'App' ? 'global_logic' : 'view_logic';
-  const state = createCompilerState();
+  const state = createCompilerState('', { descriptionComment: true });
 
   const { naslCore } = getNaslCore(logicType);
   const { naslUtil } = getNaslUtil();
@@ -93,7 +94,7 @@ export function genNaturalTSContextJSONForLogic(
     state
   );
   const { views } = getFrontendViews(frontend, state, currentNode, false);
-  const { currentLogic } = getCurrentNodeContext(currentNode, focusedNodePath);
+  const { currentLogic } = getCurrentNodeContext(currentNode, focusedNodePath, experimental);
 
   return {
     naslCore,
@@ -226,6 +227,7 @@ export function genNaturalTSContextForLogic(
   currentNode?: BaseNode,
   focusedNodePath?: string,
   requiredIndexes?: string[],
+  experimental?: boolean,
   material?: {
     moduleInterfaces: any;
     connectors: any;
@@ -239,6 +241,7 @@ export function genNaturalTSContextForLogic(
     app,
     currentNode,
     focusedNodePath,
+    experimental,
     material
   );
   const code = genNaturalTSContextFromJSONForLogic(

package/src/natural/getContext/index.ts

@@ -603,7 +603,7 @@ export const getFrontendViewsCode = (views: any) => {
   return wrapTSBlock(code);
 };
 
-export function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: string) {
+export function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: string, experimental?: boolean) {
   let code = '';
   let view: View;
   if (currentNode?.concept === 'View') {
@@ -631,16 +631,22 @@ export function getCurrentNodeContext(currentNode: BaseNode, focusedNodePath?: s
       }),
       function (state) {
         let code = '';
-        code += `\n${indent(state.tabSize + 1)}const $refs = {\n`;
-        // 生成所有的name和类型定义
-        this.elements.forEach((element) => {
-          code += element.toNaturalTSDefinition(
-            shiftState(state, code, {
-              tabSize: state.tabSize + 1,
-            })
-          );
-        });
-        code += `${indent(state.tabSize + 1)}}\n`;
+        code += `\n${indent(state.tabSize)}`;
+        
+        if (experimental) {
+          code += this.elements[0].toNaturalTS(shiftState(state, code, { tabSize: state.tabSize + 1 }));
+        } else {
+          code += `const $refs = {\n`;
+          // 生成所有的name和类型定义
+          this.elements.forEach((element) => {
+            code += element.toNaturalTSDefinition(
+              shiftState(state, code, {
+                tabSize: state.tabSize + 1,
+              })
+            );
+          });
+          code += `${indent(state.tabSize + 1)}}\n`;
+        }
         // 逻辑
         if (currentNode?.concept === 'Logic') {
           code += '\n';

package/src/server/entity2LogicNamespace.ts

@@ -15,7 +15,17 @@ import {
   NewList,
 } from '..';
 
+const entityNsMap = new Map();
+
 export function entity2LogicNamespace(entity: Entity) {
+  let nsInfo = entityNsMap.get(entity);
+  if (!nsInfo) {
+    nsInfo = {
+      contentUniqueKey: entity.contentUniqueKey
+    };
+    entityNsMap.set(entity, nsInfo);
+  }
+  if (!nsInfo.ns || nsInfo.contentUniqueKey !== entity.contentUniqueKey) {
   const { properties } = entity;
   const keys = properties.filter((item) => item.primaryKey);
   const params = keys.map(
@@ -368,7 +378,9 @@ export function entity2LogicNamespace(entity: Entity) {
     ],
   });
   ns.parentNode = entity;
-  return ns;
+  nsInfo.ns = ns;
+  }
+  return nsInfo.ns;
 }
 
 interface entityTreeFragment {

package/src/server/extendBaseNode.ts

@@ -538,6 +538,30 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
     const naslServer = (app as any).naslServer as NaslServer;
     const node = this;
     let refsList = await naslServer._isHaveRef(node);
+    const handleComposeDel = () => {
+      // // 删除页面或端的时候，如果存在组合节点，需要同步删除封装态分组内容
+      const excludedKeySet = new Set([
+        'parentNode',
+        'sourceMap',
+        'storageJSON',
+        'tsErrorDetail',
+        'NaslAnnotatedJSON',
+        'calledFrom',
+        '_events',
+        '_collectingList',
+        '_historyList',
+      ]);
+      traverse(
+        (current) => {
+          const currentNode: any = current.node;
+          if (currentNode && currentNode?.concept === 'ViewElement' && currentNode?.name === currentNode?.composedBy?.[0]) {
+            currentNode.app.deleteCompose(currentNode.composedBy);
+          }
+        },
+        { node: this },
+        { mode: 'anyObject', excludedKeySet }
+      );
+    }
     if (this.concept === 'ViewElement') {
       // 删除的时候过滤一把组件删除提示
       refsList = refsList.filter(
@@ -590,28 +614,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
           (this as any).app.emit('collect:start', {
             actionMsg: `删除节点`,
           });
-          // 删除页面或端的时候，如果存在表单设计器，需要同步删除分组内容
-          const excludedKeySet = new Set([
-            'parentNode',
-            'sourceMap',
-            'storageJSON',
-            'tsErrorDetail',
-            'NaslAnnotatedJSON',
-            'calledFrom',
-            '_events',
-            '_collectingList',
-            '_historyList',
-          ]);
-          traverse(
-            (current) => {
-              const currentNode: any = current.node;
-              if (currentNode && currentNode?.concept === 'ViewElement' && currentNode?.name === currentNode?.composedBy?.[0]) {
-                currentNode.app.deleteCompose(currentNode.composedBy);
-              }
-            },
-            { node: this },
-            { mode: 'anyObject', excludedKeySet }
-          );
+          handleComposeDel();
           this.delete();
           (this as any).app.emit('collect:end');
         } else if (isSubLogic(node)) {
@@ -660,6 +663,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
             this.delete();
             App.emit('collect:end');
           } else {
+            if (node instanceof View || node instanceof Frontend) handleComposeDel();
             this.delete();
             if (node instanceof Frontend) {
               return;
@@ -689,6 +693,7 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
               actionMsg: `删除端${node.name}`,
             });
             await Promise.all(result.map((ele) => ele.delete()));
+            handleComposeDel();
             this.delete();
             App.emit('collect:end');
             return;
@@ -832,7 +837,12 @@ BaseNode.prototype.prepareDelete = async function prepareDelete(cb?: Function) {
 
         // 删除页面或者流程,如果上一步没有return 就说明他是有别的引用的，会有引用弹框
         if (node instanceof View) {
+          (this as any).app.emit('collect:start', {
+            actionMsg: `删除节点`,
+          });
+          handleComposeDel();
           this.delete();
+          (this as any).app.emit('collect:end');
         }
         if (node instanceof Process) {
           const App = this.rootNode;

package/src/server/naslServer.ts

@@ -2245,8 +2245,8 @@ class NaslServer {
                       if(decimalPlaces > +scale) {
                         const diag: any = {
                           node: property,
-                          severity: 'error',
-                          message: `实体字段${property.name}默认值的小数位数不能大于设置的小数位数${scale}`,
+                          severity: 'warning',
+                          message: `实体字段${property.name}默认值的小数位数不能大于设置的小数位数${scale}，否则将会按照小数位数自动截断`,
                         };
                         diagnostics.push(diag);
                       }
@@ -2986,7 +2986,7 @@ class NaslServer {
       const typesArg = node.arguments?.find((arg) => {
         return arg?.keyword === 'types';
       });
-      if (typesArg?.expression?.concept !== 'NewList' || !((typesArg?.expression as NewList)?.items?.length)) {
+      if (typesArg?.expression && (typesArg?.expression?.concept !== 'NewList' || !((typesArg?.expression as NewList)?.items?.length))) {
         const diagnostic = {
           node: typesArg?.expression,
           severity: 'error',
@@ -4736,7 +4736,7 @@ class NaslServer {
       const item = (resultMap as any)?.[file]?.[line]?.[offset];
       const itemType = item?.[0]?.nodeType;
       const nodeTypeAnnotation = yield* type2TypeAnnotation(itemType);
-      const {node} = newQuickInfoNodes[index];
+      const { node } = newQuickInfoNodes[index];
 
       types.set(node, Object.freeze(nodeTypeAnnotation) as TypeAnnotation);
 
@@ -4919,7 +4919,13 @@ class NaslServer {
     });
     const typesMap = await this.getQuickInfoNodesTypeMap(nodes, true);
 
-    const json = app.toJSON();
+    console.time('app toJSON');
+    const jsonMap = new Map();
+    const json = app._toJSON((source, instance) => {
+      jsonMap.set(instance, source);
+      return source;
+    });
+    console.timeEnd('app toJSON');
 
     this.logger.timeEnd('全量标注');
 
@@ -4929,8 +4935,10 @@ class NaslServer {
     }
 
     if (releaseFlag) {
+      console.time('annotationToJson');
       // 全量标注后对json进行一些修改，为了服务端翻译处理
-      this.annotationToJson(typesMap, json);
+      this.annotationToJson(typesMap, json, jsonMap);
+      console.timeEnd('annotationToJson');
     }
 
     return json;
@@ -4974,31 +4982,32 @@ class NaslServer {
       BaseNode,
       | TypeAnnotation
       | {
-          typeAnnotation: TypeAnnotation;
-          option: any;
-        }
+        typeAnnotation: TypeAnnotation;
+        option: any;
+      }
     >,
-    json: {}
+    json: {},
+    jsonMap: Map<BaseNode, any>,
   ) {
     typesMap.forEach((value, node) => {
       // 如果节点本身有类型就不去在塞一遍了
       // 有值而且没有类型再去设置
       // 但是Identifier 和 MemberExpression 都用标注出来的因为本身是变量，有类型也需要覆盖一下
-      if (value && (node instanceof Argument ) && node.getAncestor('Connector')?.concept === 'Connector') {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+      if (value && (node instanceof Argument) && node.getAncestor('Connector')?.concept === 'Connector') {
+        const jsonNode = jsonMap.get(node);
         if (jsonNode) {
-            jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
+          jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
         }
       }
       if (value && (!(node as any).typeAnnotation || node instanceof Identifier || node instanceof MemberExpression)) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         if (jsonNode) {
-            jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
+          jsonNode.typeAnnotation = (value as TypeAnnotation)?.toJSON();
         }
       }
       // 旧版本数据查询需要确认是匿名数据结构的 ListTotal 类型
       if (node instanceof CallQueryComponent && !node.isAutoInfer()) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         jsonNode.typeAnnotation = {
           concept: 'TypeAnnotation',
           typeKind: 'anonymousStructure',
@@ -5047,7 +5056,7 @@ class NaslServer {
       if (node instanceof Param) {
         // index在nasl foreach上有脏数据
         if (node.parentKey === 'index' && node.parentNode instanceof ForEachStatement) {
-          const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+          const jsonNode = jsonMap.get(node);
           jsonNode.typeAnnotation = TypeAnnotation.createPrimitive('Long').toJSON();
         }
       }
@@ -5064,7 +5073,7 @@ class NaslServer {
             const itemCode = this.getNodeCode(fileNode, item);
 
             if (itemNode.concept === matchExpression.concept && itemCode === currentCode) {
-              const jsonNode = jsoner.queryNodeByPath(json, itemNode.getNodePath(false));
+              const jsonNode = jsonMap.get(itemNode);
               jsonNode.typeAnnotation = matchExpression.__TypeAnnotation;
             }
           });
@@ -5074,12 +5083,12 @@ class NaslServer {
       if (value && (node instanceof Param)) {
         // index在nasl foreach上有脏数据
         if (node.parentKey === 'index' && node.parentNode instanceof ForEachStatement) {
-          const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+          const jsonNode = jsonMap.get(node);
           jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
         }
       }
       if (value && (node instanceof NewComposite) && (node.typeAnnotation?.typeKind === 'anonymousStructure' || node.typeAnnotation?.typeKind === 'generic')) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         jsonNode.typeAnnotation = (value as TypeAnnotation).toJSON();
       }
 
@@ -5099,7 +5108,7 @@ class NaslServer {
         * 特殊处理，不想去查两次类型, 因为是从函数签名上拿类型，所以直接合并在一起，先这样
         */
         if (node instanceof CallLogic && node.__TypeArguments?.length) {
-          const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+          const jsonNode = jsonMap.get(node);
           jsonNode.typeArguments = node.__TypeArguments.map((type) => type?.toJSON());
           jsonNode.typeAnnotation = node.__TypeAnnotation?.toJSON();
         }
@@ -5135,13 +5144,13 @@ class NaslServer {
               if (itemExpression) {
                 const listTypeArgument = list.__TypeAnnotation?.typeArguments?.[0]?.toJSON();
                 if (listTypeArgument) {
-                  const jsonNode = jsoner.queryNodeByPath(json, item.getNodePath(false));
+                  const jsonNode = jsonMap.get(item);
                   jsonNode.typeAnnotation = listTypeArgument;
                 }
               }
             } else {
               const mapParamIndex = mapFunctionParamIndexMaps.get(calleeName);
-              if(mapParamIndex){
+              if (mapParamIndex) {
                 const map = node.arguments[mapParamIndex.collection];
                 const key = node.arguments[mapParamIndex.key];
                 const value = node.arguments[mapParamIndex.value];
@@ -5150,14 +5159,14 @@ class NaslServer {
                 if (keyExpression) {
                   const mapKeyTypeArgument = map.__TypeAnnotation?.typeArguments?.[0]?.toJSON();
                   if (mapKeyTypeArgument) {
-                    const jsonNode = jsoner.queryNodeByPath(json, key.getNodePath(false));
+                    const jsonNode = jsonMap.get(key);
                     jsonNode.typeAnnotation = mapKeyTypeArgument;
                   }
                 }
                 if (valueExpression) {
                   const mapValueTypeArgument = map.__TypeAnnotation?.typeArguments?.[1]?.toJSON();
                   if (mapValueTypeArgument) {
-                    const jsonNode = jsoner.queryNodeByPath(json, value.getNodePath(false));
+                    const jsonNode = jsonMap.get(value);
                     jsonNode.typeAnnotation = mapValueTypeArgument;
                   }
                 }
@@ -5169,7 +5178,7 @@ class NaslServer {
 
       // 服务端需要默认值节点有类型来判断父节点是否是日期类型
       if (node instanceof DefaultValue && !value) {
-        const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
+        const jsonNode = jsonMap.get(node);
         const parentNodeType = (node.parentNode as any)?.typeAnnotation || (node.parentNode as any)?.__TypeAnnotation;
         if (parentNodeType && jsonNode) {
           jsonNode.typeAnnotation = (parentNodeType as TypeAnnotation)?.toJSON();
@@ -5295,11 +5304,19 @@ class NaslServer {
   async getBindAttributeType(node: BindAttribute) {
     // 过滤掉一些不需要查找的属性
     const excludes = ['dataSource']
-    const excludeReg = /.*(f|F)ield/
-    if (excludes.includes(node.name) || excludeReg.test(node.name)) {
+    if (excludes.includes(node.name)) {
       return null;
     }
 
+    const element: any = node.getAncestor('ViewElement');
+    const api = config.allNodesAPI[element?.tag];
+    const prop = api?.props?.find?.((prop) => {
+       return prop.name === node.name;
+    });
+    if (/\(\s*item\s*:\s*T\s*\)\s*=>\s*.+/.test(prop?.tsType)) {
+      return TypeAnnotation.createPrimitive('String');
+    }
+
     const { currentSource, fileNode } = node?.getCurrentSource() || {};
 
     if (!currentSource && !fileNode) {

package/src/server/translator.ts

@@ -328,6 +328,10 @@ const TS_RULES: Array<{
     re: /Cannot find name '__UNCERTAIN__INTERMEDIATE__FIELDS__'./,
     result: '来自不确定结构或实体的字段',
   },
+  {
+    re: /Cannot find name '__UNSUPPORTED__ENTITY__FIELDS__'./,
+    result: '可能为实体属性别名，动态条件中仅支持使用变量',
+  },
   {
     re: /No value exists in scope for the shorthand property '__(?:IDENTIFIER|LEFT|RIGHT)__'. Either declare one or provide an initializer./,
     result: '用户任务未关联页面',
@@ -900,6 +904,17 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
       });
     }
   }
+
+  if (node instanceof BindAttribute && node.parentNode instanceof ViewElement) {
+    const reg = /左边类型：\s*(.*)[,，]\s*右边类型：\s*(.*)[.。]/
+    const left = reg.exec(tsErrorDetail.message)?.[1];
+    const right = reg.exec(tsErrorDetail.message)?.[2];
+
+    if (left && right) {
+      tsErrorDetail.message = `页面组件：属性类型不一致！接收类型：${left}，传入类型：${right}。`;
+    }
+  }
+
   if (node && tsErrorDetail) {
     node.tsErrorDetail = tsErrorDetail;
   }