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

package/src/concepts/View__.ts

@@ -54,19 +54,20 @@ import * as utils from '../utils';
 import { createUUID } from '../utils/create';
 import * as types from './utils/types';
 import * as asserts from './utils/asserts';
-import BaseNode from '../common/BaseNode';
+
 import StaticString from './StaticString__';
 import ViewElement from './ViewElement__';
 import Param from './Param__';
 import Variable from './Variable__';
 import Logic from './Logic__';
 import BindEvent from './BindEvent__';
+import Annotatable from './Annotatable__';
 
 /**
  * 页面
  */
 @concept('页面')
-export class View extends BaseNode {
+export class View extends Annotatable {
   /** 类名 */
   static readonly ConceptName: string = 'View';
   /**
@@ -75,7 +76,7 @@ export class View extends BaseNode {
    */
   static isAbstract: boolean = false;
   /** 继承链 */
-  static readonly inheritanceChain: string[] = ['BaseNode'];
+  static readonly inheritanceChain: string[] = ['Annotatable', 'BaseNode'];
 
   /**
    * 产品概念
@@ -1528,10 +1529,7 @@ export class View extends BaseNode {
     cb?: Function;
   }) {
     const ViewElement = getConceptConstructor('ViewElement');
-    const Logic = getConceptConstructor('Logic');
-    const Param = getConceptConstructor('Param');
-    const Variable = getConceptConstructor('Variable');
-    const BindEvent = getConceptConstructor('BindEvent');
+
     let template = utils.sliceTagContent(code, 'template');
     if (slotTarget) {
       template = `<template #${slotTarget}>${template}</template>`;
@@ -1570,9 +1568,20 @@ export class View extends BaseNode {
         }
       }
     }
+    this.mergeDefinitions(code);
+
+    return node;
+  }
 
-    // 服务端逻辑
-    if (Array.isArray(definition.logics)) {
+  mergeDefinitions(code: string) {
+    const Logic = getConceptConstructor('Logic');
+    const Param = getConceptConstructor('Param');
+    const Variable = getConceptConstructor('Variable');
+    const BindEvent = getConceptConstructor('BindEvent');
+    const definitionStr = utils.sliceTagContent(code, 'definition') || '{}';
+    const definition: any = JSON.parse(definitionStr);
+     // 服务端逻辑
+     if (Array.isArray(definition.logics)) {
       definition.logics.forEach((logicOption: any) => {
         const logic = Logic.from(
           {
@@ -1650,7 +1659,6 @@ export class View extends BaseNode {
         }
       });
     }
-    return node;
   }
 
   onChange($event?: EventPayload): void {
@@ -1739,23 +1747,18 @@ export class View extends BaseNode {
     const allComponentList: Array<ViewElement & { currentIndex: number }> = [];
     this.elementsAttrs(this.elements, componentList, allComponentList, -1);
 
-    const crumbI18n =
-      this.frontend?.i18nInfo?.enabled && this.crumb?.value && this.crumb?.i18nKey ? this.crumb.i18nKey : undefined;
+    const routeMeta = this.getRouteMeta();
 
     const definition = {
       params: this.params,
       variables: this.variables,
       logics: this.logics,
       events: this.bindEvents,
-      title: this.title,
-      crumb: this.crumb?.value,
-      crumbI18n,
-      first: this.children.find((child) => child.isIndex)?.name,
-      auth: this.auth ? 'loginAuth' : undefined,
       viewBindEvents: this.getViewBindEvents(),
       viewExpressions: this.getViewExpressions(),
       elements: componentList,
       elementsAll: allComponentList,
+      ...routeMeta,
     };
     let code = '';
     let mixin = '';
@@ -1785,8 +1788,7 @@ export class View extends BaseNode {
         };\n`;
     code += keyboardEventMixinCode;
     const processDetailFrom: ViewElement = this.getViewProcessForm(),
-      hasProcessDetailFrom = !!processDetailFrom,
-      processV2 = this.getDestinationProcessV2();
+      hasProcessDetailFrom = !!processDetailFrom, processV2 = this.getDestinationProcessV2();
     if (hasProcessDetailFrom) {
       const processDetailFromMixinCode = `const processDetailFromMixin = {
         data() {
@@ -1862,6 +1864,7 @@ export class View extends BaseNode {
 
             const container = document.getElementById('dynamicRenderContainer')
             if (!container) return
+            const vmRoot = this
             const _self = this
             const vm = new Vue({
               template: templateProcessDetailFrom,
@@ -1869,6 +1872,15 @@ export class View extends BaseNode {
                 return {
                   processDetailFormData: _self.processDetailFormData
                 }
+              },
+              methods:{
+                // 将vmRoot的方法名包含handleDataSourceLoad的方法挂载到当前vm实例上
+                ...Object.keys(vmRoot).reduce((acc, cur) => {
+                  if (cur.includes('handleDataSourceLoad')) {
+                    acc[cur] = vmRoot[cur]
+                  }
+                  return acc
+                }, {}),
               }
             }).$mount()
             var parentElement = container.parentNode
@@ -2062,7 +2074,6 @@ export class View extends BaseNode {
   }
 
   getDestinationProcessV2Element() {
-    console.log('getDestinationProcessV2Element: ');
     const processV2 = this.app?.processV2s || [];
     let res: ProcessElementV2;
     const isM = (this.frontend as Frontend)?.type === 'h5';
@@ -2687,7 +2698,7 @@ export class View extends BaseNode {
   }
 
   findElementByTag(tag: string): ViewElement {
-    return this.elements[0]?.findElementByName(tag);
+    return this.elements[0]?.findElementByTag(tag);
   }
 
   findElementByAttr(name: string, value: string): ViewElement {
@@ -2910,7 +2921,7 @@ export class View extends BaseNode {
     ]);
     utils.traverse(
       ({ node }) => {
-        if (node.isProcessForm()) {
+        if (node?.isProcessForm?.()) {
           res = node;
         }
       },
@@ -2944,6 +2955,15 @@ export class View extends BaseNode {
     );
     return res;
   }
+  getRouteMeta() {
+    return {
+      title: this.title,
+      crumb: this.crumb?.value,
+      crumbI18n: this.frontend?.i18nInfo?.enabled && this.crumb?.i18nKey ? this.crumb?.i18nKey : undefined,
+      first: this.children.find((child) => child.isIndex)?.name,
+      auth: this.auth ? 'loginAuth' : undefined,
+    };
+  }
 
   //================================================================================
   // 从这里开始到结尾注释之间的代码由 NASL Workbench 自动生成，请不手动修改！
@@ -3446,6 +3466,99 @@ export const ComponentCompletionPropertyMap: Record<string, any> = {
       label: '数据',
     },
   },
+  // react-pc
+  Table: {
+    current: {
+      prop: 'pageNumber',
+      label: '当前页数',
+    },
+    pageSize: {
+      prop: 'pageSize',
+      label: '分页大小',
+    },
+    sorter: {
+      prop: 'sorting',
+      label: '排序属性',
+    },
+    data: {
+      prop: 'dataSource',
+      state: 'currentData',
+      label: '数据',
+    },
+  },
+  List: {
+    current: {
+      prop: 'pageNumber',
+      state: 'paging?.number',
+      label: '当前页数',
+    },
+    pageSize: {
+      prop: 'pageSize',
+      state: 'paging?.size',
+      label: '分页大小',
+    },
+    filterText: {
+      prop: 'filterText',
+      state: 'filterText',
+      label: '过滤文本',
+    },
+  },
+  Radios: {
+    value: {
+      prop: 'value',
+      state: 'value',
+      label: '选中值',
+    },
+    data: {
+      prop: 'dataSource',
+      state: 'currentDataSource?.data',
+      label: '数据',
+    },
+  },
+  CheckboxGroup: {
+    value: {
+      prop: 'value',
+      label: '选中值',
+    },
+    data: {
+      prop: 'dataSource',
+      label: '数据',
+    },
+  },
+  Select: {
+    value: {
+      prop: 'value',
+      label: '选中值',
+    },
+    data: {
+      prop: 'dataSource',
+      label: '数据',
+    },
+    opened: {
+      prop: 'opened',
+      label: '弹出状态',
+    },
+  },
+  Cascader: {
+    value: {
+      prop: 'value',
+      label: '选中值',
+    },
+    data: {
+      prop: 'dataSource',
+      label: '数据',
+    },
+  },
+  Tree: {
+    value: {
+      prop: 'value',
+      label: '选中值',
+    },
+    data: {
+      prop: 'dataSource',
+      label: '数据',
+    },
+  },
 };
 
 export const FrontendTypeComponentNamePerfixMap: Record<string, string> = {

package/src/concepts/basics/stdlib/nasl.processV2.ts

@@ -1,10 +1,12 @@
 import Namespace from '../../Namespace__';
 import type Structure from '../../Structure__';
 import type TypeAnnotation from '../../TypeAnnotation__';
+import type Enum from '../../Enum__';
 import { reference2TypeAnnotationList } from './reference2TypeAnnotationList';
 import { getConceptConstructor } from '../../../decorators';
 
 export const processV2Structures: Structure[] = [];
+export const processV2Enums: Enum[] = [];
 export const processV2TypeList: Array<TypeAnnotation> = [];
 
 const processV2Namespace = new Namespace({
@@ -27,6 +29,9 @@ export function initialize() {
   const ProcessComponent = getConceptConstructor('ProcessComponent');
   const Attribute = getConceptConstructor('Attribute');
   const UseComponent = getConceptConstructor('UseComponent');
+  const Enum = getConceptConstructor('Enum');
+  const EnumItem = getConceptConstructor('EnumItem');
+  const StaticString = getConceptConstructor('StaticString');
 
   processV2Structures.push(
     new Structure({
@@ -37,7 +42,7 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
         new StructureProperty({
-          name: 'procInstTitle',
+          name: 'currNodeParticipants',
           typeAnnotation: TypeAnnotation.createGeneric('List', {
             typeArguments: [TypeAnnotation.createPrimitive('String')],
           }),
@@ -627,7 +632,7 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
         new Param({
-          name: 'nodeOperationComment',
+          name: 'comment',
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
@@ -649,7 +654,7 @@ export function initialize() {
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
         new Param({
-          name: 'nodeOperationComment',
+          name: 'comment',
           typeAnnotation: TypeAnnotation.createPrimitive('String'),
         }),
       ],
@@ -800,6 +805,21 @@ export function initialize() {
       ],
       returns: [],
     }),
+    new Logic({
+      name: 'addSignTask',
+      description: '加签',
+      params: [
+        new Param({
+          name: 'taskId',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+        new Param({
+          name: 'userForAddSign',
+          typeAnnotation: TypeAnnotation.createPrimitive('String'),
+        }),
+      ],
+      returns: [],
+    }),
     new Logic({
       name: 'terminateProcess',
       description: '终止',
@@ -931,6 +951,39 @@ export function initialize() {
     }),
   ];
 
+  // 新增枚举
+  const enums = [
+    Enum.from(
+      {
+        name: 'ProcInstStatusEnum',
+        label: '流程实例当前状态',
+        description: '流程实例当前状态',
+        valueType: {
+          concept: 'TypeAnnotation',
+          typeKind: 'primitive',
+          typeNamespace: 'nasl.core',
+          typeName: 'String',
+        },
+        enumItems: [
+          new EnumItem({
+            label: new StaticString({ value: '审批结束' }),
+            value: 'Approved',
+          }),
+          new EnumItem({
+            label: new StaticString({ value: '审批中' }),
+            value: 'Approving',
+          }),
+        ],
+      },
+      processV2Namespace,
+      'enums'
+    ),
+  ];
+  processV2Enums.push(...enums);
+  processV2TypeList.push(...reference2TypeAnnotationList(processV2Enums, 'nasl.processV2.enums'));
+
   logics.forEach((logic) => processV2Namespace.addLogic(logic));
   processComponents.forEach((item) => processV2Namespace.addProcessComponent(item));
+
+  processV2Structures.forEach((structure) => structure.parentNode = processV2Namespace);
 }

package/src/concepts/basics/types/index.ts

@@ -20,7 +20,7 @@ export { configurationEnums, configurationTypeList } from '../stdlib/nasl.config
 export { authStructures, authTypeList } from '../stdlib/nasl.auth';
 export { httpStructures, httpTypeList } from '../stdlib/nasl.http';
 export { processStructures, processTypeList } from '../stdlib/nasl.process';
-export { processV2Structures, processV2TypeList } from '../stdlib/nasl.processV2';
+export { processV2Structures, processV2Enums, processV2TypeList } from '../stdlib/nasl.processV2';
 export { uiStructures, uiTypeList } from '../stdlib/nasl.ui';
 export { interfaceTypeList } from '../stdlib/nasl.interface';
 export { interfaceStructures } from '../stdlib/nasl.interface';

package/src/concepts/index__.ts

@@ -1,3 +1,7 @@
+export * from './Annotation__';
+export * from './AnnotationProperty__';
+export * from './Annotatable__';
+export * from './ApplyAnnotation__';
 export * from './App__';
 export * from './Module__';
 export * from './Namespace__';
@@ -58,6 +62,7 @@ export * from './BackendVariable__';
 export * from './FrontendVariable__';
 export * from './Constant__';
 export * from './LogicItem__';
+export * from './SubLogic__';
 export * from './Function__';
 export * from './AnonymousFunction__';
 export * from './ImportedInterface__';
@@ -161,6 +166,10 @@ export * from './FieldPermissionV2__';
 export * from './ProcessElementV2__';
 export * from './OperatePermissionV2__';
 export * from './AssigneeV2__';
+export * from './DepartmentV2__';
+export * from './ManagerV2__';
+export * from './DirectManagerV2__';
+export * from './DepartmentManagerV2__';
 export * from './FlowConditionV2__';
 export * from './ApprovalPolicyV2__';
 export * from './SequentialPolicyV2__';