amis-core 6.6.0 → 6.8.0

package/esm/Root.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -65,6 +65,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);
     }
@@ -91,9 +92,9 @@ function renderChild(prefix, node, props) {
         // 找渲染器也是在那，所以没办法在之前根据渲染器信息来包裹个组件下发 statusStore
         // 所以这里先根据 type 来处理一下
         // 等后续把状态处理再抽一层，可以把此处放到 SchemaRenderer 里面去
-        return (React.createElement(StatusScopedSchemaRenderer, __assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+        return (React.createElement(StatusScopedSchemaRenderer, __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 (React.createElement(SchemaRenderer, __assign({ render: renderChild }, props, { schema: schema, propKey: schema.key, "$path": "".concat(prefix ? "".concat(prefix, "/") : '').concat((schema && schema.type) || '') })));
+    return (React.createElement(SchemaRenderer, __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(HocScoped(Root));
 

package/esm/RootRenderer.d.ts

@@ -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/esm/RootRenderer.js

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

package/esm/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/esm/SchemaRenderer.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -22,6 +22,7 @@ import { reaction } from 'mobx';
 import 'amis-formula';
 import 'moment';
 import 'lodash/isPlainObject';
+import './utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { resolveVariableAndFilter } from './utils/resolveVariableAndFilter.js';
 import './utils/filter.js';
@@ -88,10 +89,6 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }, function () { return _this.forceUpdate(); });
         return _this;
     }
-    SchemaRenderer.prototype.componentDidMount = function () {
-        // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
-        this.unbindEvent = bindEvent(this.cRef);
-    };
     SchemaRenderer.prototype.componentWillUnmount = function () {
         var _a, _b;
         (_a = this.reaction) === null || _a === void 0 ? void 0 : _a.call(this);
@@ -167,7 +164,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) {
@@ -175,6 +180,10 @@ var SchemaRenderer = /** @class */ (function (_super) {
                 get: function () { return _this.props; }
             });
         }
+        if (ref) {
+            // 这里无法区分监听的是不是广播，所以又bind一下，主要是为了绑广播
+            this.unbindEvent = bindEvent(this.ref);
+        }
         this.cRef = ref;
     };
     SchemaRenderer.prototype.dispatchEvent = function (e, data, renderer // for didmount
@@ -214,7 +223,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 = __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 = __rest(_h, ["$path", "schema", "rootStore", "statusStore", "render", "key"]);
         if (__ == null) {
             return null;
         }
@@ -264,12 +273,12 @@ var SchemaRenderer = /** @class */ (function (_super) {
         else if (schema.component && isValidElementType(schema.component)) {
             var isSFC = !(schema.component.prototype instanceof React.Component);
             var defaultData_1 = schema.data, defaultValue_1 = schema.value, // render时的value改放defaultValue中
-            defaultActiveKey_1 = schema.activeKey, propKey_1 = schema.key, restSchema_1 = __rest(schema, ["data", "value", "activeKey", "key"]);
+            defaultActiveKey_1 = schema.activeKey, restSchema_1 = __rest(schema, ["data", "value", "activeKey"]);
             return rest.invisible
                 ? null
                 : React.createElement(schema.component, __assign(__assign(__assign(__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;
@@ -296,7 +305,7 @@ var SchemaRenderer = /** @class */ (function (_super) {
         }
         var renderer = this.renderer;
         schema = filterSchema(schema, renderer, rest);
-        var defaultData = schema.data, defaultValue = schema.value, propKey = schema.key, defaultActiveKey = schema.activeKey, restSchema = __rest(schema, ["data", "value", "key", "activeKey"]);
+        var defaultData = schema.data, defaultValue = schema.value, defaultActiveKey = schema.activeKey, restSchema = __rest(schema, ["data", "value", "activeKey"]);
         var Component = renderer.component;
         // 原来表单项的 visible: false 和 hidden: true 表单项的值和验证是有效的
         // 而 visibleOn 和 hiddenOn 是无效的，

package/esm/Scoped.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -15,6 +15,7 @@ import { memoParse } from './utils/tokenize.js';
 import { isPureVariable } from './utils/isPureVariable.js';
 import '@rc-component/mini-decimal';
 import { getVariable } from './utils/getVariable.js';
+import './utils/memoryParse.js';
 import { dataMapping } from './utils/dataMapping.js';
 import './utils/filter.js';
 import { findTree, eachTree, qsparse, qsstringify, parseQuery, autobind } from './utils/helper.js';

package/esm/StatusScoped.js

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

package/esm/WithRootStore.js

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

package/esm/WithStore.js

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

package/esm/actions/Action.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -10,6 +10,7 @@ import { evalExpressionWithConditionBuilderAsync } from '../utils/tpl.js';
 import 'amis-formula';
 import 'moment';
 import { createObject } from '../utils/object.js';
+import '../utils/memoryParse.js';
 import '@rc-component/mini-decimal';
 import { dataMapping } from '../utils/dataMapping.js';
 import '../utils/filter.js';
@@ -182,33 +183,34 @@ var runActions = function (actions, renderer, event) { return __awaiter(void 0,
 }); };
 // 执行动作，与原有动作处理打通
 var runAction = function (actionInstrance, actionConfig, renderer, event) { return __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 __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 __generator(this, function (_z) {
+        switch (_z.label) {
             case 0:
                 additional = {
                     event: event
                 };
                 action = __assign({}, actionConfig);
                 action.args = __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 = createObject(createObject(renderer.props.data.__super
-                    ? createObject(renderer.props.data.__super, additional)
-                    : additional, renderer.props.data), event.data);
-                expression = (_b = action.expression) !== null && _b !== void 0 ? _b : action.execOn;
+                mergeData = createObject(createObject(rendererProto.__super
+                    ? 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*/, 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*/];
@@ -217,8 +219,8 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 if (!action.preventDefault) return [3 /*break*/, 4];
                 return [4 /*yield*/, evalExpressionWithConditionBuilderAsync(action.preventDefault, mergeData, false)];
             case 3:
-                preventDefault = _w.sent();
-                _w.label = 4;
+                preventDefault = _z.sent();
+                _z.label = 4;
             case 4:
                 key = {
                     componentId: dataMapping(action.componentId, mergeData),
@@ -226,25 +228,25 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 };
                 // 兼容args包裹的用法
                 if (action.actionType === 'dialog') {
-                    action.dialog = __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 = __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 = __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 = __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 : __assign({}, api);
-                    action.options = __assign({}, ((_l = action.options) !== null && _l !== void 0 ? _l : (_m = action.args) === null || _m === void 0 ? void 0 : _m.options));
-                    action.messages = __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 = __assign({}, ((_p = action.options) !== null && _p !== void 0 ? _p : (_q = action.args) === null || _q === void 0 ? void 0 : _q.options));
+                    action.messages = __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(action.args, mergeData, function (key) {
                     var _a;
@@ -273,12 +275,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(__assign(__assign(__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;
@@ -288,11 +290,11 @@ var runAction = function (actionInstrance, actionConfig, renderer, event) { retu
                 if (!action.stopPropagation) return [3 /*break*/, 7];
                 return [4 /*yield*/, 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/esm/actions/AjaxAction.js

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

package/esm/actions/BreakAction.js

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

package/esm/actions/BroadcastAction.js

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

package/esm/actions/CmptAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -20,12 +20,12 @@ var CmptAction = /** @class */ (function () {
     function CmptAction() {
     }
     CmptAction.prototype.run = function (action, renderer, event) {
-        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4;
+        var _a, _b, _c, _d, _e, _f, _g, _h, _j, _k, _l, _m, _o, _p, _q, _r, _s, _t, _u, _v, _w, _x, _y, _z, _0, _1, _2, _3, _4, _5;
         return __awaiter(this, void 0, void 0, function () {
-            var key, dataMergeMode, path, beforeSetData, res, component, msg, _5, dispatchEvent_1, data, valid, e_1, result, e_2;
-            var _6, _7, _8, _9, _10;
-            return __generator(this, function (_11) {
-                switch (_11.label) {
+            var key, dataMergeMode, path, beforeSetData, res, component, msg, _6, dispatchEvent_1, data, valid, _7, e_1, result, e_2;
+            var _8, _9, _10, _11, _12;
+            return __generator(this, function (_13) {
+                switch (_13.label) {
                     case 0:
                         key = action.componentId || action.componentName;
                         dataMergeMode = action.dataMergeMode || 'merge';
@@ -35,11 +35,11 @@ var CmptAction = /** @class */ (function () {
                         if (!(beforeSetData && typeof beforeSetData === 'function')) return [3 /*break*/, 2];
                         return [4 /*yield*/, beforeSetData(renderer, action, event)];
                     case 1:
-                        res = _11.sent();
+                        res = _13.sent();
                         if (res === false) {
                             return [2 /*return*/];
                         }
-                        _11.label = 2;
+                        _13.label = 2;
                     case 2:
                         component = key
                             ? (_d = event.context.scoped) === null || _d === void 0 ? void 0 : _d[action.componentId ? 'getComponentById' : 'getComponentByName'](key)
@@ -67,70 +67,77 @@ var CmptAction = /** @class */ (function () {
                             return [2 /*return*/, (_l = component === null || component === void 0 ? void 0 : component.reload) === null || _l === void 0 ? void 0 : _l.call(component, undefined, action.data, event.data, undefined, dataMergeMode === 'override', action.args)];
                         }
                         if (!(action.actionType === 'validateFormItem' &&
-                            ((_o = getRendererByName((_m = component === null || component === void 0 ? void 0 : component.props) === null || _m === void 0 ? void 0 : _m.type)) === null || _o === void 0 ? void 0 : _o.isFormItem))) return [3 /*break*/, 7];
-                        _5 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _5.dispatchEvent, data = _5.data;
-                        _11.label = 3;
+                            ((_o = getRendererByName((_m = component === null || component === void 0 ? void 0 : component.props) === null || _m === void 0 ? void 0 : _m.type)) === null || _o === void 0 ? void 0 : _o.isFormItem))) return [3 /*break*/, 9];
+                        _6 = (component === null || component === void 0 ? void 0 : component.props) || {}, dispatchEvent_1 = _6.dispatchEvent, data = _6.data;
+                        _13.label = 3;
                     case 3:
-                        _11.trys.push([3, 5, , 6]);
+                        _13.trys.push([3, 7, , 8]);
                         return [4 /*yield*/, ((_q = component === null || component === void 0 ? void 0 : (_p = component.props).onValidate) === null || _q === void 0 ? void 0 : _q.call(_p))];
                     case 4:
-                        valid = _11.sent();
+                        _7 = (_13.sent());
+                        if (_7) return [3 /*break*/, 6];
+                        return [4 /*yield*/, ((_r = component === null || component === void 0 ? void 0 : component.validate) === null || _r === void 0 ? void 0 : _r.call(component))];
+                    case 5:
+                        _7 = (_13.sent());
+                        _13.label = 6;
+                    case 6:
+                        valid = _7;
                         if (valid) {
-                            event.setData(createObject(event.data, (_6 = {},
-                                _6[action.outputVar || "".concat(action.actionType, "Result")] = {
+                            event.setData(createObject(event.data, (_8 = {},
+                                _8[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: '',
-                                    value: (_s = (_r = component === null || component === void 0 ? void 0 : component.props) === null || _r === void 0 ? void 0 : _r.formItem) === null || _s === void 0 ? void 0 : _s.value
+                                    value: (_t = (_s = component === null || component === void 0 ? void 0 : component.props) === null || _s === void 0 ? void 0 : _s.formItem) === null || _t === void 0 ? void 0 : _t.value
                                 },
-                                _6)));
+                                _8)));
                             dispatchEvent_1 && dispatchEvent_1('formItemValidateSucc', data);
                         }
                         else {
-                            event.setData(createObject(event.data, (_7 = {},
-                                _7[action.outputVar || "".concat(action.actionType, "Result")] = {
-                                    error: (((_u = (_t = component === null || component === void 0 ? void 0 : component.props) === null || _t === void 0 ? void 0 : _t.formItem) === null || _u === void 0 ? void 0 : _u.errors) || []).join(','),
-                                    value: (_w = (_v = component === null || component === void 0 ? void 0 : component.props) === null || _v === void 0 ? void 0 : _v.formItem) === null || _w === void 0 ? void 0 : _w.value
+                            event.setData(createObject(event.data, (_9 = {},
+                                _9[action.outputVar || "".concat(action.actionType, "Result")] = {
+                                    error: (((_v = (_u = component === null || component === void 0 ? void 0 : component.props) === null || _u === void 0 ? void 0 : _u.formItem) === null || _v === void 0 ? void 0 : _v.errors) || []).join(','),
+                                    value: (_x = (_w = component === null || component === void 0 ? void 0 : component.props) === null || _w === void 0 ? void 0 : _w.formItem) === null || _x === void 0 ? void 0 : _x.value
                                 },
-                                _7)));
+                                _9)));
                             dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
                         }
-                        return [3 /*break*/, 6];
-                    case 5:
-                        e_1 = _11.sent();
-                        event.setData(createObject(event.data, (_8 = {},
-                            _8[action.outputVar || "".concat(action.actionType, "Result")] = {
+                        return [3 /*break*/, 8];
+                    case 7:
+                        e_1 = _13.sent();
+                        event.setData(createObject(event.data, (_10 = {},
+                            _10[action.outputVar || "".concat(action.actionType, "Result")] = {
                                 error: e_1.message || '未知错误',
-                                value: (_y = (_x = component === null || component === void 0 ? void 0 : component.props) === null || _x === void 0 ? void 0 : _x.formItem) === null || _y === void 0 ? void 0 : _y.value
+                                value: (_z = (_y = component === null || component === void 0 ? void 0 : component.props) === null || _y === void 0 ? void 0 : _y.formItem) === null || _z === void 0 ? void 0 : _z.value
                             },
-                            _8)));
+                            _10)));
                         dispatchEvent_1 && dispatchEvent_1('formItemValidateError', data);
-                        return [3 /*break*/, 6];
-                    case 6: return [2 /*return*/];
-                    case 7:
-                        _11.trys.push([7, 9, , 10]);
-                        return [4 /*yield*/, ((_z = component === null || component === void 0 ? void 0 : component.doAction) === null || _z === void 0 ? void 0 : _z.call(component, action, event.data, true, action.args))];
-                    case 8:
-                        result = _11.sent();
+                        return [3 /*break*/, 8];
+                    case 8: return [2 /*return*/];
+                    case 9:
+                        _13.trys.push([9, 11, , 12]);
+                        return [4 /*yield*/, ((_0 = component === null || component === void 0 ? void 0 : component.doAction) === null || _0 === void 0 ? void 0 : _0.call(component, action, event.data, true, action.args))];
+                    case 10:
+                        result = _13.sent();
                         if (['validate', 'submit'].includes(action.actionType)) {
-                            event.setData(createObject(event.data, (_9 = {},
-                                _9[action.outputVar || "".concat(action.actionType, "Result")] = {
+                            event.setData(createObject(event.data, (_11 = {},
+                                _11[action.outputVar || "".concat(action.actionType, "Result")] = {
                                     error: '',
-                                    payload: (_0 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _0 !== void 0 ? _0 : (_2 = (_1 = component === null || component === void 0 ? void 0 : component.props) === null || _1 === void 0 ? void 0 : _1.store) === null || _2 === void 0 ? void 0 : _2.data,
+                                    payload: (_1 = result === null || result === void 0 ? void 0 : result.__payload) !== null && _1 !== void 0 ? _1 : (_3 = (_2 = component === null || component === void 0 ? void 0 : component.props) === null || _2 === void 0 ? void 0 : _2.store) === null || _3 === void 0 ? void 0 : _3.data,
                                     responseData: result === null || result === void 0 ? void 0 : result.__response
                                 },
-                                _9)));
+                                _11)));
                         }
                         return [2 /*return*/, result];
-                    case 9:
-                        e_2 = _11.sent();
-                        event.setData(createObject(event.data, (_10 = {},
-                            _10[action.outputVar || "".concat(action.actionType, "Result")] = {
+                    case 11:
+                        e_2 = _13.sent();
+                        event.setData(createObject(event.data, (_12 = {},
+                            _12[action.outputVar || "".concat(action.actionType, "Result")] = {
                                 error: e_2.message,
                                 errors: e_2.name === 'ValidateError' ? e_2.detail : e_2,
-                                payload: (_4 = (_3 = component === null || component === void 0 ? void 0 : component.props) === null || _3 === void 0 ? void 0 : _3.store) === null || _4 === void 0 ? void 0 : _4.data
+                                payload: (_5 = (_4 = component === null || component === void 0 ? void 0 : component.props) === null || _4 === void 0 ? void 0 : _4.store) === null || _5 === void 0 ? void 0 : _5.data
                             },
-                            _10)));
-                        return [3 /*break*/, 10];
-                    case 10: return [2 /*return*/];
+                            _12)));
+                        return [3 /*break*/, 12];
+                    case 12: return [2 /*return*/];
                 }
             });
         });

package/esm/actions/ContinueAction.js

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

package/esm/actions/CopyAction.js

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

package/esm/actions/CustomAction.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.6.0
+ * amis-core v6.8.0
  * Copyright 2018-2024 fex
  */
 
@@ -11,6 +11,7 @@ import 'react';
 import 'lodash/chunk';
 import 'lodash/isPlainObject';
 import 'amis-formula';
+import '../utils/memoryParse.js';
 import '../utils/DataSchema.js';
 import '../utils/DataScope.js';
 import 'moment';
@@ -57,7 +58,7 @@ var CustomAction = /** @class */ (function () {
     CustomAction.prototype.run = function (action, renderer, event) {
         var _a, _b;
         return __awaiter(this, void 0, void 0, function () {
-            var scriptFunc;
+            var scriptFunc, proxy;
             return __generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
@@ -65,7 +66,15 @@ var CustomAction = /** @class */ (function () {
                         if (typeof scriptFunc === 'string') {
                             scriptFunc = str2AsyncFunction(scriptFunc, 'context', 'doAction', 'event');
                         }
-                        return [4 /*yield*/, (scriptFunc === null || scriptFunc === void 0 ? void 0 : scriptFunc.call(null, renderer, function (action) { return runActions(action, renderer, event); }, event, action))];
+                        proxy = new Proxy({}, {
+                            get: function (target, p, receiver) {
+                                var _a, _b;
+                                if (typeof p === 'string') {
+                                    return (_b = (_a = event.context.scoped) === null || _a === void 0 ? void 0 : _a.getComponentByName) === null || _b === void 0 ? void 0 : _b.call(_a, p);
+                                }
+                            }
+                        });
+                        return [4 /*yield*/, (scriptFunc === null || scriptFunc === void 0 ? void 0 : scriptFunc.call(proxy, renderer, function (action) { return runActions(action, renderer, event); }, event, action))];
                     case 1:
                         _c.sent();
                         return [2 /*return*/];