@lcap/nasl 0.3.10 → 0.3.11

package/out/types/logic/Logic.js

@@ -9,7 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.Logic = void 0;
+exports.Logic = exports.catchFn = void 0;
 const decorators_1 = require("../decorators");
 const __1 = require("..");
 const logic_1 = require("../../service/logic");
@@ -17,12 +17,37 @@ const View_1 = __importDefault(require("../page/View"));
 const LogicItem_1 = require("./LogicItem");
 const dataTypeUtils_1 = require("../data/dataTypeUtils");
 const lodash_1 = require("lodash");
+const cache_1 = require("../cache");
+const enum_1 = require("../enum");
+function catchFn(logic) {
+    return async (err) => {
+        const code = err?.code;
+        if ([enum_1.BusinessCode.ElementExist, enum_1.BusinessCode.ElementNotExist].includes(code)) {
+            if (logic.interface) {
+                await cache_1.refreshInterfaces();
+            }
+            else if (logic.view) {
+                await cache_1.refreshView(logic.view);
+            }
+        }
+        else if (code === enum_1.BusinessCode.ParentElementNotExist) { // 父节点不存在。视图添加逻辑，发现视图不存在
+            if (logic.view) {
+                await cache_1.refreshPages();
+            }
+        }
+        else
+            __1.config.defaultApp?.emit('saved', err);
+        __1.config.defaultApp?.history.load();
+        throw err;
+    };
+}
+exports.catchFn = catchFn;
 /**
  * 逻辑类
  */
 class Logic extends __1.Vertex {
     /**
-     * @param source 需要合并的部分参数
+     * 定时任务
      */
     constructor(source) {
         super();
@@ -111,6 +136,17 @@ class Logic extends __1.Vertex {
          * 树组件的子节点字段
          */
         this.moreChildrenFields = ['params', 'returns', 'variables'];
+        /**
+         * @param source 需要合并的部分参数
+         */
+        /**
+         * 逻辑配置的cron表达式
+         */
+        this.cron = undefined;
+        /**
+         * 定时类型，当前只能是cronTrigger
+         */
+        this.triggerType = undefined;
         source && this.assign(source);
         this.on('change', lodash_1.throttle(this._onChange.bind(this), __1.config.throttleWait, { leading: true, trailing: true }));
     }
@@ -120,18 +156,16 @@ class Logic extends __1.Vertex {
     async create(none, actionOptions) {
         __1.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));
         __1.utils.logger.debug('添加逻辑', body);
         const result = await logic_1.logicService.create({
             headers: {
+                moduleType: this.moduleType,
                 appId: __1.config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.create',
                 operationDesc: actionOptions?.actionDesc || `添加逻辑"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this));
         this.deepPick(result, ['id']);
         this.pick(result, ['playgroundId']);
         this.assign({ body: result.body.map((logicNode) => LogicItem_1.LogicNode.from(logicNode, this, null)) });
@@ -156,8 +190,8 @@ class Logic extends __1.Vertex {
      * 删除逻辑
      */
     async delete(none, actionOptions) {
-        __1.config.defaultApp?.emit('saving');
         if (this.id) {
+            __1.config.defaultApp?.emit('saving');
             const body = this.toPlainJSON();
             if (this.view) {
                 body.moduleId = this.view.id;
@@ -167,20 +201,15 @@ class Logic extends __1.Vertex {
                 body.moduleId = this.interface.service.id;
                 body.moduleType = 'microService';
             }
-            try {
-                await logic_1.logicService.delete({
-                    headers: {
-                        appId: __1.config.defaultApp?.id,
-                        operationAction: actionOptions?.actionName || 'Logic.delete',
-                        operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
-                    },
-                    body,
-                });
-            }
-            catch (err) {
-                await __1.config.defaultApp?.history.load();
-                throw err;
-            }
+            await logic_1.logicService.delete({
+                headers: {
+                    moduleType: this.moduleType,
+                    appId: __1.config.defaultApp?.id,
+                    operationAction: actionOptions?.actionName || 'Logic.delete',
+                    operationDesc: actionOptions?.actionDesc || `删除逻辑"${this.name}"`,
+                },
+                body,
+            }).catch(catchFn(this));
             if (this.view) {
                 const { logics } = this.view.$def;
                 const pos = logics.indexOf(this);
@@ -190,7 +219,6 @@ class Logic extends __1.Vertex {
             [...this.body, ...this.playground].forEach((node) => {
                 __1.typeCheck.delete(node.id);
             });
-            // const index =
             this.destroy();
             if (this.view) {
                 this.view.page.service.emit('pageTreeChange');
@@ -215,19 +243,46 @@ class Logic extends __1.Vertex {
         __1.config.defaultApp?.emit('saving');
         const body = this.toPlainJSON();
         __1.utils.logger.debug('修改逻辑', body);
-        const result = await logic_1.logicService.update({
+        await logic_1.logicService.update({
             headers: {
+                moduleType: this.moduleType,
                 appId: __1.config.defaultApp?.id,
                 operationAction: actionOptions?.actionName || 'Logic.update',
                 operationDesc: actionOptions?.actionDesc || `修改逻辑"${this.name}"`,
             },
             body,
-        });
+        }).catch(catchFn(this));
         await then?.();
         await __1.config.defaultApp?.history.load();
         __1.config.defaultApp?.emit('saved');
         return this;
     }
+    /**
+     * 更新所有调用了此Logic的LogicNode
+     */
+    async callLogicUpdate(actionOptions) {
+        __1.config.defaultApp?.emit('saving');
+        const body = this.toPlainJSON();
+        body.params = this.params;
+        const result = await logic_1.logicService.callLogicUpdate({
+            headers: {
+                appId: __1.config.defaultApp?.id,
+                operationAction: actionOptions?.actionName || 'Logic.callLogicUpdate',
+                operationDesc: actionOptions?.actionDesc || `修改调用逻辑"${this.name}"`,
+            },
+            body,
+        }).catch((err) => console.log(err)); // 报错不应影响参数的添加流程
+        (result || []).forEach(async (item) => {
+            if (__1.vertexsMap.has(item.id)) {
+                const logicNode = __1.vertexsMap.get(item.id);
+                await logicNode.logic.load();
+                await logicNode.checkType();
+            }
+        });
+        // await config.defaultApp?.history.load();
+        __1.config.defaultApp?.emit('saved');
+        return this;
+    }
     /**
      * 设置逻辑名称
      */
@@ -263,25 +318,23 @@ class Logic extends __1.Vertex {
     /**
      * 按当前 id 加载逻辑数据
      */
-    async load() {
+    load() {
         if (!this.id)
             return;
         // 如果有正在进行的 Promise，则直接返回它
         if (this.contentPromise)
             return this.contentPromise;
         return this.contentPromise = (async () => {
-            try {
-                const result = await logic_1.logicService.loadDetail({
-                    query: {
-                        moduleId: this.moduleId,
-                        moduleType: this.moduleType,
-                        id: this.id,
-                    },
-                });
-                const newLogic = Logic.from(result, this.interface || this.view || this.processComponent, this);
-                this.assign(newLogic);
-            }
-            catch (err) { }
+            const result = await logic_1.logicService.loadDetail({
+                query: {
+                    moduleId: this.moduleId,
+                    moduleType: this.moduleType,
+                    id: this.id,
+                },
+                config: { noErrorTip: true },
+            }).catch(catchFn(this));
+            const newLogic = Logic.from(result, this.interface || this.view || this.processComponent, this);
+            this.assign(newLogic);
             return this;
         })().finally(() => this.contentPromise = undefined);
     }
@@ -298,6 +351,10 @@ class Logic extends __1.Vertex {
             return param;
         });
         const results = await logic_1.paramService.addList({
+            headers: {
+                moduleType: this.moduleType,
+                appId: __1.config.defaultApp?.id,
+            },
             body,
         });
         params.forEach((param, index) => param.pick(results[index], ['id']));
@@ -311,10 +368,6 @@ class Logic extends __1.Vertex {
         if (lodash_1.isPlainObject(item)) {
             item = LogicItem_1.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 ? __1.vertexsMap.get(item.parentId) : undefined;
         return item.create({
             parent,
@@ -396,6 +449,54 @@ class Logic extends __1.Vertex {
         }
         return logic;
     }
+    /**
+     * 更新定时任务
+     */
+    async updateTimer(cron) {
+        this.assign({ cron });
+        this.triggerType = 'cronTrigger';
+        await this.update(undefined, {
+            actionDesc: `设置定时任务"为"${cron}"`,
+        });
+        if (this.view) {
+            this.view.page.service.emit('pageTreeChange');
+            this.emit('change');
+        }
+        return this;
+    }
+    /**
+     * 验证表达式正确与否
+     */
+    async validateTimer() {
+        const body = this.toPlainJSON();
+        const result = await logic_1.logicService.validateTimer({
+            body,
+            config: {
+                noErrorTip: true,
+            },
+        });
+        return result;
+    }
+    /**
+     * 输出最近十次运行结果
+     */
+    async testTimer() {
+        const body = this.toPlainJSON();
+        const result = await logic_1.logicService.testTimer({
+            body,
+        });
+        return result;
+    }
+    /**
+     * 更新接口缓存
+     */
+    async updateCronCache() {
+        const body = this.toPlainJSON();
+        const result = await logic_1.logicService.updateCronCache({
+            body,
+        });
+        return result;
+    }
 }
 __decorate([
     decorators_1.immutable()
@@ -464,6 +565,12 @@ __decorate([
 __decorate([
     decorators_1.immutable()
 ], Logic.prototype, "moreChildrenFields", void 0);
+__decorate([
+    decorators_1.immutable()
+], Logic.prototype, "cron", void 0);
+__decorate([
+    decorators_1.immutable()
+], Logic.prototype, "triggerType", void 0);
 __decorate([
     decorators_1.action('添加逻辑')
 ], Logic.prototype, "create", null);
@@ -476,6 +583,9 @@ __decorate([
 __decorate([
     decorators_1.action('设置逻辑描述')
 ], Logic.prototype, "setDescription", null);
+__decorate([
+    decorators_1.action('更新定时任务')
+], Logic.prototype, "updateTimer", null);
 exports.Logic = Logic;
 exports.default = Logic;
 //# sourceMappingURL=Logic.js.map

package/out/types/logic/Logic.js.map

@@ -1 +1 @@
-{"version":3,"file":"Logic.js","sourceRoot":"","sources":["../../../src/types/logic/Logic.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"Logic.js","sourceRoot":"","sources":["../../../src/types/logic/Logic.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,8CAA4E;AAC5E,0BAA8K;AAC9K,+CAAiE;AACjE,wDAAgC;AAChC,2CAAmE;AACnE,yDAA2D;AAC3D,mCAAiD;AACjD,oCAAwE;AACxE,kCAAuC;AAEvC,SAAgB,OAAO,CAAC,KAAY;IAChC,OAAO,KAAK,EAAE,GAAQ,EAAE,EAAE;QACtB,MAAM,IAAI,GAAG,GAAG,EAAE,IAAI,CAAC;QACvB,IAAI,CAAC,mBAAY,CAAC,YAAY,EAAE,mBAAY,CAAC,eAAe,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;YAC1E,IAAI,KAAK,CAAC,SAAS,EAAE;gBACjB,MAAM,yBAAiB,EAAE,CAAC;aAC7B;iBAAM,IAAI,KAAK,CAAC,IAAI,EAAE;gBACnB,MAAM,mBAAW,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;aACjC;SACJ;aAAM,IAAI,IAAI,KAAK,mBAAY,CAAC,qBAAqB,EAAE,EAAE,wBAAwB;YAC9E,IAAI,KAAK,CAAC,IAAI,EAAE;gBACZ,MAAM,oBAAY,EAAE,CAAC;aACxB;SACJ;;YACG,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAE1C,UAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QAElC,MAAM,GAAG,CAAC;IACd,CAAC,CAAC;AACN,CAAC;AApBD,0BAoBC;AAED;;GAEG;AACH,MAAa,KAAM,SAAQ,UAAM;IA4H7B;;OAEG;IACH,YAAY,MAAuB;QAC/B,KAAK,EAAE,CAAC;QA/HZ;;WAEG;QAEa,UAAK,GAAe,cAAU,CAAC,KAAK,CAAC;QACrD;;WAEG;QAEa,OAAE,GAAW,SAAS,CAAC;QACvC;;WAEG;QAEa,SAAI,GAAW,SAAS,CAAC;QACzC;;WAEG;QAEa,gBAAW,GAAW,SAAS,CAAC;QAChD;;WAEG;QAEa,aAAQ,GAAW,SAAS,CAAC;QAC7C;;WAEG;QAEa,eAAU,GAAwC,SAAS,CAAC;QAC5E;;WAEG;QAEa,cAAS,GAAW,SAAS,CAAC;QAC9C;;WAEG;QAEa,gBAAW,GAAuC,SAAS,CAAC;QAC5E;;WAEG;QAEa,aAAQ,GAAW,SAAS,CAAC;QAC7C;;WAEG;QAEa,WAAM,GAAiB,EAAE,CAAC;QAC1C;;WAEG;QAEa,YAAO,GAAkB,EAAE,CAAC;QAC5C;;WAEG;QAEa,cAAS,GAAoB,EAAE,CAAC;QAChD;;WAEG;QAEa,SAAI,GAAqB,EAAE,CAAC;QAC5C;;WAEG;QAEa,iBAAY,GAAW,SAAS,CAAC;QACjD;;WAEG;QAEa,eAAU,GAAqB,EAAE,CAAC;QAClD;;WAEG;QAGa,cAAS,GAAc,SAAS,CAAC;QACjD;;WAEG;QAGa,SAAI,GAAS,SAAS,CAAC;QACvC;;WAEG;QAGa,qBAAgB,GAAqB,SAAS,CAAC;QAC/D;;WAEG;QAGa,YAAO,GAAY,SAAS,CAAC;QAC7C;;;WAGG;QAEI,mBAAc,GAAiB,SAAS,CAAC;QAChD;;WAEG;QAEa,uBAAkB,GAAkB,CAAC,QAAQ,EAAE,SAAS,EAAE,WAAW,CAAC,CAAC;QACvF;;WAEG;QACH;;WAEG;QAEI,SAAI,GAAW,SAAS,CAAC;QAChC;;WAEG;QAEI,gBAAW,GAAW,SAAS,CAAC;QAMnC,MAAM,IAAI,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;QAE9B,IAAI,CAAC,EAAE,CAAC,QAAQ,EAAE,iBAAQ,CACtB,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,IAAI,CAAC,EACzB,UAAM,CAAC,YAAY,EACnB,EAAE,OAAO,EAAE,IAAI,EAAE,QAAQ,EAAE,IAAI,EAAE,CACpC,CAAC,CAAC;IACP,CAAC;IACD;;OAEG;IAEH,KAAK,CAAC,MAAM,CAAC,IAAW,EAAE,aAA6B;QACnD,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,EAAE,CAAC;QAC3B,SAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,MAAM,GAAU,MAAM,oBAAY,CAAC,MAAM,CAAC;YAC5C,OAAO,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,UAAM,CAAC,UAAU,EAAE,EAAE;gBAC5B,eAAe,EAAE,aAAa,EAAE,UAAU,IAAI,cAAc;gBAC5D,aAAa,EAAE,aAAa,EAAE,UAAU,IAAI,QAAQ,IAAI,CAAC,IAAI,GAAG;aACnE;YACD,IAAI;SACP,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QACxB,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QAC9B,IAAI,CAAC,IAAI,CAAC,MAAM,EAAE,CAAC,cAAc,CAAC,CAAC,CAAC;QACpC,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,qBAAS,CAAC,IAAI,CAAC,SAAS,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC,EAAE,CAAC,CAAC;QAC7F,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,EAAE;YAC1B,KAAK,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,KAAK,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QAC7C,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,OAAO,EAAE,EAAE;YAC7B,OAAO,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACjD,CAAC,CAAC,CAAC;QACH,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE;YAChC,QAAQ,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC;QACnD,CAAC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvB;QAED,MAAM,UAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QACxC,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD;;OAEG;IAEH,KAAK,CAAC,MAAM,CAAC,IAAW,EAAE,aAA6B;QACnD,IAAI,IAAI,CAAC,EAAE,EAAE;YACT,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;YAClC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;YAChC,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;gBAC7B,IAAI,CAAC,UAAU,GAAG,MAAM,CAAC;aAC5B;iBAAM;gBACH,IAAI,CAAC,QAAQ,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,EAAE,CAAC;gBAC1C,IAAI,CAAC,UAAU,GAAG,cAAc,CAAC;aACpC;YAED,MAAM,oBAAY,CAAC,MAAM,CAAC;gBACtB,OAAO,EAAE;oBACL,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,KAAK,EAAE,UAAM,CAAC,UAAU,EAAE,EAAE;oBAC5B,eAAe,EAAE,aAAa,EAAE,UAAU,IAAI,cAAc;oBAC5D,aAAa,EAAE,aAAa,EAAE,UAAU,IAAI,QAAQ,IAAI,CAAC,IAAI,GAAG;iBACnE;gBACD,IAAI;aACP,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YAExB,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC;oBACR,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aAC7B;YAED,CAAC,GAAG,IAAI,CAAC,IAAI,EAAE,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,EAAE;gBAChD,aAAS,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;YAC9B,CAAC,CAAC,CAAC;YAEH,IAAI,CAAC,OAAO,EAAE,CAAC;YACf,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;aACvB;YAED,MAAM,UAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;YACxC,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;SACpC;aAAM;YACH,IAAI,IAAI,CAAC,IAAI,EAAE;gBACX,MAAM,EAAE,MAAM,EAAE,GAAG,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC;gBAClC,MAAM,GAAG,GAAG,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;gBACjC,IAAI,GAAG,IAAI,CAAC;oBACR,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,CAAC,CAAC,CAAC;aAC7B;SACJ;IACL,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,MAAM,CAAC,IAAW,EAAE,aAA6B,EAAE,IAAyB;QAC9E,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,SAAK,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,IAAI,CAAC,CAAC;QACjC,MAAM,oBAAY,CAAC,MAAM,CAAC;YACtB,OAAO,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,UAAM,CAAC,UAAU,EAAE,EAAE;gBAC5B,eAAe,EAAE,aAAa,EAAE,UAAU,IAAI,cAAc;gBAC5D,aAAa,EAAE,aAAa,EAAE,UAAU,IAAI,QAAQ,IAAI,CAAC,IAAI,GAAG;aACnE;YACD,IAAI;SACP,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;QAExB,MAAM,IAAI,EAAE,EAAE,CAAC;QACf,MAAM,UAAM,CAAC,UAAU,EAAE,OAAO,CAAC,IAAI,EAAE,CAAC;QACxC,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,eAAe,CAAC,aAA6B;QAC/C,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,QAAQ,CAAC,CAAC;QAElC,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,IAAI,CAAC,MAAM,GAAG,IAAI,CAAC,MAAM,CAAC;QAC1B,MAAM,MAAM,GAAG,MAAM,oBAAY,CAAC,eAAe,CAAC;YAC9C,OAAO,EAAE;gBACL,KAAK,EAAE,UAAM,CAAC,UAAU,EAAE,EAAE;gBAC5B,eAAe,EAAE,aAAa,EAAE,UAAU,IAAI,uBAAuB;gBACrE,aAAa,EAAE,aAAa,EAAE,UAAU,IAAI,UAAU,IAAI,CAAC,IAAI,GAAG;aACrE;YACD,IAAI;SACP,CAAC,CAAC,KAAK,CAAC,CAAC,GAAU,EAAE,EAAE,CAAC,OAAO,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,gBAAgB;QAE5D,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,KAAK,EAAE,IAAe,EAAE,EAAE;YAC7C,IAAI,cAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE;gBACzB,MAAM,SAAS,GAAG,cAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAc,CAAC;gBACvD,MAAM,SAAS,CAAC,KAAK,CAAC,IAAI,EAAE,CAAC;gBAC7B,MAAM,SAAS,CAAC,SAAS,EAAE,CAAC;aAC/B;QACL,CAAC,CAAC,CAAC;QAEH,2CAA2C;QAC3C,UAAM,CAAC,UAAU,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QACjC,OAAO,IAAI,CAAC;IAChB,CAAC;IACD;;OAEG;IAEH,KAAK,CAAC,OAAO,CAAC,IAAY;QACtB,MAAM,OAAO,GAAG,IAAI,CAAC,IAAI,CAAC;QAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACtB,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACzB,UAAU,EAAE,QAAQ,OAAO,SAAS,IAAI,GAAG;SAC9C,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD;;OAEG;IAEH,KAAK,CAAC,cAAc,CAAC,WAAmB;QACpC,IAAI,CAAC,MAAM,CAAC,EAAE,WAAW,EAAE,CAAC,CAAC;QAC7B,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACzB,UAAU,EAAE,QAAQ,IAAI,CAAC,IAAI,SAAS,WAAW,GAAG;SACvD,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IAED,SAAS;QACL,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;IAC1C,CAAC;IACD;;OAEG;IACH,IAAI;QACA,IAAI,CAAC,IAAI,CAAC,EAAE;YACR,OAAO;QAEX,0BAA0B;QAC1B,IAAI,IAAI,CAAC,cAAc;YACnB,OAAO,IAAI,CAAC,cAAc,CAAC;QAE/B,OAAO,IAAI,CAAC,cAAc,GAAG,CAAC,KAAK,IAAI,EAAE;YACrC,MAAM,MAAM,GAAG,MAAM,oBAAY,CAAC,UAAU,CAAC;gBACzC,KAAK,EAAE;oBACH,QAAQ,EAAE,IAAI,CAAC,QAAQ;oBACvB,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,EAAE,EAAE,IAAI,CAAC,EAAE;iBACd;gBACD,MAAM,EAAE,EAAE,UAAU,EAAE,IAAI,EAAE;aAC/B,CAAC,CAAC,KAAK,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC;YACxB,MAAM,QAAQ,GAAG,KAAK,CAAC,IAAI,CAAC,MAAM,EAAE,IAAI,CAAC,SAAS,IAAI,IAAI,CAAC,IAAI,IAAI,IAAI,CAAC,gBAAgB,EAAE,IAAI,CAAC,CAAC;YAChG,IAAI,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC;YACtB,OAAO,IAAI,CAAC;QAChB,CAAC,CAAC,EAAE,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,cAAc,GAAG,SAAS,CAAC,CAAC;IACxD,CAAC;IACD,eAAe;QACX,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,MAAM,CAAC;IAC9B,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,YAAY,CAAC,MAAoB;QACnC,MAAM,IAAI,GAAG,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE;YAC9B,KAAK,GAAG,KAAK,CAAC,MAAM,EAAE,CAAC;YACvB,kCAAkB,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC;YACjC,OAAO,KAAK,CAAC;QACjB,CAAC,CAAC,CAAC;QAEH,MAAM,OAAO,GAAG,MAAM,oBAAY,CAAC,OAAO,CAAC;YACvC,OAAO,EAAE;gBACL,UAAU,EAAE,IAAI,CAAC,UAAU;gBAC3B,KAAK,EAAE,UAAM,CAAC,UAAU,EAAE,EAAE;aAC/B;YACD,IAAI;SACP,CAAC,CAAC;QACH,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAE,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,KAAK,CAAC,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC;QACrE,IAAI,CAAC,MAAM,CAAC,IAAI,CAAC,GAAG,MAAM,CAAC,CAAC;IAChC,CAAC;IACD;;;OAGG;IACH,OAAO,CAAC,IAAe,EAAE,aAA6B;QAClD,IAAI,sBAAa,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,IAAI,EAAE,IAAI,CAAC,CAAC;SAC3C;QACD,MAAM,MAAM,GAAG,IAAI,CAAC,UAAU,CAAC,CAAC,CAAC,cAAU,CAAC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAc,CAAC,CAAC,CAAC,SAAS,CAAC;QACxF,OAAO,IAAI,CAAC,MAAM,CAAC;YACf,MAAM;YACN,QAAQ,EAAE,IAAI,CAAC,QAAQ;YACvB,UAAU,EAAE,IAAI,CAAC,UAAU;YAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,KAAK,EAAE,KAAK;SACf,EAAE,aAAa,CAAC,CAAC;IACtB,CAAC;IACD;;;OAGG;IACH,UAAU,CAAC,IAAe,EAAE,aAA6B;QACrD,IAAI,sBAAa,CAAC,IAAI,CAAC,EAAE;YACrB,IAAI,GAAG,cAAU,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAc,CAAC;SAC/C;QACD,OAAO,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE,aAAa,CAAC,CAAC;IACjD,CAAC;IACD;;;;OAIG;IACI,mBAAmB,CAAC,IAAY;QACnC,IAAI,MAAW,CAAC;QAEhB,SAAK,CAAC,QAAQ,CAAC,CAAC,OAAO,EAAE,EAAE;YACvB,IAAK,OAAO,CAAC,IAAY,CAAC,IAAI,KAAK,IAAI;gBACnC,OAAO,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;QACrC,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE;YACf,IAAI,EAAE,WAAW;YACjB,cAAc,EAAE,IAAI,CAAC,kBAAkB;SAC1C,CAAC,CAAC;QAEH,OAAO,MAAmB,CAAC;IAC/B,CAAC;IACD;;OAEG;IACI,MAAM,CAAC,IAAI,CAAC,MAAW,EAAE,MAA8D,EAAE,YAAoB;QAChH,MAAM,KAAK,GAAG,IAAI,KAAK,CAAC,MAAM,CAAC,CAAC;QAChC,YAAY,GAAG,YAAY,IAAI,KAAK,CAAC;QAErC,KAAK,CAAC,MAAM,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,SAAK,CAAC,IAAI,CAAC,KAAK,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;QACvF,KAAK,CAAC,MAAM,CAAC,EAAE,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,UAAM,CAAC,IAAI,CAAC,GAAG,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;QACtF,KAAK,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,KAAK,CAAC,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,YAAQ,CAAC,IAAI,CAAC,QAAQ,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC;QAEtG,KAAK,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YAC/B,IAAI,IAAI,CAAC,KAAK,KAAK,cAAU,CAAC,SAAS;gBACnC,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;iBACnE,IAAI,IAAI,CAAC,KAAK,KAAK,cAAU,CAAC,cAAc;gBAC7C,IAAI,GAAG,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,GAAG,0BAAc,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QACjF,CAAC,CAAC,CAAC;QACH,KAAK,CAAC,UAAU,CAAC,OAAO,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACrC,IAAI,IAAI,CAAC,KAAK,KAAK,cAAU,CAAC,SAAS;gBACnC,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,qBAAS,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;iBACzE,IAAI,IAAI,CAAC,KAAK,KAAK,cAAU,CAAC,cAAc;gBAC7C,IAAI,GAAG,KAAK,CAAC,UAAU,CAAC,KAAK,CAAC,GAAG,0BAAc,CAAC,IAAI,CAAC,IAAI,EAAE,YAAY,EAAE,IAAI,CAAC,CAAC;QACvF,CAAC,CAAC,CAAC;QAEH,IAAI,MAAM,YAAY,aAAS;YAC3B,KAAK,CAAC,MAAM,CAAC;gBACT,SAAS,EAAE,MAAM;gBACjB,UAAU,EAAE,cAAc;gBAC1B,QAAQ,EAAE,MAAM,CAAC,EAAE;aACtB,CAAC,CAAC;aACF,IAAI,MAAM,YAAY,cAAI;YAC3B,KAAK,CAAC,MAAM,CAAC;gBACT,IAAI,EAAE,MAAM;gBACZ,UAAU,EAAE,MAAM;gBAClB,QAAQ,EAAE,MAAM,CAAC,EAAE;aACtB,CAAC,CAAC;aACF,IAAI,MAAM,YAAY,oBAAgB;YACvC,KAAK,CAAC,MAAM,CAAC;gBACT,gBAAgB,EAAE,MAAM;gBACxB,UAAU,EAAE,SAAS;gBACrB,QAAQ,EAAE,MAAM,CAAC,EAAE;aACtB,CAAC,CAAC;aACF,IAAI,MAAM,YAAY,oBAAgB,EAAE;YACzC,KAAK,CAAC,MAAM,CAAC;gBACT,OAAO,EAAE,MAAM;aAClB,CAAC,CAAC;SACN;QAED,OAAO,KAAK,CAAC;IACjB,CAAC;IACD;;OAEG;IAEH,KAAK,CAAC,WAAW,CAAC,IAAY;QAC1B,IAAI,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,CAAC,CAAC;QACtB,IAAI,CAAC,WAAW,GAAG,aAAa,CAAC;QACjC,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;YACzB,UAAU,EAAE,YAAY,IAAI,GAAG;SAClC,CAAC,CAAC;QAEH,IAAI,IAAI,CAAC,IAAI,EAAE;YACX,IAAI,CAAC,IAAI,CAAC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,gBAAgB,CAAC,CAAC;YAC9C,IAAI,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;SACvB;QACD,OAAO,IAAI,CAAC;IAChB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,aAAa;QACf,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,oBAAY,CAAC,aAAa,CAAC;YAC5C,IAAI;YACJ,MAAM,EAAE;gBACJ,UAAU,EAAE,IAAI;aACnB;SACJ,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,SAAS;QACX,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,oBAAY,CAAC,SAAS,CAAC;YACxC,IAAI;SACP,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;IACD;;OAEG;IACH,KAAK,CAAC,eAAe;QACjB,MAAM,IAAI,GAAG,IAAI,CAAC,WAAW,EAAE,CAAC;QAChC,MAAM,MAAM,GAAG,MAAM,oBAAY,CAAC,eAAe,CAAC;YAC9C,IAAI;SACP,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAClB,CAAC;CACJ;AA5fG;IADC,sBAAS,EAAE;oCACyC;AAKrD;IADC,sBAAS,EAAE;iCAC2B;AAKvC;IADC,sBAAS,EAAE;mCAC6B;AAKzC;IADC,sBAAS,EAAE;0CACoC;AAKhD;IADC,sBAAS,EAAE;uCACiC;AAK7C;IADC,sBAAS,EAAE;yCACgE;AAK5E;IADC,sBAAS,EAAE;wCACkC;AAK9C;IADC,sBAAS,EAAE;0CACgE;AAK5E;IADC,sBAAS,EAAE;uCACiC;AAK7C;IADC,sBAAS,EAAE;qCAC8B;AAK1C;IADC,sBAAS,EAAE;sCACgC;AAK5C;IADC,sBAAS,EAAE;wCACoC;AAKhD;IADC,sBAAS,EAAE;mCACgC;AAK5C;IADC,sBAAS,EAAE;2CACqC;AAKjD;IADC,sBAAS,EAAE;yCACsC;AAMlD;IAFC,qBAAQ,EAAE;IACV,sBAAS,EAAE;wCACqC;AAMjD;IAFC,qBAAQ,EAAE;IACV,sBAAS,EAAE;mCAC2B;AAMvC;IAFC,qBAAQ,EAAE;IACV,sBAAS,EAAE;+CACmD;AAM/D;IAFC,qBAAQ,EAAE;IACV,sBAAS,EAAE;sCACiC;AAM7C;IADC,2BAAc,EAAE;6CAC+B;AAKhD;IADC,sBAAS,EAAE;iDAC2E;AAQvF;IADC,sBAAS,EAAE;mCACoB;AAKhC;IADC,sBAAS,EAAE;0CAC2B;AAkBvC;IADC,mBAAM,CAAC,MAAM,CAAC;mCAoCd;AAKD;IADC,mBAAM,CAAC,MAAM,CAAC;mCAkDd;AAyDD;IADC,mBAAM,CAAC,QAAQ,CAAC;oCAahB;AAKD;IADC,mBAAM,CAAC,QAAQ,CAAC;2CAYhB;AAwJD;IADC,mBAAM,CAAC,QAAQ,CAAC;wCAahB;AA/dL,sBAigBC;AAED,kBAAe,KAAK,CAAC"}

package/out/types/logic/LogicItem.d.ts

@@ -48,6 +48,7 @@ export declare enum LOGIC_TYPE {
 export declare function evaluate(node: LogicNode | ExpressionNode, finalCode?: boolean): string;
 export declare const logicItemKeyOfLogicItem: string[];
 export declare const logicItemArrayKeyOfLogicItem: string[];
+export declare function catchFn(logic: Logic): (err: any) => Promise<never>;
 /**
  * 逻辑项类
  */

package/out/types/logic/LogicItem.js

@@ -9,7 +9,7 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.ExpressionNode = exports.LogicNode = exports.LogicItem = exports.logicItemArrayKeyOfLogicItem = exports.logicItemKeyOfLogicItem = exports.evaluate = exports.LOGIC_TYPE = void 0;
+exports.ExpressionNode = exports.LogicNode = exports.LogicItem = exports.catchFn = exports.logicItemArrayKeyOfLogicItem = exports.logicItemKeyOfLogicItem = exports.evaluate = exports.LOGIC_TYPE = void 0;
 const decorators_1 = require("../decorators");
 const __1 = require("..");
 const logic_1 = require("../../service/logic");
@@ -17,6 +17,8 @@ const utils_1 = require("../utils");
 const cacheData_1 = require("../cacheData");
 const tools_1 = require("./tools");
 const Structure_1 = __importDefault(require("../data/Structure"));
+const cache_1 = require("../cache");
+const enum_1 = require("../enum");
 var LOGIC_TYPE;
 (function (LOGIC_TYPE) {
     // LogicNode
@@ -66,6 +68,17 @@ var LOGIC_TYPE;
     LOGIC_TYPE["QueryJoinExpression"] = "QueryJoinExpression";
     LOGIC_TYPE["QueryAggregateExpression"] = "QueryAggregateExpression";
 })(LOGIC_TYPE = exports.LOGIC_TYPE || (exports.LOGIC_TYPE = {}));
+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,
+];
 function evaluate(node, finalCode = true) {
     if (!node)
         return '';
@@ -81,19 +94,19 @@ function evaluate(node, finalCode = true) {
         return 'null';
     if (node.type === 'BinaryExpression') {
         let left = evaluate(node.left, finalCode);
-        if (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes(node.left?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
         let right = evaluate(node.right, finalCode);
-        if (!finalCode && node.right?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes(node.right?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
         return `${left} ${node.operator} ${right}`;
     }
     if (node.type === 'LogicalExpression') {
         let left = evaluate(node.left, finalCode);
-        if (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes(node.left?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             left = `(${left})`;
         let right = evaluate(node.right, finalCode);
-        if (!finalCode && node.right?.type === LOGIC_TYPE.MemberExpression)
+        if (!atomicList.includes(node.right?.type) || (!finalCode && node.left?.type === LOGIC_TYPE.MemberExpression))
             right = `(${right})`;
         return `${left} ${node.operator} ${right}`;
     }
@@ -198,6 +211,17 @@ exports.logicItemKeyOfLogicItem = ['test', 'left', 'right', 'each', 'item', 'ind
 exports.logicItemArrayKeyOfLogicItem = ['body', 'consequent', 'alternate', 'cases', 'params', 'arguments', 'builtInFuncParams',
     'groupBy', 'orderBy', 'selectElementList', 'joinPartList', 'onExpressionList', 'where', 'having',
 ];
+function catchFn(logic) {
+    return async (err) => {
+        if (err.code !== enum_1.BusinessCode.HasReferenced) // 节点被引用，不用刷新数据
+            await cache_1.refreshLogic(logic);
+        else
+            __1.config.defaultApp?.emit('saved', err);
+        __1.config.defaultApp?.history.load();
+        throw err;
+    };
+}
+exports.catchFn = catchFn;
 /**
  * 逻辑项类
  */
@@ -366,6 +390,7 @@ class LogicItem extends __1.Vertex {
             body.logicId = this.logic && this.logic.id;
             result = await logic_1.logicService.addItem({
                 headers: {
+                    moduleType: this.logic && this.logic.moduleType,
                     appId: __1.config.defaultApp?.id,
                     serviceId: this.logic?.interface?.serviceId,
                     operationAction: 'LogicItem.create',
@@ -373,7 +398,7 @@ class LogicItem extends __1.Vertex {
                     operationIgnore: actionOptions?.actionIgnore,
                 },
                 body,
-            });
+            }).catch(catchFn(this.logic));
             this.deepPick(result, ['id', 'parentId', 'parentAttr', 'joinPartRef', 'structureRef']);
         }
         this.assign({
@@ -439,8 +464,9 @@ class LogicItem extends __1.Vertex {
         LogicItem.preprocess(body);
         if (actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo) {
             __1.utils.logger.debug(`在该逻辑节点的属性"${parentAttr}"上插入一个节点"`, body);
-            const result = await logic_1.logicService.moveItem({
+            await logic_1.logicService.moveItem({
                 headers: {
+                    moduleType: this.logic && this.logic.moduleType,
                     appId: __1.config.defaultApp?.id,
                     operationAction: 'LogicItem.move',
                     operationDesc: actionOptions?.actionDesc || `移动逻辑项"${this.label || this.type}"`,
@@ -462,7 +488,7 @@ class LogicItem extends __1.Vertex {
                         offsetY,
                     },
                 },
-            });
+            }).catch(catchFn(this.logic));
         }
         if (!(this.parentId === parentId && this.parentId === this.logic.playgroundId && this.parentAttr === parentAttr)) {
             // 以下几句顺序不能变，注意！
@@ -515,6 +541,7 @@ class LogicItem extends __1.Vertex {
      * @param targetId
      */
     static async paste(logicItems, targetType, targetId) {
+        __1.config.defaultApp?.emit('saving');
         if (!Array.isArray(logicItems))
             logicItems = [logicItems];
         logicItems.forEach((logicItem) => {
@@ -532,7 +559,7 @@ class LogicItem extends __1.Vertex {
                 operationAction: 'LogicItem.paste',
                 operationDesc: `粘贴逻辑项"${logicItems[0].label || logicItems[0].type}"`,
             },
-        });
+        }).catch(catchFn(cacheData_1.vertexsMap.get(targetId)));
         LogicItem.redoPaste(res);
     }
     static async redoPaste(res) {
@@ -669,26 +696,21 @@ class LogicItem extends __1.Vertex {
                 /// @TODO: 不知道哪里来的 index
                 delete body.index;
                 ///
-                try {
-                    await logic_1.logicService.removeItem({
-                        headers: {
-                            appId: __1.config.defaultApp?.id,
-                            serviceId: this.logic?.interface?.serviceId,
-                            operationAction: 'LogicItem.delete',
-                            operationDesc: `删除逻辑项"${this.label || this.type}"`,
-                        },
-                        body,
-                    });
-                }
-                catch (err) {
-                    await __1.config.defaultApp?.history.load();
-                    throw err;
-                }
+                await logic_1.logicService.removeItem({
+                    headers: {
+                        moduleType: this.logic?.moduleType,
+                        appId: __1.config.defaultApp?.id,
+                        serviceId: this.logic?.interface?.serviceId,
+                        operationAction: 'LogicItem.delete',
+                        operationDesc: `删除逻辑项"${this.label || this.type}"`,
+                    },
+                    body,
+                }).catch(catchFn(this.logic));
             }
         }
         if (this.id) {
             __1.typeCheck.delete(this.id);
-            this.logic.interface?.service?.syncStructures(); // 处理 CallQueryComponent 嵌套的情形
+            this.logic?.interface?.service?.syncStructures(); // 处理 CallQueryComponent 嵌套的情形
             const parent = this.parent;
             if (parent && parent.checkType) {
                 parent.checkType();
@@ -744,7 +766,6 @@ class LogicItem extends __1.Vertex {
             }
             this.assign(source);
         }
-        // const body = this.toPlainJSON();
         const body = this.toJSON();
         body.params = this.params && JSON.parse(JSON.stringify(this.params));
         body.querySchemaList = this.querySchemaList && Array.from(this.querySchemaList);
@@ -758,14 +779,14 @@ class LogicItem extends __1.Vertex {
         if (actionOptions?.actionMode !== __1.ACTION_MODE.undoRedo) {
             const result = await logic_1.logicService.updateItem({
                 headers: {
+                    moduleType: this.logic.moduleType,
                     appId: __1.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) {
                 const logicItem = LogicItem.from(result, this.logic, this.parent);
@@ -783,7 +804,6 @@ class LogicItem extends __1.Vertex {
             let eachSchema = tools_1.getSchemaOfExpressionNode(each);
             if (eachSchema) {
                 eachSchema = eachSchema.schema || eachSchema;
-                // eachSchema = convert2SchemaType(eachSchema);
                 item.schema = eachSchema.items; // 兼容老的items形式
                 if (eachSchema.type === 'genericType') {
                     item.schema = eachSchema.typeInstantiation.typeParams[0].typeParamValue;
@@ -919,7 +939,6 @@ class LogicItem extends __1.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)) {
             if (['id', 'typeCheckNote', 'processComponentId', 'attributes'].includes(key))
@@ -1092,8 +1111,6 @@ class LogicNode extends LogicItem {
         const hasInstantiated = source && source.id && cacheData_1.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);
     }