amis-core 6.2.2 → 6.4.0

package/esm/utils/tpl-builtin.js

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

package/esm/utils/tpl-lodash.js

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

package/esm/utils/tpl.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -80,10 +80,10 @@ function evalExpression(expression, data) {
             return !!evalFormula(expression, data);
         }
         // 后续改用 FormulaExec['js']
-        var debug = false;
+        var debug_1 = false;
         var idx = expression.indexOf('debugger');
         if (~idx) {
-            debug = true;
+            debug_1 = true;
             expression = expression.replace(/debugger;?/, '');
         }
         var fn = void 0;
@@ -91,7 +91,7 @@ function evalExpression(expression, data) {
             fn = EVAL_CACHE[expression];
         }
         else {
-            fn = new Function('data', 'utils', "with(data) {".concat(debug ? 'debugger;' : '', "return !!(").concat(expression, ");}"));
+            fn = new Function('data', 'utils', "with(data) {".concat(debug_1 ? 'debugger;' : '', "return !!(").concat(expression, ");}"));
             EVAL_CACHE[expression] = fn;
         }
         data = data || {};

package/esm/utils/uncontrollable.js

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

package/esm/utils/validateId.js

@@ -1,9 +1,10 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
 import { __read } from 'tslib';
+import moment from 'moment';
 
 /**
  * 身份证号码校验，（没有校验城市和区县）
@@ -131,7 +132,9 @@ function verifyRegion(province, city, country) {
     return true;
 }
 function verifyBirthday(birthday) {
-    return !isNaN(+birthday);
+    var min = moment(new Date('1850-01-01')); // 还有1850年前的人活着吗？
+    var max = moment().endOf('day'); // 最大值是今天
+    return !isNaN(+birthday) && moment(birthday).isBetween(min, max);
 }
 /**
  * 校验码计算方式

package/esm/utils/validations.js

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

package/lib/Root.js

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

package/lib/RootRenderer.d.ts

@@ -18,7 +18,7 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     componentDidCatch(error: any, errorInfo: any): void;
     componentWillUnmount(): void;
     handlePageVisibilityChange(): void;
-    handleAction(e: React.UIEvent<any> | void, action: ActionObject, ctx: object, throwErrors?: boolean, delegate?: IScopedContext): void;
+    handleAction(e: React.UIEvent<any> | void, action: ActionObject, ctx: object, throwErrors?: boolean, delegate?: IScopedContext): any;
     handleDialogConfirm(values: object[], action: ActionObject, ...args: Array<any>): void;
     handleDialogClose(confirmed?: boolean): void;
     handleDrawerConfirm(values: object[], action: ActionObject, ...args: Array<any>): void;
@@ -30,5 +30,5 @@ export declare class RootRenderer extends React.Component<RootRendererProps> {
     renderError(): React.ReactNode;
     renderDialog(): React.ReactNode;
     renderDrawer(): React.ReactNode;
-    render(): string | number | boolean | React.JSX.Element | Iterable<React.ReactNode> | null | undefined;
+    render(): string | number | boolean | Iterable<React.ReactNode> | React.JSX.Element | null | undefined;
 }

package/lib/RootRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -142,12 +142,30 @@ var RootRenderer = /** @class */ (function (_super) {
             window.open(mailto);
         }
         else if (action.actionType === 'dialog') {
-            store.setCurrentAction(action);
-            store.openDialog(ctx, undefined, action.callback, delegate || this.context);
+            store.setCurrentAction(action, this.props.resolveDefinitions);
+            return new Promise(function (resolve) {
+                store.openDialog(ctx, undefined, function (confirmed, value) {
+                    var _a;
+                    (_a = action.callback) === null || _a === void 0 ? void 0 : _a.call(action, confirmed, value);
+                    resolve({
+                        confirmed: confirmed,
+                        value: value
+                    });
+                }, delegate || _this.context);
+            });
         }
         else if (action.actionType === 'drawer') {
-            store.setCurrentAction(action);
-            store.openDrawer(ctx, undefined, undefined, delegate);
+            store.setCurrentAction(action, this.props.resolveDefinitions);
+            return new Promise(function (resolve) {
+                store.openDrawer(ctx, undefined, function (confirmed, value) {
+                    var _a;
+                    (_a = action.callback) === null || _a === void 0 ? void 0 : _a.call(action, confirmed, value);
+                    resolve({
+                        confirmed: confirmed,
+                        value: value
+                    });
+                }, delegate);
+            });
         }
         else if (action.actionType === 'toast') {
             (_b = (_a = action.toast) === null || _a === void 0 ? void 0 : _a.items) === null || _b === void 0 ? void 0 : _b.forEach(function (item) {
@@ -159,7 +177,7 @@ var RootRenderer = /** @class */ (function (_super) {
             });
         }
         else if (action.actionType === 'ajax') {
-            store.setCurrentAction(action);
+            store.setCurrentAction(action, this.props.resolveDefinitions);
             store
                 .saveRemote(action.api, ctx, {
                 successMessage: (action.messages && action.messages.success) ||
@@ -231,7 +249,7 @@ var RootRenderer = /** @class */ (function (_super) {
         var dialogAction = store.action;
         var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : dialogAction.reload;
         var scoped = store.getDialogScoped() || this.context;
-        store.closeDialog(true);
+        store.closeDialog(true, values);
         if (reload) {
             scoped.reload(reload, store.data);
         }
@@ -260,7 +278,7 @@ var RootRenderer = /** @class */ (function (_super) {
         var drawerAction = store.action;
         var reload = (_a = action.reload) !== null && _a !== void 0 ? _a : drawerAction.reload;
         var scoped = store.getDrawerScoped() || this.context;
-        store.closeDrawer();
+        store.closeDrawer(true, values);
         // 稍等会，等动画结束。
         setTimeout(function () {
             if (reload) {
@@ -270,7 +288,7 @@ var RootRenderer = /** @class */ (function (_super) {
     };
     RootRenderer.prototype.handleDrawerClose = function () {
         var store = this.store;
-        store.closeDrawer();
+        store.closeDrawer(false);
     };
     RootRenderer.prototype.openFeedback = function (dialog, ctx) {
         var _this = this;
@@ -280,7 +298,7 @@ var RootRenderer = /** @class */ (function (_super) {
                 type: 'button',
                 actionType: 'dialog',
                 dialog: dialog
-            });
+            }, _this.props.resolveDefinitions);
             store.openDialog(ctx, undefined, function (confirmed) {
                 resolve(confirmed);
             }, _this.context);

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var difference = require('lodash/difference');
 var omit = require('lodash/omit');
 var React = require('react');
+var reactIs = require('react-is');
 var LazyComponent = require('./components/LazyComponent.js');
 var factory = require('./factory.js');
 var Item = require('./renderers/Item.js');
@@ -28,6 +29,7 @@ require('lodash/isPlainObject');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
 require('./utils/filter.js');
 var style = require('./utils/style.js');
+var formula = require('./utils/formula.js');
 var tpl = require('./utils/tpl.js');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
@@ -49,6 +51,7 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'children',
     'ref',
     'visible',
+    'loading',
     'visibleOn',
     'hidden',
     'hiddenOn',
@@ -71,7 +74,8 @@ var RENDERER_TRANSMISSION_OMIT_PROPS = [
     'renderLabel',
     'trackExpression',
     'editorSetting',
-    'updatePristineAfterStoreDataReInit'
+    'updatePristineAfterStoreDataReInit',
+    'source'
 ];
 var componentCache = new SimpleMap.SimpleMap();
 var SchemaRenderer = /** @class */ (function (_super) {
@@ -260,7 +264,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
                     ? schema.children
                     : schema.children(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), exprProps), { $path: $path, $schema: schema, render: this.renderChild, forwardedRef: this.refFn, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
         }
-        else if (typeof schema.component === 'function') {
+        else if (schema.component && reactIs.isValidElementType(schema.component)) {
             var isSFC = !(schema.component.prototype instanceof React__default["default"].Component);
             var defaultData_1 = schema.data, defaultValue_1 = schema.value, // render时的value改放defaultValue中
             defaultActiveKey_1 = schema.activeKey, propKey_1 = schema.key, restSchema_1 = tslib.__rest(schema, ["data", "value", "activeKey", "key"]);
@@ -327,15 +331,21 @@ var SchemaRenderer = /** @class */ (function (_super) {
         if (isStatic !== undefined) {
             props.static = isStatic;
         }
-        if (rest.env.enableTestid && props.id && !props.testid) {
-            props.testid = props.id;
+        // 优先使用组件自己的testid或者id，这个解决不了table行内的一些子元素
+        // 每一行都会出现这个testid的元素，只在测试工具中直接使用nth拿序号
+        if (rest.env.enableTestid) {
+            if (props.testid || props.id || props.testIdBuilder == null) {
+                if (!(props.testIdBuilder instanceof helper.TestIdBuilder)) {
+                    props.testIdBuilder = new helper.TestIdBuilder(props.testid || props.id);
+                }
+            }
         }
         // 自动解析变量模式，主要是方便直接引入第三方组件库，无需为了支持变量封装一层
         if (renderer.autoVar) {
             try {
                 for (var _k = tslib.__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' && formula.isExpression(props[key])) {
                         props[key] = resolveVariableAndFilter.resolveVariableAndFilter(props[key], props.data, '| raw');
                     }
                 }

package/lib/Scoped.d.ts

@@ -22,7 +22,7 @@ export declare function filterTarget(target: string, data: Record<string, any>):
 export declare function splitTarget(target: string): Array<string>;
 export interface ScopedComponentType extends React.Component<RendererProps> {
     focus?: () => void;
-    doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean) => void;
+    doAction?: (action: ActionObject, data: RendererData, throwErrors?: boolean, args?: any) => void;
     receive?: (values: RendererData, subPath?: string, replace?: boolean) => void;
     reload?: (subPath?: string, query?: RendererData | null, ctx?: RendererData) => void;
     context: any;
@@ -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/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -69,8 +69,10 @@ require('./actions/CopyAction.js');
 require('./actions/DialogAction.js');
 require('./actions/DrawerAction.js');
 require('./actions/EmailAction.js');
+require('./actions/EventAction.js');
 require('./actions/LinkAction.js');
 require('./actions/ToastAction.js');
+require('./actions/WaitAction.js');
 require('./actions/PageAction.js');
 require('./actions/PrintAction.js');
 var Action = require('./actions/Action.js');
@@ -183,24 +185,38 @@ function createScopedTools(path, parent, env, rendererType) {
             });
             return resolved || (parent && parent.getComponentByName(name));
         },
+        getComponentByIdUnderCurrentScope: function (id, ignoreScope) {
+            var component = undefined;
+            helper.findTree([this], function (item) {
+                return item !== ignoreScope &&
+                    item.getComponents().find(function (cmpt) {
+                        if (tpl.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;
-            helper.findTree([root], function (item) {
-                return item.getComponents().find(function (cmpt) {
-                    if (tpl.filter(cmpt.props.id, cmpt.props.data) === id) {
-                        component = cmpt;
-                        return true;
-                    }
-                    return false;
-                });
-            });
-            return component;
+            return undefined;
         },
         /**
          * 基于绑定的变量名称查找组件

package/lib/StatusScoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -50,7 +50,9 @@ function StatusScoped(ComposedComponent) {
                 var injectedProps = {
                     statusStore: this.store
                 };
-                var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent)
+                var refConfig = ((_a = ComposedComponent.prototype) === null || _a === void 0 ? void 0 : _a.isReactComponent) ||
+                    ComposedComponent.$$typeof ===
+                        Symbol.for('react.forward_ref')
                     ? { ref: this.childRef }
                     : { forwardedRef: this.childRef };
                 return (_J$X_(ComposedComponent, tslib.__assign({}, this.props, injectedProps, refConfig)));

package/lib/WithRootStore.js

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

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -31,6 +31,17 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var __react_jsx__ = require('react');
 var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
 (__react_jsx__["default"] || __react_jsx__).Fragment;
+/**
+ * 忽略静态数据中的 schema 属性
+ *
+ * 比如 https://github.com/baidu/amis/issues/8972 中的用法
+ */
+function ignoreSchemaProps(key, value) {
+    if (['clickAction'].includes(key) && typeof value !== 'string') {
+        return true;
+    }
+    return false;
+}
 function HocStoreFactory(renderer) {
     return function (Component) {
         var StoreFactory = /** @class */ (function (_super) {
@@ -54,19 +65,19 @@ function HocStoreFactory(renderer) {
                 if (extendsData === false) {
                     store.initData(object.createObject(_this.props.data
                         ? _this.props.data.__super
-                        : null, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data))), _this.formatData(_this.props.data))));
+                        : null, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps))), _this.formatData(_this.props.data))));
                 }
                 else if (_this.props.scope ||
                     (_this.props.data && _this.props.data.__super)) {
-                    if (_this.props.store && _this.props.data === _this.props.store.data) {
-                        store.initData(object.createObject(_this.props.store.data, tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data)))));
+                    if (_this.props.store && _this.props.data === _this.props.scope) {
+                        store.initData(object.createObject(_this.props.store.data, tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps)))));
                     }
                     else {
-                        store.initData(object.createObject(_this.props.data.__super || _this.props.scope, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data))), _this.formatData(_this.props.data))));
+                        store.initData(object.createObject(_this.props.data.__super || _this.props.scope, tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps))), _this.formatData(_this.props.data))));
                     }
                 }
                 else {
-                    store.initData(tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data))), _this.formatData(_this.props.data)));
+                    store.initData(tslib.__assign(tslib.__assign({}, _this.formatData(dataMapping.dataMapping(_this.props.defaultData, _this.props.data, ignoreSchemaProps))), _this.formatData(_this.props.data)));
                 }
                 _this.state = {};
                 var detectField = props.detectField, rest = tslib.__rest(props, ["detectField"]);
@@ -96,7 +107,7 @@ function HocStoreFactory(renderer) {
             };
             StoreFactory.prototype.componentDidUpdate = function (prevProps) {
                 var _this = this;
-                var _a, _b, _c, _d;
+                var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k;
                 var props = this.props;
                 var store = this.store;
                 // dialog 场景下 schema 是显示的时候更新的，
@@ -130,7 +141,7 @@ function HocStoreFactory(renderer) {
                                 (props.data &&
                                     prevProps.data &&
                                     props.data.__super !== prevProps.data.__super))) {
-                        store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign(tslib.__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), props.updatePristineAfterStoreDataReInit === false);
+                        store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign(tslib.__assign({}, (store.hasRemoteData ? store.data : null)), this.formatData(props.defaultData)), this.formatData(props.data))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                 }
                 else if (shouldSync === true ||
@@ -140,9 +151,9 @@ function HocStoreFactory(renderer) {
                         : helper.isObjectShallowModified(prevProps.data, props.data) ||
                             (props.syncSuperStore !== false &&
                                 helper.isSuperDataModified(props.data, prevProps.data, store)))) {
-                    if (props.store && props.store.data === props.data) {
+                    if (props.store && props.scope === props.data) {
                         store.initData(object.createObject(props.store.data, props.syncSuperStore === false
-                            ? tslib.__assign({}, store.data) : helper.syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)), props.updatePristineAfterStoreDataReInit === false);
+                            ? tslib.__assign({}, store.data) : helper.syncDataFromSuper(store.data, props.store.data, prevProps.scope, store, props.syncSuperStore === true)), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else if (props.data && props.data.__super) {
                         store.initData(object.extendObject(props.data, 
@@ -151,24 +162,24 @@ function HocStoreFactory(renderer) {
                         store.hasRemoteData || !store.path.includes('/')
                             ? tslib.__assign(tslib.__assign({}, store.data), props.data) : // combo 不需要同步，如果要同步，在 Combo.tsx 里面已经实现了相关逻辑
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
-                            ((_c = props.store) === null || _c === void 0 ? void 0 : _c.storeType) === 'ComboStore'
+                            ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
                                 ? undefined
-                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.data), props.data), props.data.__super, prevProps.data.__super, store, false)), props.updatePristineAfterStoreDataReInit === false);
+                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.data), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                     else {
-                        store.initData(object.createObject(props.scope, props.data), props.updatePristineAfterStoreDataReInit === false);
+                        store.initData(object.createObject(props.scope, props.data), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                     }
                 }
                 else if (!props.trackExpression &&
-                    (!props.store || props.data !== props.store.data) &&
+                    (!props.store || props.data !== props.scope) &&
                     props.data &&
                     props.data.__super) {
                     // 这个用法很少，当 data.__super 值发生变化时，更新 store.data
                     if (!prevProps.data ||
                         helper.isObjectShallowModified(props.data.__super, prevProps.data.__super, false)) {
-                        store.initData(object.createObject(props.data.__super, tslib.__assign(tslib.__assign({}, props.data), store.data)), props.updatePristineAfterStoreDataReInit === false ||
+                        store.initData(object.createObject(props.data.__super, tslib.__assign(tslib.__assign({}, props.data), store.data)), ((_h = props.updatePristineAfterStoreDataReInit) !== null && _h !== void 0 ? _h : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false ||
                             (store.storeType === 'FormStore' &&
-                                ((_d = prevProps.store) === null || _d === void 0 ? void 0 : _d.storeType) === 'CRUDStore'));
+                                ((_j = prevProps.store) === null || _j === void 0 ? void 0 : _j.storeType) === 'CRUDStore'));
                     }
                     // nextProps.data.__super !== props.data.__super) &&
                 }
