@lcap/nasl 0.3.10 → 0.3.11

package/src/types/logic/LogicItem.ts

@@ -1,11 +1,12 @@
-import { immutable, excludedInJSON, circular, action } from '../decorators';
-import { config, history, typeCheck, utils, Vertex, Service, LEVEL_ENUM, Interface, Param, Return, Variable, Logic, View, Schema, ActionOptions, ACTION_MODE } from '..';
+import { immutable, excludedInJSON, action } from '../decorators';
+import { config, typeCheck, utils, Vertex, LEVEL_ENUM, Logic, Schema, ActionOptions, ACTION_MODE } from '..';
 import { logicService } from '../../service/logic';
-import { assert } from 'console';
 import { traverse } from '../utils';
 import { vertexsMap } from '../cacheData';
 import { getSchemaOfExpressionNode } from './tools';
 import Structure from '../data/Structure';
+import { refreshLogic } from '../cache';
+import { BusinessCode } from '../enum';
 
 export enum LOGIC_TYPE {
     // LogicNode
@@ -56,6 +57,18 @@ export enum LOGIC_TYPE {
     QueryAggregateExpression = 'QueryAggregateExpression',
 }
 
+const atomicList = [
+    LOGIC_TYPE.Identifier,
+    LOGIC_TYPE.NumericLiteral,
+    LOGIC_TYPE.BooleanLiteral,
+    LOGIC_TYPE.StringLiteral,
+    LOGIC_TYPE.NullLiteral,
+    LOGIC_TYPE.UnaryExpression,
+    LOGIC_TYPE.MemberExpression,
+    LOGIC_TYPE.Unparsed,
+    LOGIC_TYPE.BuiltInFunction,
+];
+
 export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): string {
     if (!node)
         return '';
@@ -76,11 +89,11 @@ export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): st
 
     if (node.type === 'BinaryExpression') {
         let left: string = evaluate(<LogicNode>node.left, finalCode);
-        if (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.left as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
 
         let right: string = evaluate(<LogicNode>node.right, finalCode);
-        if (!finalCode && node.right?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.right as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
 
         return `${left} ${node.operator} ${right}`;
@@ -88,13 +101,11 @@ export function evaluate(node: LogicNode | ExpressionNode, finalCode = true): st
 
     if (node.type === 'LogicalExpression') {
         let left: string = evaluate(<LogicNode>node.left, finalCode);
-        if (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.left as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
-
         let right: string = evaluate(<LogicNode>node.right, finalCode);
-        if (!finalCode && node.right?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes((node.right as any)?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
-
         return `${left} ${node.operator} ${right}`;
     }
 
@@ -209,6 +220,18 @@ export const logicItemArrayKeyOfLogicItem: string[] = ['body', 'consequent', 'al
     'groupBy', 'orderBy', 'selectElementList', 'joinPartList', 'onExpressionList', 'where', 'having',
 ];
 
+export function catchFn(logic: Logic) {
+    return async (err: any) => {
+        if (err.code !== BusinessCode.HasReferenced) // 节点被引用，不用刷新数据
+            await refreshLogic(logic);
+        else
+            config.defaultApp?.emit('saved', err);
+
+        config.defaultApp?.history.load();
+        throw err;
+    };
+}
+
 /**
  * 逻辑项类
  */
@@ -425,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',
@@ -432,7 +456,7 @@ export class LogicItem extends Vertex {
                     operationIgnore: actionOptions?.actionIgnore,
                 },
                 body,
-            });
+            }).catch(catchFn(this.logic));
             this.deepPick(result, ['id', 'parentId', 'parentAttr', 'joinPartRef', 'structureRef']);
         }
 
@@ -525,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}"`,
@@ -548,7 +573,7 @@ export class LogicItem extends Vertex {
                         offsetY,
                     },
                 },
-            });
+            }).catch(catchFn(this.logic));
         }
 
         if (!(this.parentId === parentId && this.parentId === this.logic.playgroundId && this.parentAttr === parentAttr)) {
@@ -577,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');
@@ -612,6 +637,8 @@ export class LogicItem extends Vertex {
      * @param targetId
      */
     static async paste(logicItems: LogicItem[] | LogicItem, targetType: 'logic' | 'html' | 'processComponent', targetId: string) {
+        config.defaultApp?.emit('saving');
+
         if (!Array.isArray(logicItems))
             logicItems = [logicItems];
 
@@ -630,7 +657,7 @@ export class LogicItem extends Vertex {
                 operationAction: 'LogicItem.paste',
                 operationDesc: `粘贴逻辑项"${logicItems[0].label || logicItems[0].type}"`,
             },
-        });
+        }).catch(catchFn(vertexsMap.get(targetId) as Logic));
 
         LogicItem.redoPaste(res);
     }
