amis-core 6.3.0 → 6.4.1

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -25,6 +25,7 @@ import 'lodash/isPlainObject';
 import { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
 import './utils/filter.js';
 import { buildStyle } from './utils/style.js';
+import { isExpression } from './utils/formula.js';
 import { filter, evalExpression } from './utils/tpl.js';
 
 var RENDERER_TRANSMISSION_OMIT_PROPS = [
@@ -331,7 +332,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
             try {
                 for (var _k = __values(Object.keys(schema)), _l = _k.next(); !_l.done; _l = _k.next()) {
                     var key = _l.value;
-                    if (typeof props[key] === 'string') {
+                    if (typeof props[key] === 'string' && isExpression(props[key])) {
                         props[key] = resolveVariableAndFilter(props[key], props.data, '| raw');
                     }
                 }

package/esm/Scoped.d.ts

@@ -37,6 +37,7 @@ export interface IScopedContext {
     unRegisterComponent: (component: ScopedComponentType) => void;
     getComponentByName: (name: string) => ScopedComponentType;
     getComponentById: (id: string) => ScopedComponentType | undefined;
+    getComponentByIdUnderCurrentScope: (id: string, ignoreScope?: IScopedContext) => ScopedComponentType | undefined;
     getComponents: () => Array<ScopedComponentType>;
     reload: (target: string, ctx: RendererData) => void;
     send: (target: string, ctx: RendererData) => void;

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -172,24 +172,38 @@ function createScopedTools(path, parent, env, rendererType) {
             });
             return resolved || (parent && parent.getComponentByName(name));
         },
+        getComponentByIdUnderCurrentScope: function (id, ignoreScope) {
+            var component = undefined;
+            findTree([this], function (item) {
+                return item !== ignoreScope &&
+                    item.getComponents().find(function (cmpt) {
+                        if (filter(cmpt.props.id, cmpt.props.data) === id) {
+                            component = cmpt;
+                            return true;
+                        }
+                        return false;
+                    });
+            });
+            return component;
+        },
         getComponentById: function (id) {
             var root = this;
+            var ignoreScope = undefined;
             // 找到顶端scoped
-            while (root.parent && root.parent !== rootScopedContext) {
+            while (root) {
+                // 优先从当前scope查找
+                // 直接跑到顶层查找，对于有历史标签一次渲染多个页面的情况，会有问题
+                var component = root.getComponentByIdUnderCurrentScope(id, ignoreScope);
+                if (component) {
+                    return component;
+                }
+                if (!root.parent || root.parent === rootScopedContext) {
+                    break;
+                }
+                ignoreScope = root;
                 root = root.parent;
             }
-            // 向下查找
-            var component = undefined;
-            findTree([root], function (item) {
-                return item.getComponents().find(function (cmpt) {
-                    if (filter(cmpt.props.id, cmpt.props.data) === id) {
-                        component = cmpt;
-                        return true;
-                    }
-                    return false;
-                });
-            });
-            return component;
+            return undefined;
         },
         /**
          * 基于绑定的变量名称查找组件

package/esm/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/WithRootStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -255,7 +255,9 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                         'table': ['condition'],
                         'table2': ['condition'],
                         'crud': ['condition'],
-                        'combo': ['condition']
+                        'combo': ['condition'],
+                        'list': ['condition'],
+                        'cards': ['condition']
                     };
                     var curCmptType = (_a = targetComponent === null || targetComponent === void 0 ? void 0 : targetComponent.props) === null || _a === void 0 ? void 0 : _a.type;
                     var curActionType = action.actionType;

package/esm/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -7,6 +7,7 @@ import { __awaiter, __generator, __assign } from 'tslib';
 import { normalizeApiResponseData, normalizeApi } from '../utils/api.js';
 import { ServerError } from '../utils/errors.js';
 import { isEmpty } from '../utils/helper.js';
+import { evalExpressionWithConditionBuilder } from '../utils/tpl.js';
 import { registerAction } from './Action.js';
 import { createObject } from '../utils/object.js';
 
@@ -23,12 +24,12 @@ var AjaxAction = /** @class */ (function () {
         this.fetcherType = fetcherType;
     }
     AjaxAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o;
         return __awaiter(this, void 0, void 0, function () {
-            var env, silent, messages, api, result, responseData, msg, e_1, result;
-            var _o;
-            return __generator(this, function (_p) {
-                switch (_p.label) {
+            var env, silent, messages, api, sendOn, result, responseData, msg, e_1, result;
+            var _p;
+            return __generator(this, function (_q) {
+                switch (_q.label) {
                     case 0:
                         if (!((_a = event.context.env) === null || _a === void 0 ? void 0 : _a.fetcher)) {
                             throw new Error('env.fetcher is required!');
@@ -45,27 +46,36 @@ var AjaxAction = /** @class */ (function () {
                         silent = ((_b = action === null || action === void 0 ? void 0 : action.options) === null || _b === void 0 ? void 0 : _b.silent) || (action === null || action === void 0 ? void 0 : action.api).silent;
                         messages = (_c = action === null || action === void 0 ? void 0 : action.api) === null || _c === void 0 ? void 0 : _c.messages;
                         api = normalizeApi(action.api);
+                        if (!(api.sendOn !== undefined)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, evalExpressionWithConditionBuilder(api.sendOn, (_d = action.data) !== null && _d !== void 0 ? _d : {}, false)];
+                    case 1:
+                        sendOn = _q.sent();
+                        if (!sendOn) {
+                            return [2 /*return*/];
+                        }
+                        _q.label = 2;
+                    case 2:
                         // 如果没配置data数据映射，则给一个空对象，避免将当前数据域作为接口请求参数
                         if ((api === null || api === void 0 ? void 0 : api.data) == undefined) {
                             api = __assign(__assign({}, api), { data: {} });
                         }
-                        _p.label = 1;
-                    case 1:
-                        _p.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, env.fetcher(api, (_d = action.data) !== null && _d !== void 0 ? _d : {}, (_e = action === null || action === void 0 ? void 0 : action.options) !== null && _e !== void 0 ? _e : {})];
-                    case 2:
-                        result = _p.sent();
+                        _q.label = 3;
+                    case 3:
+                        _q.trys.push([3, 5, , 6]);
+                        return [4 /*yield*/, env.fetcher(api, (_e = action.data) !== null && _e !== void 0 ? _e : {}, (_f = action === null || action === void 0 ? void 0 : action.options) !== null && _f !== void 0 ? _f : {})];
+                    case 4:
+                        result = _q.sent();
                         responseData = !isEmpty(result.data) || result.ok
                             ? normalizeApiResponseData(result.data)
                             : null;
                         // 记录请求返回的数据
-                        event.setData(createObject(event.data, __assign(__assign({}, responseData), (_o = { responseData: responseData }, _o[action.outputVar || 'responseResult'] = __assign(__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _o))));
+                        event.setData(createObject(event.data, __assign(__assign({}, responseData), (_p = { responseData: responseData }, _p[action.outputVar || 'responseResult'] = __assign(__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _p))));
                         if (!silent) {
                             if (!result.ok) {
-                                throw new ServerError((_h = (_f = messages === null || messages === void 0 ? void 0 : messages.failed) !== null && _f !== void 0 ? _f : (_g = action.messages) === null || _g === void 0 ? void 0 : _g.failed) !== null && _h !== void 0 ? _h : result.msg, result);
+                                throw new ServerError((_j = (_g = messages === null || messages === void 0 ? void 0 : messages.failed) !== null && _g !== void 0 ? _g : (_h = action.messages) === null || _h === void 0 ? void 0 : _h.failed) !== null && _j !== void 0 ? _j : result.msg, result);
                             }
                             else {
-                                msg = (_m = (_l = (_j = messages === null || messages === void 0 ? void 0 : messages.success) !== null && _j !== void 0 ? _j : (_k = action.messages) === null || _k === void 0 ? void 0 : _k.success) !== null && _l !== void 0 ? _l : result.msg) !== null && _m !== void 0 ? _m : result.defaultMsg;
+                                msg = (_o = (_m = (_k = messages === null || messages === void 0 ? void 0 : messages.success) !== null && _k !== void 0 ? _k : (_l = action.messages) === null || _l === void 0 ? void 0 : _l.success) !== null && _m !== void 0 ? _m : result.msg) !== null && _o !== void 0 ? _o : result.defaultMsg;
                                 msg &&
                                     env.notify('success', msg, result.msgTimeout !== undefined
                                         ? {
@@ -76,8 +86,8 @@ var AjaxAction = /** @class */ (function () {
                             }
                         }
                         return [2 /*return*/, result.data];
-                    case 3:
-                        e_1 = _p.sent();
+                    case 5:
+                        e_1 = _q.sent();
                         if (!silent) {
                             if (e_1.type === 'ServerError') {
                                 result = e_1.response;
@@ -92,8 +102,8 @@ var AjaxAction = /** @class */ (function () {
                                 env.notify('error', e_1.message);
                             }
                         }
-                        return [3 /*break*/, 4];
-                    case 4: return [2 /*return*/];
+                        return [3 /*break*/, 6];
+                    case 6: return [2 /*return*/];
                 }
             });
         });

package/esm/actions/BreakAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/BroadcastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -46,7 +46,7 @@ var CmptAction = /** @class */ (function () {
                             : renderer;
                         // 如果key指定了，但是没找到组件，则报错
                         if (key && !component) {
-                            msg = '尝试执行一个不存在的目标组件动作，请检查目标组件非隐藏状态，且正确指定了componentId或componentName';
+                            msg = "\u5C1D\u8BD5\u6267\u884C\u4E00\u4E2A\u4E0D\u5B58\u5728\u7684\u76EE\u6807\u7EC4\u4EF6\u52A8\u4F5C\uFF08".concat(key, "\uFF09\uFF0C\u8BF7\u68C0\u67E5\u76EE\u6807\u7EC4\u4EF6\u975E\u9690\u85CF\u72B6\u6001\uFF0C\u4E14\u6B63\u786E\u6307\u5B9A\u4E86componentId\u6216componentName");
                             if (action.ignoreError === false) {
                                 throw Error(msg);
                             }

package/esm/actions/ContinueAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CopyAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/DialogAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -66,12 +66,20 @@ var DialogAction = /** @class */ (function () {
                         if (action.$$id !== undefined) {
                             return [2 /*return*/];
                         }
-                        ret = (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
-                            actionType: 'dialog',
-                            dialog: action.dialog,
-                            reload: 'none',
-                            data: action.rawData
-                        }, action.data);
+                        ret = renderer.handleAction
+                            ? renderer.handleAction(event, {
+                                actionType: 'dialog',
+                                dialog: action.dialog,
+                                reload: 'none',
+                                data: action.rawData
+                            }, action.data)
+                            : (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
+                                actionType: 'dialog',
+                                dialog: action.dialog,
+                                reload: 'none',
+                                data: action.rawData
+                            }, action.data);
+                        event.pendingPromise.push(ret);
                         if (!action.waitForAction) return [3 /*break*/, 2];
                         return [4 /*yield*/, ret];
                     case 1:
@@ -173,13 +181,21 @@ var ConfirmAction = /** @class */ (function () {
                         return [2 /*return*/, confirmed_1];
                     case 2: return [4 /*yield*/, new Promise(function (resolve, reject) {
                             var _a, _b;
-                            (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
-                                actionType: 'dialog',
-                                dialog: modal,
-                                data: action.rawData,
-                                reload: 'none',
-                                callback: function (result) { return resolve(result); }
-                            }, action.data);
+                            renderer.handleAction
+                                ? renderer.handleAction(event, {
+                                    actionType: 'dialog',
+                                    dialog: modal,
+                                    data: action.rawData,
+                                    reload: 'none',
+                                    callback: function (result) { return resolve(result); }
+                                }, action.data)
+                                : (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
+                                    actionType: 'dialog',
+                                    dialog: modal,
+                                    data: action.rawData,
+                                    reload: 'none',
+                                    callback: function (result) { return resolve(result); }
+                                }, action.data);
                         })];
                     case 3:
                         confirmed = _v.sent();

package/esm/actions/DrawerAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -66,12 +66,20 @@ var DrawerAction = /** @class */ (function () {
                         if (action.$$id !== undefined) {
                             return [2 /*return*/];
                         }
-                        ret = (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
-                            actionType: 'drawer',
-                            drawer: action.drawer,
-                            reload: 'none',
-                            data: action.rawData
-                        }, action.data);
+                        ret = renderer.handleAction
+                            ? renderer.handleAction(event, {
+                                actionType: 'drawer',
+                                drawer: action.drawer,
+                                reload: 'none',
+                                data: action.rawData
+                            }, action.data)
+                            : (_b = (_a = renderer.props).onAction) === null || _b === void 0 ? void 0 : _b.call(_a, event, {
+                                actionType: 'drawer',
+                                drawer: action.drawer,
+                                reload: 'none',
+                                data: action.rawData
+                            }, action.data);
+                        event.pendingPromise.push(ret);
                         if (!action.waitForAction) return [3 /*break*/, 2];
                         return [4 /*yield*/, ret];
                     case 1:

package/esm/actions/EmailAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/EventAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/LinkAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/LoopAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/PageAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ParallelAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/PrintAction.d.ts

@@ -3,8 +3,8 @@ import { RendererAction, ListenerAction, ListenerContext } from './Action';
 export interface IPrintAction extends ListenerAction {
     actionType: 'copy';
     args: {
-        testid?: string;
-        testids?: string[];
+        id?: string;
+        ids?: string[];
     };
 }
 /**

package/esm/actions/PrintAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -22,16 +22,16 @@ var PrintAction = /** @class */ (function () {
         return __awaiter(this, void 0, void 0, function () {
             var element, elements_1;
             return __generator(this, function (_c) {
-                if ((_a = action.args) === null || _a === void 0 ? void 0 : _a.testid) {
-                    element = document.querySelector("[data-testid='".concat(action.args.testid, "']"));
+                if ((_a = action.args) === null || _a === void 0 ? void 0 : _a.id) {
+                    element = document.querySelector("[data-id='".concat(action.args.id, "']"));
                     if (element) {
                         printElements([element]);
                     }
                 }
-                else if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.testids) {
+                else if ((_b = action.args) === null || _b === void 0 ? void 0 : _b.ids) {
                     elements_1 = [];
-                    action.args.testids.forEach(function (testid) {
-                        var element = document.querySelector("[data-testid='".concat(testid, "']"));
+                    action.args.ids.forEach(function (id) {
+                        var element = document.querySelector("[data-id='".concat(id, "']"));
                         if (element) {
                             elements_1.push(element);
                         }

package/esm/actions/StatusAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/SwitchAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/ToastAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/actions/WaitAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/components/CustomStyle.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -10,9 +10,6 @@ var styleIdCount = new Map();
 function CustomStyle (props) {
     var config = props.config, env = props.env, data = props.data;
     var themeCss = config.themeCss, classNames = config.classNames, id = config.id, defaultData = config.defaultData, wrapperCustomStyle = config.wrapperCustomStyle;
-    if (!themeCss && !wrapperCustomStyle) {
-        return null;
-    }
     useEffect(function () {
         if (styleIdCount.has(id)) {
             styleIdCount.set(id, styleIdCount.get(id) + 1);

package/esm/components/ErrorBoundary.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/components/LazyComponent.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/components/Overlay.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/components/PopOver.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/env.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/envOverwrite.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/factory.d.ts

@@ -39,6 +39,7 @@ export interface RendererProps extends ThemeProps, LocaleProps, OnEventProps, St
         [propName: string]: any;
     };
     onBroadcast?: (type: string, rawEvent: RendererEvent<any>, ctx: any) => any;
+    dispatchEvent: (e: React.UIEvent<any> | React.BaseSyntheticEvent<any> | string, data: any, renderer?: React.Component<RendererProps>) => Promise<RendererEvent<any>>;
     mobileUI?: boolean;
     [propName: string]: any;
 }

package/esm/factory.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 

package/esm/index.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */
 
@@ -148,7 +148,7 @@ export { StoreNode } from './store/node.js';
  */
 var classPrefix = getClassPrefix();
 // @ts-ignore
-var version = '6.3.0';
+var version = '6.4.1';
 function render(schema, props, options, pathPrefix) {
     if (props === void 0) { props = {}; }
     if (options === void 0) { options = {}; }

package/esm/locale.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.3.0
+ * amis-core v6.4.1
  * Copyright 2018-2024 fex
  */