@lcap/nasl 3.5.0-beta.4 → 3.6.0-alpha.1

package/src/common/BaseNode.ts

@@ -20,6 +20,38 @@ export function setActionable(value: boolean) {
   actionable = value;
 }
 
+// 确保属性都是定义过的
+function ensureDefined(object: any, concept: string) {
+  if (!object) {
+    return object;
+  }
+  const newObject: any = {};
+  const actualConcept = object?.concept || concept;
+  if (actualConcept) {
+    const propertyMap = getConceptPropertyMap(actualConcept);
+    for (const key in object) {
+      const property = propertyMap.get(key);
+      if (property) {
+        const objProperty = object[key] ?? null;
+        const propertyConcept = property?.objectRef;
+        if (propertyConcept) {
+          if (Array.isArray(objProperty)) {
+            newObject[key] = objProperty.map((objItem: any) => {
+              return ensureDefined(objItem, propertyConcept);
+            });
+          } else {
+            newObject[key] = ensureDefined(objProperty, propertyConcept);
+          }
+        } else {
+          newObject[key] = objProperty;
+        }
+      }
+    }
+
+    newObject.concept = actualConcept;
+  }
+  return newObject;
+}
 
 type NodePathOption = {
   useName?: boolean,
@@ -210,6 +242,20 @@ export class BaseNode extends EventEmitter {
   @property()
   name: string = '';
 
+  /**
+   * 应用内节点的分组管理机制
+   * 暂无明确的名称定义要求，只要求唯一即可，建议使用时第一个分组给一个root分组
+   */
+  @property()
+  composedBy?: Array<string>;
+
+
+  /**
+   * 分组管理在多人协作场景触点
+   */
+  @property()
+  composedOrigin?: 'Form' | 'Table' | 'Process';
+
   /**
    * 当前节点的类型标注
    */
@@ -300,6 +346,10 @@ export class BaseNode extends EventEmitter {
     if (utils.isNode && ('concept' in this) && !this.concept) {
       Reflect.deleteProperty(this, 'concept');
     }
+
+    if (this?.composedBy) {
+      (this as any)?.app && (this as any).app.addComposeNodes(this.composedBy, this);
+     }
   }
 
   fixInstantiate() {
@@ -1053,27 +1103,7 @@ export class BaseNode extends EventEmitter {
     });
     return JSON.parse(JSON.stringify(temp));
   }
-  // 给国际化展示用
-  getNodeChinesePath(useIndex: boolean | string[] | NodePathOption) {
-    let node: BaseNode = this;
-    const pathArr: string[] = [];
-    while (node && node.concept) {
-      let pathText = '';
-      const { parentNode } = node;
-      if (parentNode) {
-        const { name, title, label } = parentNode as any;
-        pathText = `${(parentNode.constructor as any)?.nodeTitle || ''}${name || ''}`;
-        if (title && label) {
-          pathText += `(${title} | ${label})`;
-        } else if (title || label) {
-          pathText += `(${title || label})`;
-        }
-        pathArr.unshift(pathText);
-      }
-      node = parentNode;
-    }
-    return pathArr.join('/');
-  }
+
   /**
    * 查找引用
    */
@@ -1102,6 +1132,14 @@ export class BaseNode extends EventEmitter {
     /* override */
   }
 
+  /**
+   * 移除绑定实体元素的页面元素
+   */
+  @action('移除绑定实体元素的页面元素')
+  async removeBindEntityPropertyViewEelment(): Promise<any> {
+    /* override */
+  }
+
   /**
    * 准备删除
    */
@@ -1458,7 +1496,7 @@ export class BaseNode extends EventEmitter {
     if (typeAnnotation) {
       const { typeKind, typeNamespace, typeName, properties } = typeAnnotation;
       if (typeKind === 'reference' || typeKind === 'generic') {
-        if (typeNamespace?.endsWith('.enums')) return null;
+        if (typeNamespace.endsWith('.enums')) return null;
         return [{}];
       }
       if (typeNamespace === 'nasl.core' && ['String', 'Text', 'Email'].includes(typeName)) {

package/src/common/Command.ts

@@ -47,6 +47,7 @@ export function unregisterCommand(command: string, execute?: CommandExecute) {
     }
     _commands.delete(command);
   }
+  _commands.delete(command);
 }
 
 export function invokeCommand(command: string, ...args: any[]) {

package/src/common/EventEmitter.ts

@@ -27,12 +27,7 @@ export class EventEmitter {
    * @param eventName 事件名
    * @param listener 监听器
    */
-  off(eventName?: string, listener?: EventListener) {
-    if (!eventName) {
-      (this as any)._events = {};
-      return;
-    }
-
+  off(eventName: string, listener: EventListener) {
     const listeners = this._events[eventName];
     if (listeners) {
       const index = listeners.indexOf(listener);