amis 1.9.0-beta.13 → 1.9.0-beta.14

package/lib/actions/AjaxAction.d.ts

@@ -2,12 +2,15 @@ import { Api } from '../types';
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IAjaxAction extends ListenerAction {
-    api: Api;
-    messages: {
-        success: string;
-        failed: string;
+    args: {
+        api: Api;
+        messages: {
+            success: string;
+            failed: string;
+        };
+        options: object;
+        [propName: string]: any;
     };
-    options: object;
 }
 /**
  * 发送请求动作

package/lib/actions/AjaxAction.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AjaxAction = void 0;
 var tslib_1 = require("tslib");
+var omit_1 = (0, tslib_1.__importDefault)(require("lodash/omit"));
 var api_1 = require("../utils/api");
 var errors_1 = require("../utils/errors");
 var helper_1 = require("../utils/helper");
@@ -17,42 +18,47 @@ var AjaxAction = /** @class */ (function () {
     function AjaxAction() {
     }
     AjaxAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var env, result, responseData, e_1, result;
-            var _d;
-            return (0, tslib_1.__generator)(this, function (_e) {
-                switch (_e.label) {
+            var env, result, responseData, msg, e_1, result;
+            var _m;
+            return (0, tslib_1.__generator)(this, function (_o) {
+                switch (_o.label) {
                     case 0:
+                        if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.fetcher)) {
+                            throw new Error('env.fetcher is required!');
+                        }
                         env = event.context.env;
-                        _e.label = 1;
+                        _o.label = 1;
                     case 1:
-                        _e.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, env.fetcher(action.api, action.args, (_a = action.options) !== null && _a !== void 0 ? _a : {})];
+                        _o.trys.push([1, 3, , 4]);
+                        return [4 /*yield*/, env.fetcher((_b = action.args) === null || _b === void 0 ? void 0 : _b.api, (0, omit_1.default)((_c = action.args) !== null && _c !== void 0 ? _c : {}, ['api', 'options', 'messages']), (_e = (_d = action.args) === null || _d === void 0 ? void 0 : _d.options) !== null && _e !== void 0 ? _e : {})];
                     case 2:
-                        result = _e.sent();
+                        result = _o.sent();
                         if (!(0, helper_1.isEmpty)(result.data) || result.ok) {
                             responseData = (0, api_1.normalizeApiResponseData)(result.data);
-                            // 记录请求返回的数据
+                            // 记录请求返回的数据
                             event.setData((0, helper_1.createObject)(event.data, action.outputVar
-                                ? (_d = {},
-                                    _d["" + action.outputVar] = responseData,
-                                    _d) : responseData));
+                                ? (_m = {},
+                                    _m["" + action.outputVar] = responseData,
+                                    _m) : responseData));
                         }
                         if (!result.ok) {
-                            throw new errors_1.ServerError((_b = (action.messages && action.messages.failed)) !== null && _b !== void 0 ? _b : result.msg, result);
+                            throw new errors_1.ServerError((_h = (_g = (_f = action.args) === null || _f === void 0 ? void 0 : _f.messages) === null || _g === void 0 ? void 0 : _g.failed) !== null && _h !== void 0 ? _h : result.msg, result);
                         }
                         else {
-                            env.notify('success', (_c = (action.messages && action.messages.success)) !== null && _c !== void 0 ? _c : result.msg, result.msgTimeout !== undefined
-                                ? {
-                                    closeButton: true,
-                                    timeout: result.msgTimeout
-                                }
-                                : undefined);
+                            msg = (_l = (_k = (_j = action.args) === null || _j === void 0 ? void 0 : _j.messages) === null || _k === void 0 ? void 0 : _k.success) !== null && _l !== void 0 ? _l : result.msg;
+                            msg &&
+                                env.notify('success', msg, result.msgTimeout !== undefined
+                                    ? {
+                                        closeButton: true,
+                                        timeout: result.msgTimeout
+                                    }
+                                    : undefined);
                         }
                         return [2 /*return*/, result.data];
                     case 3:
-                        e_1 = _e.sent();
+                        e_1 = _o.sent();
                         if (e_1.type === 'ServerError') {
                             result = e_1.response;
                             env.notify('error', e_1.message, result.msgTimeout !== undefined

package/lib/actions/AjaxAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/AjaxAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,oCAAsD;AACtD,0CAA4C;AAC5C,0CAAiE;AAGjE,mCAKkB;AAWlB;;;;;;GAMG;AACH;IAAA;IAqEA,CAAC;IApEO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB;;;;;;;;wBAEnB,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;;;;wBAEb,qBAAM,GAAG,CAAC,OAAO,CAC9B,MAAM,CAAC,GAAa,EACpB,MAAM,CAAC,IAAI,EACX,MAAA,MAAM,CAAC,OAAO,mCAAI,EAAE,CACrB,EAAA;;wBAJK,MAAM,GAAG,SAId;wBAED,IAAI,CAAC,IAAA,gBAAO,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,EAAE,EAAE;4BAChC,YAAY,GAAG,IAAA,8BAAwB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;4BAC3D,cAAc;4BACd,KAAK,CAAC,OAAO,CACX,IAAA,qBAAY,EACV,KAAK,CAAC,IAAI,EACV,MAAM,CAAC,SAAS;gCACd,CAAC;oCACG,GAAC,KAAG,MAAM,CAAC,SAAW,IAAG,YAAY;wCAEzC,CAAC,CAAC,YAAY,CACjB,CACF,CAAC;yBACH;wBAED,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;4BACd,MAAM,IAAI,oBAAW,CACnB,MAAA,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,mCAAI,MAAM,CAAC,GAAG,EACzD,MAAM,CACP,CAAC;yBACH;6BAAM;4BACL,GAAG,CAAC,MAAM,CACR,SAAS,EACT,MAAA,CAAC,MAAM,CAAC,QAAQ,IAAI,MAAM,CAAC,QAAQ,CAAC,OAAO,CAAC,mCAAI,MAAM,CAAC,GAAG,EAC1D,MAAM,CAAC,UAAU,KAAK,SAAS;gCAC7B,CAAC,CAAC;oCACE,WAAW,EAAE,IAAI;oCACjB,OAAO,EAAE,MAAM,CAAC,UAAU;iCAC3B;gCACH,CAAC,CAAC,SAAS,CACd,CAAC;yBACH;wBAED,sBAAO,MAAM,CAAC,IAAI,EAAC;;;wBAEnB,IAAI,GAAC,CAAC,IAAI,KAAK,aAAa,EAAE;4BACtB,MAAM,GAAI,GAAiB,CAAC,QAAQ,CAAC;4BAC3C,GAAG,CAAC,MAAM,CACR,OAAO,EACP,GAAC,CAAC,OAAO,EACT,MAAM,CAAC,UAAU,KAAK,SAAS;gCAC7B,CAAC,CAAC;oCACE,WAAW,EAAE,IAAI;oCACjB,OAAO,EAAE,MAAM,CAAC,UAAU;iCAC3B;gCACH,CAAC,CAAC,SAAS,CACd,CAAC;yBACH;6BAAM;4BACL,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAC,CAAC,OAAO,CAAC,CAAC;yBAChC;;;;;;KAKJ;IACH,iBAAC;AAAD,CAAC,AArED,IAqEC;AArEY,gCAAU;AAuEvB,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AAAA,kEAA+B;AAE/B,oCAAsD;AACtD,0CAA4C;AAC5C,0CAAsD;AAEtD,mCAKkB;AAclB;;;;;;GAMG;AACH;IAAA;IA2EA,CAAC;IA1EO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB;;;;;;;;wBAEzB,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,KAAK,CAAC,GAAG,0CAAE,OAAO,CAAA,EAAE;4BAChC,MAAM,IAAI,KAAK,CAAC,0BAA0B,CAAC,CAAC;yBAC7C;wBAEK,GAAG,GAAG,KAAK,CAAC,OAAO,CAAC,GAAG,CAAC;;;;wBAEb,qBAAM,GAAG,CAAC,OAAO,CAC9B,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAa,EAC1B,IAAA,cAAI,EAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,EAAE,CAAC,KAAK,EAAE,SAAS,EAAE,UAAU,CAAC,CAAC,EACvD,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,mCAAI,EAAE,CAC3B,EAAA;;wBAJK,MAAM,GAAG,SAId;wBAED,IAAI,CAAC,IAAA,gBAAO,EAAC,MAAM,CAAC,IAAI,CAAC,IAAI,MAAM,CAAC,EAAE,EAAE;4BAChC,YAAY,GAAG,IAAA,8BAAwB,EAAC,MAAM,CAAC,IAAI,CAAC,CAAC;4BAC3D,YAAY;4BACZ,KAAK,CAAC,OAAO,CACX,IAAA,qBAAY,EACV,KAAK,CAAC,IAAI,EACV,MAAM,CAAC,SAAS;gCACd,CAAC;oCACG,GAAC,KAAG,MAAM,CAAC,SAAW,IAAG,YAAY;wCAEzC,CAAC,CAAC,YAAY,CACjB,CACF,CAAC;yBACH;wBAED,IAAI,CAAC,MAAM,CAAC,EAAE,EAAE;4BACd,MAAM,IAAI,oBAAW,CACnB,MAAA,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,QAAQ,0CAAE,MAAM,mCAAI,MAAM,CAAC,GAAG,EAC3C,MAAM,CACP,CAAC;yBACH;6BAAM;4BACC,GAAG,GAAG,MAAA,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,QAAQ,0CAAE,OAAO,mCAAI,MAAM,CAAC,GAAG,CAAC;4BACzD,GAAG;gCACD,GAAG,CAAC,MAAM,CACR,SAAS,EACT,GAAG,EACH,MAAM,CAAC,UAAU,KAAK,SAAS;oCAC7B,CAAC,CAAC;wCACE,WAAW,EAAE,IAAI;wCACjB,OAAO,EAAE,MAAM,CAAC,UAAU;qCAC3B;oCACH,CAAC,CAAC,SAAS,CACd,CAAC;yBACL;wBAED,sBAAO,MAAM,CAAC,IAAI,EAAC;;;wBAEnB,IAAI,GAAC,CAAC,IAAI,KAAK,aAAa,EAAE;4BACtB,MAAM,GAAI,GAAiB,CAAC,QAAQ,CAAC;4BAC3C,GAAG,CAAC,MAAM,CACR,OAAO,EACP,GAAC,CAAC,OAAO,EACT,MAAM,CAAC,UAAU,KAAK,SAAS;gCAC7B,CAAC,CAAC;oCACE,WAAW,EAAE,IAAI;oCACjB,OAAO,EAAE,MAAM,CAAC,UAAU;iCAC3B;gCACH,CAAC,CAAC,SAAS,CACd,CAAC;yBACH;6BAAM;4BACL,GAAG,CAAC,MAAM,CAAC,OAAO,EAAE,GAAC,CAAC,OAAO,CAAC,CAAC;yBAChC;;;;;;KAKJ;IACH,iBAAC;AAAD,CAAC,AA3ED,IA2EC;AA3EY,gCAAU;AA6EvB,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {Api} from '../types';\nimport {normalizeApiResponseData} from '../utils/api';\nimport {ServerError} from '../utils/errors';\nimport {createObject, isEmpty, isVisible} from '../utils/helper';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IAjaxAction extends ListenerAction {\n  api: Api;\n  messages: {\n    success: string;\n    failed: string;\n  };\n  options: object;\n}\n\n/**\n * 发送请求动作\n *\n * @export\n * @class AjaxAction\n * @implements {Action}\n */\nexport class AjaxAction implements RendererAction {\n  async run(\n    action: IAjaxAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    const env = event.context.env;\n    try {\n      const result = await env.fetcher(\n        action.api as string,\n        action.args,\n        action.options ?? {}\n      );\n\n      if (!isEmpty(result.data) || result.ok) {\n        const responseData = normalizeApiResponseData(result.data);\n        // \b\b记录请求返回的数据\n        event.setData(\n          createObject(\n            event.data,\n            action.outputVar\n              ? {\n                  [`${action.outputVar}`]: responseData\n                }\n              : responseData\n          )\n        );\n      }\n\n      if (!result.ok) {\n        throw new ServerError(\n          (action.messages && action.messages.failed) ?? result.msg,\n          result\n        );\n      } else {\n        env.notify(\n          'success',\n          (action.messages && action.messages.success) ?? result.msg,\n          result.msgTimeout !== undefined\n            ? {\n                closeButton: true,\n                timeout: result.msgTimeout\n              }\n            : undefined\n        );\n      }\n\n      return result.data;\n    } catch (e) {\n      if (e.type === 'ServerError') {\n        const result = (e as ServerError).response;\n        env.notify(\n          'error',\n          e.message,\n          result.msgTimeout !== undefined\n            ? {\n                closeButton: true,\n                timeout: result.msgTimeout\n              }\n            : undefined\n        );\n      } else {\n        env.notify('error', e.message);\n      }\n\n      // 不阻塞后面执行\n      // throw e;\n    }\n  }\n}\n\nregisterAction('ajax', new AjaxAction());\n"
+        "import omit from 'lodash/omit';\nimport {Api} from '../types';\nimport {normalizeApiResponseData} from '../utils/api';\nimport {ServerError} from '../utils/errors';\nimport {createObject, isEmpty} from '../utils/helper';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IAjaxAction extends ListenerAction {\n  args: {\n    api: Api;\n    messages: {\n      success: string;\n      failed: string;\n    };\n    options: object;\n    [propName: string]: any;\n  };\n}\n\n/**\n * 发送请求动作\n *\n * @export\n * @class AjaxAction\n * @implements {Action}\n */\nexport class AjaxAction implements RendererAction {\n  async run(\n    action: IAjaxAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (!renderer.props.env?.fetcher) {\n      throw new Error('env.fetcher is required!');\n    }\n\n    const env = event.context.env;\n    try {\n      const result = await env.fetcher(\n        action.args?.api as string,\n        omit(action.args ?? {}, ['api', 'options', 'messages']),\n        action.args?.options ?? {}\n      );\n\n      if (!isEmpty(result.data) || result.ok) {\n        const responseData = normalizeApiResponseData(result.data);\n        // 记录请求返回的数据\n        event.setData(\n          createObject(\n            event.data,\n            action.outputVar\n              ? {\n                  [`${action.outputVar}`]: responseData\n                }\n              : responseData\n          )\n        );\n      }\n\n      if (!result.ok) {\n        throw new ServerError(\n          action.args?.messages?.failed ?? result.msg,\n          result\n        );\n      } else {\n        const msg = action.args?.messages?.success ?? result.msg;\n        msg &&\n          env.notify(\n            'success',\n            msg,\n            result.msgTimeout !== undefined\n              ? {\n                  closeButton: true,\n                  timeout: result.msgTimeout\n                }\n              : undefined\n          );\n      }\n\n      return result.data;\n    } catch (e) {\n      if (e.type === 'ServerError') {\n        const result = (e as ServerError).response;\n        env.notify(\n          'error',\n          e.message,\n          result.msgTimeout !== undefined\n            ? {\n                closeButton: true,\n                timeout: result.msgTimeout\n              }\n            : undefined\n        );\n      } else {\n        env.notify('error', e.message);\n      }\n\n      // 不阻塞后面执行\n      // throw e;\n    }\n  }\n}\n\nregisterAction('ajax', new AjaxAction());\n"
     ]
 }

package/lib/actions/BroadcastAction.js

@@ -21,7 +21,7 @@ var BroadcastAction = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         if (!action.eventName) {
-                            console.warn('eventName 未定义，请定义事件名称');
+                            console.error('eventName 未定义，请定义事件名称');
                             return [2 /*return*/];
                         }
                         // 作为一个新的事件，需要把广播动作的args参数追加到事件数据中

package/lib/actions/BroadcastAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/BroadcastAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,0CAA6C;AAC7C,0DAAqE;AACrE,mCAKkB;AAMlB;;;;;;GAMG;AACH;IAAA;IAuBA,CAAC;IAtBO,6BAAG,GAAT,UACE,MAAwB,EACxB,QAAyB,EACzB,KAAyB;;;;;wBAEzB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;4BACrB,OAAO,CAAC,IAAI,CAAC,uBAAuB,CAAC,CAAC;4BACtC,sBAAO;yBACR;wBAED,kCAAkC;wBAClC,KAAK,CAAC,OAAO,CAAC,IAAA,qBAAY,EAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;wBAG9C,qBAAM,IAAA,8BAAa,EACxB,MAAM,CAAC,SAAS,EAChB,QAAQ,EACR,KAAK,CAAC,OAAO,CAAC,MAAM,EACpB,MAAM,CAAC,IAAI,EACX,KAAK,CACN,EAAA;;oBAPD,YAAY;oBACZ,sBAAO,SAMN,EAAC;;;;KACH;IACH,sBAAC;AAAD,CAAC,AAvBD,IAuBC;AAvBY,0CAAe;AAyB5B,IAAA,uBAAc,EAAC,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AACA,0CAA6C;AAC7C,0DAAqE;AACrE,mCAKkB;AAMlB;;;;;;GAMG;AACH;IAAA;IAuBA,CAAC;IAtBO,6BAAG,GAAT,UACE,MAAwB,EACxB,QAAyB,EACzB,KAAyB;;;;;wBAEzB,IAAI,CAAC,MAAM,CAAC,SAAS,EAAE;4BACrB,OAAO,CAAC,KAAK,CAAC,uBAAuB,CAAC,CAAC;4BACvC,sBAAO;yBACR;wBAED,kCAAkC;wBAClC,KAAK,CAAC,OAAO,CAAC,IAAA,qBAAY,EAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC,CAAC;wBAG9C,qBAAM,IAAA,8BAAa,EACxB,MAAM,CAAC,SAAS,EAChB,QAAQ,EACR,KAAK,CAAC,OAAO,CAAC,MAAM,EACpB,MAAM,CAAC,IAAI,EACX,KAAK,CACN,EAAA;;oBAPD,YAAY;oBACZ,sBAAO,SAMN,EAAC;;;;KACH;IACH,sBAAC;AAAD,CAAC,AAvBD,IAuBC;AAvBY,0CAAe;AAyB5B,IAAA,uBAAc,EAAC,WAAW,EAAE,IAAI,eAAe,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererProps} from '../factory';\nimport {createObject} from '../utils/helper';\nimport {RendererEvent, dispatchEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IBroadcastAction extends ListenerAction {\n  eventName: string; // 事件名称，actionType: broadcast\n}\n\n/**\n * broadcast\n *\n * @export\n * @class BroadcastAction\n * @implements {Action}\n */\nexport class BroadcastAction implements RendererAction {\n  async run(\n    action: IBroadcastAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (!action.eventName) {\n      console.warn('eventName 未定义，请定义事件名称');\n      return;\n    }\n\n    // 作为一个新的事件，需要把广播动作的args参数追加到事件数据中\n    event.setData(createObject(event.data, action.args));\n\n    // 直接触发对应的动作\n    return await dispatchEvent(\n      action.eventName,\n      renderer,\n      event.context.scoped,\n      action.args,\n      event\n    );\n  }\n}\n\nregisterAction('broadcast', new BroadcastAction());\n"
+        "import {RendererProps} from '../factory';\nimport {createObject} from '../utils/helper';\nimport {RendererEvent, dispatchEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IBroadcastAction extends ListenerAction {\n  eventName: string; // 事件名称，actionType: broadcast\n}\n\n/**\n * broadcast\n *\n * @export\n * @class BroadcastAction\n * @implements {Action}\n */\nexport class BroadcastAction implements RendererAction {\n  async run(\n    action: IBroadcastAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (!action.eventName) {\n      console.error('eventName 未定义，请定义事件名称');\n      return;\n    }\n\n    // 作为一个新的事件，需要把广播动作的args参数追加到事件数据中\n    event.setData(createObject(event.data, action.args));\n\n    // 直接触发对应的动作\n    return await dispatchEvent(\n      action.eventName,\n      renderer,\n      event.context.scoped,\n      action.args,\n      event\n    );\n  }\n}\n\nregisterAction('broadcast', new BroadcastAction());\n"
     ]
 }

package/lib/actions/CmptAction.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CmptAction = void 0;
 var tslib_1 = require("tslib");
-var tpl_builtin_1 = require("../utils/tpl-builtin");
 var Action_1 = require("./Action");
 /**
  * 组件动作
@@ -15,10 +14,10 @@ var CmptAction = /** @class */ (function () {
     function CmptAction() {
     }
     CmptAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e;
+        var _a, _b, _c, _d, _e, _f, _g;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var component, value;
-            return (0, tslib_1.__generator)(this, function (_f) {
+            var component;
+            return (0, tslib_1.__generator)(this, function (_h) {
                 component = action.componentId && renderer.props.$schema.id !== action.componentId
                     ? (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a.getComponentById(action.componentId)
                     : renderer;
@@ -31,20 +30,19 @@ var CmptAction = /** @class */ (function () {
                 }
                 // 数据更新
                 if (action.actionType === 'setValue') {
-                    value = (0, tpl_builtin_1.dataMapping)(action.value, event.data);
                     if (component.setData) {
-                        return [2 /*return*/, component.setData(value)];
+                        return [2 /*return*/, component.setData((_b = action.args) === null || _b === void 0 ? void 0 : _b.value)];
                     }
                     else {
-                        return [2 /*return*/, (_c = (_b = component.props).onChange) === null || _c === void 0 ? void 0 : _c.call(_b, value)];
+                        return [2 /*return*/, (_d = (_c = component.props).onChange) === null || _d === void 0 ? void 0 : _d.call(_c, (_e = action.args) === null || _e === void 0 ? void 0 : _e.value)];
                     }
                 }
                 // 刷新
                 if (action.actionType === 'reload') {
-                    return [2 /*return*/, (_d = component.reload) === null || _d === void 0 ? void 0 : _d.call(component, undefined, action.args)];
+                    return [2 /*return*/, (_f = component.reload) === null || _f === void 0 ? void 0 : _f.call(component, undefined, action.args)];
                 }
                 // 执行组件动作
-                return [2 /*return*/, (_e = component === null || component === void 0 ? void 0 : component.doAction) === null || _e === void 0 ? void 0 : _e.call(component, action, action.args)];
+                return [2 /*return*/, (_g = component === null || component === void 0 ? void 0 : component.doAction) === null || _g === void 0 ? void 0 : _g.call(component, action, action.args)];
             });
         });
     };

package/lib/actions/CmptAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/CmptAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,oDAAiD;AACjD,mCAMkB;AAMlB;;;;;;GAMG;AACH;IAAA;IA8CA,CAAC;IA7CO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB;;;;;gBAMnB,SAAS,GACb,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,MAAM,CAAC,WAAW;oBACpE,CAAC,CAAC,MAAA,KAAK,CAAC,OAAO,CAAC,MAAM,0CAAE,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC;oBAC5D,CAAC,CAAC,QAAQ,CAAC;gBAEf,UAAU;gBACV,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;oBAClD,sBAAO,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CACxC,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,UAAU,KAAK,MAAM,CAC7B,EAAC;iBACH;qBAAM,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;oBAC9D,sBAAO,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CACxC,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,UAAU,KAAK,UAAU,CACjC,EAAC;iBACH;gBAED,OAAO;gBACP,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,EAAE;oBAC9B,KAAK,GAAG,IAAA,yBAAW,EAAC,MAAM,CAAC,KAAK,EAAE,KAAK,CAAC,IAAI,CAAC,CAAC;oBACpD,IAAI,SAAS,CAAC,OAAO,EAAE;wBACrB,sBAAO,SAAS,CAAC,OAAO,CAAC,KAAK,CAAC,EAAC;qBACjC;yBAAM;wBACL,sBAAO,MAAA,MAAA,SAAS,CAAC,KAAK,EAAC,QAAQ,mDAAG,KAAK,CAAC,EAAC;qBAC1C;iBACF;gBAED,KAAK;gBACL,IAAI,MAAM,CAAC,UAAU,KAAK,QAAQ,EAAE;oBAClC,sBAAO,MAAA,SAAS,CAAC,MAAM,+CAAhB,SAAS,EAAU,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAC;iBACnD;gBAED,SAAS;gBACT,sBAAO,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,+CAAnB,SAAS,EAAa,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,EAAC;;;KACnD;IACH,iBAAC;AAAD,CAAC,AA9CD,IA8CC;AA9CY,gCAAU;AAgDvB,IAAA,uBAAc,EAAC,WAAW,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AAEA,mCAMkB;AAMlB;;;;;;GAMG;AACH;IAAA;IA6CA,CAAC;IA5CO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB;;;;;gBAMnB,SAAS,GACb,MAAM,CAAC,WAAW,IAAI,QAAQ,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,KAAK,MAAM,CAAC,WAAW;oBACpE,CAAC,CAAC,MAAA,KAAK,CAAC,OAAO,CAAC,MAAM,0CAAE,gBAAgB,CAAC,MAAM,CAAC,WAAW,CAAC;oBAC5D,CAAC,CAAC,QAAQ,CAAC;gBAEf,UAAU;gBACV,IAAI,CAAC,MAAM,EAAE,QAAQ,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;oBAClD,sBAAO,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CACxC,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,UAAU,KAAK,MAAM,CAC7B,EAAC;iBACH;qBAAM,IAAI,CAAC,SAAS,EAAE,UAAU,CAAC,CAAC,QAAQ,CAAC,MAAM,CAAC,UAAU,CAAC,EAAE;oBAC9D,sBAAO,QAAQ,CAAC,KAAK,CAAC,SAAS,CAAC,UAAU,CACxC,MAAM,CAAC,WAAW,EAClB,MAAM,CAAC,UAAU,KAAK,UAAU,CACjC,EAAC;iBACH;gBAED,OAAO;gBACP,IAAI,MAAM,CAAC,UAAU,KAAK,UAAU,EAAE;oBACpC,IAAI,SAAS,CAAC,OAAO,EAAE;wBACrB,sBAAO,SAAS,CAAC,OAAO,CAAC,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,CAAC,EAAC;qBAC9C;yBAAM;wBACL,sBAAO,MAAA,MAAA,SAAS,CAAC,KAAK,EAAC,QAAQ,mDAAG,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,CAAC,EAAC;qBACvD;iBACF;gBAED,KAAK;gBACL,IAAI,MAAM,CAAC,UAAU,KAAK,QAAQ,EAAE;oBAClC,sBAAO,MAAA,SAAS,CAAC,MAAM,+CAAhB,SAAS,EAAU,SAAS,EAAE,MAAM,CAAC,IAAI,CAAC,EAAC;iBACnD;gBAED,SAAS;gBACT,sBAAO,MAAA,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,+CAAnB,SAAS,EAAa,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,EAAC;;;KACnD;IACH,iBAAC;AAAD,CAAC,AA7CD,IA6CC;AA7CY,gCAAU;AA+CvB,IAAA,uBAAc,EAAC,WAAW,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {dataMapping} from '../utils/tpl-builtin';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  LoopStatus,\n  registerAction\n} from './Action';\n\nexport interface ICmptAction extends ListenerAction {\n  value?: string | {[key: string]: string};\n}\n\n/**\n * 组件动作\n *\n * @export\n * @class CmptAction\n * @implements {Action}\n */\nexport class CmptAction implements RendererAction {\n  async run(\n    action: ICmptAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    /**\n     * 根据唯一ID查找指定组件\n     * 触发组件未指定id或未指定响应组件componentId，则使用触发组件响应\n     */\n    const component =\n      action.componentId && renderer.props.$schema.id !== action.componentId\n        ? event.context.scoped?.getComponentById(action.componentId)\n        : renderer;\n\n    // 显隐&状态控制\n    if (['show', 'hidden'].includes(action.actionType)) {\n      return renderer.props.rootStore.setVisible(\n        action.componentId,\n        action.actionType === 'show'\n      );\n    } else if (['enabled', 'disabled'].includes(action.actionType)) {\n      return renderer.props.rootStore.setDisable(\n        action.componentId,\n        action.actionType === 'disabled'\n      );\n    }\n\n    // 数据更新\n    if (action.actionType === 'setValue') {\n      const value = dataMapping(action.value, event.data);\n      if (component.setData) {\n        return component.setData(value);\n      } else {\n        return component.props.onChange?.(value);\n      }\n    }\n\n    // 刷新\n    if (action.actionType === 'reload') {\n      return component.reload?.(undefined, action.args);\n    }\n\n    // 执行组件动作\n    return component?.doAction?.(action, action.args);\n  }\n}\n\nregisterAction('component', new CmptAction());\n"
+        "import {RendererEvent} from '../utils/renderer-event';\nimport {dataMapping} from '../utils/tpl-builtin';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  LoopStatus,\n  registerAction\n} from './Action';\n\nexport interface ICmptAction extends ListenerAction {\n  value?: string | {[key: string]: string};\n}\n\n/**\n * 组件动作\n *\n * @export\n * @class CmptAction\n * @implements {Action}\n */\nexport class CmptAction implements RendererAction {\n  async run(\n    action: ICmptAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    /**\n     * 根据唯一ID查找指定组件\n     * 触发组件未指定id或未指定响应组件componentId，则使用触发组件响应\n     */\n    const component =\n      action.componentId && renderer.props.$schema.id !== action.componentId\n        ? event.context.scoped?.getComponentById(action.componentId)\n        : renderer;\n\n    // 显隐&状态控制\n    if (['show', 'hidden'].includes(action.actionType)) {\n      return renderer.props.rootStore.setVisible(\n        action.componentId,\n        action.actionType === 'show'\n      );\n    } else if (['enabled', 'disabled'].includes(action.actionType)) {\n      return renderer.props.rootStore.setDisable(\n        action.componentId,\n        action.actionType === 'disabled'\n      );\n    }\n\n    // 数据更新\n    if (action.actionType === 'setValue') {\n      if (component.setData) {\n        return component.setData(action.args?.value);\n      } else {\n        return component.props.onChange?.(action.args?.value);\n      }\n    }\n\n    // 刷新\n    if (action.actionType === 'reload') {\n      return component.reload?.(undefined, action.args);\n    }\n\n    // 执行组件动作\n    return component?.doAction?.(action, action.args);\n  }\n}\n\nregisterAction('component', new CmptAction());\n"
     ]
 }

package/lib/actions/CopyAction.d.ts

@@ -1,8 +1,11 @@
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface ICopyAction extends ListenerAction {
-    content: string;
-    copyFormat?: string;
+    args: {
+        content: string;
+        copyFormat?: string;
+        [propName: string]: any;
+    };
 }
 /**
  * 复制动作

package/lib/actions/CopyAction.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.CopyAction = void 0;
 var tslib_1 = require("tslib");
-var tpl_1 = require("../utils/tpl");
 var Action_1 = require("./Action");
 /**
  * 复制动作
@@ -15,12 +14,15 @@ var CopyAction = /** @class */ (function () {
     function CopyAction() {
     }
     CopyAction.prototype.run = function (action, renderer, event) {
-        var _a, _b;
+        var _a, _b, _c, _d, _e, _f;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_c) {
-                if (action.content) {
-                    (_b = (_a = renderer.props.env).copy) === null || _b === void 0 ? void 0 : _b.call(_a, (0, tpl_1.filter)(action.content, action.args, '| raw'), {
-                        format: action.copyFormat
+            return (0, tslib_1.__generator)(this, function (_g) {
+                if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.copy)) {
+                    throw new Error('env.copy is required!');
+                }
+                if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.content) {
+                    (_d = (_c = renderer.props.env).copy) === null || _d === void 0 ? void 0 : _d.call(_c, action.args.content, {
+                        format: (_f = (_e = action.args) === null || _e === void 0 ? void 0 : _e.copyFormat) !== null && _f !== void 0 ? _f : 'text/html'
                     });
                 }
                 return [2 /*return*/];

package/lib/actions/CopyAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/CopyAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,oCAAoC;AACpC,mCAMkB;AAOlB;;;;;;GAMG;AACH;IAAA;IAYA,CAAC;IAXO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB;;;;gBAEzB,IAAI,MAAM,CAAC,OAAO,EAAE;oBAClB,MAAA,MAAA,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,mDAAG,IAAA,YAAM,EAAC,MAAM,CAAC,OAAO,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,EAAE;wBACtE,MAAM,EAAE,MAAM,CAAC,UAAU;qBAC1B,CAAC,CAAC;iBACJ;;;;KACF;IACH,iBAAC;AAAD,CAAC,AAZD,IAYC;AAZY,gCAAU;AAcvB,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AAEA,mCAKkB;AAUlB;;;;;;GAMG;AACH;IAAA;IAgBA,CAAC;IAfO,wBAAG,GAAT,UACE,MAAmB,EACnB,QAAyB,EACzB,KAAyB;;;;gBAEzB,IAAI,CAAC,CAAA,MAAA,QAAQ,CAAC,KAAK,CAAC,GAAG,0CAAE,IAAI,CAAA,EAAE;oBAC7B,MAAM,IAAI,KAAK,CAAC,uBAAuB,CAAC,CAAC;iBAC1C;gBAED,IAAI,MAAA,MAAM,CAAC,IAAI,0CAAE,OAAO,EAAE;oBACxB,MAAA,MAAA,QAAQ,CAAC,KAAK,CAAC,GAAG,EAAC,IAAI,mDAAG,MAAM,CAAC,IAAI,CAAC,OAAO,EAAE;wBAC7C,MAAM,EAAE,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,UAAU,mCAAI,WAAW;qBAC/C,CAAC,CAAC;iBACJ;;;;KACF;IACH,iBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,gCAAU;AAkBvB,IAAA,uBAAc,EAAC,MAAM,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  LoopStatus,\n  registerAction\n} from './Action';\n\nexport interface ICopyAction extends ListenerAction {\n  content: string;\n  copyFormat?: string;\n}\n\n/**\n * 复制动作\n *\n * @export\n * @class CopyAction\n * @implements {Action}\n */\nexport class CopyAction implements RendererAction {\n  async run(\n    action: ICopyAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (action.content) {\n      renderer.props.env.copy?.(filter(action.content, action.args, '| raw'), {\n        format: action.copyFormat\n      });\n    }\n  }\n}\n\nregisterAction('copy', new CopyAction());\n"
+        "import {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface ICopyAction extends ListenerAction {\n  args: {\n    content: string;\n    copyFormat?: string;\n    [propName: string]: any;\n  };\n}\n\n/**\n * 复制动作\n *\n * @export\n * @class CopyAction\n * @implements {Action}\n */\nexport class CopyAction implements RendererAction {\n  async run(\n    action: ICopyAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (!renderer.props.env?.copy) {\n      throw new Error('env.copy is required!');\n    }\n\n    if (action.args?.content) {\n      renderer.props.env.copy?.(action.args.content, {\n        format: action.args?.copyFormat ?? 'text/html'\n      });\n    }\n  }\n}\n\nregisterAction('copy', new CopyAction());\n"
     ]
 }

package/lib/actions/DialogAction.d.ts

@@ -2,11 +2,17 @@ import { SchemaNode } from '../types';
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IAlertAction extends ListenerAction {
-    msg: string;
+    args: {
+        msg: string;
+        [propName: string]: any;
+    };
 }
 export interface IConfirmAction extends ListenerAction {
-    title: string;
-    msg: string;
+    args: {
+        title: string;
+        msg: string;
+        [propName: string]: any;
+    };
 }
 export interface IDialogAction extends ListenerAction {
     dialog: SchemaNode;

package/lib/actions/DialogAction.js

@@ -61,10 +61,10 @@ var AlertAction = /** @class */ (function () {
     function AlertAction() {
     }
     AlertAction.prototype.run = function (action, renderer, event) {
-        var _a, _b;
+        var _a, _b, _c;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_c) {
-                (_b = (_a = event.context.env).alert) === null || _b === void 0 ? void 0 : _b.call(_a, action.msg);
+            return (0, tslib_1.__generator)(this, function (_d) {
+                (_b = (_a = event.context.env).alert) === null || _b === void 0 ? void 0 : _b.call(_a, (_c = action.args) === null || _c === void 0 ? void 0 : _c.msg);
                 return [2 /*return*/];
             });
         });
@@ -79,10 +79,10 @@ var ConfirmAction = /** @class */ (function () {
     function ConfirmAction() {
     }
     ConfirmAction.prototype.run = function (action, renderer, event) {
-        var _a, _b;
+        var _a, _b, _c, _d;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            return (0, tslib_1.__generator)(this, function (_c) {
-                (_b = (_a = event.context.env).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, action.msg, action.title);
+            return (0, tslib_1.__generator)(this, function (_e) {
+                (_b = (_a = event.context.env).confirm) === null || _b === void 0 ? void 0 : _b.call(_a, (_c = action.args) === null || _c === void 0 ? void 0 : _c.msg, (_d = action.args) === null || _d === void 0 ? void 0 : _d.title);
                 return [2 /*return*/];
             });
         });

package/lib/actions/DialogAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/DialogAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AAEA,mCAKkB;AAelB;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,0BAAG,GAAT,UACE,MAAqB,EACrB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,QAAQ,CAAC,KAAK,EAAC,QAAQ,mDAAG,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;;;;KACvD;IACH,mBAAC;AAAD,CAAC,AARD,IAQC;AARY,oCAAY;AAUzB;;;;;;GAMG;AACH;IAAA;IAqBA,CAAC;IApBO,+BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;;gBAEzB,IAAI,MAAM,CAAC,WAAW,EAAE;oBACtB,SAAS;oBACT,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;iBACpD;qBAAM;oBACL,SAAS;oBACT,MAAA,MAAA,QAAQ,CAAC,KAAK,EAAC,QAAQ,mDACrB,KAAK,kDAEA,MAAM,KACT,UAAU,EAAE,OAAO,KAErB,MAAM,CAAC,IAAI,CACZ,CAAC;iBACH;;;;KACF;IACH,wBAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,8CAAiB;AAuB9B;;GAEG;AACH;IAAA;IAQA,CAAC;IAPO,yBAAG,GAAT,UACE,MAAoB,EACpB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,KAAK,mDAAG,MAAM,CAAC,GAAG,CAAC,CAAC;;;;KACvC;IACH,kBAAC;AAAD,CAAC,AARD,IAQC;AARY,kCAAW;AAUxB;;GAEG;AACH;IAAA;IAQA,CAAC;IAPO,2BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,OAAO,mDAAG,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC;;;;KACvD;IACH,oBAAC;AAAD,CAAC,AARD,IAQC;AARY,sCAAa;AAU1B,IAAA,uBAAc,EAAC,QAAQ,EAAE,IAAI,YAAY,EAAE,CAAC,CAAC;AAC7C,IAAA,uBAAc,EAAC,aAAa,EAAE,IAAI,iBAAiB,EAAE,CAAC,CAAC;AACvD,IAAA,uBAAc,EAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC;AAC3C,IAAA,uBAAc,EAAC,eAAe,EAAE,IAAI,aAAa,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AAEA,mCAKkB;AAqBlB;;;;;;GAMG;AACH;IAAA;IAQA,CAAC;IAPO,0BAAG,GAAT,UACE,MAAqB,EACrB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,QAAQ,CAAC,KAAK,EAAC,QAAQ,mDAAG,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;;;;KACvD;IACH,mBAAC;AAAD,CAAC,AARD,IAQC;AARY,oCAAY;AAUzB;;;;;;GAMG;AACH;IAAA;IAqBA,CAAC;IApBO,+BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;;gBAEzB,IAAI,MAAM,CAAC,WAAW,EAAE;oBACtB,SAAS;oBACT,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;iBACpD;qBAAM;oBACL,SAAS;oBACT,MAAA,MAAA,QAAQ,CAAC,KAAK,EAAC,QAAQ,mDACrB,KAAK,kDAEA,MAAM,KACT,UAAU,EAAE,OAAO,KAErB,MAAM,CAAC,IAAI,CACZ,CAAC;iBACH;;;;KACF;IACH,wBAAC;AAAD,CAAC,AArBD,IAqBC;AArBY,8CAAiB;AAuB9B;;GAEG;AACH;IAAA;IAQA,CAAC;IAPO,yBAAG,GAAT,UACE,MAAoB,EACpB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,KAAK,mDAAG,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,CAAC,CAAC;;;;KAC7C;IACH,kBAAC;AAAD,CAAC,AARD,IAQC;AARY,kCAAW;AAUxB;;GAEG;AACH;IAAA;IAQA,CAAC;IAPO,2BAAG,GAAT,UACE,MAAsB,EACtB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,OAAO,mDAAG,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,EAAE,MAAA,MAAM,CAAC,IAAI,0CAAE,KAAK,CAAC,CAAC;;;;KACnE;IACH,oBAAC;AAAD,CAAC,AARD,IAQC;AARY,sCAAa;AAU1B,IAAA,uBAAc,EAAC,QAAQ,EAAE,IAAI,YAAY,EAAE,CAAC,CAAC;AAC7C,IAAA,uBAAc,EAAC,aAAa,EAAE,IAAI,iBAAiB,EAAE,CAAC,CAAC;AACvD,IAAA,uBAAc,EAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC;AAC3C,IAAA,uBAAc,EAAC,eAAe,EAAE,IAAI,aAAa,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {SchemaNode} from '../types';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IAlertAction extends ListenerAction {\n  msg: string;\n}\n\nexport interface IConfirmAction extends ListenerAction {\n  title: string;\n  msg: string;\n}\n\nexport interface IDialogAction extends ListenerAction {\n  dialog: SchemaNode;\n}\n\n/**\n * 打开弹窗动作\n *\n * @export\n * @class DialogAction\n * @implements {Action}\n */\nexport class DialogAction implements RendererAction {\n  async run(\n    action: IDialogAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    renderer.props.onAction?.(event, action, action.args);\n  }\n}\n\n/**\n * 关闭弹窗动作\n *\n * @export\n * @class CloseDialogAction\n * @implements {Action}\n */\nexport class CloseDialogAction implements RendererAction {\n  async run(\n    action: ListenerAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (action.componentId) {\n      // 关闭指定弹窗\n      event.context.scoped.closeById(action.componentId);\n    } else {\n      // 关闭当前弹窗\n      renderer.props.onAction?.(\n        event,\n        {\n          ...action,\n          actionType: 'close'\n        },\n        action.args\n      );\n    }\n  }\n}\n\n/**\n * alert提示动作\n */\nexport class AlertAction implements RendererAction {\n  async run(\n    action: IAlertAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    event.context.env.alert?.(action.msg);\n  }\n}\n\n/**\n * confirm确认提示动作\n */\nexport class ConfirmAction implements RendererAction {\n  async run(\n    action: IConfirmAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    event.context.env.confirm?.(action.msg, action.title);\n  }\n}\n\nregisterAction('dialog', new DialogAction());\nregisterAction('closeDialog', new CloseDialogAction());\nregisterAction('alert', new AlertAction());\nregisterAction('confirmDialog', new ConfirmAction());\n"
+        "import {SchemaNode} from '../types';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IAlertAction extends ListenerAction {\n  args: {\n    msg: string;\n    [propName: string]: any;\n  };\n}\n\nexport interface IConfirmAction extends ListenerAction {\n  args: {\n    title: string;\n    msg: string;\n    [propName: string]: any;\n  };\n}\n\nexport interface IDialogAction extends ListenerAction {\n  dialog: SchemaNode;\n}\n\n/**\n * 打开弹窗动作\n *\n * @export\n * @class DialogAction\n * @implements {Action}\n */\nexport class DialogAction implements RendererAction {\n  async run(\n    action: IDialogAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    renderer.props.onAction?.(event, action, action.args);\n  }\n}\n\n/**\n * 关闭弹窗动作\n *\n * @export\n * @class CloseDialogAction\n * @implements {Action}\n */\nexport class CloseDialogAction implements RendererAction {\n  async run(\n    action: ListenerAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (action.componentId) {\n      // 关闭指定弹窗\n      event.context.scoped.closeById(action.componentId);\n    } else {\n      // 关闭当前弹窗\n      renderer.props.onAction?.(\n        event,\n        {\n          ...action,\n          actionType: 'close'\n        },\n        action.args\n      );\n    }\n  }\n}\n\n/**\n * alert提示动作\n */\nexport class AlertAction implements RendererAction {\n  async run(\n    action: IAlertAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    event.context.env.alert?.(action.args?.msg);\n  }\n}\n\n/**\n * confirm确认提示动作\n */\nexport class ConfirmAction implements RendererAction {\n  async run(\n    action: IConfirmAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    event.context.env.confirm?.(action.args?.msg, action.args?.title);\n  }\n}\n\nregisterAction('dialog', new DialogAction());\nregisterAction('closeDialog', new CloseDialogAction());\nregisterAction('alert', new AlertAction());\nregisterAction('confirmDialog', new ConfirmAction());\n"
     ]
 }

package/lib/actions/EmailAction.d.ts

@@ -1,11 +1,14 @@
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IEmailAction extends ListenerAction {
-    to: string;
-    cc: string;
-    bcc: string;
-    subject: string;
-    body: string;
+    args: {
+        to: string;
+        cc: string;
+        bcc: string;
+        subject: string;
+        body: string;
+        [propName: string]: any;
+    };
 }
 /**
  * 邮件动作

package/lib/actions/EmailAction.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.EmailAction = void 0;
 var tslib_1 = require("tslib");
-var tpl_1 = require("../utils/tpl");
 var pick_1 = (0, tslib_1.__importDefault)(require("lodash/pick"));
-var mapValues_1 = (0, tslib_1.__importDefault)(require("lodash/mapValues"));
 var qs_1 = (0, tslib_1.__importDefault)(require("qs"));
 var Action_1 = require("./Action");
 /**
@@ -18,11 +16,12 @@ var EmailAction = /** @class */ (function () {
     function EmailAction() {
     }
     EmailAction.prototype.run = function (action, renderer, event) {
+        var _a, _b;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var mailTo, mailInfo, mailStr, mailto;
-            return (0, tslib_1.__generator)(this, function (_a) {
-                mailTo = (0, tpl_1.filter)(action.to, action.args);
-                mailInfo = (0, mapValues_1.default)((0, pick_1.default)(action, 'cc', 'bcc', 'subject', 'body'), function (val) { return (0, tpl_1.filter)(val, action.args); });
+            return (0, tslib_1.__generator)(this, function (_c) {
+                mailTo = (_a = action.args) === null || _a === void 0 ? void 0 : _a.to;
+                mailInfo = (0, pick_1.default)((_b = action.args) !== null && _b !== void 0 ? _b : {}, 'cc', 'bcc', 'subject', 'body');
                 mailStr = qs_1.default.stringify(mailInfo);
                 mailto = "mailto:" + mailTo + "?" + mailStr;
                 window.open(mailto);

package/lib/actions/EmailAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/EmailAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,oCAAoC;AACpC,kEAA+B;AAC/B,4EAAyC;AACzC,uDAAoB;AACpB,mCAKkB;AAUlB;;;;;;GAMG;AACH;IAAA;IAgBA,CAAC;IAfO,yBAAG,GAAT,UACE,MAAoB,EACpB,QAAyB,EACzB,KAAyB;;;;gBAEnB,MAAM,GAAG,IAAA,YAAM,EAAC,MAAM,CAAC,EAAE,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;gBACxC,QAAQ,GAAG,IAAA,mBAAS,EACxB,IAAA,cAAI,EAAC,MAAM,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,EAC5C,UAAA,GAAG,IAAI,OAAA,IAAA,YAAM,EAAC,GAAG,EAAE,MAAM,CAAC,IAAI,CAAC,EAAxB,CAAwB,CAChC,CAAC;gBACI,OAAO,GAAG,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACjC,MAAM,GAAG,YAAU,MAAM,SAAI,OAAS,CAAC;gBAE7C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;;KACrB;IACH,kBAAC;AAAD,CAAC,AAhBD,IAgBC;AAhBY,kCAAW;AAkBxB,IAAA,uBAAc,EAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AAEA,kEAA+B;AAE/B,uDAAoB;AACpB,mCAKkB;AAalB;;;;;;GAMG;AACH;IAAA;IAaA,CAAC;IAZO,yBAAG,GAAT,UACE,MAAoB,EACpB,QAAyB,EACzB,KAAyB;;;;;gBAEnB,MAAM,GAAG,MAAA,MAAM,CAAC,IAAI,0CAAE,EAAE,CAAC;gBACzB,QAAQ,GAAG,IAAA,cAAI,EAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,EAAE,IAAI,EAAE,KAAK,EAAE,SAAS,EAAE,MAAM,CAAC,CAAC;gBACnE,OAAO,GAAG,YAAE,CAAC,SAAS,CAAC,QAAQ,CAAC,CAAC;gBACjC,MAAM,GAAG,YAAU,MAAM,SAAI,OAAS,CAAC;gBAE7C,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC;;;;KACrB;IACH,kBAAC;AAAD,CAAC,AAbD,IAaC;AAbY,kCAAW;AAexB,IAAA,uBAAc,EAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport pick from 'lodash/pick';\nimport mapValues from 'lodash/mapValues';\nimport qs from 'qs';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IEmailAction extends ListenerAction {\n  to: string;\n  cc: string;\n  bcc: string;\n  subject: string;\n  body: string;\n}\n\n/**\n * 邮件动作\n *\n * @export\n * @class EmailAction\n * @implements {Action}\n */\nexport class EmailAction implements RendererAction {\n  async run(\n    action: IEmailAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    const mailTo = filter(action.to, action.args);\n    const mailInfo = mapValues(\n      pick(action, 'cc', 'bcc', 'subject', 'body'),\n      val => filter(val, action.args)\n    );\n    const mailStr = qs.stringify(mailInfo);\n    const mailto = `mailto:${mailTo}?${mailStr}`;\n\n    window.open(mailto);\n  }\n}\n\nregisterAction('email', new EmailAction());\n"
+        "import {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport pick from 'lodash/pick';\nimport mapValues from 'lodash/mapValues';\nimport qs from 'qs';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface IEmailAction extends ListenerAction {\n  args: {\n    to: string;\n    cc: string;\n    bcc: string;\n    subject: string;\n    body: string;\n    [propName: string]: any;\n  };\n}\n\n/**\n * 邮件动作\n *\n * @export\n * @class EmailAction\n * @implements {Action}\n */\nexport class EmailAction implements RendererAction {\n  async run(\n    action: IEmailAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    const mailTo = action.args?.to;\n    const mailInfo = pick(action.args ?? {}, 'cc', 'bcc', 'subject', 'body');\n    const mailStr = qs.stringify(mailInfo);\n    const mailto = `mailto:${mailTo}?${mailStr}`;\n\n    window.open(mailto);\n  }\n}\n\nregisterAction('email', new EmailAction());\n"
     ]
 }

package/lib/actions/LinkAction.d.ts

@@ -1,19 +1,25 @@
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface ILinkAction extends ListenerAction {
-    link: string;
-    url?: never;
-    blank?: boolean;
-    params?: {
-        [key: string]: string;
+    args: {
+        link: string;
+        url?: never;
+        blank?: boolean;
+        params?: {
+            [key: string]: string;
+        };
+        [propName: string]: any;
     };
 }
 export interface IUrlAction extends ListenerAction {
-    url: string;
-    link?: never;
-    blank?: boolean;
-    params?: {
-        [key: string]: string;
+    args: {
+        url: string;
+        link?: never;
+        blank?: boolean;
+        params?: {
+            [key: string]: string;
+        };
+        [propName: string]: any;
     };
 }
 /**
@@ -24,5 +30,5 @@ export interface IUrlAction extends ListenerAction {
  * @implements {Action}
  */
 export declare class LinkAction implements RendererAction {
-    run(action: ILinkAction | IUrlAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
+    run(action: ListenerAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }

package/lib/actions/LinkAction.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkAction = void 0;
 var tslib_1 = require("tslib");
 var api_1 = require("../utils/api");
+var omit_1 = (0, tslib_1.__importDefault)(require("lodash/omit"));
 var Action_1 = require("./Action");
 /**
  * 打开页面动作
@@ -15,20 +16,20 @@ var LinkAction = /** @class */ (function () {
     function LinkAction() {
     }
     LinkAction.prototype.run = function (action, renderer, event) {
-        var _a;
+        var _a, _b, _c, _d, _e, _f;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
             var urlObj;
-            return (0, tslib_1.__generator)(this, function (_b) {
+            return (0, tslib_1.__generator)(this, function (_g) {
                 if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.jumpTo)) {
                     throw new Error('env.jumpTo is required!');
                 }
                 urlObj = (0, api_1.buildApi)({
-                    url: (action.url || action.link),
+                    url: (((_b = action.args) === null || _b === void 0 ? void 0 : _b.url) || ((_c = action.args) === null || _c === void 0 ? void 0 : _c.link)),
                     method: 'get'
-                }, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, action.params), action.args), {
+                }, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, ((_e = (_d = action.args) === null || _d === void 0 ? void 0 : _d.params) !== null && _e !== void 0 ? _e : {})), (0, omit_1.default)((_f = action.args) !== null && _f !== void 0 ? _f : {}, ['params', 'blank', 'url', 'link'])), {
                     autoAppend: true
                 });
-                renderer.props.env.jumpTo(urlObj.url, action, action.args);
+                renderer.props.env.jumpTo(urlObj.url, (0, tslib_1.__assign)({ actionType: action.actionType }, action.args), action.args);
                 return [2 /*return*/];
             });
         });

package/lib/actions/LinkAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/LinkAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,oCAAsC;AAItC,mCAKkB;AAoBlB;;;;;;GAMG;AACH;IAAA;IAwBA,CAAC;IAvBO,wBAAG,GAAT,UACE,MAAgC,EAChC,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;gBAGG,MAAM,GAAG,IAAA,cAAQ,EACnB;oBACE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAW;oBAC1C,MAAM,EAAE,KAAK;iBACd,kDACG,MAAM,CAAC,MAAM,GAAK,MAAM,CAAC,IAAI,GACjC;oBACE,UAAU,EAAE,IAAI;iBACjB,CACF,CAAC;gBAEF,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CAAC,MAAM,CAAC,GAAG,EAAE,MAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;;;;KACtE;IACH,iBAAC;AAAD,CAAC,AAxBD,IAwBC;AAxBY,gCAAU;AA0BvB,IAAA,uBAAc,EAAC,UAAU,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AACA,oCAAsC;AAItC,kEAA+B;AAC/B,mCAKkB;AA0BlB;;;;;;GAMG;AACH;IAAA;IAkCA,CAAC;IAjCO,wBAAG,GAAT,UACE,MAAsB,EACtB,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;gBAGG,MAAM,GAAG,IAAA,cAAQ,EACnB;oBACE,GAAG,EAAE,CAAC,CAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,GAAG,MAAI,MAAA,MAAM,CAAC,IAAI,0CAAE,IAAI,CAAA,CAAW;oBACtD,MAAM,EAAE,KAAK;iBACd,kDAEI,CAAC,MAAA,MAAA,MAAM,CAAC,IAAI,0CAAE,MAAM,mCAAI,EAAE,CAAC,GAC3B,IAAA,cAAI,EAAC,MAAA,MAAM,CAAC,IAAI,mCAAI,EAAE,EAAE,CAAC,QAAQ,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,CAAC,CAAC,GAEhE;oBACE,UAAU,EAAE,IAAI;iBACjB,CACF,CAAC;gBAEF,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CACvB,MAAM,CAAC,GAAG,0BAER,UAAU,EAAE,MAAM,CAAC,UAAU,IAC1B,MAAM,CAAC,IAAI,GAEhB,MAAM,CAAC,IAAI,CACZ,CAAC;;;;KACH;IACH,iBAAC;AAAD,CAAC,AAlCD,IAkCC;AAlCY,gCAAU;AAoCvB,IAAA,uBAAc,EAAC,UAAU,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {Action} from '../types';\nimport {buildApi} from '../utils/api';\nimport {isEmpty, isObject, qsstringify} from '../utils/helper';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface ILinkAction extends ListenerAction {\n  link: string;\n  url?: never;\n  blank?: boolean;\n  params?: {\n    [key: string]: string;\n  };\n}\n\nexport interface IUrlAction extends ListenerAction {\n  url: string;\n  link?: never;\n  blank?: boolean;\n  params?: {\n    [key: string]: string;\n  };\n}\n\n/**\n * 打开页面动作\n *\n * @export\n * @class LinkAction\n * @implements {Action}\n */\nexport class LinkAction implements RendererAction {\n  async run(\n    action: ILinkAction | IUrlAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (!renderer.props.env?.jumpTo) {\n      throw new Error('env.jumpTo is required!');\n    }\n\n    // 通过buildApi兼容较复杂的url情况\n    let urlObj = buildApi(\n      {\n        url: (action.url || action.link) as string,\n        method: 'get'\n      },\n      {...action.params, ...action.args},\n      {\n        autoAppend: true\n      }\n    );\n\n    renderer.props.env.jumpTo(urlObj.url, action as Action, action.args);\n  }\n}\n\nregisterAction('openlink', new LinkAction());\n"
+        "import {Action} from '../types';\nimport {buildApi} from '../utils/api';\nimport {isEmpty, isObject, qsstringify} from '../utils/helper';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport omit from 'lodash/omit';\nimport {\n  RendererAction,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface ILinkAction extends ListenerAction {\n  args: {\n    link: string;\n    url?: never;\n    blank?: boolean;\n    params?: {\n      [key: string]: string;\n    };\n    [propName: string]: any;\n  };\n}\n\nexport interface IUrlAction extends ListenerAction {\n  args: {\n    url: string;\n    link?: never;\n    blank?: boolean;\n    params?: {\n      [key: string]: string;\n    };\n    [propName: string]: any;\n  };\n}\n\n/**\n * 打开页面动作\n *\n * @export\n * @class LinkAction\n * @implements {Action}\n */\nexport class LinkAction implements RendererAction {\n  async run(\n    action: ListenerAction,\n    renderer: ListenerContext,\n    event: RendererEvent<any>\n  ) {\n    if (!renderer.props.env?.jumpTo) {\n      throw new Error('env.jumpTo is required!');\n    }\n\n    // 通过buildApi兼容较复杂的url情况\n    let urlObj = buildApi(\n      {\n        url: (action.args?.url || action.args?.link) as string,\n        method: 'get'\n      },\n      {\n        ...(action.args?.params ?? {}),\n        ...omit(action.args ?? {}, ['params', 'blank', 'url', 'link'])\n      },\n      {\n        autoAppend: true\n      }\n    );\n\n    renderer.props.env.jumpTo(\n      urlObj.url,\n      {\n        actionType: action.actionType,\n        ...action.args\n      },\n      action.args\n    );\n  }\n}\n\nregisterAction('openlink', new LinkAction());\n"
     ]
 }

package/lib/actions/LoopAction.d.ts

@@ -1,7 +1,10 @@
 import { RendererEvent } from '../utils/renderer-event';
 import { RendererAction, ListenerAction, ListenerContext, LogicAction } from './Action';
 export interface ILoopAction extends ListenerAction, LogicAction {
-    loopName: string;
+    args: {
+        loopName: string;
+        [propName: string]: any;
+    };
 }
 /**
  * 循环动作