@lcap/nasl 3.7.3-beta.1 → 3.8.0-beta.2

package/src/concepts/ProcessElementV2__.ts

@@ -9,6 +9,7 @@ import {
   TranslatorGenerator,
 } from '../translator';
 import { syncMemberExpression } from '../server/getProcesses';
+import { invokeCommand } from '../common';
 
 import {
   getFlowAfterElements,
@@ -1220,6 +1221,10 @@ export class ProcessElementV2 extends BaseNode {
   get processV2() {
     return this.getAncestor('ProcessV2') as ProcessV2;
   }
+
+  get isFormProcess() {
+    return this.processV2?.isFormProcess
+  }
   // 属于流程自动任务
   get isAutoTask() {
     return ['ServiceTask'].includes(this.type);
@@ -1523,6 +1528,24 @@ export class ProcessElementV2 extends BaseNode {
     return code;
   }
 
+  get subLogic() {
+    // 只有自动任务需要， 其他的UI展示上均在其下面的 Logic 中
+    if (this.type === 'ServiceTask') {
+      const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
+        if (asserts.isSubLogic(node)) {
+          return true;
+        }
+      });
+      return subLogics;
+    }
+    return [];
+  }
+
+  genActionListener($event: EventPayload): void {
+    super.genActionListener($event);
+    invokeCommand('logic.update', this);
+  }
+
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/ProcessElement__.ts

@@ -16,6 +16,7 @@ import {
   isFromStartNode,
   getFlowBeforeElements,
 } from '../server/getProcesses';
+import { invokeCommand } from '../common';
 import type Namespace from './Namespace__';
 import type View from './View__';
 import Process from './Process__';
@@ -1722,6 +1723,23 @@ export class ProcessElement extends BaseNode {
   //     });
   //     this.app.emit('collect:end');
   // }
+  get subLogic() {
+    // 只有自动任务需要， 其他的UI展示上均在其下面的 Logic 中
+    if (this.type === 'ServiceTask') {
+      const subLogics = this.findNaslNodeByBFS((node: BaseNode) => {
+        if (asserts.isSubLogic(node)) {
+          return true;
+        }
+      });
+      return subLogics;
+    }
+    return [];
+  }
+
+  genActionListener($event: EventPayload): void {
+    super.genActionListener($event);
+    invokeCommand('logic.update', this);
+  }
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
   // ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓   ↓

package/src/concepts/ProcessV2__.ts

@@ -739,6 +739,10 @@ export class ProcessV2 extends BaseNode {
     return entity;
   }
 
+  get isFormProcess() {
+    return !!this.composedBy?.length
+  }
+
   onChange($event?: EventPayload): void {
     this.emit('change', $event);
   }
@@ -1006,65 +1010,6 @@ export class ProcessV2 extends BaseNode {
             },
           ],
         },
