amis 1.9.0-beta.12 → 1.9.0-beta.15

package/lib/actions/LoopAction.d.ts

@@ -1,7 +1,10 @@
 import { RendererEvent } from '../utils/renderer-event';
-import { Action, ListenerAction, ListenerContext, LogicAction } from './Action';
+import { RendererAction, ListenerAction, ListenerContext, LogicAction } from './Action';
 export interface ILoopAction extends ListenerAction, LogicAction {
-    loopName: string;
+    args: {
+        loopName: string;
+        [propName: string]: any;
+    };
 }
 /**
  * 循环动作
@@ -10,6 +13,6 @@ export interface ILoopAction extends ListenerAction, LogicAction {
  * @class LoopAction
  * @implements {Action}
  */
-export declare class LoopAction implements Action {
+export declare class LoopAction implements RendererAction {
     run(action: ILoopAction, renderer: ListenerContext, event: RendererEvent<any>, mergeData: any): Promise<void>;
 }

package/lib/actions/LoopAction.js

@@ -16,56 +16,58 @@ var LoopAction = /** @class */ (function () {
     function LoopAction() {
     }
     LoopAction.prototype.run = function (action, renderer, event, mergeData) {
-        var _a;
+        var _a, _b;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var loopData, protoData, _i, loopData_1, data, _b, _c, subAction;
-            return (0, tslib_1.__generator)(this, function (_d) {
-                switch (_d.label) {
+            var loopName, loopData, protoData, _i, loopData_1, data, _c, _d, subAction;
+            return (0, tslib_1.__generator)(this, function (_e) {
+                switch (_e.label) {
                     case 0:
-                        if (typeof action.loopName !== 'string') {
-                            console.warn('loopName 必须是字符串类型');
+                        loopName = (_a = action.args) === null || _a === void 0 ? void 0 : _a.loopName;
+                        if (typeof loopName !== 'string') {
+                            console.error('loopName 必须是字符串类型');
                             return [2 /*return*/];
                         }
-                        loopData = (0, tpl_builtin_1.resolveVariable)(action.loopName, mergeData) || [];
+                        loopData = (0, tpl_builtin_1.resolveVariable)(loopName, mergeData) || [];
                         if (!!loopData) return [3 /*break*/, 1];
-                        console.warn("\u6CA1\u6709\u627E\u5230\u6570\u636E ".concat(action.loopName));
+                        console.error("\u6CA1\u6709\u627E\u5230\u6570\u636E ".concat(loopName));
                         return [3 /*break*/, 10];
                     case 1:
                         if (!!Array.isArray(loopData)) return [3 /*break*/, 2];
-                        console.warn("".concat(action.loopName, " \u6570\u636E\u4E0D\u662F\u6570\u7EC4"));
+                        console.error("".concat(loopName, " \u6570\u636E\u4E0D\u662F\u6570\u7EC4"));
                         return [3 /*break*/, 10];
                     case 2:
-                        if (!((_a = action.children) === null || _a === void 0 ? void 0 : _a.length)) return [3 /*break*/, 10];
+                        if (!((_b = action.children) === null || _b === void 0 ? void 0 : _b.length)) return [3 /*break*/, 10];
                         protoData = event.data;
                         _i = 0, loopData_1 = loopData;
-                        _d.label = 3;
+                        _e.label = 3;
                     case 3:
                         if (!(_i < loopData_1.length)) return [3 /*break*/, 9];
                         data = loopData_1[_i];
                         renderer.loopStatus = Action_1.LoopStatus.NORMAL;
                         // 追加逻辑处理中的数据，事件数据优先，用完还要还原
                         event.setData((0, helper_1.createObject)(event.data, data));
-                        _b = 0, _c = action.children;
-                        _d.label = 4;
+                        _c = 0, _d = action.children;
+                        _e.label = 4;
                     case 4:
-                        if (!(_b < _c.length)) return [3 /*break*/, 7];
-                        subAction = _c[_b];
+                        if (!(_c < _d.length)) return [3 /*break*/, 7];
+                        subAction = _d[_c];
                         // @ts-ignore
                         if (renderer.loopStatus === Action_1.LoopStatus.CONTINUE) {
                             return [3 /*break*/, 6];
                         }
                         return [4 /*yield*/, (0, Action_1.runActions)(subAction, renderer, event)];
                     case 5:
-                        _d.sent();
+                        _e.sent();
                         // @ts-ignore
                         if (renderer.loopStatus === Action_1.LoopStatus.BREAK || event.stoped) {
                             // 还原事件数据
                             event.setData(protoData);
+                            event.stopPropagation();
                             return [3 /*break*/, 7];
                         }
-                        _d.label = 6;
+                        _e.label = 6;
                     case 6:
-                        _b++;
+                        _c++;
                         return [3 /*break*/, 4];
                     case 7:
                         if (event.stoped) {
@@ -73,14 +75,14 @@ var LoopAction = /** @class */ (function () {
                             event.setData(protoData);
                             return [3 /*break*/, 9];
                         }
-                        _d.label = 8;
+                        _e.label = 8;
                     case 8:
                         _i++;
                         return [3 /*break*/, 3];
                     case 9:
                         renderer.loopStatus = Action_1.LoopStatus.NORMAL;
                         event.setData(protoData);
-                        _d.label = 10;
+                        _e.label = 10;
                     case 10: return [2 /*return*/];
                 }
             });

package/lib/actions/LoopAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/LoopAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,0CAA6C;AAC7C,mCASkB;AAClB,oDAAqD;AAMrD;;;;;;GAMG;AACH;IAAA;IAsDA,CAAC;IArDO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB,EACzB,SAAc;;;;;;;wBAEd,IAAI,OAAO,MAAM,CAAC,QAAQ,KAAK,QAAQ,EAAE;4BACvC,OAAO,CAAC,IAAI,CAAC,mBAAmB,CAAC,CAAC;4BAClC,sBAAO;yBACR;wBAEK,QAAQ,GAAG,IAAA,6BAAe,EAAC,MAAM,CAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;6BAG/D,CAAC,QAAQ,EAAT,wBAAS;wBACX,OAAO,CAAC,IAAI,CAAC,+CAAU,MAAM,CAAC,QAAQ,CAAE,CAAC,CAAC;;;6BACjC,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAxB,wBAAwB;wBACjC,OAAO,CAAC,IAAI,CAAC,UAAG,MAAM,CAAC,QAAQ,0CAAS,CAAC,CAAC;;;6BACjC,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,MAAM,CAAA,EAAvB,yBAAuB;wBAE1B,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;8BAEF,EAAR,qBAAQ;;;6BAAR,CAAA,sBAAQ,CAAA;wBAAhB,IAAI;wBACb,QAAQ,CAAC,UAAU,GAAG,mBAAU,CAAC,MAAM,CAAC;wBACxC,2BAA2B;wBAC3B,KAAK,CAAC,OAAO,CAAC,IAAA,qBAAY,EAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;8BAEP,EAAf,KAAA,MAAM,CAAC,QAAQ;;;6BAAf,CAAA,cAAe,CAAA;wBAA5B,SAAS;wBAClB,aAAa;wBACb,IAAI,QAAQ,CAAC,UAAU,KAAK,mBAAU,CAAC,QAAQ,EAAE;4BAC/C,wBAAS;yBACV;wBACD,qBAAM,IAAA,mBAAU,EAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAA;;wBAA5C,SAA4C,CAAC;wBAE7C,aAAa;wBACb,IAAI,QAAQ,CAAC,UAAU,KAAK,mBAAU,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;4BAC5D,SAAS;4BACT,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;4BACzB,wBAAM;yBACP;;;wBAZqB,IAAe,CAAA;;;wBAevC,IAAI,KAAK,CAAC,MAAM,EAAE;4BAChB,SAAS;4BACT,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;4BACzB,wBAAM;yBACP;;;wBAxBgB,IAAQ,CAAA;;;wBA2B3B,QAAQ,CAAC,UAAU,GAAG,mBAAU,CAAC,MAAM,CAAC;wBACxC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;;;;;;KAE5B;IACH,iBAAC;AAAD,CAAC,AAtDD,IAsDC;AAtDY,gCAAU;AAwDvB,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AACA,0CAA6C;AAC7C,mCASkB;AAClB,oDAAqD;AASrD;;;;;;GAMG;AACH;IAAA;IAwDA,CAAC;IAvDO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB,EACzB,SAAc;;;;;;;wBAER,QAAQ,GAAG,MAAA,MAAM,CAAC,IAAI,0CAAE,QAAQ,CAAC;wBACvC,IAAI,OAAO,QAAQ,KAAK,QAAQ,EAAE;4BAChC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAAC,CAAC;4BACnC,sBAAO;yBACR;wBAEK,QAAQ,GAAG,IAAA,6BAAe,EAAC,QAAQ,EAAE,SAAS,CAAC,IAAI,EAAE,CAAC;6BAGxD,CAAC,QAAQ,EAAT,wBAAS;wBACX,OAAO,CAAC,KAAK,CAAC,+CAAU,QAAQ,CAAE,CAAC,CAAC;;;6BAC3B,CAAC,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,EAAxB,wBAAwB;wBACjC,OAAO,CAAC,KAAK,CAAC,UAAG,QAAQ,0CAAS,CAAC,CAAC;;;6BAC3B,CAAA,MAAA,MAAM,CAAC,QAAQ,0CAAE,MAAM,CAAA,EAAvB,yBAAuB;wBAE1B,SAAS,GAAG,KAAK,CAAC,IAAI,CAAC;8BAEF,EAAR,qBAAQ;;;6BAAR,CAAA,sBAAQ,CAAA;wBAAhB,IAAI;wBACb,QAAQ,CAAC,UAAU,GAAG,mBAAU,CAAC,MAAM,CAAC;wBACxC,2BAA2B;wBAC3B,KAAK,CAAC,OAAO,CAAC,IAAA,qBAAY,EAAC,KAAK,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,CAAC;8BAEP,EAAf,KAAA,MAAM,CAAC,QAAQ;;;6BAAf,CAAA,cAAe,CAAA;wBAA5B,SAAS;wBAClB,aAAa;wBACb,IAAI,QAAQ,CAAC,UAAU,KAAK,mBAAU,CAAC,QAAQ,EAAE;4BAC/C,wBAAS;yBACV;wBACD,qBAAM,IAAA,mBAAU,EAAC,SAAS,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAA;;wBAA5C,SAA4C,CAAC;wBAE7C,aAAa;wBACb,IAAI,QAAQ,CAAC,UAAU,KAAK,mBAAU,CAAC,KAAK,IAAI,KAAK,CAAC,MAAM,EAAE;4BAC5D,SAAS;4BACT,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;4BACzB,KAAK,CAAC,eAAe,EAAE,CAAC;4BACxB,wBAAM;yBACP;;;wBAbqB,IAAe,CAAA;;;wBAgBvC,IAAI,KAAK,CAAC,MAAM,EAAE;4BAChB,SAAS;4BACT,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;4BACzB,wBAAM;yBACP;;;wBAzBgB,IAAQ,CAAA;;;wBA4B3B,QAAQ,CAAC,UAAU,GAAG,mBAAU,CAAC,MAAM,CAAC;wBACxC,KAAK,CAAC,OAAO,CAAC,SAAS,CAAC,CAAC;;;;;;KAE5B;IACH,iBAAC;AAAD,CAAC,AAxDD,IAwDC;AAxDY,gCAAU;AA0DvB,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {createObject} from '../utils/helper';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  LogicAction,\n  LoopStatus,\n  registerAction,\n  runAction,\n  runActions\n} from './Action';\nimport {resolveVariable} from '../utils/tpl-builtin';\n\nexport interface ILoopAction extends ListenerAction, LogicAction {\n  loopName: string;\n}\n\n/**\n * 循环动作\n *\n * @export\n * @class LoopAction\n * @implements {Action}\n */\nexport class LoopAction implements Action {\n  async run(\n    action: ILoopAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>,\n    mergeData: any\n  ) {\n    if (typeof action.loopName !== 'string') {\n      console.warn('loopName 必须是字符串类型');\n      return;\n    }\n\n    const loopData = resolveVariable(action.loopName, mergeData) || [];\n\n    // 必须是数组\n    if (!loopData) {\n      console.warn(`没有找到数据 ${action.loopName}`);\n    } else if (!Array.isArray(loopData)) {\n      console.warn(`${action.loopName} 数据不是数组`);\n    } else if (action.children?.length) {\n      // 暂存一下\n      const protoData = event.data;\n\n      for (const data of loopData) {\n        renderer.loopStatus = LoopStatus.NORMAL;\n        // 追加逻辑处理中的数据，事件数据优先，用完还要还原\n        event.setData(createObject(event.data, data));\n\n        for (const subAction of action.children) {\n          // @ts-ignore\n          if (renderer.loopStatus === LoopStatus.CONTINUE) {\n            continue;\n          }\n          await runActions(subAction, renderer, event);\n\n          // @ts-ignore\n          if (renderer.loopStatus === LoopStatus.BREAK || event.stoped) {\n            // 还原事件数据\n            event.setData(protoData);\n            break;\n          }\n        }\n\n        if (event.stoped) {\n          // 还原事件数据\n          event.setData(protoData);\n          break;\n        }\n      }\n\n      renderer.loopStatus = LoopStatus.NORMAL;\n      event.setData(protoData);\n    }\n  }\n}\n\nregisterAction('loop', new LoopAction());\n"
+        "import {RendererEvent} from '../utils/renderer-event';\nimport {createObject} from '../utils/helper';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  LogicAction,\n  LoopStatus,\n  registerAction,\n  runAction,\n  runActions\n} from './Action';\nimport {resolveVariable} from '../utils/tpl-builtin';\n\nexport interface ILoopAction extends ListenerAction, LogicAction {\n  args: {\n    loopName: string;\n    [propName: string]: any;\n  };\n}\n\n/**\n * 循环动作\n *\n * @export\n * @class LoopAction\n * @implements {Action}\n */\nexport class LoopAction implements RendererAction {\n  async run(\n    action: ILoopAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>,\n    mergeData: any\n  ) {\n    const loopName = action.args?.loopName;\n    if (typeof loopName !== 'string') {\n      console.error('loopName 必须是字符串类型');\n      return;\n    }\n\n    const loopData = resolveVariable(loopName, mergeData) || [];\n\n    // 必须是数组\n    if (!loopData) {\n      console.error(`没有找到数据 ${loopName}`);\n    } else if (!Array.isArray(loopData)) {\n      console.error(`${loopName} 数据不是数组`);\n    } else if (action.children?.length) {\n      // 暂存一下\n      const protoData = event.data;\n\n      for (const data of loopData) {\n        renderer.loopStatus = LoopStatus.NORMAL;\n        // 追加逻辑处理中的数据，事件数据优先，用完还要还原\n        event.setData(createObject(event.data, data));\n\n        for (const subAction of action.children) {\n          // @ts-ignore\n          if (renderer.loopStatus === LoopStatus.CONTINUE) {\n            continue;\n          }\n          await runActions(subAction, renderer, event);\n\n          // @ts-ignore\n          if (renderer.loopStatus === LoopStatus.BREAK || event.stoped) {\n            // 还原事件数据\n            event.setData(protoData);\n            event.stopPropagation();\n            break;\n          }\n        }\n\n        if (event.stoped) {\n          // 还原事件数据\n          event.setData(protoData);\n          break;\n        }\n      }\n\n      renderer.loopStatus = LoopStatus.NORMAL;\n      event.setData(protoData);\n    }\n  }\n}\n\nregisterAction('loop', new LoopAction());\n"
     ]
 }

package/lib/actions/PageAction.d.ts

@@ -1,7 +1,10 @@
 import { RendererEvent } from '../utils/renderer-event';
-import { Action, ListenerAction, ListenerContext } from './Action';
+import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IPageGoAction extends ListenerAction {
-    delta?: number;
+    args: {
+        delta?: number;
+        [propName: string]: any;
+    };
 }
 /**
  * 返回上个页面
@@ -10,7 +13,7 @@ export interface IPageGoAction extends ListenerAction {
  * @class PageGoBackAction
  * @implements {Action}
  */
-export declare class PageGoBackAction implements Action {
+export declare class PageGoBackAction implements RendererAction {
     run(action: ListenerAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }
 /**
@@ -20,7 +23,7 @@ export declare class PageGoBackAction implements Action {
  * @class PageGoAction
  * @implements {Action}
  */
-export declare class PageGoAction implements Action {
+export declare class PageGoAction implements RendererAction {
     run(action: IPageGoAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }
 /**
@@ -30,6 +33,6 @@ export declare class PageGoAction implements Action {
  * @class PageRefreshAction
  * @implements {Action}
  */
-export declare class PageRefreshAction implements Action {
+export declare class PageRefreshAction implements RendererAction {
     run(action: ListenerAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }

package/lib/actions/PageAction.js

@@ -35,9 +35,10 @@ var PageGoAction = /** @class */ (function () {
     function PageGoAction() {
     }
     PageGoAction.prototype.run = function (action, renderer, event) {
+        var _a;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_a) {
-                window.history.go(action.delta || 0);
+            return (0, tslib_1.__generator)(this, function (_b) {
+                window.history.go(((_a = action.args) === null || _a === void 0 ? void 0 : _a.delta) || 0);
                 return [2 /*return*/];
             });
         });

package/lib/actions/PageAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/PageAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,mCAKkB;AAMlB;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,8BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;gBAEzB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;;;;KACvB;IACH,uBAAC;AAAD,CAAC,AARD,IAQC;AARY,4CAAgB;AAU7B;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,0BAAG,GAAT,UACE,MAAqB,EACrB,QAAyB,EACzB,KAAyB;;;gBAEzB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,MAAM,CAAC,KAAK,IAAI,CAAC,CAAC,CAAC;;;;KACtC;IACH,mBAAC;AAAD,CAAC,AARD,IAQC;AARY,oCAAY;AAUzB;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,+BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;gBAEzB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;;;;KAC1B;IACH,wBAAC;AAAD,CAAC,AARD,IAQC;AARY,8CAAiB;AAU9B,IAAA,uBAAc,EAAC,QAAQ,EAAE,IAAI,gBAAgB,EAAE,CAAC,CAAC;AACjD,IAAA,uBAAc,EAAC,SAAS,EAAE,IAAI,iBAAiB,EAAE,CAAC,CAAC;AACnD,IAAA,uBAAc,EAAC,QAAQ,EAAE,IAAI,YAAY,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AACA,mCAKkB;AASlB;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,8BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;gBAEzB,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,CAAC;;;;KACvB;IACH,uBAAC;AAAD,CAAC,AARD,IAQC;AARY,4CAAgB;AAU7B;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,0BAAG,GAAT,UACE,MAAqB,EACrB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,KAAI,CAAC,CAAC,CAAC;;;;KAC5C;IACH,mBAAC;AAAD,CAAC,AARD,IAQC;AARY,oCAAY;AAUzB;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,+BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;gBAEzB,MAAM,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;;;;KAC1B;IACH,wBAAC;AAAD,CAAC,AARD,IAQC;AARY,8CAAiB;AAU9B,IAAA,uBAAc,EAAC,QAAQ,EAAE,IAAI,gBAAgB,EAAE,CAAC,CAAC;AACjD,IAAA,uBAAc,EAAC,SAAS,EAAE,IAAI,iBAAiB,EAAE,CAAC,CAAC;AACnD,IAAA,uBAAc,EAAC,QAAQ,EAAE,IAAI,YAAY,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IPageGoAction extends ListenerAction {\n  delta?: number;\n}\n\n/**\n * 返回上个页面\n *\n * @export\n * @class PageGoBackAction\n * @implements {Action}\n */\nexport class PageGoBackAction implements Action {\n  async run(\n    action: ListenerAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    window.history.back();\n  }\n}\n\n/**\n * 到指定页面\n *\n * @export\n * @class PageGoAction\n * @implements {Action}\n */\nexport class PageGoAction implements Action {\n  async run(\n    action: IPageGoAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    window.history.go(action.delta || 0);\n  }\n}\n\n/**\n * 浏览器刷新\n *\n * @export\n * @class PageRefreshAction\n * @implements {Action}\n */\nexport class PageRefreshAction implements Action {\n  async run(\n    action: ListenerAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    window.location.reload();\n  }\n}\n\nregisterAction('goBack', new PageGoBackAction());\nregisterAction('refresh', new PageRefreshAction());\nregisterAction('goPage', new PageGoAction());\n"
+        "import {RendererEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IPageGoAction extends ListenerAction {\n  args: {\n    delta?: number;\n    [propName: string]: any;\n  };\n}\n\n/**\n * 返回上个页面\n *\n * @export\n * @class PageGoBackAction\n * @implements {Action}\n */\nexport class PageGoBackAction implements RendererAction {\n  async run(\n    action: ListenerAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    window.history.back();\n  }\n}\n\n/**\n * 到指定页面\n *\n * @export\n * @class PageGoAction\n * @implements {Action}\n */\nexport class PageGoAction implements RendererAction {\n  async run(\n    action: IPageGoAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    window.history.go(action.args?.delta || 0);\n  }\n}\n\n/**\n * 浏览器刷新\n *\n * @export\n * @class PageRefreshAction\n * @implements {Action}\n */\nexport class PageRefreshAction implements RendererAction {\n  async run(\n    action: ListenerAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    window.location.reload();\n  }\n}\n\nregisterAction('goBack', new PageGoBackAction());\nregisterAction('refresh', new PageRefreshAction());\nregisterAction('goPage', new PageGoAction());\n"
     ]
 }

package/lib/actions/ParallelAction.d.ts

@@ -1,7 +1,7 @@
 import { RendererEvent } from '../utils/renderer-event';
-import { Action, ListenerAction, ListenerContext, LogicAction } from './Action';
+import { RendererAction, ListenerAction, ListenerContext, LogicAction } from './Action';
 export interface IParallelAction extends ListenerAction, LogicAction {
 }
-export declare class ParallelAction implements Action {
+export declare class ParallelAction implements RendererAction {
     run(action: IParallelAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }

package/lib/actions/ParallelAction.js.map

@@ -8,6 +8,6 @@
     "names": [],
     "mappings": ";;;;AACA,mCAOkB;AAIlB;IAAA;IAcA,CAAC;IAbO,4BAAG,GAAT,UACE,MAAuB,EACvB,QAAyB,EACzB,KAAyB;;;;;;6BAErB,CAAA,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAA,EAAzC,wBAAyC;wBACrC,YAAY,GAAG,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,UAAC,KAAkB;4BAC1D,6BAA6B;4BAC7B,OAAO,IAAA,mBAAU,EAAC,KAAK,EAAE,QAAQ,EAAE,KAAK,CAAC,CAAC;wBAC5C,CAAC,CAAC,CAAC;wBACH,qBAAM,OAAO,CAAC,GAAG,CAAC,YAAY,CAAC,EAAA;;wBAA/B,SAA+B,CAAC;;;;;;KAEnC;IACH,qBAAC;AAAD,CAAC,AAdD,IAcC;AAdY,wCAAc;AAgB3B,IAAA,uBAAc,EAAC,UAAU,EAAE,IAAI,cAAc,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  LogicAction,\n  registerAction,\n  runActions\n} from './Action';\n\nexport interface IParallelAction extends ListenerAction, LogicAction {}\n\nexport class ParallelAction implements Action {\n  async run(\n    action: IParallelAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (action.children && action.children.length) {\n      const childActions = action.children.map((child: LogicAction) => {\n        // 并行动作互不干扰，但不管哪个存在干预都对后续动作生效\n        return runActions(child, renderer, event);\n      });\n      await Promise.all(childActions);\n    }\n  }\n}\n\nregisterAction('parallel', new ParallelAction());\n"
+        "import {RendererEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  LogicAction,\n  registerAction,\n  runActions\n} from './Action';\n\nexport interface IParallelAction extends ListenerAction, LogicAction {}\n\nexport class ParallelAction implements RendererAction {\n  async run(\n    action: IParallelAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (action.children && action.children.length) {\n      const childActions = action.children.map((child: LogicAction) => {\n        // 并行动作互不干扰，但不管哪个存在干预都对后续动作生效\n        return runActions(child, renderer, event);\n      });\n      await Promise.all(childActions);\n    }\n  }\n}\n\nregisterAction('parallel', new ParallelAction());\n"
     ]
 }

package/lib/actions/SwitchAction.d.ts

@@ -1,10 +1,10 @@
 import { RendererEvent } from '../utils/renderer-event';
-import { Action, ListenerAction, ListenerContext, LogicAction } from './Action';
+import { RendererAction, ListenerAction, ListenerContext, LogicAction } from './Action';
 export interface ISwitchAction extends ListenerAction, LogicAction {
 }
 /**
  * 排他动作
  */
-export declare class SwitchAction implements Action {
+export declare class SwitchAction implements RendererAction {
     run(action: ISwitchAction, renderer: ListenerContext, event: RendererEvent<any>, mergeData: any): Promise<void>;
 }

package/lib/actions/SwitchAction.js.map

@@ -8,6 +8,6 @@
     "names": [],
     "mappings": ";;;;AAEA,oCAA4C;AAC5C,mCAOkB;AAIlB;;GAEG;AACH;IAAA;IAmBA,CAAC;IAlBO,0BAAG,GAAT,UACE,MAAqB,EACrB,QAAyB,EACzB,KAAyB,EACzB,SAAc;;;;;;8BAE4B,EAArB,KAAA,MAAM,CAAC,QAAQ,IAAI,EAAE;;;6BAArB,CAAA,cAAqB,CAAA;wBAA/B,MAAM;wBACf,IAAI,CAAC,MAAM,CAAC,UAAU,EAAE;4BACtB,wBAAS;yBACV;6BAEG,IAAA,oBAAc,EAAC,MAAM,CAAC,UAAU,EAAE,SAAS,CAAC,EAA5C,wBAA4C;wBAC9C,qBAAM,IAAA,mBAAU,EAAC,MAAM,EAAE,QAAQ,EAAE,KAAK,CAAC,EAAA;;wBAAzC,SAAyC,CAAC;wBAC1C,0CAA0C;wBAC1C,wBAAM;;wBARW,IAAqB,CAAA;;;;;;KAW3C;IACH,mBAAC;AAAD,CAAC,AAnBD,IAmBC;AAnBY,oCAAY;AAqBzB,IAAA,uBAAc,EAAC,QAAQ,EAAE,IAAI,YAAY,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {inflate} from 'zlib';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {evalExpression} from '../utils/tpl';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  LogicAction,\n  registerAction,\n  runActions\n} from './Action';\n\nexport interface ISwitchAction extends ListenerAction, LogicAction {}\n\n/**\n * 排他动作\n */\nexport class SwitchAction implements Action {\n  async run(\n    action: ISwitchAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>,\n    mergeData: any\n  ) {\n    for (const branch of action.children || []) {\n      if (!branch.expression) {\n        continue;\n      }\n\n      if (evalExpression(branch.expression, mergeData)) {\n        await runActions(branch, renderer, event);\n        // 去掉runAllMatch，这里只做排他，多个可以直接通过expression\n        break;\n      }\n    }\n  }\n}\n\nregisterAction('switch', new SwitchAction());\n"
+        "import {inflate} from 'zlib';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {evalExpression} from '../utils/tpl';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  LogicAction,\n  registerAction,\n  runActions\n} from './Action';\n\nexport interface ISwitchAction extends ListenerAction, LogicAction {}\n\n/**\n * 排他动作\n */\nexport class SwitchAction implements RendererAction {\n  async run(\n    action: ISwitchAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>,\n    mergeData: any\n  ) {\n    for (const branch of action.children || []) {\n      if (!branch.expression) {\n        continue;\n      }\n\n      if (evalExpression(branch.expression, mergeData)) {\n        await runActions(branch, renderer, event);\n        // 去掉runAllMatch，这里只做排他，多个可以直接通过expression\n        break;\n      }\n    }\n  }\n}\n\nregisterAction('switch', new SwitchAction());\n"
     ]
 }

package/lib/actions/ToastAction.d.ts

@@ -1,5 +1,5 @@
 import { RendererEvent } from '../utils/renderer-event';
-import { Action, ListenerAction, ListenerContext } from './Action';
+import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IToastAction extends ListenerAction {
     msg: string;
     msgType?: string;
@@ -11,6 +11,6 @@ export interface IToastAction extends ListenerAction {
 /**
  * 全局toast
  */
-export declare class ToastAction implements Action {
+export declare class ToastAction implements RendererAction {
     run(action: IToastAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }

package/lib/actions/ToastAction.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.ToastAction = void 0;
 var tslib_1 = require("tslib");
 var Action_1 = require("./Action");
-var tpl_builtin_1 = require("../utils/tpl-builtin");
 /**
  * 全局toast
  */
@@ -11,10 +10,13 @@ var ToastAction = /** @class */ (function () {
     function ToastAction() {
     }
     ToastAction.prototype.run = function (action, renderer, event) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_c) {
-                (_b = (_a = event.context.env).notify) === null || _b === void 0 ? void 0 : _b.call(_a, action.msgType || 'info', (0, tpl_builtin_1.resolveVariableAndFilter)(action.msg, event === null || event === void 0 ? void 0 : event.data, '| raw'), action);
+            return (0, tslib_1.__generator)(this, function (_f) {
+                if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.notify)) {
+                    throw new Error('env.notify is required!');
+                }
+                (_c = (_b = event.context.env).notify) === null || _c === void 0 ? void 0 : _c.call(_b, ((_d = action.args) === null || _d === void 0 ? void 0 : _d.msgType) || 'info', String((_e = action.args) === null || _e === void 0 ? void 0 : _e.msg), action.args);
                 return [2 /*return*/];
             });
         });

package/lib/actions/ToastAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/ToastAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,mCAKkB;AAClB,oDAA8D;AAkB9D;;GAEG;AACH;IAAA;IAYA,CAAC;IAXO,yBAAG,GAAT,UACE,MAAoB,EACpB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,MAAM,mDACtB,MAAM,CAAC,OAAO,IAAI,MAAM,EACxB,IAAA,sCAAwB,EAAC,MAAM,CAAC,GAAG,EAAE,KAAK,aAAL,KAAK,uBAAL,KAAK,CAAE,IAAI,EAAE,OAAO,CAAC,EAC1D,MAAM,CACP,CAAC;;;;KACH;IACH,kBAAC;AAAD,CAAC,AAZD,IAYC;AAZY,kCAAW;AAcxB,IAAA,uBAAc,EAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AACA,mCAKkB;AAmBlB;;GAEG;AACH;IAAA;IAgBA,CAAC;IAfO,yBAAG,GAAT,UACE,MAAoB,EACpB,QAAyB,EACzB,KAAyB;;;;gBAEzB,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,KAAK,CAAC,GAAG,0CAAE,MAAM,CAAA,EAAE;oBAC/B,MAAM,IAAI,KAAK,CAAC,yBAAyB,CAAC,CAAC;iBAC5C;gBAED,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,MAAM,mDACtB,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,KAAI,MAAM,EAC9B,MAAM,CAAC,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,CAAC,EACxB,MAAM,CAAC,IAAI,CACZ,CAAC;;;;KACH;IACH,kBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,kCAAW;AAkBxB,IAAA,uBAAc,EAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\nimport {resolveVariableAndFilter} from '../utils/tpl-builtin';\n\nexport interface IToastAction extends ListenerAction {\n  msg: string;\n  msgType?: string;\n  position?:\n    | 'top-right'\n    | 'top-center'\n    | 'top-left'\n    | 'bottom-center'\n    | 'bottom-left'\n    | 'bottom-right'\n    | 'center';\n  closeButton?: boolean;\n  showIcon?: boolean;\n  timeout?: number;\n}\n\n/**\n * 全局toast\n */\nexport class ToastAction implements Action {\n  async run(\n    action: IToastAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    event.context.env.notify?.(\n      action.msgType || 'info',\n      resolveVariableAndFilter(action.msg, event?.data, '| raw'),\n      action\n    );\n  }\n}\n\nregisterAction('toast', new ToastAction());\n"
+        "import {RendererEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\nimport {resolveVariableAndFilter} from '../utils/tpl-builtin';\n\nexport interface IToastAction extends ListenerAction {\n  msg: string;\n  msgType?: string;\n  position?:\n    | 'top-right'\n    | 'top-center'\n    | 'top-left'\n    | 'bottom-center'\n    | 'bottom-left'\n    | 'bottom-right'\n    | 'center';\n  closeButton?: boolean;\n  showIcon?: boolean;\n  timeout?: number;\n}\n\n/**\n * 全局toast\n */\nexport class ToastAction implements RendererAction {\n  async run(\n    action: IToastAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (!renderer.props.env?.notify) {\n      throw new Error('env.notify is required!');\n    }\n\n    event.context.env.notify?.(\n      action.args?.msgType || 'info',\n      String(action.args?.msg),\n      action.args\n    );\n  }\n}\n\nregisterAction('toast', new ToastAction());\n"
     ]
 }