@lcap/nasl 3.3.3-beta.8 → 3.3.6-beta.1

package/src/concepts/Param__.ts

@@ -325,6 +325,9 @@ export class Param extends BaseNode {
       const { defaultValue } = this;
       const defaultValueType = Object.prototype.toString.call(defaultValue);
       const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
+      const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
+      const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
+
       // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
       let parsedValue = defaultValue ?? undefined;
       if (
@@ -342,10 +345,27 @@ export class Param extends BaseNode {
         if ([''].includes(defaultValue)) {
           parsedValue = undefined;
         } else {
-          parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
+          function parseNumberValue(defaultValue: any, typeAnnotation: any) {
+            const { typeKind, typeName } = typeAnnotation;
+            const isNaslNumber = typeKind === 'primitive' && ['Decimal', 'Long', 'Double', 'Int'].includes(typeName);
+            if (isNaslNumber) {
+              return String(defaultValue);
+            } else {
+              return tryJSONParse(defaultValue) ?? defaultValue;
+            }
+          }
+          parsedValue = parseNumberValue(defaultValue, typeAnnotation);
         }
       }
-      code += `${this.name} !== undefined ? ${this.name} : ${JSON.stringify(parsedValue)}`;
+      let valueCode = '';
+      if (isDecimal) {
+        valueCode = `new NaslDecimal('${defaultValue}')`;
+      } else if (isInteger) {
+        valueCode = `new NaslLong('${defaultValue}')`;
+      } else {
+        valueCode = `${JSON.stringify(parsedValue)}`;
+      }
+      code += `${this.name} !== undefined ? ${this.name} : ${valueCode}`;
 
       if (needGenInitFromSchema) {
         code += `)`;
@@ -561,3 +581,5 @@ export default Param;
 // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
 // 自动生成的代码已结束。下面可以手动编写。
 //================================================================================
+
+

package/src/concepts/ProcessElement__.ts

@@ -37,6 +37,7 @@ import Variable from './Variable__';
 import Return from './Return__';
 import Constant from './Constant__';
 import BindAttribute from './BindAttribute__';
+import MultiApprovalPolicy from './MultiApprovalPolicy__';
 import Process from './Process__';
 import Module from './Module__';
 import App from './App__';
@@ -157,6 +158,13 @@ export class ProcessElement extends BaseNode {
   @property('BindAttribute')
   bindAttrs: Array<BindAttribute> = [];
 
+  /**
+   * 多人审批任务
+   */
+  @property('MultiApprovalPolicy')
+  // @ts-ignore
+  multiApprovalPolicy!: MultiApprovalPolicy;
+
   /**
    * 祖先 Process
    */
@@ -1656,6 +1664,62 @@ export class ProcessElement extends BaseNode {
     return params;
   }
 
+  /**
+   * 删除多人审批任务
+   * @param name 多人审批任务名称
+   */
+  removeMultiApprovalPolicy(name: string): void;
+
+  /**
+   * 删除多人审批任务
+   * @param multiApprovalPolicy 已有的多人审批任务实例
+   */
+  removeMultiApprovalPolicy(multiApprovalPolicy: MultiApprovalPolicy): void;
+
+  removeMultiApprovalPolicy(options: string | MultiApprovalPolicy) {
+    let multiApprovalPolicy: MultiApprovalPolicy;
+    if (typeof options === 'string') {
+      multiApprovalPolicy = this.multiApprovalPolicy;
+      if (!multiApprovalPolicy) {
+        throw new Error('找不到多人审批任务 ' + options);
+      }
+    } else {
+      multiApprovalPolicy = options;
+    }
+    return multiApprovalPolicy.delete();
+  }
+
+  __removeMultiApprovalPolicy(multiApprovalPolicy: MultiApprovalPolicy) {
+    const parentKey = multiApprovalPolicy.parentKey;
+    const params: Params = {
+      parentNode: this,
+      parentKey,
+      index: -1,
+      object: null,
+      oldObject: multiApprovalPolicy,
+    };
+    if (parentKey) {
+      params.parentKey = parentKey;
+      // @ts-ignore
+      const t = this.__v_raw || this;
+      // @ts-ignore
+      const n = multiApprovalPolicy.__v_raw || multiApprovalPolicy;
+      if (Array.isArray((t as any)[parentKey])) {
+        // @ts-ignore
+        const index = (t as any)[parentKey].findIndex((el) => (el.__v_raw || el) === n);
+        ~index && (this as any)[parentKey].splice(index, 1);
+        params.index = index;
+      } else {
+        const q = (t as any)[parentKey];
+        if ((q.__v_raw || q) === n) {
+          params.index = 0;
+          (this as any)[parentKey] = undefined;
+        }
+      }
+    }
+    return params;
+  }
+
   //================================================================================
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
@@ -1668,7 +1732,12 @@ export class ProcessElement extends BaseNode {
   }
 
   get isUserTask() {
-    return this.type === 'UserTask' || this.type === 'ApprovalTask' || this.type === 'InitiateTask';
+    return (
+      this.type === 'UserTask' ||
+      this.type === 'ApprovalTask' ||
+      this.type === 'MultiApprovalTask' ||
+      this.type === 'InitiateTask'
+    );
   }
 
   get logics() {

package/src/concepts/Return__.ts

@@ -17,7 +17,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) { }
+  } catch (e) {}
 
   return result;
 }
@@ -282,6 +282,9 @@ export class Return extends BaseNode {
     const { defaultValue } = this;
     const defaultValueType = Object.prototype.toString.call(defaultValue);
     const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
+    const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
+    const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
+
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
     if (
@@ -295,10 +298,27 @@ export class Return extends BaseNode {
       if ([''].includes(defaultValue)) {
         parsedValue = undefined;
       } else {
-        parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
+        function parseNumberValue(defaultValue: any, typeAnnotation: any) {
+          const { typeKind, typeName } = typeAnnotation;
+          const isNaslNumber = typeKind === 'primitive' && ['Decimal', 'Long', 'Double', 'Int'].includes(typeName);
+          if (isNaslNumber) {
+            return String(defaultValue);
+          } else {
+            return tryJSONParse(defaultValue) ?? defaultValue;
+          }
+        }
+        parsedValue = parseNumberValue(defaultValue, typeAnnotation);
       }
     }
-    code += JSON.stringify(parsedValue);
+    if (isDecimal) {
+      parsedValue = `new NaslDecimal('${defaultValue}')`;
+      code += `${parsedValue}`;
+    } else if (isInteger) {
+      parsedValue = `new NaslLong('${defaultValue}')`;
+      code += `${parsedValue}`;
+    } else {
+      code += `${JSON.stringify(parsedValue)}`;
+    }
     if (needGenInitFromSchema) {
       code += `)`;
     }

package/src/concepts/SequentialPolicy__.ts

@@ -0,0 +1,58 @@
+//================================================================================
+// 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+// ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+//================================================================================
+import { EventPayload, Params } from '../common/EventEmitter';
+import { concept, excludedInJSON, property, className } from '../decorators';
+
+import * as utils from '../utils';
+import { v4 as uuidv4 } from 'uuid';
+import BaseNode from '../common/BaseNode';
+import MultiApprovalPolicy from './MultiApprovalPolicy__';
+
+/**
+ * 依次审批
+ */
+@className
+@concept('依次审批')
+// @ts-ignore
+export class SequentialPolicy extends MultiApprovalPolicy {
+  /** 类名 */
+  static readonly ConceptName = 'SequentialPolicy';
+
+  /**
+   * 产品概念
+   */
+  @property('concept')
+  // @ts-ignore
+  readonly concept!: 'SequentialPolicy';
+
+  /**
+   * @param source 需要合并的部分参数
+   */
+  constructor(source?: Partial<SequentialPolicy>) {
+    source = Object.assign({}, SequentialPolicy.getDefaultOptions(), source);
+    super(source);
+    super.subConstructor(source);
+  }
+
+  static from(source: any, parentNode?: any, parentKey?: string): SequentialPolicy {
+    return super.from(source, parentNode, parentKey) as SequentialPolicy;
+  }
+
+  //================================================================================
+  // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+  // 自动生成的代码已结束。下面可以手动编写。
+  //================================================================================
+
+  //================================================================================
+  // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
+  // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
+  //================================================================================
+}
+
+export default SequentialPolicy;
+//================================================================================
+// ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
+// 自动生成的代码已结束。下面可以手动编写。
+//================================================================================

package/src/concepts/Variable__.ts

@@ -22,7 +22,7 @@ function tryJSONParse(str: string) {
 
   try {
     result = JSON.parse(str);
-  } catch (e) { }
+  } catch (e) {}
 
   return result;
 }
@@ -298,11 +298,14 @@ export class Variable extends BaseNode {
     if (needGenInitFromSchema) {
       code += `${context}.$genInitFromSchema('${typeAnnotation?.sortedTypeKey}',`;
     }
+
     const { defaultValue } = this;
     const defaultValueType = Object.prototype.toString.call(defaultValue);
     const { typeKind, typeNamespace, typeName } = typeAnnotation || {};
     // 设置成null，才能同步给后端清除该值，但是null对checkbox组件是一种特殊状态
     let parsedValue = defaultValue ?? undefined;
+    const isDecimal = typeKind === 'primitive' && ['Decimal', 'Double'].includes(typeName);
+    const isInteger = typeKind === 'primitive' && ['Long', 'Integer'].includes(typeName);
     if (
       defaultValueType === '[object String]' &&
       !(typeKind === 'primitive' && typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) &&
@@ -314,10 +317,27 @@ export class Variable extends BaseNode {
       if ([''].includes(defaultValue)) {
         parsedValue = undefined;
       } else {
-        parsedValue = tryJSONParse(defaultValue) ?? defaultValue;
+        function parseNumberValue(defaultValue: any, typeAnnotation: any) {
+          const { typeKind, typeName } = typeAnnotation;
+          const isNaslNumber = typeKind === 'primitive' && ['Decimal', 'Long', 'Double', 'Int'].includes(typeName);
+          if (isNaslNumber) {
+            return String(defaultValue);
+          } else {
+            return tryJSONParse(defaultValue) ?? defaultValue;
+          }
+        }
+        parsedValue = parseNumberValue(defaultValue, typeAnnotation);
       }
     }
-    code += JSON.stringify(parsedValue);
+    if (isDecimal) {
+      parsedValue = `new NaslDecimal('${defaultValue}')`;
+      code += `${parsedValue}`;
+    } else if (isInteger) {
+      parsedValue = `new NaslLong('${defaultValue}')`;
+      code += `${parsedValue}`;
+    } else {
+      code += `${JSON.stringify(parsedValue)}`;
+    }
     if (needGenInitFromSchema) {
       code += `)`;
     }

package/src/concepts/ViewElement__.ts

@@ -1579,8 +1579,9 @@ export class ViewElement extends BaseNode {
       code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any, any>;\n`;
     } else if (Object.keys(PAGE_COMPONENT_INCLUDE_TAG_MAP).includes(self.tag)) {
       if (self.bindAttrs?.findIndex((attr) => attr.name === 'data-source') > -1) {
-        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<__elements_completionProperty['${self.name
-          }']['dataSource']>;\n`;
+        code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<__elements_completionProperty['${
+          self.name
+        }']['dataSource']>;\n`;
       } else {
         code += `${self.name}: nasl.ui.${self.toHump(self.tag)}<any>;\n`;
       }
@@ -1659,8 +1660,9 @@ export class ViewElement extends BaseNode {
       const _this = self.parentNode;
       let genericity = '';
       if (_this.tag === 'u-table-view-column-dynamic') {
-        genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${(_this as any).__tsVariableDataSourceTypeName
-          }>`;
+        genericity += `<${(_this.parentNode as any).__tsVariableDataSourceTypeName}, ${
+          (_this as any).__tsVariableDataSourceTypeName
+        }>`;
       } else {
         let targetNode: any = _this;
         while (!targetNode.__tsVariableDataSourceTypeName && targetNode?.parentNode instanceof ViewElement) {

package/src/concepts/View__.ts

@@ -26,6 +26,11 @@ import BatchAssignment from './BatchAssignment__';
 import CallInterface from './CallInterface__';
 import CallLogic from './CallLogic__';
 
+const getBranchCopyUniCode = () => (window as any)?.BranchCopyUniCode
+const removedViewElementCache : {
+  [key: string]: number | bigint;
+}= {} // 临时记录删除的页面元素计数的最大值
+
 //================================================================================
 // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
 // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓
@@ -44,11 +49,6 @@ import BindEvent from './BindEvent__';
 import Module from './Module__';
 import Frontend from './Frontend__';
 import App from './App__';
-
-const getBranchCopyUniCode = () => (window as any)?.BranchCopyUniCode
-const removedViewElementCache : {
-  [key: string]: number | bigint;
-}= {} // 临时记录删除的页面元素计数的最大值
 /**
  * 页面
  */

package/src/concepts/index__.ts

@@ -98,6 +98,9 @@ export * from './ProcessComponent__';
 export * from './ProcessOutcome__';
 export * from './Assignee__';
 export * from './ProcessOutcomes__';
+export * from './MultiApprovalPolicy__';
+export * from './SequentialPolicy__';
+export * from './CountersignPolicy__';
 export * from './Role__';
 export * from './Configuration__';
 export * from './ConfigGroup__';

package/src/concepts/types__.ts

@@ -97,6 +97,9 @@ import type { ProcessComponent } from './ProcessComponent__';
 import type { ProcessOutcome } from './ProcessOutcome__';
 import type { Assignee } from './Assignee__';
 import type { ProcessOutcomes } from './ProcessOutcomes__';
+import type { MultiApprovalPolicy } from './MultiApprovalPolicy__';
+import type { SequentialPolicy } from './SequentialPolicy__';
+import type { CountersignPolicy } from './CountersignPolicy__';
 import type { Role } from './Role__';
 import type { Configuration } from './Configuration__';
 import type { ConfigGroup } from './ConfigGroup__';
@@ -221,6 +224,9 @@ export type SyntaxNode =
     | ProcessOutcome
     | Assignee
     | ProcessOutcomes
+    | MultiApprovalPolicy
+    | SequentialPolicy
+    | CountersignPolicy
     | Role
     | Configuration
     | ConfigGroup

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,15 +188,24 @@ 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',
       };
+      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;
+      }
       /**
        * nasl和vue的通信，回退，要触发vue的watch。
        * 因为如果没修改的话nasl不会修改view，就不会通知到页面改成旧值

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 = [];