amis 1.9.0-beta.10 → 1.9.0-beta.12

package/lib/actions/LinkAction.d.ts

@@ -2,7 +2,14 @@ import { RendererEvent } from '../utils/renderer-event';
 import { Action, ListenerAction, ListenerContext } from './Action';
 export interface ILinkAction extends ListenerAction {
     link: string;
+    url?: never;
+    params?: {
+        [key: string]: string;
+    };
+}
+export interface IUrlAction extends ListenerAction {
     url: string;
+    link?: never;
     params?: {
         [key: string]: string;
     };
@@ -15,5 +22,5 @@ export interface ILinkAction extends ListenerAction {
  * @implements {Action}
  */
 export declare class LinkAction implements Action {
-    run(action: ILinkAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
+    run(action: ILinkAction | IUrlAction, renderer: ListenerContext, event: RendererEvent<any>): Promise<void>;
 }

package/lib/actions/LinkAction.js

@@ -2,8 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.LinkAction = void 0;
 var tslib_1 = require("tslib");
-var helper_1 = require("../utils/helper");
-var tpl_1 = require("../utils/tpl");
+var api_1 = require("../utils/api");
 var Action_1 = require("./Action");
 /**
  * 打开页面动作
@@ -18,20 +17,18 @@ var LinkAction = /** @class */ (function () {
     LinkAction.prototype.run = function (action, renderer, event) {
         var _a;
         return (0, tslib_1.__awaiter)(this, void 0, void 0, function () {
-            var url;
+            var urlObj;
             return (0, tslib_1.__generator)(this, function (_b) {
                 if (!((_a = renderer.props.env) === null || _a === void 0 ? void 0 : _a.jumpTo)) {
                     throw new Error('env.jumpTo is required!');
                 }
-                url = (action.url || action.link);
-                // 处理参数
-                if (!(0, helper_1.isEmpty)(action.params)) {
-                    if (!(0, helper_1.isObject)(action.params)) {
-                        throw new Error('action.params must be an object');
-                    }
-                    url = "".concat(/\?/.test(url) ? '&' : '?').concat((0, helper_1.qsstringify)(action.params));
-                }
-                renderer.props.env.jumpTo((0, tpl_1.filter)(url, action.args, '| raw'), action, action.args);
+                urlObj = (0, api_1.buildApi)({
+                    url: (action.url || action.link),
+                    method: 'get'
+                }, (0, tslib_1.__assign)((0, tslib_1.__assign)({}, action.params), action.args), {
+                    autoAppend: true
+                });
+                renderer.props.env.jumpTo(urlObj.url, action, action.args);
                 return [2 /*return*/];
             });
         });

package/lib/actions/LinkAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/LinkAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AAAA,0CAA+D;AAE/D,oCAAoC;AACpC,mCAKkB;AAUlB;;;;;;GAMG;AACH;IAAA;IA0BA,CAAC;IAzBO,wBAAG,GAAT,UACE,MAAmB,EACnB,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;gBAEG,GAAG,GAAG,CAAC,MAAM,CAAC,GAAG,IAAI,MAAM,CAAC,IAAI,CAAW,CAAC;gBAEhD,OAAO;gBACP,IAAI,CAAC,IAAA,gBAAO,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE;oBAC3B,IAAI,CAAC,IAAA,iBAAQ,EAAC,MAAM,CAAC,MAAM,CAAC,EAAE;wBAC5B,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;qBACpD;oBACD,GAAG,GAAG,UAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,GAAG,SAAG,IAAA,oBAAW,EAAC,MAAM,CAAC,MAAM,CAAC,CAAE,CAAC;iBACpE;gBAED,QAAQ,CAAC,KAAK,CAAC,GAAG,CAAC,MAAM,CACvB,IAAA,YAAM,EAAC,GAAG,EAAE,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,EACjC,MAAM,EACN,MAAM,CAAC,IAAI,CACZ,CAAC;;;;KACH;IACH,iBAAC;AAAD,CAAC,AA1BD,IA0BC;AA1BY,gCAAU;AA4BvB,IAAA,uBAAc,EAAC,UAAU,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
+    "mappings": ";;;;AAAA,oCAAsC;AAItC,mCAKkB;AAkBlB;;;;;;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,MAAM,EAAE,MAAM,CAAC,IAAI,CAAC,CAAC;;;;KAC5D;IACH,iBAAC;AAAD,CAAC,AAxBD,IAwBC;AAxBY,gCAAU;AA0BvB,IAAA,uBAAc,EAAC,UAAU,EAAE,IAAI,UAAU,EAAE,CAAC,CAAC",
     "sourcesContent": [
-        "import {isEmpty, isObject, qsstringify} from '../utils/helper';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface ILinkAction extends ListenerAction {\n  link: string;\n  url: string;\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 Action {\n  async run(\n    action: ILinkAction,\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    let url = (action.url || action.link) as string;\n\n    // 处理参数\n    if (!isEmpty(action.params)) {\n      if (!isObject(action.params)) {\n        throw new Error('action.params must be an object');\n      }\n      url = `${/\\?/.test(url) ? '&' : '?'}${qsstringify(action.params)}`;\n    }\n\n    renderer.props.env.jumpTo(\n      filter(url, action.args, '| raw'),\n      action,\n      action.args\n    );\n  }\n}\n\nregisterAction('openlink', new LinkAction());\n"
+        "import {buildApi} from '../utils/api';\nimport {isEmpty, isObject, qsstringify} from '../utils/helper';\nimport {RendererEvent} from '../utils/renderer-event';\nimport {filter} from '../utils/tpl';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\n\nexport interface ILinkAction extends ListenerAction {\n  link: string;\n  url?: never;\n  params?: {\n    [key: string]: string;\n  };\n}\n\nexport interface IUrlAction extends ListenerAction {\n  url: string;\n  link?: never;\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 Action {\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, action.args);\n  }\n}\n\nregisterAction('openlink', new LinkAction());\n"
     ]
 }

package/lib/actions/ToastAction.js

@@ -3,6 +3,7 @@ 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
  */
@@ -13,7 +14,7 @@ var ToastAction = /** @class */ (function () {
         var _a, _b;
         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', action.msg, action);
+                (_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 [2 /*return*/];
             });
         });

package/lib/actions/ToastAction.js.map

@@ -6,8 +6,8 @@
         "/src/actions/ToastAction.ts"
     ],
     "names": [],
-    "mappings": ";;;;AACA,mCAKkB;AAkBlB;;GAEG;AACH;IAAA;IAQA,CAAC;IAPO,yBAAG,GAAT,UACE,MAAoB,EACpB,QAAyB,EACzB,KAAyB;;;;gBAEzB,MAAA,MAAA,KAAK,CAAC,OAAO,CAAC,GAAG,EAAC,MAAM,mDAAG,MAAM,CAAC,OAAO,IAAI,MAAM,EAAE,MAAM,CAAC,GAAG,EAAE,MAAM,CAAC,CAAC;;;;KAC1E;IACH,kBAAC;AAAD,CAAC,AARD,IAQC;AARY,kCAAW;AAUxB,IAAA,uBAAc,EAAC,OAAO,EAAE,IAAI,WAAW,EAAE,CAAC,CAAC",
+    "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",
     "sourcesContent": [
-        "import {RendererEvent} from '../utils/renderer-event';\nimport {\n  Action,\n  ListenerAction,\n  ListenerContext,\n  registerAction\n} from './Action';\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?.(action.msgType || 'info', action.msg, action);\n  }\n}\n\nregisterAction('toast', new ToastAction());\n"
+        "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"
     ]
 }