-        {
-          concept: 'ProcessElementV2',
-          name: 'ApprovalTask',
-          type: 'ApprovalTask',
-          title: '审批任务',
-          taskTitle: '审批任务',
-          bindAttrs: [
-            {
-              concept: 'BindAttribute',
-              name: 'assigneeV2',
-              assigneeV2: {
-                concept: 'AssigneeV2',
-              },
-            },
-          ],
-          operatePermissions: [
-            {
-              concept: 'OperatePermissionV2',
-              name: 'approve',
-              operationEnabled: true,
-              displayText: '同意',
-              commentRequired: true,
-            },
-            {
-              concept: 'OperatePermissionV2',
-              name: 'reject',
-              operationEnabled: true,
-              displayText: '拒绝',
-              commentRequired: true,
-            },
-            {
-              concept: 'OperatePermissionV2',
-              name: 'reassign',
-              operationEnabled: true,
-              displayText: '转派',
-              commentRequired: false,
-            },
-            {
-              concept: 'OperatePermissionV2',
-              name: 'revert',
-              operationEnabled: true,
-              displayText: '回退',
-              commentRequired: false,
-            },
-            {
-              concept: 'OperatePermissionV2',
-              name: 'withdraw',
-              operationEnabled: true,
-              displayText: '撤回',
-              commentRequired: false,
-            },
-          ],
-          approvalPolicy: { concept: 'OrSignPolicyV2' },
-          bounds: {
-            concept: 'Rect',
-            x: 0,
-            y: 150,
-          },
-        },
         {
           concept: 'ProcessElementV2',
           name: 'End',
@@ -1082,17 +1027,6 @@ export class ProcessV2 extends BaseNode {
           name: 'SequenceFlow',
           type: 'SequenceFlow',
           sourceRef: 'Start',
-          targetRef: 'ApprovalTask',
-          waypoints: [
-            { x: 0, y: 1 },
-            { x: 0, y: -1 },
-          ],
-        },
-        {
-          concept: 'ProcessElementV2',
-          name: 'SequenceFlow1',
-          type: 'SequenceFlow',
-          sourceRef: 'ApprovalTask',
           targetRef: 'End',
           waypoints: [
             { x: 0, y: 1 },

package/src/concepts/QueryFromExpression__.ts

@@ -262,12 +262,12 @@ export class QueryFromExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const simpleEntityKey = this.entityKey + 'Entity';
+    const simpleEntityKey = this.entityName + 'Entity';
     let code = `FROM(${simpleEntityKey}, ${this.asName || this.entityName} => $`;
 
     if (this.joinParts.length) {
       this.joinParts.forEach((joinPart) => {
-        code += `\n${indent(state.tabSize)}`;
+        code += '\n';
         code += joinPart.toNaturalTS(state);
       });
     }

package/src/concepts/QueryJoinExpression__.ts

@@ -466,7 +466,7 @@ export class QueryJoinExpression extends LogicItem {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    const simpleEntityKey = this.entityKey + 'Entity';
+    const simpleEntityKey = this.entityName + 'Entity';
     let code = `.${this.joinType}_JOIN(${simpleEntityKey}, ${this.asName || this.entityName} => ON(() => `;
     this.onExpressions.forEach((on) => {
       code += on.toNaturalTS(shiftState(state, code, { inline: true }));
@@ -475,7 +475,7 @@ export class QueryJoinExpression extends LogicItem {
 
     if (this.joinParts.length) {
       this.joinParts.forEach((joinPart) => {
-        code += `\n${indent(state.tabSize)}`;
+        code += '\n';
         code += joinPart.toNaturalTS(state);
       });
     }

package/src/concepts/StaticString__.ts

@@ -65,19 +65,6 @@ export class StaticString extends BaseNode {
   // ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑   ↑
   // 自动生成的代码已结束。下面可以手动编写。
   //================================================================================
-
-  /**
-   * 设置字符串的值
-   */
-  setValue(value: string) {
-    const object = {
-      value,
-    };
-    this.update({
-      ...object,
-    });
-  }
-
   /**
    * 祖先 View
    */

package/src/concepts/StructureProperty__.ts

@@ -9,8 +9,8 @@ import {
   TranslatorGenerator,
   indent,
   createDecoratorCode,
-  createDescriptionComment,
 } from '../translator';
+import type Namespace from './Namespace__';
 
 interface defaultCode {
   code?: string;
@@ -203,11 +203,7 @@ export class StructureProperty extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = '';
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['label', 'description']);
-    
-    code += this.name;
+    let code = this.name;
     if (this.typeAnnotation) {
       code += ': ';
       code += this.typeAnnotation.toNaturalTS(shiftState(state, code, { inline: true }));
@@ -268,6 +264,19 @@ export class StructureProperty extends BaseNode {
       ...object,
     });
   }
+  
+  getNamespace() {
+    if (this.parentNode && (this.parentNode as Namespace).getNamespace) {
+      const parentNamespace = (this.parentNode as Namespace).getNamespace();
+      const parentName = this.parentNode.name;
+      const arr = [parentNamespace];
+      if (this.parentNode.concept !== 'App' && parentName) {
+        arr.push(parentName);
+      }
+      return `${arr.join('.')}.structures`;
+    }
+    throw new Error('无法获取命名空间，请设置 parentNode！');
+  }
 
   public static getDefaultOptions() {
     return {
@@ -291,7 +300,7 @@ export class StructureProperty extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || this.isConnector;
+    return !!this.module || (this.parentNode as Structure).origin === 'CallQueryComponent' || this.isConnector;
   }
 
   //================================================================================

package/src/concepts/Structure__.ts

@@ -10,7 +10,6 @@ import {
   withGenerator,
   TranslatorGenerator,
   createDecoratorCode,
-  createDescriptionComment,
 } from '../translator';
 import type Namespace from './Namespace__';
 import { CUSTOM_CONNECTOR_EDITABLE_SUFFIX } from './basics/constants';
@@ -52,12 +51,19 @@ export class Structure extends BaseNode {
   @property('concept')
   // @ts-ignore
   readonly concept!: 'Structure';
+
   /**
    * 数据结构名称
    */
   @property()
   name: string = '';
 
+    /**
+   * 数据结构来源
+   */
+  @property()
+  origin: 'CallQueryComponent';
+
   /**
    * 数据结构描述
    */
@@ -517,7 +523,7 @@ export class Structure extends BaseNode {
    * 是否可编辑
    * */
   get readonly() {
-    return !!this.module || this.isConnector;
+    return !!this.module || this.origin === 'CallQueryComponent' || this.isConnector;
   }
 
   /* 删除空数据模块 */
@@ -555,10 +561,7 @@ export class Structure extends BaseNode {
 
   @withSourceMap()
   toNaturalTS(state = createCompilerState()): string {
-    let code = '';
-    if (state.descriptionComment)
-      code += createDescriptionComment(state, this, ['description']);
-    code = `class ${this.name}`;
+    let code = `class ${this.name}`;
 
     if (this.typeParams?.length) {
       code += `<${this.typeParams
@@ -566,11 +569,7 @@ export class Structure extends BaseNode {
         .join(', ')}>`;
     }
 
-    code += ` {`;
-    if (state.descriptionComment && this.description)
-      code += `/* ${this.description} */`;
-    code += '\n';
-
+    code += ` {\n`;
     // code += `${indent(state.tabSize + 1)}__name: '${this.getNamespace()}.${this.name}';\n`;
     this.properties.forEach((property) => {
       code += indent(state.tabSize + 1);