@@ -778,27 +805,22 @@ export class LogicItem extends Vertex {
                 delete body.index;
                 ///
 
-                try {
-                    await logicService.removeItem({
-                        headers: {
-                            appId: config.defaultApp?.id,
-                            serviceId: this.logic?.interface?.serviceId,
-                            operationAction: 'LogicItem.delete',
-                            operationDesc: `删除逻辑项"${this.label || this.type}"`,
-
-                        },
-                        body,
-                    });
-                } catch (err) {
-                    await config.defaultApp?.history.load();
-                    throw err;
-                }
+                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));
             }
         }
 
         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) {
@@ -858,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));
@@ -877,14 +898,14 @@ 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}"`,
                     operationIgnore: actionOptions?.actionIgnore,
                 },
                 body,
-            });
-            // this.deepPick(result, ['id', 'parentId', 'parentAttr']);
+            }).catch(catchFn(this.logic));
 
             // 合并params里的id
             if (body.params && body.params.length) {
@@ -904,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;
@@ -925,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}"`,
         });
@@ -1062,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)) {
@@ -1200,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,9 +1,30 @@
-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';
+import { BusinessCode } from '../enum';
+
+export function catchFn(logic: Logic) {
+    return async (err: any) => {
+        const code = err?.code;
+        // 节点已存在； 节点不存在
+        if ([BusinessCode.ElementExist, BusinessCode.ElementNotExist].includes(code)) {
+            await refreshLogic(logic);
+        } else if (code === BusinessCode.ParentElementNotExist) { // 父节点不存在，即逻辑不存在
+            if (logic.interface) {
+                await refreshInterfaces();
+            } else if (logic.view) {
+                await refreshView(logic.view);
+            }
+        } else
+            config.defaultApp?.emit('saved', err);
+        config.defaultApp?.history.load();
+        throw err;
+    };
+}
 
 /**
  * 逻辑输入参数
@@ -50,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,
-        });
-        // convert2RefType(result.schema);
+        }).catch(catchFn(this.logic));
         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');
@@ -75,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;
     }
     /**
@@ -85,29 +107,24 @@ export class Param extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
-                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(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+            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');
@@ -124,20 +141,17 @@ 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}"`,
             },
             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');
@@ -156,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');
@@ -213,7 +226,6 @@ export class Param extends BaseVariable {
             typeInstantiation: undefined,
         });
         Object.assign(this.schema, schema);
-        // if (this.defaultValue)
         this.assign({ defaultValue: getBasicTypeDefaultValue() });
 
         try {
@@ -223,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');
@@ -250,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');
@@ -286,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');
@@ -305,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,10 +1,10 @@
-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,
-        });
-        // convert2RefType(result.schema);
+        }).catch(catchFn(this.logic));
         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,29 +73,24 @@ export class Return extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
-                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(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+            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');
@@ -114,19 +107,17 @@ 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}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
 
         await then?.();
         await config.defaultApp?.history.load();
@@ -146,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');
@@ -197,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, {
@@ -212,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');
@@ -239,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,9 +1,10 @@
-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';
 
 /**
  * 逻辑局部变量
@@ -39,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,
-        });
-        // convert2RefType(result.schema);
+        }).catch(catchFn(this.logic));
+
         this.deepPick(result, ['id']);
         this.assign({ code: this.genCode() });
 
@@ -73,22 +74,18 @@ export class Variable extends BaseVariable {
         config.defaultApp?.emit('saving');
 
         if (this.id) {
-            try {
-                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(err) {
-                await config.defaultApp?.history.load();
-                throw err;
-            }
+            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);
@@ -111,19 +108,17 @@ 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}"`,
             },
             body,
-        });
+        }).catch(catchFn(this.logic));
         this.schema.id = result.schema.id;
-        // convert2RefType(result.schema);
-        // this.plainAssign(result);
 
         await then?.();
         await config.defaultApp?.history.load();
@@ -199,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, {