@lcap/nasl 3.4.0-beta.6 → 3.5.0-alpha.1

package/src/server/getMemberIdentifier.ts

@@ -11,7 +11,7 @@ import {
   LogicItem,
   Frontend,
   View,
-  SyntaxNode,
+  types,
   ViewElement,
   PAGE_COMPONENT_INCLUDE_TAG_MAP,
 } from '..';
@@ -163,7 +163,7 @@ function formatGlobalVariable() {
   const i18nInfoVariable = {
     name: 'i18nInfo',
     value: 'i18nInfo',
-    children: [{ name: 'localeName', value: 'i18nInfo.localeName' }],
+    children: [{ name: 'currentLocale', value: 'i18nInfo.currentLocale' }],
   };
   const i18nInfoIdentifier = new Identifier({
     name: 'i18nInfo',
@@ -222,7 +222,7 @@ function getCurrentLogic(
   }
 }
 
-export async function getMemberIdentifier(node: SyntaxNode) {
+export async function getMemberIdentifier(node: types.SyntaxNode) {
   if (node) {
     // 获取字面量
     const literals = getLiteralsIdentifier();
@@ -306,7 +306,7 @@ export function getBackendVariablesIdentifier(node: BaseNode): CompletionPropert
   return newvariables;
 }
 // 获取变量
-export async function getVariableIdentifier(node: SyntaxNode): Promise<CompletionProperty[]> {
+export async function getVariableIdentifier(node: types.SyntaxNode): Promise<CompletionProperty[]> {
   let completionData: CompletionProperty[] = [new CompletionProperty({})];
   // 只获取第一层内容
   const app = node.getAncestor('App');
@@ -403,6 +403,20 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
           }
         }
       })
+      const decoTagAtrrs = (attrName: any) => {
+        const filterAttr: any = {
+          name: attrName,
+          value: `${item.name}.${attrName}`,
+          expression: new MemberExpression({
+            object: stashItem.expression,
+            property: new Identifier({
+              name: attrName,
+              namespace: attrName
+            }),
+          }),
+        };
+        return filterAttr;
+      }
       attrsList.forEach((attr) => {
         const currentAttrInfo = PAGE_COMPONENT_INCLUDE_TAG_MAP[item.tag]?.[attr.name]
         if (attr.name !== 'sorting') {
@@ -424,6 +438,13 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
           stashItem.children.push(completionProperty)
         }
       })
+      if (['u-list-view', 'van-grid-view', 'van-list-view', 'u-cascader', 'van-cascader'].includes(item.tag)) {
+        const filterAttr = decoTagAtrrs('filterText');
+        const filterTextCompletionProperty = new CompletionProperty(filterAttr);
+        filterTextCompletionProperty.name = 'filterText（过滤文本）';
+        filterTextCompletionProperty.icon = 'attr'
+        stashItem.children.push(filterTextCompletionProperty)
+      }
       if (['u-select', 'van-pickerson'].includes(item.tag)) {
         const pageAttr: any = {
           name: 'page-number',
@@ -502,7 +523,7 @@ function flatElements(elements: ViewElement[], componentList: CompletionProperty
 }
 
 // 获取页面组件
-export function getPageComponentsIdentifier(node: SyntaxNode): CompletionProperty[] {
+export function getPageComponentsIdentifier(node: types.SyntaxNode): CompletionProperty[] {
   const { fileNode } = node.getCurrentSource();
   const stashElements = (fileNode as View).elements;
   const componentList: CompletionProperty[] = []

package/src/server/getProcessComponents.ts

@@ -1,7 +1,7 @@
-import { stdlibNamespace } from '..';
+import { getStdlibNamespace } from '..';
 
 export function getProcessComponents() {
-  return stdlibNamespace.findChild('process');
+  return getStdlibNamespace().findChild('process');
 }
 
 export function getProcessComponent(name: string) {

package/src/server/getProcesses.ts

@@ -80,7 +80,8 @@ export function constantToParam(v: Constant) {
 export function genUserTaskLogic(userTask: ProcessElement) {
   const taskId = userTask.constants.find((p) => p.name === 'taskId');
   const { process } = userTask;
-  const l = [
+  let logics = [];
+  const usertaskLogics = [
     new Logic({
       name: `complete`,
       fake: true,
@@ -106,15 +107,63 @@ export function genUserTaskLogic(userTask: ProcessElement) {
       returns: [],
     }),
   ];
-  if (userTask.type === 'InitiateTask') l.pop();
+  const multiTaskLogics = [
+    new Logic({
+      name: `reject`,
+      fake: true,
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'targetTaskDefinitionId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      body: [],
+      returns: [
+        new Return({
+          name: 'result',
+          typeAnnotation: TypeAnnotation.createReference('LCAPOperateProcessResult', {
+            typeNamespace: 'nasl.process',
+          }),
+        }),
+      ],
+    }),
+    new Logic({
+      name: `pass`,
+      fake: true,
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [],
+    }),
+    new Logic({
+      name: `fail`,
+      fake: true,
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [],
+    }),
+  ]
+  logics = userTask.type === 'MultiApprovalTask' ? multiTaskLogics : usertaskLogics;
+  if (userTask.type === 'InitiateTask') logics.pop();
   const path = `app.processes.${process.name}.elements.${userTask.name}.logics`;
-  l.forEach((item) => {
+  logics.forEach((item) => {
     item.getNamespace = function () {
       return path;
     };
     item.fake = true;
   });
-  return l;
+  return logics;
 }
 
 export function userTask2LogicNamespace(userTask: ProcessElement) {
@@ -361,12 +410,13 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
 
   const elements: ProcessElement[] = getPreviousTask(processElem, process);
   const prevtasks = elements.map((us) => {
+    const constant = us.type === 'MultiApprovalTask' ? [] : us.constants.map(genCompletionProperty([process.name, us.name]));
     const cp = new CompletionProperty({
       name: us.name,
       value: us.name,
       children: [
         ...us.returns.map(genCompletionProperty([process.name, us.name])),
-        ...(abandonConstant ? [] : us.constants.map(genCompletionProperty([process.name, us.name]))),
+        ...(abandonConstant ? [] : constant),
       ],
     });
     cp.icon = us.type;
@@ -400,7 +450,7 @@ export function getProcessVariableSuggestions(node: LogicItem, abandonConstant:
   if (processElem.isUserTask) {
     // 任务完成时可以拿到该任务的输出参数
     let returns: CompletionProperty[] = [];
-    if (node.logic && node.logic.parentNode.name === 'OnClose') {
+    if (node.logic && node.logic.parentNode.name === 'OnClose' && processElem.type !== 'MultiApprovalTask') {
       returns = processElem.returns.map(genCompletionProperty([process.name, processElem.name]));
     }
     const scopeVariable = new CompletionProperty({

package/src/server/getValidates.ts

@@ -1,7 +1,8 @@
-import { CallFunction, stdlibNamespace } from '..';
+import { getStdlibNamespace } from '../concepts';
+import type { CallFunction } from '..';
 
 export function getValidates(node?: CallFunction) {
-  return stdlibNamespace.findChild('validation');
+  return getStdlibNamespace().findChild('validation');
 }
 
 export function getValidateFunction(name: string) {

package/src/server/index.ts

@@ -1,4 +1,4 @@
-import { getLogics, iteratorTree } from './getLogics';
+import { getLogics, iteratorTree, getLogicsSync } from './getLogics';
 import { getConnectorTree, publishConnector } from './getConnector';
 import { getInterfaces } from './getInterfaces';
 import { getFunctions, getBuildInFunction } from './getFunctions';
@@ -21,6 +21,7 @@ import { getAllComponentEventMap } from './createUiTs';
 import { displayString2TypeAnnotation } from './formatTsUtils';
 
 const server: any = {
+  getLogicsSync,
   getLogics,
   iteratorTree,
   getInterfaces,

package/src/server/naslServer.ts

@@ -86,23 +86,26 @@ import {
   I18nInfo,
   MetadataType,
   UnaryExpression,
-  SyntaxNode,
+  types,
+  asserts,
 } from '../concepts';
 
-import { lsp2tspNumber, SourceMap, SourceMapItem, isSameRange, Range } from '../translator';
+import * as utils from '../utils';
+import * as jsoner from '../service/storage/jsoner';
+
+import formatUiTs from './createUiTs';
 import axios from '../service/storage';
+
+import { lsp2tspNumber, SourceMap, SourceMapItem, isSameRange } from '../translator';
 import { translateDiagnosticMessage, naslNodeTranslateMessage, MinRange, checkAStructure_ } from './translator';
 import { EventPayload, invokeCommand, registerCommand } from '../common';
 import { DiagnosticRecord, Diagnostic, DiagnosticManager } from '../manager/diagnostic';
-import formatUiTs from './createUiTs';
 import { primitiveTypeList } from '../concepts/basics/types/coreTypeList';
 import { getPlatformType, type2TypeAnnotation } from './formatTsUtils';
-import * as utils from '../utils';
 import naslStdlibMap from './naslStdlibMap';
-import * as jsoner from '../service/storage/jsoner';
 import { EventEmitter } from '../common/EventEmitter';
 
-import { traverse } from '../utils';
+import { traverse, FileNode } from '../utils';
 import { withQueueExecute } from '../decorators';
 import { getNodeByNodeCallee } from '../automate/engine/utils';
 
@@ -120,11 +123,6 @@ const EmbeddedTSFileOffsetMap: { [name: string]: number } = {
 
 const SentryMessager = sentryMonitorTSWorkerMessager(Messager);
 
-export interface FileNode extends BaseNode {
-  getEmbeddedFilePath(name?: string): string;
-  toEmbeddedTSFile(): utils.EmbeddedTSFileGenerator;
-}
-
 interface RenameMinRange extends MinRange {
   newValue?: any;
   setTypeMethods?: string;
@@ -273,6 +271,7 @@ class NaslServer {
       protocol: 'ts-worker',
       sender: 'ide',
       context: this,
+      timeout: 120000,
       getReceiver: () => this.worker as any,
       getSender: () => this.worker as any,
       handleMessage: async ({ data }: any) => {
@@ -575,13 +574,7 @@ class NaslServer {
    */
   writeFiles(files: Array<tsProtocol.OpenRequestArgs>) {
     files.forEach(({ file, fileContent }) => this.tsFiles.set(file, fileContent));
-    const noRepeatFiles = Array.from(this.tsFiles.entries()).map(([key, value]) => ({
-      file: key,
-      fileContent: value,
-    }));
-    // const newFiles = require('/Users/sufangzhou/dev/neteast/lcap-ide/packages/nasl/tmp/files-original.json');
-    // debugger;
-    return this.messager.requestCommand('writeFiles', noRepeatFiles);
+    return this.messager.requestCommand('writeFiles', files);
   }
 
   /**
@@ -1016,7 +1009,7 @@ class NaslServer {
             if (diagnostic.severity === 'warning') {
               record.suggestionDiagnostics.push(diagnostic);
               return null;
-            } if (currentNode.concept === 'OqlQueryComponent') {
+            } if (asserts.isStrictOqlQueryComponent(currentNode)) {
               // OQL别名错误降级为警告
               if (diagnostic.originalDiagnostic && diagnostic.originalDiagnostic?.text.includes('__OQL_ALIAS_WARNING__')) {
                 // 重置 图标和错误等级
@@ -1077,14 +1070,15 @@ class NaslServer {
             // 局部变量和输入变量未使用的警告
             const fromModule = record.node.parentNode.concept === 'Module';
             const fromConnector = record.node.parentNode.concept === 'Connector';
-            if ((record.node.concept === 'View' || record.node.concept === 'Logic') && !(fromModule || fromConnector)) {
+            if ((asserts.isStrictView(record.node) || asserts.isStrictLogic(record.node)) && !(fromModule || fromConnector)) {
               /**
                * javalogic不用提示
                */
-              if (record.node.concept === 'Logic' && self._isJavalogic(record.node as Logic)) {
+              if (asserts.isStrictLogic(record.node) && self._isJavalogic(record.node)) {
                 return null;
               }
-              const minRange = yield* self._findMinRangeWithGenerator(diag as unknown as tsProtocol.DiagnosticWithFileName, record.node as FileNode);
+              asserts.assertFileNode(record.node);
+              const minRange = yield* self._findMinRangeWithGenerator(diag as unknown as tsProtocol.DiagnosticWithFileName, record.node);
               if (minRange) {
                 /**
                  * 如果节点是入参类型
@@ -1706,8 +1700,8 @@ class NaslServer {
           const fileSourceCode = self.getNodeCode(fileNode, value);
           if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
             const typeAnnotation = node.typeAnnotation.toJSON()
-            self._treeMetadataType2CoreType(typeAnnotation, (node.rootNode as App))
-            const isDuplicate = self._isDuplicateCoreType(typeAnnotation)
+            yield* self._treeMetadataType2CoreType(typeAnnotation, (node.rootNode as App))
+            const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
                 const diagnostic = {
                   node: node,
@@ -2085,10 +2079,10 @@ class NaslServer {
         diagnostics.push(diagnostic);
       }
 
-      yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), ([node, value]) => {
+      yield* utils.wrapIteratorToGenerator(fileNode.sourceMap.entries(), function* wrapIterator([node, value]) {
         if (node instanceof OqlQueryComponent) {
           // 自动推导情况
-          const typeAnnotation = type2TypeAnnotation((node as any).__nodeType);
+          const typeAnnotation = yield* type2TypeAnnotation((node as any).__nodeType);
           if (!node.typeAnnotation && typeAnnotation) {
             if (typeAnnotation.typeName === 'List' && typeAnnotation.typeKind === 'generic') {
               const {typeArguments} = typeAnnotation;
@@ -2141,11 +2135,11 @@ class NaslServer {
           } else {
             node.__aStructureError = null;
           }
-          const fileSourceCode = this.getNodeCode(fileNode, value);
+          const fileSourceCode = self.getNodeCode(fileNode, value);
           if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
             const typeAnnotation = node.typeAnnotation.toJSON()
-            this._treeMetadataType2CoreType(typeAnnotation, (node.rootNode as App))
-            const isDuplicate = this._isDuplicateCoreType(typeAnnotation)
+            yield* self._treeMetadataType2CoreType(typeAnnotation, (node.rootNode as App))
+            const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
               const diagnostic = {
                 node: node,
@@ -2157,11 +2151,11 @@ class NaslServer {
           }
         }
         else if (node instanceof Param) {
-          const fileSourceCode = this.getNodeCode(fileNode, value);
+          const fileSourceCode = self.getNodeCode(fileNode, value);
           if (fileSourceCode.includes('|') && fileSourceCode.includes('.metadataTypes.')) {
             const typeAnnotation = node.typeAnnotation.toJSON()
-            this._treeMetadataType2CoreType(typeAnnotation, (node.rootNode as App))
-            const isDuplicate = this._isDuplicateCoreType(typeAnnotation)
+            yield* self._treeMetadataType2CoreType(typeAnnotation, (node.rootNode as App))
+            const isDuplicate = yield* self._isDuplicateCoreType(typeAnnotation)
             if (isDuplicate) {
               const diagnostic = {
                 node: node,
@@ -2172,7 +2166,7 @@ class NaslServer {
             }
           }
         }
-        this.checkNodeError(node, diagnostics);
+        self.checkNodeError(node, diagnostics);
       });
     }
     else if (fileNode instanceof Process) {
@@ -2261,8 +2255,10 @@ class NaslServer {
     return diagnostics;
   }
 
-  _treeMetadataType2CoreType(type: TypeAnnotation, app: App) {
-    type.typeArguments?.forEach((item: TypeAnnotation) => {
+  *_treeMetadataType2CoreType(type: TypeAnnotation, app: App): Generator<any, void, any> {
+    const self = this;
+
+    yield* utils.wrapForEachToGenerator(type.typeArguments ?? [], function* wrapForEach(item) {
       if (item.typeNamespace?.endsWith('.metadataTypes')) {
         let originType = {} as TypeAnnotation
         if (item.typeNamespace === 'app.metadataTypes') {
@@ -2275,29 +2271,29 @@ class NaslServer {
         item.typeNamespace = 'nasl.core'
         item.typeName = originType?.typeName
       }
-      if (type.typeArguments?.length > 0) {
-        type.typeArguments.forEach((ele) => {
-            this._treeMetadataType2CoreType(ele, app)
-        })
-      }
-    })
+
+      yield* utils.wrapForEachToGenerator(type.typeArguments ?? [], function* wrapForEach2(ele) {
+        yield* self._treeMetadataType2CoreType(ele, app)
+      });
+    });
   }
 
-  _isDuplicateCoreType(type: TypeAnnotation) {
+  *_isDuplicateCoreType(type: TypeAnnotation): Generator<any, boolean, any> {
     const argsStringList = type.typeArguments?.map((item) => JSON.stringify(item)) || []
     const setList = Array.from(new Set(argsStringList))
     if (argsStringList.length > setList.length) {
       return true
     }
+
     let flag = false
-    if (type.typeArguments?.length > 0) {
-      type.typeArguments.forEach((ele) => {
-        const subFlag = this._isDuplicateCoreType(ele)
-        if (subFlag) {
-            flag = true
-        }
-      })
+
+    for (const ele of type.typeArguments ?? []) {
+      const subFlag = yield* this._isDuplicateCoreType(ele)
+      if (subFlag) {
+        flag = true
+      }
     }
+
     return flag
   }
   checkNodeError(node: BaseNode, diagnostics: Diagnostic[]): any {
@@ -3832,7 +3828,7 @@ class NaslServer {
   getCurrentSource(node: BaseNode) {
     if (node instanceof App || node instanceof Theme) return { fileNode: null };
     let {sourceMap} = node;
-    let fileNode = node as FileNode & SyntaxNode;
+    let fileNode = node as FileNode & types.SyntaxNode;
     // 连接器 操作，上层结构是 Namespace， Namespace 并无含义，因此需要过滤掉
     const isConnectorLogic = node.getAncestor('Connector') && node.concept === 'Logic' && node.parentNode instanceof Namespace;
     // 如果没有sourceMap,就继续向上找 ,或者到module结束
@@ -3852,7 +3848,7 @@ class NaslServer {
       !(fileNode instanceof View) &&
       !(fileNode instanceof ConfigProperty)
     ) {
-      fileNode = fileNode.parentNode as FileNode & SyntaxNode;
+      fileNode = fileNode.parentNode as FileNode & types.SyntaxNode;
       sourceMap = fileNode?.sourceMap;
     }
     const currentSource = sourceMap && sourceMap.get(node);
@@ -4176,10 +4172,10 @@ class NaslServer {
       args.push(fileDetail);
     });
     const resultMap: any = (yield this.getNaslNodeTypeFull(args))?.response;
-    yield* utils.wrapForEachToGenerator(args, ({ file, line, offset }, index) => {
+    yield* utils.wrapForEachToGenerator(args, function* wrapForEach({ file, line, offset }, index) {
       const item = (resultMap as any)?.[file]?.[line]?.[offset];
       const itemType = item?.[0]?.nodeType;
-      const nodeTypeAnnotation = type2TypeAnnotation(itemType);
+      const nodeTypeAnnotation = yield* type2TypeAnnotation(itemType);
       const {node} = newQuickInfoNodes[index];
 
       types.set(node, Object.freeze(nodeTypeAnnotation) as TypeAnnotation);
@@ -4448,7 +4444,7 @@ class NaslServer {
       if (node instanceof DefaultValue && !value) {
         const jsonNode = jsoner.queryNodeByPath(json, node.getNodePath(false));
         const parentNodeType = (node.parentNode as any)?.typeAnnotation || (node.parentNode as any)?.__TypeAnnotation;
-        if (parentNodeType) {
+        if (parentNodeType && jsonNode) {
           jsonNode.typeAnnotation = (parentNodeType as TypeAnnotation)?.toJSON();
         }
       }
@@ -4476,7 +4472,7 @@ class NaslServer {
       if (nodeType && Array.isArray(nodeType.fnParams)) {
         const index = node.parentNode.arguments.indexOf(node);
         const type = nodeType.fnParams[index]?.typeInfo;
-        const nodeTypeAnnotation = type2TypeAnnotation(type);
+        const nodeTypeAnnotation = yield* type2TypeAnnotation(type);
         if (nodeTypeAnnotation) {
           return nodeTypeAnnotation
         }
@@ -4885,11 +4881,6 @@ class NaslServer {
     if (targetNode instanceof Namespace && targetNode.parentNode instanceof Connector) {
       return;
     }
-    // 连接器本身没有真实文件，也不需要删除
-    if (targetNode instanceof Connector) {
-      return;
-    }
-    
     // Connection 相关配置的更新不需要写入文件
     // i18nInfo 更新不需要写入文件
     if (targetNode?.parentNode instanceof Connection || targetNode instanceof I18nInfo) {

package/src/server/translator.ts

@@ -504,6 +504,9 @@ export function naslNodeTranslateMessage(minRange: MinRange, tsErrorDetail: Diag
         case 'ApprovalTask':
           u = '审批任务';
           break;
+        case 'MultiApprovalTask':
+          u = '多人审批任务';
+          break;
         case 'InitiateTask':
           u = '发起任务';
           break;

package/src/service/creator/errHandles.js

@@ -32,10 +32,13 @@ export default {
             return;
         }
 
-        // 检测到当前应用已在新 tab 页打开
-        if (err.code === 500502) {
-            eventBus.emit('multiTabOpened');
-            return;
+        // 检测到当前应用已在新 tab 页操作，或者版本升级，备份还原
+        if (err.code === 500502 || err.code === 500505) {
+          eventBus.emit('multiTabOpened', {
+            refreshBrowser: err.code === 500505,
+            message: err.msg,
+          });
+          return;
         }
 
         if (versionStatus[err.code])

package/src/service/storage/init.ts

@@ -1,5 +1,5 @@
 import { cloneDeep } from 'lodash';
-import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, SyntaxNode, BindDirective, CallLogic, BindAttribute, AuthInterface } from '../../concepts';
+import { App, LogicItem, Logic, Module, View, ViewElement, Argument, SelectMembers, BindDirective, CallLogic, BindAttribute, types } from '../../concepts';
 import { addBreakpointNodesFromApp } from '../../breakpoint';
 import { getConceptConstructor } from '../../decorators';
 import { config } from '../../config';
@@ -455,7 +455,7 @@ async function doAction(app: any, actionItem: any) {
   try {
     if (Array.isArray(list)) {
       list.forEach((event) => {
-        const emitTarget = event?.originEvent?.target as SyntaxNode;
+        const emitTarget = event?.originEvent?.target as types.SyntaxNode;
         const _path: string = event.originEvent.path;
         const _root = _path.split('.')?.[1] || '';
         if (['backend', 'overriddenLogics', 'dataSources', 'processes', 'roles', 'logics', 'enums', 'structures', 'interfaces', 'interfaceDependencies', 'configuration', 'dependencies', 'authLogics', 'authLogicsForCallInterface', 'triggerLaunchers', 'connections'].some((item) => _root.startsWith(item))) {
@@ -583,7 +583,7 @@ async function doAction(app: any, actionItem: any) {
           hasBackEnd = true;
         }
       }
-        event.eventList.forEach(({ action, riskList, path, object: objItem }: { action: string; riskList: string; path: string; object: any }) => {
+        event.eventList.forEach(({ action, riskList, path, object: objItem }: { action: string; riskList: string[]; path: string; object: any }) => {
           if (riskList) {
             allRiskList.push(...(riskList || []));
           }
@@ -676,8 +676,10 @@ async function doAction(app: any, actionItem: any) {
 }
 
 type Instruct = {
-  uuid: string,
-  actions: any[],
+  uuid: string;
+  actions: any[];
+  oldUUid?: string;
+  riskList?: string[];
 };
 type TaskOption = {
   app: any,
@@ -755,9 +757,10 @@ class TaskQueue {
 
     // code: 401650, 检测到当前应用拉取操作已被强制结束, 用户确认后再刷新
     // code: 500502  msg: '该应用已在新tab 页打开，请刷新!'      不重试或刷新
+    // code: 500505  需要刷新浏览器
     if (!error)
       this.recover(app);
-    else if (![401650, 500502].includes(error.code)) {
+    else if (![401650, 500502, 500505].includes(error.code)) {
       // 连接失败，或超时，或后端持久化异常
       if ((error.message === 'Network Error' || error.message?.includes('timeout') || error.code === 500500)
         && this.status !== TaskQueueStatus.Retrying) {
@@ -891,9 +894,33 @@ async function _saveNasl(options: TaskOption) {
           return `${index + 1}.${risk};`;
         }).join('\n')}\n请及时排查原因`);
       }
+      /**
+       * 将指令列表拆分成每个指令最多200条指令的数组
+       * 因为服务端（孙浩然），单个actions太多，会导致服务端处理超时，事务超时
+       * 所以在这里把请求拆开，然后存储一下原来的 uuid，然后再请求的时候给一个新的uuid，表示事务不一样
+       */
+      function transformArr(instructList: Instruct[]) {
+        if (!Array.isArray(instructList)) return instructList;
+        const transformedArr: Instruct[] = [];
+        instructList.forEach((item) => {
+          let tempActions = [...item.actions];
+          if (tempActions.length > 200) {
+            const { uuid: oldUUid, riskList } = item;
+            while (tempActions.length > 200) {
+              transformedArr.push({ oldUUid, uuid: uuidv4().replace(/-/g, ''), actions: tempActions.splice(0, 200), riskList });
+            }
+            transformedArr.push({ oldUUid, uuid: uuidv4().replace(/-/g, ''), actions: tempActions, riskList });
+          } else {
+            transformedArr.push(item);
+          }
+        });
+
+        return transformedArr;
+      }
+      const transformedInstructList = transformArr(instructList);
       // 接口请求
       res = await storageService.batchInstruct({
-        body: instructList,
+        body: transformedInstructList,
         headers: {
           appId: app.id,
           ChangedNASLType,

package/src/translator/types.ts

@@ -47,6 +47,7 @@ export interface TranslatorState {
   sourceMap?: SourceMap;
   finalCode?: boolean;
   focusedNodePath?: string;
+  getVuePrototype?: boolean;
 }
 
 export type SourceMapItem = Range;

package/src/translator/utils.ts

@@ -64,7 +64,6 @@ const statementMap = [
   "IfStatement",
   "ForEachStatement",
   "SwitchStatement",
-  // "SwitchCase",
   "WhileStatement",
   "Match",
   "Comment",
@@ -133,7 +132,7 @@ export function withSourceMap() {
         });
 
         if (isNatural && statementMap?.includes(this.concept) && code) {
-          before += `// ${this.nodePath} \n`;
+          before += `// nodePath: '${this.nodePath}' \n`;
         }
 
         return before + code;

package/src/utils/i18nInfo.ts

@@ -1,14 +1,4 @@
 export const languageList = [
-  {
-    id: 'ms-MY',
-    name: 'Bahasa Melayu',
-    title: '马来语（马来西亚）',
-  },
-  {
-    id: 'de-DE',
-    name: 'Deutsch',
-    title: '德语',
-  },
   {
     id: 'en-US',
     name: 'English (United States)',
@@ -19,26 +9,6 @@ export const languageList = [
     name: 'Français',
     title: '法语',
   },
-  {
-    id: 'it-IT',
-    name: 'Italiano',
-    title: '意大利语',
-  },
-  {
-    id: 'ru-RU',
-    name: 'Русский',
-    title: '俄语',
-  },
-  {
-    id: 'th-TH',
-    name: 'ไทย',
-    title: '泰语',
-  },
-  {
-    id: 'ko-KR',
-    name: '한국어',
-    title: '韩语',
-  },
   {
     id: 'zh-CN',
     name: '中文 (简体)',