@lcap/nasl 0.3.10-beta.oom4 → 0.3.12-beta

package/src/types/logic/Logic.ts

@@ -1,5 +1,5 @@
 import { immutable, excludedInJSON, circular, action } from '../decorators';
-import { config, history, utils, Vertex, LEVEL_ENUM, Interface, Param, Return, Variable, vertexsMap, typeCheck, ProcessComponent, ProcessInterface, Process, ActionOptions } from '..';
+import { config, utils, Vertex, LEVEL_ENUM, Interface, Param, Return, Variable, vertexsMap, typeCheck, ProcessComponent, ProcessInterface, Process, ActionOptions } from '..';
 import { logicService, paramService } from '../../service/logic';
 import View from '../page/View';
 import { ExpressionNode, LogicItem, LogicNode } from './LogicItem';
@@ -11,14 +11,14 @@ import { BusinessCode } from '../enum';
 export function catchFn(logic: Logic) {
     return async (err: any) => {
         const code = err?.code;
-        if([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
-            if(logic.interface) {
+        if ([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+            if (logic.interface) {
                 await refreshInterfaces();
-            } else if(logic.view) {
+            } else if (logic.view) {
                 await refreshView(logic.view);
             }
-        } else if(code === BusinessCode.ParentElementNotExist) {  // 父节点不存在。视图添加逻辑，发现视图不存在
-            if(logic.view) {
+        } else if (code === BusinessCode.ParentElementNotExist) { // 父节点不存在。视图添加逻辑，发现视图不存在
+            if (logic.view) {
                 await refreshPages();
             }
         } else
@@ -27,7 +27,7 @@ export function catchFn(logic: Logic) {
         config.defaultApp?.history.load();
 
         throw err;
-    }
+    };
 }
 
 /**
@@ -178,12 +178,10 @@ export class Logic extends Vertex {
         config.defaultApp?.emit('saving');
 
         const body = this.toJSON();
-        // body.params.forEach((param: any) => convert2SchemaType(param.schema));
-        // body.returns.forEach((ret: any) => convert2SchemaType(ret.schema));
-        // body.variables.forEach((variable: any) => convert2SchemaType(variable.schema));
         utils.logger.debug('添加逻辑', body);
         const result: Logic = await logicService.create({
             headers: {
+                moduleType: this.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.create',
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.name}"`,
@@ -230,6 +228,7 @@ export class Logic extends Vertex {
 
             await logicService.delete({
                 headers: {
+                    moduleType: this.moduleType,
                     appId: config.defaultApp?.id,
                     operationAction: actionOptions?.actionName || 'Logic.delete',
                     operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
@@ -248,7 +247,6 @@ export class Logic extends Vertex {
                 typeCheck.delete(node.id);
             });
 
-            // const index =
             this.destroy();
             if (this.view) {
                 this.view.page.service.emit('pageTreeChange');
@@ -274,8 +272,9 @@ export class Logic extends Vertex {
 
         const body = this.toPlainJSON();
         utils.logger.debug('修改逻辑', body);
-        const result = await logicService.update({
+        await logicService.update({
             headers: {
+                moduleType: this.moduleType,
                 appId: config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.update',
                 operationDesc: actionOptions?.actionDesc || `修改逻辑"${this.name}"`,
@@ -288,6 +287,35 @@ export class Logic extends Vertex {
         config.defaultApp?.emit('saved');
         return this;
     }
+    /**
+     * 更新所有调用了此Logic的LogicNode
+     */
+    async callLogicUpdate(actionOptions?: ActionOptions) {
+        config.defaultApp?.emit('saving');
+
+        const body = this.toPlainJSON();
+        body.params = this.params;
+        const result = await logicService.callLogicUpdate({
+            headers: {
+                appId: config.defaultApp?.id,
+                operationAction: actionOptions?.actionName || 'Logic.callLogicUpdate',
+                operationDesc: actionOptions?.actionDesc || `修改调用逻辑"${this.name}"`,
+            },
+            body,
+        }).catch((err: Error) => console.log(err)); // 报错不应影响参数的添加流程
+
+        (result || []).forEach(async (item: LogicNode) => {
+            if (vertexsMap.has(item.id)) {
+                const logicNode = vertexsMap.get(item.id) as LogicNode;
+                await logicNode.logic.load();
+                await logicNode.checkType();
+            }
+        });
+
+        // await config.defaultApp?.history.load();
+        config.defaultApp?.emit('saved');
+        return this;
+    }
     /**
      * 设置逻辑名称
      */
@@ -328,7 +356,7 @@ export class Logic extends Vertex {
     /**
      * 按当前 id 加载逻辑数据
      */
-    async load() {
+    load() {
         if (!this.id)
             return;
 
@@ -364,6 +392,10 @@ export class Logic extends Vertex {
         });
 
         const results = await paramService.addList({
+            headers: {
+                moduleType: this.moduleType,
+                appId: config.defaultApp?.id,
+            },
             body,
         });
         params.forEach((param, index) => param.pick(results[index], ['id']));
@@ -377,10 +409,6 @@ export class Logic extends Vertex {
         if (isPlainObject(item)) {
             item = LogicItem.from(item, this, null);
         }
-        // if (!this.children.includes(child)) {
-        //     const index = child._posIndex === undefined ? this.children.length : child._posIndex;
-        //     this.children.splice(index, 0, child);
-        // }
         const parent = item.parentAttr ? vertexsMap.get(item.parentId) as LogicItem : undefined;
         return item.create({
             parent,

package/src/types/logic/LogicItem.ts

@@ -448,6 +448,7 @@ export class LogicItem extends Vertex {
             body.logicId = this.logic && this.logic.id;
             result = await logicService.addItem({
                 headers: {
+                    moduleType: this.logic && this.logic.moduleType,
                     appId: config.defaultApp?.id,
                     serviceId: this.logic?.interface?.serviceId,
                     operationAction: 'LogicItem.create',
@@ -548,8 +549,9 @@ export class LogicItem extends Vertex {
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             utils.logger.debug(`在该逻辑节点的属性"${parentAttr}"上插入一个节点"`, body);
 
-            const result: LogicItem = await logicService.moveItem({
+            await logicService.moveItem({
                 headers: {
+                    moduleType: this.logic && this.logic.moduleType,
                     appId: config.defaultApp?.id,
                     operationAction: 'LogicItem.move',
                     operationDesc: actionOptions?.actionDesc || `移动逻辑项"${this.label || this.type}"`,
@@ -600,7 +602,7 @@ export class LogicItem extends Vertex {
         await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
             operationAction: 'LogicItem.move',
             operationBeforeImage: null,
-            operationAfterImage: null, // JSON.parse(JSON.stringify(this)),
+            operationAfterImage: null,
             operationDesc: `移动逻辑项"${this.label || this.type}"`,
         });
         config.defaultApp?.emit('saved');
@@ -805,11 +807,11 @@ export class LogicItem extends Vertex {
 
                 await logicService.removeItem({
                     headers: {
+                        moduleType: this.logic?.moduleType,
                         appId: config.defaultApp?.id,
                         serviceId: this.logic?.interface?.serviceId,
                         operationAction: 'LogicItem.delete',
                         operationDesc: `删除逻辑项"${this.label || this.type}"`,
-
                     },
                     body,
                 }).catch(catchFn(this.logic));
@@ -818,7 +820,7 @@ export class LogicItem extends Vertex {
 
         if (this.id) {
             typeCheck.delete(this.id);
-            this.logic.interface?.service?.syncStructures(); // 处理 CallQueryComponent 嵌套的情形
+            this.logic?.interface?.service?.syncStructures(); // 处理 CallQueryComponent 嵌套的情形
 
             const parent: LogicItem = this.parent;
             if (parent && parent.checkType) {
@@ -878,7 +880,6 @@ export class LogicItem extends Vertex {
             }
             this.assign(source);
         }
-        // const body = this.toPlainJSON();
         const body = this.toJSON();
 
         body.params = (this as any).params && JSON.parse(JSON.stringify((this as any).params));
@@ -897,6 +898,7 @@ export class LogicItem extends Vertex {
         if (actionOptions?.actionMode !== ACTION_MODE.undoRedo) {
             const result = await logicService.updateItem({
                 headers: {
+                    moduleType: this.logic.moduleType,
                     appId: config.defaultApp?.id,
                     operationAction: 'LogicItem.update',
                     operationDesc: `修改逻辑项"${this.label || this.type}"`,
@@ -904,7 +906,6 @@ export class LogicItem extends Vertex {
                 },
                 body,
             }).catch(catchFn(this.logic));
-            // this.deepPick(result, ['id', 'parentId', 'parentAttr']);
 
             // 合并params里的id
             if (body.params && body.params.length) {
@@ -924,7 +925,6 @@ export class LogicItem extends Vertex {
             let eachSchema = getSchemaOfExpressionNode(each);
             if (eachSchema) {
                 eachSchema = eachSchema.schema || eachSchema;
-                // eachSchema = convert2SchemaType(eachSchema);
                 (item as any).schema = eachSchema.items; // 兼容老的items形式
                 if (eachSchema.type === 'genericType') {
                     (item as any).schema = eachSchema.typeInstantiation.typeParams[0].typeParamValue;
@@ -945,7 +945,7 @@ export class LogicItem extends Vertex {
 
         await config.defaultApp?.history.load(actionOptions?.actionMode !== ACTION_MODE.undoRedo && {
             operationAction: 'LogicItem.update',
-            operationBeforeImage: null, // JSON.parse(JSON.stringify(this)),
+            operationBeforeImage: null,
             operationAfterImage: null,
             operationDesc: `修改逻辑项"${this.label || this.type}"`,
         });
@@ -1082,7 +1082,6 @@ export class LogicItem extends Vertex {
         if (!typeCheckResult || !logicItem || typeof typeCheckResult !== 'object')
             return;
 
-        // if(logicItem.id === typeCheckResult.id)
         logicItem.typeCheckNote = typeCheckResult.typeCheckNote;
 
         for (const [key, object] of Object.entries(typeCheckResult)) {
@@ -1220,8 +1219,6 @@ export class LogicNode extends LogicItem {
         const hasInstantiated = source && source.id && vertexsMap.get(source.id) instanceof LogicNode;
         if (hasInstantiated) {
             console.warn(`LogicNode (${source.id}) 多次实例化`);
-            // Object.assign(vertexsMap.get(source.id), source);
-            // return vertexsMap.get(source.id) as LogicNode;
         }
 
         source && this.assign(source);

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, {