@lcap/nasl 3.7.0-beta.11 → 3.7.0-beta.13

package/src/server/extendBaseNode.ts

@@ -201,6 +201,21 @@ BaseNode.prototype.changeName = async function changeName(newValue: string, upda
       const callback = (value: boolean, toast?: Function) => {
         if (value) {
           const App = this.rootNode;
+          // 实体重命名时需要同步更新绑定该实体的审批页面
+          if(this.concept === 'Entity') {
+            const originEvent: any = [];
+            (this as Entity).__bindView?.forEach((view) => {
+              originEvent.push({
+                originEvent: {
+                  action: 'update',
+                  target: view,
+                }
+              });
+            })
+            naslServer.embeddedTSEmitter?.emit('change', {
+              value: originEvent,
+            })
+          }
           // 收集修改
           App.emit('collect:start', {
             actionMsg: '重命名并更新引用',
@@ -888,6 +903,10 @@ function newNode(node: BaseNode, parentNode: BaseNode, needNewStructure: boolean
   }
   return node as Structure;
 }
+
+function findStructInConnectorByName(name: string, connector: Connector) {
+  return connector?.structures?.find((struct) => struct.name === name);
+}
 /**
  * 获取下一级变量
  */
@@ -898,6 +917,12 @@ BaseNode.prototype.getSelectRef = function getSelectRef(newTypeAnnotation: TypeA
     const { typeName, typeKind, typeNamespace, typeArguments, properties: typeProperties } = typeAnnotation;
     const parentNode = this;
     let completionChildren: any;
+    // 连接器需要区分 编辑态和稳定态
+    const connector = this.getAncestor('Connector') as Connector;
+    const isInConnector = !!connector;
+    const isInIntegration = !!this.getAncestor('Integration');
+    const isInEditableConnector = isInConnector && isInIntegration;
+
     if (typeKind === 'reference') {
       if (typeNamespace === 'nasl.ui' || typeNamespace === 'nasl.process' || typeNamespace === 'nasl.auth' || typeNamespace === 'nasl.http') {
         const node = newNode(getNaslNodeByNodeCallee(typeNamespace, typeName), parentNode, needNewStructure);
@@ -912,7 +937,13 @@ BaseNode.prototype.getSelectRef = function getSelectRef(newTypeAnnotation: TypeA
         } else {
           app = this.rootNode || typeAnnotation.app;
         }
-        const node = newNode(getNodeByNodeCallee(app, typeNamespace + '.' + typeName), parentNode, needNewStructure);
+        let node;
+        if (isInEditableConnector) {
+          const target = findStructInConnectorByName(typeName, connector);
+          node = newNode(target, parentNode, needNewStructure);
+        } else {
+          node = newNode(getNodeByNodeCallee(app, typeNamespace + '.' + typeName, ), parentNode, needNewStructure)
+        }
         const properties = node?.properties || [];
         completionChildren = properties;
       }

package/src/server/getLogics.ts

@@ -160,7 +160,7 @@ function getElementsMethods(likeComponent: View | BusinessComponent, parentNodeN
 
 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') {
+  if (node?.concept === 'CallLogic' || node?.concept === 'BindEvent' || ['Logic', 'BusinessLogic'].includes(node?.concept)) {
     const result = [];
 
     if (needAllLogic) {

package/src/server/naslServer.ts

@@ -297,19 +297,13 @@ class NaslServer {
     if (globalThis.process)
       // For TS build
       this.worker = new Worker(path.join(__dirname, '../../ts-worker/src/index.js'));
-    // worker = new Worker(path.join(__dirname, '../../../src/static/ts-worker.js'));
     /// #endif
     /// #if process.env.BUILD_TARGET !== 'node'
-    if (globalThis.window){
-      const source = require('!!raw-loader!../../../../public/ts-worker/1.0.0.js').default;
-      const createWorker = (code = '') => {
-        const content = [code];
-        const bold = new Blob(content);
-        const url = URL.createObjectURL(bold);
-        const worker = new Worker(url);
-        return worker;
-      };
-      this.worker = createWorker(source);
+    if (globalThis.window) {
+      const source = require('!!raw-loader!../../ts-worker/bundle.js').default;
+      const url = URL.createObjectURL(new Blob([source]));
+      this.worker = new Worker(url);
+      URL.revokeObjectURL(url);
     }
     /// #endif
 

package/src/templator/genCreateBlock.ts

@@ -14,9 +14,14 @@ import {
   genQueryLogic,
 } from '.';
 
-export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>, appointKeys: string[] = []) {
+interface IBlockExtra {
+  disabledRelationEntity?: boolean;
+}
+
+export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>, appointKeys: string[] = [], process: ProcessV2, extra: IBlockExtra = {}) {
   const dataSource = entity.parentNode as DataSource;
   let properties = entity.properties.filter(filterProperty('inForm'));
+  const { disabledRelationEntity } = extra;
 
   if(appointKeys.length) {
     properties = entity.properties.filter((property) => appointKeys.includes(property.name));
@@ -48,7 +53,7 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
               ?.split('(')[1]
               .slice(0, -1)
           ) || 0;
-        if (property.relationEntity) {
+        if (property.relationEntity && !disabledRelationEntity) {
           // 有外键关联
           const relationEntity = dataSource?.findEntityByName(property.relationEntity);
           if (relationEntity) {
@@ -109,9 +114,10 @@ export function genCreateFormTemplate(entity: Entity, nameGroup: NameGroup, sele
 </u-form>`;
 }
 
-export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>, appointKeys: string[] = [] ) {
+export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, selectNameGroupMap: Map<string, NameGroup>, appointKeys: string[] = [], process: ProcessV2, extra: IBlockExtra = {}) {
   const dataSource = entity.parentNode as DataSource;
   let properties = entity.properties.filter(filterProperty('inForm'));
+  const { disabledRelationEntity } = extra;
 
   if(appointKeys.length) {
     properties = entity.properties.filter((property) => appointKeys.includes(property.name));
@@ -134,7 +140,7 @@ export function genH5CreateFormTemplate(entity: Entity, nameGroup: NameGroup, se
         const { typeAnnotation } = property || {};
         const { typeNamespace: propertyTypeNamespace } = typeAnnotation || {};
         const propertyTypeName = transEntityMetadataTypes(typeAnnotation, dataSource.app);
-        if (property.relationEntity) {
+        if (property.relationEntity && !disabledRelationEntity) {
           // 有外键关联
           const relationEntity = dataSource?.findEntityByName(property.relationEntity);
           if (relationEntity) {
@@ -380,16 +386,16 @@ function genProcessV2LunchLogic(module: any, entity: Entity, process: ProcessV2)
     ],
   });
 }
-
 /**
  * 生成创建页区块
  * @param resolver 实体创建 Action
  */
-export function genCreateBlock(entity: Entity, oldNode: ViewElement, appointKeys: string[] = [],frontendType: string, process: ProcessV2) {
+export function genCreateBlock(entity: Entity, oldNode: ViewElement, appointKeys: string[] = [],frontendType: string, process: ProcessV2, extra: IBlockExtra = {}) {
   const likeComponent = oldNode?.likeComponent;
   const dataSource = entity.parentNode as DataSource;
   const module = dataSource.app;
   const { ns } = entity;
+  const { disabledRelationEntity } = extra;
   const createLogic = ns?.logics?.find((logic) => logic.name === `create`);
 
   const nameGroup: NameGroup = {};
@@ -403,7 +409,7 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement, appointKeys
   const newLoadSelectLogics: any[] = [];
   entity.properties.forEach((property) => {
     // 有外键关联
-    if (property.relationEntity) {
+    if (property.relationEntity && !disabledRelationEntity) {
       const relationEntity = dataSource?.findEntityByName(property.relationEntity);
       if (relationEntity) {
         const displayedProperty = getFirstDisplayedProperty(relationEntity);
@@ -449,8 +455,8 @@ export function genCreateBlock(entity: Entity, oldNode: ViewElement, appointKeys
 
   return `<template>
     ${(frontendType || config.scope) === 'h5'
-      ? genH5CreateFormTemplate(entity, nameGroup, selectNameGroupMap, appointKeys)
-      : genCreateFormTemplate(entity, nameGroup, selectNameGroupMap, appointKeys)
+      ? genH5CreateFormTemplate(entity, nameGroup, selectNameGroupMap, appointKeys, process, extra)
+      : genCreateFormTemplate(entity, nameGroup, selectNameGroupMap, appointKeys, process, extra)
     }
 </template>