amis-core 6.6.0 → 6.8.0

package/esm/utils/tpl.js

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

package/esm/utils/uncontrollable.js

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

package/esm/utils/validateId.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -122,8 +122,8 @@ function verifyRegion(province, city, country) {
         return false;
     }
     // 这里暂时不获取市和区的具体信息，因为调用CityDB会把校验函数传染为异步
-    // city位: 00表示省；01-20，51-70表示省直辖市；21-50表示地区（自治州、盟）
-    if (!/^(?:[0-6]\d|70)$/.test(city)) {
+    // city位: 00表示省；01-20，51-70表示省直辖市；21-50表示地区（自治州、盟）, 90 表示 直辖县级市
+    if (!/^(?:[0-6]\d|70|90)$/.test(city)) {
         return false;
     }
     if (!/^\d\d$/.test(country)) {

package/esm/utils/validations.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -8,6 +8,7 @@ import moment from 'moment';
 import { filter } from './tpl.js';
 import 'amis-formula';
 import isPlainObject from 'lodash/isPlainObject';
+import './memoryParse.js';
 import { isPureVariable } from './isPureVariable.js';
 import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './resolveVariableAndFilter.js';

package/esm/utils/visitedCache.d.ts

@@ -0,0 +1,46 @@
+/**
+ * @description 缓存值的单元
+ */
+export type CacheEntry<V> = {
+    value: V;
+    visitCount: number;
+};
+/**
+ * 自动清理访问次数最少key的Map，次数相同时优先淘汰旧项
+ * 每次触发清理的计数基于容量的百分比
+ * @class VisitedCache
+ * @template K - 缓存key的类型
+ * @template V - 缓存value的类型
+ */
+export default class VisitedCache<K, V> {
+    private capacity;
+    private cache;
+    private visitCountOrder;
+    private keyOrderMatrixForByCount;
+    private releaseCount;
+    /**
+     *
+     * @param capacity 容量
+     * @param releasePercent 清理数量占容量百分比
+     */
+    constructor(capacity: number, releasePercent?: number);
+    /**
+     * 更新现存项目的缓存顺序
+     * @param key
+     * @param entry
+     */
+    private updateCacheEntryOrder;
+    /**
+     *
+     * @param {K} key
+     * @returns {(V | undefined)}
+     */
+    get(key: K): V | undefined;
+    /**
+     *
+     * @param {K} key
+     * @param {V} value
+     */
+    set(key: K, value: V): void;
+    has(key: K): boolean;
+}

package/esm/utils/visitedCache.js

@@ -0,0 +1,124 @@
+/**
+ * amis-core v6.8.0
+ * Copyright 2018-2024 fex
+ */
+
+import { __spreadArray, __read } from 'tslib';
+
+/**
+ * 自动清理访问次数最少key的Map，次数相同时优先淘汰旧项
+ * 每次触发清理的计数基于容量的百分比
+ * @class VisitedCache
+ * @template K - 缓存key的类型
+ * @template V - 缓存value的类型
+ */
+var VisitedCache = /** @class */ (function () {
+    /**
+     *
+     * @param capacity 容量
+     * @param releasePercent 清理数量占容量百分比
+     */
+    function VisitedCache(capacity, releasePercent) {
+        this.visitCountOrder = [];
+        this.keyOrderMatrixForByCount = {};
+        this.capacity = capacity;
+        this.cache = new Map();
+        this.releaseCount = (this.capacity * (releasePercent || 1 / 8)) >> 0 || 1;
+    }
+    /**
+     * 更新现存项目的缓存顺序
+     * @param key
+     * @param entry
+     */
+    VisitedCache.prototype.updateCacheEntryOrder = function (key, entry, nextVisitCount) {
+        var oldVisitCount = entry.visitCount;
+        var oldKeyOrder = this.keyOrderMatrixForByCount[oldVisitCount];
+        if (Array.isArray(oldKeyOrder)) {
+            // 从key为旧访问次数的顺序数组中删除
+            var oldKeyIndex = oldKeyOrder.indexOf(key);
+            if (oldKeyIndex !== -1) {
+                oldKeyOrder.splice(oldKeyIndex, 1);
+            }
+        }
+        // 相同访问量，更新访问顺序
+        this.keyOrderMatrixForByCount[nextVisitCount] = Array.isArray(this.keyOrderMatrixForByCount[nextVisitCount])
+            ? __spreadArray(__spreadArray([], __read(this.keyOrderMatrixForByCount[nextVisitCount]), false), [key], false) : [key];
+        entry.visitCount = nextVisitCount;
+        // 重新按照访问量排序
+        this.visitCountOrder = __spreadArray([], __read(new Set(__spreadArray(__spreadArray([], __read(this.visitCountOrder), false), [nextVisitCount], false))), false).sort(function (a, b) { return a - b; });
+    };
+    /**
+     *
+     * @param {K} key
+     * @returns {(V | undefined)}
+     */
+    VisitedCache.prototype.get = function (key) {
+        if (this.cache.has(key)) {
+            var entry = this.cache.get(key);
+            if (entry !== undefined) {
+                var visitCount = entry.visitCount;
+                // 更新访问顺序
+                this.updateCacheEntryOrder(key, entry, visitCount + 1);
+                return entry.value;
+            }
+        }
+        return undefined;
+    };
+    /**
+     *
+     * @param {K} key
+     * @param {V} value
+     */
+    VisitedCache.prototype.set = function (key, value) {
+        // 更新现存项的值和访问次数及新鲜度
+        if (this.cache.has(key)) {
+            var entry = this.cache.get(key);
+            if (entry !== undefined) {
+                var visitCount = entry.visitCount;
+                this.updateCacheEntryOrder(key, entry, visitCount + 1);
+                entry.value = value;
+            }
+        }
+        else {
+            // 先进行清理
+            if (this.cache.size === this.capacity) {
+                // TODO 依据最大容量的1/10进行释放,试试效果
+                var dynamicReleaseCount = this.releaseCount;
+                // const dynamicReleaseCount =
+                // 	(this.keyOrderMatrixForByCount[this.visitCountOrder[this.visitCountOrder.length - 1]].length / (this.capacity)) >>
+                // 		0 || 1
+                var findIndex = 0;
+                var released = 0;
+                while (released < dynamicReleaseCount &&
+                    findIndex <= this.visitCountOrder.length - 1) {
+                    // 最少访问的次数
+                    var targetCount = this.visitCountOrder[findIndex];
+                    // 查看其中有没有项
+                    var targetKeyOrder = this.keyOrderMatrixForByCount[targetCount];
+                    if (!targetKeyOrder.length) {
+                        findIndex++;
+                    }
+                    else {
+                        while (targetKeyOrder.length > 0 &&
+                            released < dynamicReleaseCount) {
+                            this.cache.delete(targetKeyOrder.shift());
+                            released++;
+                        }
+                    }
+                }
+            }
+            var newEntry = {
+                visitCount: 1,
+                value: value
+            };
+            this.cache.set(key, newEntry);
+            this.updateCacheEntryOrder(key, newEntry, 1);
+        }
+    };
+    VisitedCache.prototype.has = function (key) {
+        return this.cache.has(key);
+    };
+    return VisitedCache;
+}());
+
+export { VisitedCache as default };

package/lib/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -77,6 +77,7 @@ function renderChildren(prefix, node, props) {
     return renderChild(prefix, node, props);
 }
 function renderChild(prefix, node, props) {
+    var _a, _b;
     if (Array.isArray(node)) {
         return renderChildren(prefix, node, props);
     }
@@ -103,9 +104,9 @@ function renderChild(prefix, node, props) {
         // 找渲染器也是在那，所以没办法在之前根据渲染器信息来包裹个组件下发 statusStore
         // 所以这里先根据 type 来处理一下
         // 等后续把状态处理再抽一层，可以把此处放到 SchemaRenderer 里面去
-        return (_J$X_(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+        return (_J$X_(StatusScopedSchemaRenderer, tslib.__assign({ render: renderChild }, props, { key: (_a = props.key) !== null && _a !== void 0 ? _a : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
     }
-    return (_J$X_(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+    return (_J$X_(SchemaRenderer.SchemaRenderer, tslib.__assign({ render: renderChild }, props, { key: (_b = props.key) !== null && _b !== void 0 ? _b : schema.key, schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
 }
 var ScopedRootRenderer = StatusScoped.StatusScoped(Scoped.HocScoped(Root));
 

package/lib/RootRenderer.js

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

package/lib/SchemaRenderer.d.ts

@@ -23,7 +23,6 @@ export declare class SchemaRenderer extends React.Component<SchemaRendererProps,
     unbindEvent: (() => void) | undefined;
     isStatic: any;
     constructor(props: SchemaRendererProps);
-    componentDidMount(): void;
     componentWillUnmount(): void;
     shouldComponentUpdate(nextProps: SchemaRendererProps): boolean;
     resolveRenderer(props: SchemaRendererProps, force?: boolean): any;

package/lib/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -26,6 +26,7 @@ var mobx = require('mobx');
 require('amis-formula');
 require('moment');
 require('lodash/isPlainObject');
+require('./utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var resolveVariableAndFilter = require('./utils/resolveVariableAndFilter.js');
 require('./utils/filter.js');
@@ -101,10 +102,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }, function () { return _this.forceUpdate(); });
         return _this;
     }
-    SchemaRenderer.prototype.componentDidMount = function () {
-        // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
-        this.unbindEvent = rendererEvent.bindEvent(this.cRef);
-    };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
         (_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -180,7 +177,15 @@ var SchemaRenderer = /** @class */ (function (_super) {
     };
     SchemaRenderer.prototype.childRef = function (ref) {
         var _this = this;
-        while (ref && ref.getWrappedInstance) {
+        var _a;
+        // todo 这里有个问题，就是注意以下的这段注释
+        // > // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
+        // > 而 visibleOn 和 hiddenOn 是无效的，
+        // > 这个本来就是个bug，但是已经被广泛使用了
+        // > 我只能继续实现这个bug了
+        // 这样会让子组件去根据是 hidden 的情况去渲染个 null，这样会导致这里 ref 有值，但是 ref.getWrappedInstance() 为 null
+        // 这样会和直接渲染的组件时有些区别，至少 cRef 的指向是不一样的
+        while ((_a = ref === null || ref === void 0 ? void 0 : ref.getWrappedInstance) === null || _a === void 0 ? void 0 : _a.call(ref)) {
             ref = ref.getWrappedInstance();
         }
         if (ref && !ref.props) {
@@ -188,6 +193,10 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 get: function () { return _this.props; }
             });
         }
+        if (ref) {
+            // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
+            this.unbindEvent = rendererEvent.bindEvent(this.ref);
+        }
         this.cRef = ref;
     };
     SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount
@@ -227,7 +236,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         var e_1, _a;
         var _this = this;
         var _b, _c, _d, _e, _f, _g;
-        var _h = this.props; _h.$path; var __ = _h.schema, rootStore = _h.rootStore, statusStore = _h.statusStore, render = _h.render, rest = tslib.__rest(_h, ["$path", "schema", "rootStore", "statusStore", "render"]);
+        var _h = this.props; _h.$path; var __ = _h.schema, rootStore = _h.rootStore, statusStore = _h.statusStore, render = _h.render, propKey = _h.key, rest = tslib.__rest(_h, ["$path", "schema", "rootStore", "statusStore", "render", "key"]);
         if (__ == null) {
             return null;
         }
@@ -277,12 +286,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
         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"]);
+            defaultActiveKey_1 = schema.activeKey, restSchema_1 = tslib.__rest(schema, ["data", "value", "activeKey"]);
             return rest.invisible
                 ? null
                 : _J$X_(schema.component, tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, rest), restSchema_1), exprProps), { 
                     // value: defaultValue, // 备注: 此处并没有将value传递给渲染器
-                    defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey_1, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
+                    defaultData: defaultData_1, defaultValue: defaultValue_1, defaultActiveKey: defaultActiveKey_1, propKey: propKey, $path: $path, $schema: schema, ref: isSFC ? undefined : this.refFn, forwardedRef: isSFC ? this.refFn : undefined, render: this.renderChild, rootStore: rootStore, statusStore: statusStore, dispatchEvent: this.dispatchEvent }));
         }
         else if (Object.keys(schema).length === 0) {
             return null;
@@ -309,7 +318,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         var renderer = this.renderer;
         schema = factory.filterSchema(schema, renderer, rest);
-        var defaultData = schema.data, defaultValue = schema.value, propKey = schema.key, defaultActiveKey = schema.activeKey, restSchema = tslib.__rest(schema, ["data", "value", "key", "activeKey"]);
+        var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, restSchema = tslib.__rest(schema, ["data", "value", "activeKey"]);
         var Component = renderer.component;
         // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
         // 而 visibleOn 和 hiddenOn 是无效的，

package/lib/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -19,6 +19,7 @@ var tokenize = require('./utils/tokenize.js');
 var isPureVariable = require('./utils/isPureVariable.js');
 require('@rc-component/mini-decimal');
 var getVariable = require('./utils/getVariable.js');
+require('./utils/memoryParse.js');
 var dataMapping = require('./utils/dataMapping.js');
 require('./utils/filter.js');
 var helper = require('./utils/helper.js');

package/lib/StatusScoped.js

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

package/lib/WithRootStore.js

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

package/lib/WithStore.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -19,6 +19,7 @@ require('amis-formula');
 require('moment');
 var object = require('./utils/object.js');
 var tokenize = require('./utils/tokenize.js');
+require('./utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var dataMapping = require('./utils/dataMapping.js');
 require('./utils/filter.js');
@@ -142,7 +143,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))), ((_c = props.updatePristineAfterStoreDataReInit) !== null && _c !== void 0 ? _c : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                        store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign(tslib.__assign(tslib.__assign({}, this.formatData(dataMapping.dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (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 ||
@@ -153,19 +154,18 @@ function HocStoreFactory(renderer) {
                             (props.syncSuperStore !== false &&
                                 helper.isSuperDataModified(props.data, prevProps.data, store)))) {
                     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)), ((_d = props.updatePristineAfterStoreDataReInit) !== null && _d !== void 0 ? _d : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                        store.initData(object.createObject(props.store.data, tslib.__assign(tslib.__assign({}, this.formatData(dataMapping.dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), (props.syncSuperStore === 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, 
-                        // 有远程数据
+                        store.initData(object.extendObject(props.data, tslib.__assign(tslib.__assign({}, this.formatData(dataMapping.dataMapping(this.props.defaultData, this.props.data, ignoreSchemaProps))), // 有远程数据
                         // 或者顶级 store
-                        store.hasRemoteData || !store.path.includes('/')
+                        (store.hasRemoteData || !store.path.includes('/')
                             ? tslib.__assign(tslib.__assign({}, store.data), props.data) : // combo 不需要同步，如果要同步，在 Combo.tsx 里面已经实现了相关逻辑
                             // 目前主要的问题是，如果 combo 中表单项名字和 combo 本身的名字一样，会导致里面的值会被覆盖成数组
                             ((_e = props.store) === null || _e === void 0 ? void 0 : _e.storeType) === 'ComboStore'
                                 ? undefined
-                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.pristineDiff), props.data), props.data.__super, prevProps.data.__super, store, false)), ((_f = props.updatePristineAfterStoreDataReInit) !== null && _f !== void 0 ? _f : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);
+                                : helper.syncDataFromSuper(tslib.__assign(tslib.__assign({}, store.pristineDiff), 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), ((_g = props.updatePristineAfterStoreDataReInit) !== null && _g !== void 0 ? _g : props.dataUpdatedAt !== prevProps.dataUpdatedAt) === false);

package/lib/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -14,6 +14,7 @@ var tpl = require('../utils/tpl.js');
 require('amis-formula');
 require('moment');
 var object = require('../utils/object.js');
+require('../utils/memoryParse.js');
 require('@rc-component/mini-decimal');
 var dataMapping = require('../utils/dataMapping.js');
 require('../utils/filter.js');
@@ -190,33 +191,34 @@ var runActions = function (actions, renderer, event) { return tslib.__awaiter(vo
 }); };
 // 执行动作，与原有动作处理打通
 var runAction = function (actionInstrance, actionConfig, renderer, event) { return tslib.__awaiter(void 0, void 0, void 0, function () {
-    var additional, action, mergeData, expression, isStop, preventDefault, key, api, cmptFlag, targetComponent, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
-    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v;
-    return tslib.__generator(this, function (_w) {
-        switch (_w.label) {
+    var additional, action, rendererProto, mergeData, expression, isStop, preventDefault, key, api, cmptFlag, targetComponent, args, afterMappingData, actionData, data, stopped, actionResult, stopPropagation;
+    var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y;
+    return tslib.__generator(this, function (_z) {
+        switch (_z.label) {
             case 0:
                 additional = {
                     event: event
                 };
                 action = tslib.__assign({}, actionConfig);
                 action.args = tslib.__assign({}, actionConfig.args);
+                rendererProto = (_c = (_b = (_a = renderer.props).getData) === null || _b === void 0 ? void 0 : _b.call(_a)) !== null && _c !== void 0 ? _c : renderer.props.data;
                 // __rendererData默认为renderer.props.data，兼容表单项值变化时的data读取
-                if (!((_a = event.data) === null || _a === void 0 ? void 0 : _a.__rendererData)) {
+                if (!((_d = event.data) === null || _d === void 0 ? void 0 : _d.__rendererData)) {
                     additional = {
                         event: event,
-                        __rendererData: renderer.props.data // 部分组件交互后会有更新，如果想要获取那部分数据，可以通过事件数据获取
+                        __rendererData: rendererProto // 部分组件交互后会有更新，如果想要获取那部分数据，可以通过事件数据获取
                     };
                 }
-                mergeData = object.createObject(object.createObject(renderer.props.data.__super
-                    ? object.createObject(renderer.props.data.__super, additional)
-                    : additional, renderer.props.data), event.data);
-                expression = (_b = action.expression) !== null && _b !== void 0 ? _b : action.execOn;
+                mergeData = object.createObject(object.createObject(rendererProto.__super
+                    ? object.createObject(rendererProto.__super, additional)
+                    : additional, rendererProto), event.data);
+                expression = (_e = action.expression) !== null && _e !== void 0 ? _e : action.execOn;
                 isStop = false;
                 if (!expression) return [3 /*break*/, 2];
                 return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(expression, mergeData, true)];
             case 1:
-                isStop = !(_w.sent());
-                _w.label = 2;
+                isStop = !(_z.sent());
+                _z.label = 2;
             case 2:
                 if (isStop) {
                     return [2 /*return*/];
@@ -225,8 +227,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 if (!action.preventDefault) return [3 /*break*/, 4];
                 return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.preventDefault, mergeData, false)];
             case 3:
-                preventDefault = _w.sent();
-                _w.label = 4;
+                preventDefault = _z.sent();
+                _z.label = 4;
             case 4:
                 key = {
                     componentId: dataMapping.dataMapping(action.componentId, mergeData),
@@ -234,25 +236,25 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 };
                 // 兼容args包裹的用法
                 if (action.actionType === 'dialog') {
-                    action.dialog = tslib.__assign({}, ((_c = action.dialog) !== null && _c !== void 0 ? _c : (_d = action.args) === null || _d === void 0 ? void 0 : _d.dialog));
-                    (_e = action.args) === null || _e === void 0 ? true : delete _e.dialog;
+                    action.dialog = tslib.__assign({}, ((_f = action.dialog) !== null && _f !== void 0 ? _f : (_g = action.args) === null || _g === void 0 ? void 0 : _g.dialog));
+                    (_h = action.args) === null || _h === void 0 ? true : delete _h.dialog;
                 }
                 else if (action.actionType === 'drawer') {
-                    action.drawer = tslib.__assign({}, ((_f = action.drawer) !== null && _f !== void 0 ? _f : (_g = action.args) === null || _g === void 0 ? void 0 : _g.drawer));
-                    (_h = action.args) === null || _h === void 0 ? true : delete _h.drawer;
+                    action.drawer = tslib.__assign({}, ((_j = action.drawer) !== null && _j !== void 0 ? _j : (_k = action.args) === null || _k === void 0 ? void 0 : _k.drawer));
+                    (_l = action.args) === null || _l === void 0 ? true : delete _l.drawer;
                 }
                 else if (['ajax', 'download'].includes(action.actionType)) {
-                    api = (_j = action.api) !== null && _j !== void 0 ? _j : (_k = action.args) === null || _k === void 0 ? void 0 : _k.api;
+                    api = (_m = action.api) !== null && _m !== void 0 ? _m : (_o = action.args) === null || _o === void 0 ? void 0 : _o.api;
                     action.api = typeof api === 'string' ? api : tslib.__assign({}, api);
-                    action.options = tslib.__assign({}, ((_l = action.options) !== null && _l !== void 0 ? _l : (_m = action.args) === null || _m === void 0 ? void 0 : _m.options));
-                    action.messages = tslib.__assign({}, ((_o = action.messages) !== null && _o !== void 0 ? _o : (_p = action.args) === null || _p === void 0 ? void 0 : _p.messages));
-                    (_q = action.args) === null || _q === void 0 ? true : delete _q.api;
-                    (_r = action.args) === null || _r === void 0 ? true : delete _r.options;
-                    (_s = action.args) === null || _s === void 0 ? true : delete _s.messages;
+                    action.options = tslib.__assign({}, ((_p = action.options) !== null && _p !== void 0 ? _p : (_q = action.args) === null || _q === void 0 ? void 0 : _q.options));
+                    action.messages = tslib.__assign({}, ((_r = action.messages) !== null && _r !== void 0 ? _r : (_s = action.args) === null || _s === void 0 ? void 0 : _s.messages));
+                    (_t = action.args) === null || _t === void 0 ? true : delete _t.api;
+                    (_u = action.args) === null || _u === void 0 ? true : delete _u.options;
+                    (_v = action.args) === null || _v === void 0 ? true : delete _v.messages;
                 }
                 cmptFlag = key.componentId || key.componentName;
                 targetComponent = cmptFlag
-                    ? (_t = event.context.scoped) === null || _t === void 0 ? void 0 : _t[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
+                    ? (_w = event.context.scoped) === null || _w === void 0 ? void 0 : _w[action.componentId ? 'getComponentById' : 'getComponentByName'](cmptFlag)
                     : renderer;
                 args = dataMapping.dataMapping(action.args, mergeData, function (key) {
                     var _a;
@@ -281,12 +283,12 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                     !['ajax', 'download', 'dialog', 'drawer'].includes(action.actionType) // 避免非法配置影响对actionData的判断，导致动作配置中的数据映射失败
                     ? actionData
                     : mergeData;
-                (_u = console.group) === null || _u === void 0 ? void 0 : _u.call(console, "run action ".concat(action.actionType));
+                (_x = console.group) === null || _x === void 0 ? void 0 : _x.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, rawData: actionConfig.data, data: action.actionType === 'reload' ? actionData : data }), key), renderer, event, mergeData)];
             case 5:
-                actionResult = _w.sent();
+                actionResult = _z.sent();
                 // 二次确认弹窗如果取消，则终止后续动作
                 if ((action === null || action === void 0 ? void 0 : action.actionType) === 'confirmDialog' && !actionResult) {
                     stopped = true;
@@ -296,11 +298,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 if (!action.stopPropagation) return [3 /*break*/, 7];
                 return [4 /*yield*/, tpl.evalExpressionWithConditionBuilderAsync(action.stopPropagation, mergeData, false)];
             case 6:
-                stopPropagation = _w.sent();
-                _w.label = 7;
+                stopPropagation = _z.sent();
+                _z.label = 7;
             case 7:
                 console.debug("[".concat(action.actionType, "] action end event"), event);
-                (_v = console.groupEnd) === null || _v === void 0 ? void 0 : _v.call(console);
+                (_y = console.groupEnd) === null || _y === void 0 ? void 0 : _y.call(console);
                 // 阻止原有动作执行
                 preventDefault && event.preventDefault();
                 // 阻止后续动作执行

package/lib/actions/AjaxAction.js

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

package/lib/actions/BreakAction.js

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

package/lib/actions/BroadcastAction.js

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