@lcap/nasl 3.3.3-beta.8 → 3.3.3-beta.9

package/src/generator/genReleaseBody.ts

@@ -81,21 +81,21 @@ async function mergeBodyData(app: App, opt: ReleaseData) {
 
 async function getCalllogicData(app: App, releaseData: ReleaseData) {
   function getValidationMap(serverData: InputServerValidationData) {
-      const map = new Map<string, ServerValidationData>();
-      Object.values(serverData).forEach((logic) => {
-        logic.forEach((item) => {
-            map.set(item.uuid, item);
-        });
+    const map = new Map<string, ServerValidationData>();
+    Object.values(serverData).forEach((logic) => {
+      logic.forEach((item) => {
+        map.set(item.uuid, item);
+      });
     });
     return map;
   }
 
   function clearValidationMap(serverData: InputServerValidationData) {
     Object.values(serverData).forEach((logic) => {
-        logic.forEach((item) => {
-            item.rules = [];
-            item.failureRules = [];
-        });
+      logic.forEach((item) => {
+        item.rules = [];
+        item.failureRules = [];
+      });
     });
     return serverData;
   }
@@ -109,14 +109,14 @@ async function getCalllogicData(app: App, releaseData: ReleaseData) {
 
     nasl.traverseStrictChildren((node) => {
       if (
-          node.concept === 'CallLogic' &&
-          'uuid' in node &&
-          node.validation &&
-          map.has(node.uuid)
+        'uuid' in node &&
+        node.concept === 'CallLogic' &&
+        node.validation &&
+        map.has(node.uuid)
       ) {
-          const data = map.get(node.uuid)!;
-          const naslRules = node.validation.rules.map((rule) => rule.toJSON());
-          data.rules = [...naslRules, ...data.rules];
+        const data = map.get(node.uuid)!;
+        const naslRules = node.validation.rules.map((rule) => rule.toJSON());
+        data.rules = [...naslRules, ...data.rules];
       }
     });
 
@@ -136,24 +136,24 @@ async function getCalllogicData(app: App, releaseData: ReleaseData) {
 
     const passwordCallLogicUuid = new Set<string>();
     const removeRuleNames = [
-        "rangeLength",
-        "pattern",
-        "^az",
-        "^az09",
-        "^az09_",
-        "^azAZ",
-        "^azAZ09",
-        "^azAZ09_",
-        "az09$",
-        "azAZ09$",
-        "^09$",
-        "^az09$",
-        "^az09-$",
-        "^az09-.$",
-        "^azAZ09$",
-        "^azAZ09-$",
-        "^azAZ09_$",
-        "^azAZ09-_$",
+      "rangeLength",
+      "pattern",
+      "^az",
+      "^az09",
+      "^az09_",
+      "^azAZ",
+      "^azAZ09",
+      "^azAZ09_",
+      "az09$",
+      "azAZ09$",
+      "^09$",
+      "^az09$",
+      "^az09-$",
+      "^az09-.$",
+      "^azAZ09$",
+      "^azAZ09-$",
+      "^azAZ09_$",
+      "^azAZ09-_$",
     ];
 
     // 获取所有调用加密函数的调用节点 uuid
@@ -205,18 +205,18 @@ async function getCalllogicData(app: App, releaseData: ReleaseData) {
     validations = {},
   } = releaseData;
   const {
-      preferenceMap: {
-          serverValidationRules,
-      },
+    preferenceMap: {
+      serverValidationRules,
+    },
   } = app;
   const serverValidationRulesBySwitch =
     serverValidationRules === 'custom'
       ? // 自定义
-        mergeValidation(validations, app)
+      mergeValidation(validations, app)
       : serverValidationRules === 'auto'
-      ? // 自动
+        ? // 自动
         validations
-      : // 关闭
+        : // 关闭
         clearValidationMap(validations);
 
   return removePasswordValidation(serverValidationRulesBySwitch, app);

package/src/server/extendBaseNode.ts

@@ -131,9 +131,28 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
     if (res.length <= 1) {
       if (this.concept === 'enumItem') {
         (this as any).setValue(newValue);
+      } else if (this.concept === 'Process' || (this.concept === 'ProcessElement' && ['InitiateTask', 'ApprovalTask', 'MultiApprovalTask', 'UserTask'].includes((this as any).type))) {
+        const confirmParms: any = {
+          actionType: 'rename',
+          node: this,
+          newValue,
+          unReference: true,
+          icon: 'warning',
+        };
+        if (this.concept === 'Process') {
+          confirmParms.title = '重命名流程名称';
+          confirmParms.process = true;
+        } else if (this.concept === 'ProcessElement') {
+          confirmParms.title = '修改节点名称'
+          confirmParms.process = true;
+        }
+        const callback = () => {
+          (this as SetNameNode).setName(newValue);
+        }
+        invokeCommand('tsConfirm.open', confirmParms, callback)
       } else (this as SetNameNode).setName(newValue);
     } else {
-      const callback = (value: boolean) => {
+      const callback = (value: boolean, toast?: Function) => {
         if (value) {
           const App = this.rootNode;
           // 收集修改
@@ -169,36 +188,26 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
           });
           // 结束修改 ，批量操作
           App.emit('collect:end');
+          toast && toast();
         } else {
           (this as SetNameNode).setName(newValue);
         }
       };
-      const confirmParms = {
+      const confirmParms: any = {
         actionType: 'rename',
         node: this,
         newValue,
+        icon: 'warning',
       };
-      /**
-       * nasl和vue的通信，回退，要触发vue的watch。
-       * 因为如果没修改的话nasl不会修改view，就不会通知到页面改成旧值
-       * 先修改之
-       */
-      const closeCallBack = () => {
-        if (this.concept === 'EnumItem') {
-          const oldValue = (this as EnumItem).value;
-          (this as EnumItem).value = oldValue + ' ';
-          setTimeout(() => {
-            (this as EnumItem).value = oldValue;
-          }, 0);
-        } else {
-          const oldValue = this.name;
-          this.name = oldValue + ' ';
-          setTimeout(() => {
-            this.name = oldValue;
-          }, 0);
-        }
-      };
-      updateAll ? callback(true) : invokeCommand('tsConfirm.open', confirmParms, callback, closeCallBack);
+      if (this.concept === 'Process') {
+        confirmParms.title = '重命名流程名称';
+        confirmParms.process = true;
+      } else if (this.concept === 'ProcessElement' && ['InitiateTask', 'ApprovalTask', 'MultiApprovalTask', 'UserTask'].includes((this as any).type)) {
+        confirmParms.title = '修改节点名称'
+        confirmParms.process = true;
+      }
+
+      updateAll ? callback(true) : invokeCommand('tsConfirm.open', confirmParms, callback);
 
       return;
     }

package/src/server/formatTsUtils.ts

@@ -21,6 +21,7 @@ import {
   AuthLogicForCallInterface,
 } from '..';
 import { getNaslNodeByNodeCallee } from '../automate/engine/utils';
+import { runGeneratorSync as runSync } from '../utils';
 
 interface variableItem {
   text: string;
@@ -59,9 +60,8 @@ function isValidName(str: string) {
  * 解析 Completion 和 QuickInfo 的 displayString
  * 生成 TypeAnnotation
  * @param displayString
- * @returns TypeAnnotation
  */
-export function type2TypeAnnotation(oldType: Array<any> | {}): TypeAnnotation {
+export function* type2TypeAnnotation(oldType: Array<any> | {}): Generator<any, TypeAnnotation, any> {
   if (!oldType) return null;
   let type = oldType;
   if (Array.isArray(oldType)) {
@@ -74,14 +74,14 @@ export function type2TypeAnnotation(oldType: Array<any> | {}): TypeAnnotation {
       // 自定义类型
       const newProperties: StructureProperty[] = [];
       if (Array.isArray(properties) && properties.length) {
-        properties.forEach((item) => {
+        for (const item of properties) {
           if (!item?.name?.startsWith('__')) {
             // 如果没有获取到类型，就默认塞一个string
-            const itemType = type2TypeAnnotation(item.typeInfo) || TypeAnnotation.createPrimitive('String');
+            const itemType = (yield* type2TypeAnnotation(item.typeInfo)) || TypeAnnotation.createPrimitive('String');
             const structureProperty = StructureProperty.from({ name: item.name, typeAnnotation: itemType }, typeAnnotation, 'properties');
             newProperties.push(structureProperty);
           }
-        });
+        }
       }
       typeAnnotation = TypeAnnotation.createTypeAnonymousStructure(newProperties);
     } else if (!typeName || typeName === 'Promise' || typeName === 'nasl' || typeName === '___IDENTIFIER__') {
@@ -91,12 +91,12 @@ export function type2TypeAnnotation(oldType: Array<any> | {}): TypeAnnotation {
     } else if (typeName === 'Union') {
       typeAnnotation = TypeAnnotation.createPrimitive('Union');
       typeAnnotation.typeArguments = [];
-      typeArguments.forEach((item: any) => {
-        const typeItem = type2TypeAnnotation(item);
+      for (const item of typeArguments) {
+        const typeItem = yield* type2TypeAnnotation(item);
         if (typeItem) {
           typeAnnotation.typeArgumentsPush(typeItem);
         }
-      });
+      }
     } else if (typeNamespace && typeNamespace.startsWith('nasl.core')) {
       typeAnnotation = TypeAnnotation.createPrimitive(typeName);
     } else if (typeNamespace && typeArguments?.length) {
@@ -106,12 +106,12 @@ export function type2TypeAnnotation(oldType: Array<any> | {}): TypeAnnotation {
       });
       // 如果有泛型处理泛型
       typeAnnotation.typeArguments = [];
-      typeArguments.forEach((item: any) => {
-        const typeItem = type2TypeAnnotation(item);
+      for (const item of typeArguments) {
+        const typeItem = yield* type2TypeAnnotation(item);
         if (typeItem) {
           typeAnnotation.typeArgumentsPush(typeItem);
         }
-      });
+      }
     } else {
       // 其余的引用类型
       typeAnnotation = TypeAnnotation.createReference(typeName, {
@@ -121,6 +121,7 @@ export function type2TypeAnnotation(oldType: Array<any> | {}): TypeAnnotation {
   } catch (err) {
     console.log(err, type);
   }
+  yield;
   return typeAnnotation;
 }
 
@@ -498,7 +499,7 @@ function getNodeTypeVariableData(nodeType: any, item: any, node: SyntaxNode) {
   const parentExpression = new Identifier({ name: item.text });
   item.expression = parentExpression;
   if (nodeType) {
-    const typeAnnotation = type2TypeAnnotation(nodeType);
+    const typeAnnotation = runSync(type2TypeAnnotation(nodeType));
     const typeKeyMap = new Map();
     const app = node.rootNode as App;
     let structure: any = {};

package/src/server/getLogics.ts

@@ -101,6 +101,10 @@ function getViewElementPath(node: BaseNode, parentNodeNames: Array<string>) {
 }
 
 export async function getLogics(node: CallLogic | BindEvent | Identifier | Logic, needAllLogic: boolean = true) {
+  return getLogicsSync(node, needAllLogic)
+}
+
+export function getLogicsSync(node: CallLogic | BindEvent | Identifier | Logic, needAllLogic: boolean = true) {
   const app = node?.rootNode as App;
   if (node?.concept === 'CallLogic' || node?.concept === 'BindEvent' || node?.concept === 'Logic') {
     const result = [];

package/src/server/getMemberIdentifier.ts

@@ -375,6 +375,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') {
@@ -396,6 +410,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',

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/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

@@ -514,8 +514,8 @@ class NaslServer {
     await this.writeFiles(files);
     this._debugInFileStorage(app, files);
     // 修改名称回调
-    registerCommand('tsRename.change', (value: boolean, callback: Function) => {
-      callback(value);
+    registerCommand('tsRename.change', (value: boolean, callback: Function, toast?: Function) => {
+      callback(value, toast);
     });
     // 删除回调
     registerCommand('tsDelete.change', (callback: Function) => {
@@ -1704,8 +1704,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,
@@ -2083,10 +2083,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;
@@ -2139,11 +2139,11 @@ class NaslServer {
           } else {
             delete node.tsErrorDetail;
           }
-          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,
@@ -2155,11 +2155,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,
@@ -2170,7 +2170,7 @@ class NaslServer {
             }
           }
         }
-        this.checkNodeError(node, diagnostics);
+        self.checkNodeError(node, diagnostics);
       });
     }
     else if (fileNode instanceof Process) {
@@ -2225,8 +2225,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') {
@@ -2239,29 +2241,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 {
@@ -4063,7 +4065,7 @@ class NaslServer {
       } else if (['NewComposite', 'NewList', 'NewMap'].includes(node.concept)) {
         const code = getCode(item);
         fileDetail.line = item.end.line;
-        const indexOf = code.indexOf('return __newComposite');
+        const indexOf = code.lastIndexOf('return __newComposite');
         let newCode = code.substring(0, indexOf);
         newCode = newCode.substring(newCode.lastIndexOf('\n'), indexOf);
         fileDetail.offset = newCode.length + 'return '.length;
@@ -4073,10 +4075,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);
@@ -4362,7 +4364,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 {
             typeAnnotation: nodeTypeAnnotation,

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

@@ -88,7 +88,6 @@ async function deleteExpiredRecords() {
       expiredRecordsRequest.onsuccess = (event: any) => {
         const cursor = event.target.result;
         if (cursor) {
-          console.log(cursor);
           objectStore.delete(cursor.primaryKey);
           cursor.continue();
         } else {
@@ -751,9 +750,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) {