@@ -178,7 +189,7 @@ function HocStoreFactory(renderer) {
                     prevProps.data !== props.data) {
                     // 只有父级数据变动的时候才应该进来，
                     // 目前看来这个 case 很少有情况下能进来
-                    store.initData(object.createObject(props.scope, tslib.__assign({}, store.data)), props.updatePristineAfterStoreDataReInit === false);
+                    store.initData(object.createObject(props.scope, tslib.__assign({}, store.data)), ((_k = props.updatePristineAfterStoreDataReInit) !== null && _k !== void 0 ? _k : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
                 }
             };
             StoreFactory.prototype.componentWillUnmount = function () {

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -263,7 +263,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;
@@ -281,7 +283,7 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 (_u = console.group) === null || _u === void 0 ? void 0 : _u.call(console, "run action ".concat(action.actionType));
                 console.debug("[".concat(action.actionType, "] action args, data"), args, data);
                 stopped = false;
-                return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
+                return [4 /*yield*/, actionInstrance.run(tslib.__assign(tslib.__assign(tslib.__assign({}, action), { args: args, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
             case 5:
                 actionResult = _w.sent();
                 // 二次确认弹窗如果取消，则终止后续动作

package/lib/actions/AjaxAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ var tslib = require('tslib');
 var api = require('../utils/api.js');
 var errors = require('../utils/errors.js');
 var helper = require('../utils/helper.js');
+var tpl = require('../utils/tpl.js');
 var Action = require('./Action.js');
 var object = require('../utils/object.js');
 
@@ -27,12 +28,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 tslib.__awaiter(this, void 0, void 0, function () {
-            var env, silent, messages, api$1, result, responseData, msg, e_1, result;
-            var _o;
-            return tslib.__generator(this, function (_p) {
-                switch (_p.label) {
+            var env, silent, messages, api$1, sendOn, result, responseData, msg, e_1, result;
+            var _p;
+            return tslib.__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!');
@@ -49,27 +50,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$1 = api.normalizeApi(action.api);
+                        if (!(api$1.sendOn !== undefined)) return [3 /*break*/, 2];
+                        return [4 /*yield*/, tpl.evalExpressionWithConditionBuilder(api$1.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$1 === null || api$1 === void 0 ? void 0 : api$1.data) == undefined) {
                             api$1 = tslib.__assign(tslib.__assign({}, api$1), { data: {} });
                         }
-                        _p.label = 1;
-                    case 1:
-                        _p.trys.push([1, 3, , 4]);
-                        return [4 /*yield*/, env.fetcher(api$1, (_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$1, (_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 = !helper.isEmpty(result.data) || result.ok
                             ? api.normalizeApiResponseData(result.data)
                             : null;
                         // 记录请求返回的数据
-                        event.setData(object.createObject(event.data, tslib.__assign(tslib.__assign({}, responseData), (_o = { responseData: responseData }, _o[action.outputVar || 'responseResult'] = tslib.__assign(tslib.__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _o))));
+                        event.setData(object.createObject(event.data, tslib.__assign(tslib.__assign({}, responseData), (_p = { responseData: responseData }, _p[action.outputVar || 'responseResult'] = tslib.__assign(tslib.__assign({}, responseData), { responseData: responseData, responseStatus: result.status, responseMsg: result.msg }), _p))));
                         if (!silent) {
                             if (!result.ok) {
-                                throw new errors.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 errors.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
                                         ? {
@@ -80,8 +90,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;
@@ -96,8 +106,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/lib/actions/BreakAction.js

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