@lcap/nasl 0.3.10-beta → 0.3.10-beta.10

package/src/types/logic/Param.ts

@@ -1,7 +1,7 @@
-import { immutable, excludedInJSON, action } from '../decorators';
-import { config, history, utils, LEVEL_ENUM, Vertex, Logic, PackageJSON, App, WebService, Page, Block, Schema, BaseVariable, ActionOptions, Interface } from '..';
+import { immutable, action } from '../decorators';
+import { config, utils, LEVEL_ENUM, Vertex, Logic, Schema, BaseVariable, ActionOptions, Interface } from '..';
 import { paramService } from '../../service/logic';
-import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
+import { convert2RefType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
 import { refreshLogic, refreshInterfaces, refreshView } from '../cache';
@@ -11,21 +11,19 @@ export function catchFn(logic: Logic) {
     return async (err: any) => {
         const code = err?.code;
         // 节点已存在； 节点不存在
-        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+        if ([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
             await refreshLogic(logic);
-        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在，即逻辑不存在
-            if(logic.interface) {
+        } else if (code === BusinessCode.ParentElementNotExist) { // 父节点不存在，即逻辑不存在
+            if (logic.interface) {
                 await refreshInterfaces();
-            } else if(logic.view) {
+            } else if (logic.view) {
                 await refreshView(logic.view);
             }
         } else
             config.defaultApp?.emit('saved', err);
-       
         config.defaultApp?.history.load();
-
         throw err;
-    }
+    };
 }
 
 /**
@@ -73,23 +71,21 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // convert2SchemaType(body.schema);
         body._posIndex = this.logic.params.indexOf(this);
         utils.logger.debug('添加逻辑输入参数', body);
         const result: Param = await paramService.create({
             headers: {
+                moduleType: this.logic && this.logic.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Param.create',
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"输入参数"${this.name}"`,
             },
             body,
         }).catch(catchFn(this.logic));
-        // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
         if (this.logic.interface) {
             const interfaceItem = Vertex.getVertexByRef(this.logic.interface.id) as Interface;
-            // this.logic.interface.service.emit('interfacesChange');
             interfaceItem.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -98,6 +94,9 @@ export class Param extends BaseVariable {
 
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
+
+        // 更新所有调用此Logic的LogicItem
+        await this.logic.callLogicUpdate();
         return this;
     }
     /**
@@ -108,24 +107,24 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-                await paramService.delete({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Param.create',
-                        operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.logic.name}"输入参数"${this.name}"`,
-                    },
-                    query: {
-                        loValId: this.id,
-                        logicId: this.logic.id,
-                    },
-                }).catch(catchFn(this.logic));
+            await paramService.delete({
+                headers: {
+                    moduleType: this.logic && this.logic.moduleType,
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Param.create',
+                    operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.logic.name}"输入参数"${this.name}"`,
+                },
+                query: {
+                    loValId: this.id,
+                    logicId: this.logic.id,
+                },
+            }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.params.indexOf(this);
         ~index && this.logic.params.splice(index, 1);
         this.destroy();
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -142,10 +141,10 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // convert2SchemaType(body.schema);
         utils.logger.debug('修改逻辑输入参数', body);
         const result = await paramService.update({
             headers: {
+                moduleType: this.logic && this.logic.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Param.update',
                 operationDesc: actionOptions?.actionDesc || `修改逻辑输入参数"${this.name}"`,
@@ -153,9 +152,6 @@ export class Param extends BaseVariable {
             body,
         }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
-
         await then?.();
         await config.defaultApp?.history.load();
         config.defaultApp?.emit('saved');
@@ -174,7 +170,6 @@ export class Param extends BaseVariable {
         });
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -231,7 +226,6 @@ export class Param extends BaseVariable {
             typeInstantiation: undefined,
         });
         Object.assign(this.schema, schema);
-        // if (this.defaultValue)
         this.assign({ defaultValue: getBasicTypeDefaultValue() });
 
         try {
@@ -241,7 +235,6 @@ export class Param extends BaseVariable {
             this.genSchemaChildren();
 
             if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
                 this.logic.interface.setParamAndReturn();
             } else if (this.logic.view) {
                 this.logic.view.page.service.emit('pageTreeChange');
@@ -268,7 +261,6 @@ export class Param extends BaseVariable {
         this.genSchemaChildren();
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -304,7 +296,6 @@ export class Param extends BaseVariable {
         });
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -323,7 +314,6 @@ export class Param extends BaseVariable {
         });
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');

package/src/types/logic/Return.ts

@@ -1,7 +1,7 @@
-import { immutable, excludedInJSON, action } from '../decorators';
-import { config, history, utils, ActionOptions, LEVEL_ENUM, Vertex, Logic, PackageJSON, App, WebService, Page, Block, Schema, BaseVariable, genRefSchemaChildren } from '..';
+import { immutable, action } from '../decorators';
+import { config, utils, ActionOptions, LEVEL_ENUM, Logic, Schema, BaseVariable, genRefSchemaChildren } from '..';
 import { paramService } from '../../service/logic';
-import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
+import { convert2RefType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
 import { catchFn } from './Param';
@@ -40,23 +40,21 @@ export class Return extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // convert2SchemaType(body.schema);
         body._posIndex = this.logic.returns.indexOf(this);
         utils.logger.debug('添加逻辑输出参数', body);
         const result: Return = await paramService.create({
             headers: {
+                moduleType: this.logic && this.logic.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Return.create',
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"输出参数"${this.name}"`,
             },
             body,
         }).catch(catchFn(this.logic));
-        // convert2RefType(result.schema);
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -75,24 +73,24 @@ export class Return extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-                await paramService.delete({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Return.create',
-                        operationDesc: `删除逻辑"${this.logic.name}"输出参数"${this.name}"`,
-                    },
-                    query: {
-                        loValId: this.id,
-                        logicId: this.logic.id,
-                    },
-                }).catch(catchFn(this.logic));
+            await paramService.delete({
+                headers: {
+                    moduleType: this.logic && this.logic.moduleType,
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Return.create',
+                    operationDesc: `删除逻辑"${this.logic.name}"输出参数"${this.name}"`,
+                },
+                query: {
+                    loValId: this.id,
+                    logicId: this.logic.id,
+                },
+            }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.returns.indexOf(this);
         ~index && this.logic.returns.splice(index, 1);
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -109,10 +107,10 @@ export class Return extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // convert2SchemaType(body.schema);
         utils.logger.debug('修改逻辑输出参数', body);
         const result = await paramService.update({
             headers: {
+                moduleType: this.logic && this.logic.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Return.update',
                 operationDesc: actionOptions?.actionDesc || `修改逻辑输出参数"${this.name}"`,
@@ -120,8 +118,6 @@ export class Return extends BaseVariable {
             body,
         }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
 
         await then?.();
         await config.defaultApp?.history.load();
@@ -141,7 +137,6 @@ export class Return extends BaseVariable {
         });
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');
@@ -192,13 +187,12 @@ export class Return extends BaseVariable {
             defaultValue: this.defaultValue,
         };
         Object.assign(this.schema, {
-            $ref: undefined, //引用到Entity或者structure
+            $ref: undefined, // 引用到Entity或者structure
             type: undefined,
             format: undefined,
             typeInstantiation: undefined,
         });
         Object.assign(this.schema, schema);
-        // if (this.defaultValue)
         this.assign({ defaultValue: getBasicTypeDefaultValue() });
         try {
             await this.update(undefined, {
@@ -207,7 +201,6 @@ export class Return extends BaseVariable {
             this.genSchemaChildren();
 
             if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
                 this.logic.interface.setParamAndReturn();
             } else if (this.logic.view) {
                 this.logic.view.page.service.emit('pageTreeChange');
@@ -234,7 +227,6 @@ export class Return extends BaseVariable {
         this.genSchemaChildren();
 
         if (this.logic.interface) {
-            // this.logic.interface.service.emit('interfacesChange');
             this.logic.interface.setParamAndReturn();
         } else if (this.logic.view) {
             this.logic.view.page.service.emit('pageTreeChange');

package/src/types/logic/Variable.ts

@@ -1,7 +1,7 @@
-import { immutable, excludedInJSON, action } from '../decorators';
-import { config, history, utils, LEVEL_ENUM, Vertex, Logic, PackageJSON, App, WebService, Page, Block, Schema, BaseVariable, ActionOptions } from '..';
+import { immutable, action } from '../decorators';
+import { config, utils, LEVEL_ENUM, Logic, Schema, BaseVariable, ActionOptions } from '..';
 import { paramService } from '../../service/logic';
-import { convert2RefType, convert2SchemaType } from '../data/dataTypeUtils';
+import { convert2RefType } from '../data/dataTypeUtils';
 import { getBasicTypeDefaultValue } from '../data/basicTypes';
 import { schemaService } from '../../service/common';
 import { catchFn } from './Param';
@@ -40,18 +40,18 @@ export class Variable extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // convert2SchemaType(body.schema);
         body._posIndex = this.logic.variables.indexOf(this);
         utils.logger.debug('添加逻辑局部变量', body);
         const result: Variable = await paramService.create({
             headers: {
+                moduleType: this.logic && this.logic.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Variable.create',
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.logic.name}"局部变量"${this.name}"`,
             },
             body,
         }).catch(catchFn(this.logic));
-        // convert2RefType(result.schema);
+
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
 
@@ -74,17 +74,18 @@ export class Variable extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-                await paramService.delete({
-                    headers: {
-                        appId: config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Param.create',
-                        operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.logic.name}"局部变量"${this.name}"`,
-                    },
-                    query: {
-                        loValId: this.id,
-                        logicId: this.logic.id,
-                    },
-                }).catch(catchFn(this.logic));
+            await paramService.delete({
+                headers: {
+                    moduleType: this.logic && this.logic.moduleType,
+                    appId: config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Param.create',
+                    operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.logic.name}"局部变量"${this.name}"`,
+                },
+                query: {
+                    loValId: this.id,
+                    logicId: this.logic.id,
+                },
+            }).catch(catchFn(this.logic));
         }
 
         const index = this.logic.variables.indexOf(this);
@@ -107,10 +108,10 @@ export class Variable extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // convert2SchemaType(body.schema);
         utils.logger.debug('修改逻辑局部变量', body);
         const result = await paramService.update({
             headers: {
+                moduleType: this.logic && this.logic.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Param.update',
                 operationDesc: actionOptions?.actionDesc || `修改逻辑局部变量"${this.name}"`,
@@ -118,8 +119,6 @@ export class Variable extends BaseVariable {
             body,
         }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
 
         await then?.();
         await config.defaultApp?.history.load();
@@ -195,7 +194,6 @@ export class Variable extends BaseVariable {
             typeInstantiation: undefined,
         });
         Object.assign(this.schema, schema);
-        // if (this.defaultValue)
         this.assign({ defaultValue: getBasicTypeDefaultValue() });
         try {
             await this.update(undefined, {