amis-core 6.2.2 → 6.4.0

package/lib/renderers/Form.js

@@ -1,5 +1,5 @@
 /**
- * amis-core v6.2.2
+ * amis-core v6.4.0
  * Copyright 2018-2024 fex
  */
 
@@ -41,7 +41,7 @@ require('../utils/highlight.js');
 require('../utils/icon.js');
 require('../utils/image.js');
 require('lodash/isPlainObject');
-require('lodash/isEqual');
+var isEqual = require('lodash/isEqual');
 require('../actions/Action.js');
 require('../utils/resize-sensor.js');
 require('react-overlays/useRootClose');
@@ -59,6 +59,7 @@ require('../utils/validations.js');
 require('../utils/resolveCondition.js');
 var mobx = require('mobx');
 require('../utils/Animation.js');
+var groupBy = require('lodash/groupBy');
 
 function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
@@ -66,6 +67,8 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
 var debounce__default = /*#__PURE__*/_interopDefaultLegacy(debounce);
 var flatten__default = /*#__PURE__*/_interopDefaultLegacy(flatten);
 var find__default = /*#__PURE__*/_interopDefaultLegacy(find);
+var isEqual__default = /*#__PURE__*/_interopDefaultLegacy(isEqual);
+var groupBy__default = /*#__PURE__*/_interopDefaultLegacy(groupBy);
 
 var __react_jsx__ = require('react');
 var _J$X_ = (__react_jsx__["default"] || __react_jsx__).createElement;
@@ -83,6 +86,8 @@ var Form = /** @class */ (function (_super) {
         });
         // 如果开启了 lazyChange，需要一个 flush 方法把队列中值应用上。
         _this.flushing = false;
+        _this.emittedData = null;
+        _this.emitting = false;
         _this.onInit = _this.onInit.bind(_this);
         _this.handleAction = _this.handleAction.bind(_this);
         _this.handleQuery = _this.handleQuery.bind(_this);
@@ -199,7 +204,6 @@ var Form = /** @class */ (function (_super) {
                     return helper.until(function () { return store.checkRemote(initAsyncApi, store.data); }, function (ret) { return ret && ret[initFinishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, initCheckInterval);
                 }
             })
-                .then(this.dispatchInited)
                 .then(this.initInterval)
                 .then(this.onInit);
         }
@@ -220,8 +224,8 @@ var Form = /** @class */ (function (_super) {
                 successMessage: fetchSuccess,
                 errorMessage: fetchFailed
             })
-                .then(this.dispatchInited)
-                .then(this.initInterval);
+                .then(this.initInterval)
+                .then(this.dispatchInited);
         }
     };
     Form.prototype.componentWillUnmount = function () {
@@ -251,20 +255,18 @@ var Form = /** @class */ (function (_super) {
     Form.prototype.dispatchInited = function (value) {
         var _a;
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _b, data, store, dispatchEvent;
+            var _b, data, store, dispatchEvent, result;
             return tslib.__generator(this, function (_c) {
                 switch (_c.label) {
                     case 0:
                         _b = this.props, data = _b.data, store = _b.store, dispatchEvent = _b.dispatchEvent;
-                        if (store.fetching) {
+                        if (!mobxStateTree.isAlive(store) || store.fetching) {
                             return [2 /*return*/, value];
                         }
-                        // 派发init事件，参数为初始化数据
                         return [4 /*yield*/, dispatchEvent('inited', object.createObject(data, tslib.__assign(tslib.__assign({}, value === null || value === void 0 ? void 0 : value.data), { responseData: (_a = value === null || value === void 0 ? void 0 : value.data) !== null && _a !== void 0 ? _a : {}, responseStatus: store.error ? 1 : 0, responseMsg: store.msg })))];
                     case 1:
-                        // 派发init事件，参数为初始化数据
-                        _c.sent();
-                        return [2 /*return*/, value];
+                        result = _c.sent();
+                        return [2 /*return*/, result];
                 }
             });
         });
@@ -285,7 +287,7 @@ var Form = /** @class */ (function (_super) {
     };
     Form.prototype.onInit = function () {
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onInit, store, persistData, submitOnInit, data, initedAt, hooks;
+            var _a, onInit, store, persistData, submitOnInit, data, initedAt, hooks, groupedHooks, dispatch;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
@@ -297,8 +299,23 @@ var Form = /** @class */ (function (_super) {
                         initedAt = store.initedAt;
                         store.setInited(true);
                         hooks = this.hooks['init'] || [];
-                        return [4 /*yield*/, Promise.all(hooks.map(function (hook) { return hook(data); }))];
+                        groupedHooks = groupBy__default["default"](hooks, function (item) {
+                            return item.__enforce === 'prev'
+                                ? 'prev'
+                                : item.__enforce === 'post'
+                                    ? 'post'
+                                    : 'normal';
+                        });
+                        return [4 /*yield*/, Promise.all((groupedHooks.prev || []).map(function (hook) { return hook(data); }))];
                     case 1:
+                        _b.sent();
+                        //  有可能在前面的步骤中删除了钩子，所以需要重新验证一下
+                        return [4 /*yield*/, Promise.all((groupedHooks.normal || []).map(function (hook) { return hooks.includes(hook) && hook(data); }))];
+                    case 2:
+                        //  有可能在前面的步骤中删除了钩子，所以需要重新验证一下
+                        _b.sent();
+                        return [4 /*yield*/, Promise.all((groupedHooks.post || []).map(function (hook) { return hooks.includes(hook) && hook(data); }))];
+                    case 3:
                         _b.sent();
                         if (!mobxStateTree.isAlive(store)) {
                             return [2 /*return*/];
@@ -315,6 +332,13 @@ var Form = /** @class */ (function (_super) {
                             data = object.cloneObject(store.data);
                         }
                         onInit && onInit(data, this.props);
+                        return [4 /*yield*/, this.dispatchInited({ data: data })];
+                    case 4:
+                        dispatch = _b.sent();
+                        if (dispatch === null || dispatch === void 0 ? void 0 : dispatch.prevented) {
+                            return [2 /*return*/];
+                        }
+                        // submitOnInit
                         submitOnInit &&
                             this.handleAction(undefined, {
                                 type: 'submit'
@@ -340,7 +364,8 @@ var Form = /** @class */ (function (_super) {
                             store.updateData((_c = {},
                                 _c[initFinishedField || 'finished'] = false,
                                 _c));
-                        if (!api.isEffectiveApi(initApi, store.data)) return [3 /*break*/, 3];
+                        result = undefined;
+                        if (!api.isEffectiveApi(initApi, store.data)) return [3 /*break*/, 2];
                         return [4 /*yield*/, store.fetchInitData(initApi, store.data, {
                                 successMessage: fetchSuccess,
                                 errorMessage: fetchFailed,
@@ -356,20 +381,18 @@ var Form = /** @class */ (function (_super) {
                             })];
                     case 1:
                         result = _d.sent();
-                        // 派发初始化接口请求完成事件
-                        return [4 /*yield*/, this.dispatchInited(result)];
-                    case 2:
-                        // 派发初始化接口请求完成事件
-                        _d.sent();
                         if (result === null || result === void 0 ? void 0 : result.ok) {
                             this.initInterval(result);
                             store.reset(undefined, false);
                         }
-                        return [3 /*break*/, 4];
-                    case 3:
+                        return [3 /*break*/, 3];
+                    case 2:
                         store.reset(undefined, false);
-                        _d.label = 4;
-                    case 4: return [2 /*return*/];
+                        _d.label = 3;
+                    case 3:
+                        // 派发初始化接口请求完成事件
+                        this.dispatchInited(result);
+                        return [2 /*return*/];
                 }
             });
         });
@@ -471,7 +494,7 @@ var Form = /** @class */ (function (_super) {
             return tslib.__generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
-                        _a.trys.push([0, , 3, 4]);
+                        _a.trys.push([0, , 4, 5]);
                         if (this.flushing) {
                             return [2 /*return*/];
                         }
@@ -480,14 +503,16 @@ var Form = /** @class */ (function (_super) {
                         return [4 /*yield*/, Promise.all(hooks.map(function (fn) { return fn(); }))];
                     case 1:
                         _a.sent();
+                        if (!!this.emitting) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.lazyEmitChange.flush()];
                     case 2:
                         _a.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
+                        _a.label = 3;
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
                         this.flushing = false;
                         return [7 /*endfinally*/];
-                    case 4: return [2 /*return*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -496,11 +521,13 @@ var Form = /** @class */ (function (_super) {
         var _a = this.props, store = _a.store, onReset = _a.onReset;
         store.reset(onReset);
     };
-    Form.prototype.addHook = function (fn, type) {
+    Form.prototype.addHook = function (fn, type, enforce) {
         var _this = this;
         if (type === void 0) { type = 'validate'; }
         this.hooks[type] = this.hooks[type] || [];
-        this.hooks[type].push(type === 'flush' ? fn : helper.promisify(fn));
+        var hook = type === 'flush' ? fn : helper.promisify(fn);
+        hook.__enforce = enforce;
+        this.hooks[type].push(hook);
         return function () {
             _this.removeHook(fn, type);
             fn = helper.noop;
@@ -539,30 +566,34 @@ var Form = /** @class */ (function (_super) {
         var dispatchEvent = this.props.dispatchEvent;
         return dispatchEvent(type, data);
     };
-    Form.prototype.emitChange = function (submit, skipIfNothingChanges) {
-        if (skipIfNothingChanges === void 0) { skipIfNothingChanges = false; }
+    Form.prototype.emitChange = function (submit, emitedFromWatch) {
+        if (emitedFromWatch === void 0) { emitedFromWatch = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _a, onChange, store, submitOnChange, dispatchEvent, data, diff, changeProps, dispatcher;
+            var _a, onChange, store, submitOnChange, dispatchEvent_1, data, diff, changeProps, dispatcher;
             return tslib.__generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
-                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent = _a.dispatchEvent, data = _a.data;
+                        _b.trys.push([0, , 4, 5]);
+                        this.emitting = true;
+                        _a = this.props, onChange = _a.onChange, store = _a.store, submitOnChange = _a.submitOnChange, dispatchEvent_1 = _a.dispatchEvent, data = _a.data;
                         if (!mobxStateTree.isAlive(store)) {
                             return [2 /*return*/];
                         }
                         diff = helper.difference(store.data, store.pristine);
-                        if (skipIfNothingChanges && !Object.keys(diff).length) {
+                        if (emitedFromWatch &&
+                            (!Object.keys(diff).length || isEqual__default["default"](store.data, this.emittedData))) {
                             return [2 /*return*/];
                         }
+                        this.emittedData = store.data;
                         changeProps = [store.data, diff, this.props];
-                        return [4 /*yield*/, dispatchEvent('change', object.createObject(data, store.data))];
+                        return [4 /*yield*/, dispatchEvent_1('change', object.createObject(data, store.data))];
                     case 1:
                         dispatcher = _b.sent();
                         if (!(dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented)) {
                             onChange && onChange.apply(null, changeProps);
                         }
                         store.clearRestError();
-                        if (!(submit || (submitOnChange && store.inited))) return [3 /*break*/, 3];
+                        if (!(!emitedFromWatch && (submit || (submitOnChange && store.inited)))) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.handleAction(undefined, {
                                 type: 'submit',
                                 // 如果这里不跳过，会相互依赖死循环，flush 会 让 emiteChange 立即执行
@@ -572,7 +603,11 @@ var Form = /** @class */ (function (_super) {
                     case 2:
                         _b.sent();
                         _b.label = 3;
-                    case 3: return [2 /*return*/];
+                    case 3: return [3 /*break*/, 5];
+                    case 4:
+                        this.emitting = false;
+                        return [7 /*endfinally*/];
+                    case 5: return [2 /*return*/];
                 }
             });
         });
@@ -617,7 +652,7 @@ var Form = /** @class */ (function (_super) {
         var _a, _b;
         if (throwErrors === void 0) { throwErrors = false; }
         return tslib.__awaiter(this, void 0, void 0, function () {
-            var _c, store, onSubmit, api$1, asyncApi, finishedField, checkInterval, _d, saveSuccess, saveFailed, resetAfterSubmit, clearAfterSubmit, onAction, onSaved, onReset, onFinished, onFailed, redirect, reload, target, env, onChange, clearPersistDataAfterSubmit, trimValues, dispatchEvent, __, fields, validationRes, dispatcher, _e, dispatchEvent_1, onEvent, submitEvent, dispatcher, successMsg, failMsg;
+            var _c, store, onSubmit, api$1, asyncApi, finishedField, checkInterval, _d, saveSuccess, saveFailed, resetAfterSubmit, clearAfterSubmit, onAction, onSaved, onReset, onFinished, onFailed, redirect, reload, target, env, onChange, clearPersistDataAfterSubmit, trimValues, dispatchEvent, __, fields, validationRes, dispatcher, _e, dispatchEvent_2, onEvent, submitEvent, dispatcher, successMsg, failMsg;
             var _this = this;
             return tslib.__generator(this, function (_f) {
                 switch (_f.label) {
@@ -665,15 +700,15 @@ var Form = /** @class */ (function (_super) {
                             action.actionType === 'confirm' ||
                             action.actionType === 'reset-and-submit' ||
                             action.actionType === 'clear-and-submit')) return [3 /*break*/, 8];
-                        _e = this.props, dispatchEvent_1 = _e.dispatchEvent, onEvent = _e.onEvent;
+                        _e = this.props, dispatchEvent_2 = _e.dispatchEvent, onEvent = _e.onEvent;
                         submitEvent = (_b = (_a = onEvent === null || onEvent === void 0 ? void 0 : onEvent.submit) === null || _a === void 0 ? void 0 : _a.actions) === null || _b === void 0 ? void 0 : _b.length;
-                        return [4 /*yield*/, dispatchEvent_1('submit', this.props.data)];
+                        return [4 /*yield*/, dispatchEvent_2('submit', this.props.data)];
                     case 7:
                         dispatcher = _f.sent();
                         if ((dispatcher === null || dispatcher === void 0 ? void 0 : dispatcher.prevented) || submitEvent) {
                             return [2 /*return*/];
                         }
-                        store.setCurrentAction(action);
+                        store.setCurrentAction(action, this.props.resolveDefinitions);
                         if (action.actionType === 'reset-and-submit') {
                             store.reset(this.handleReset(action));
                         }
@@ -697,22 +732,40 @@ var Form = /** @class */ (function (_super) {
                                             _b.label = 2;
                                         case 2:
                                             // 走到这里代表校验成功了
-                                            dispatchEvent_1('validateSucc', this.props.data);
+                                            dispatchEvent_2('validateSucc', this.props.data);
                                             if (target) {
                                                 this.submitToTarget(Scoped.filterTarget(target, values), values);
                                                 /** 可能配置页面跳转事件，页面路由变化导致persistKey不一致，无法清除持久化数据，所以提交成功事件之前先清理一下 */
                                                 clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                                dispatchEvent_1('submitSucc', object.createObject(this.props.data, values));
+                                                dispatchEvent_2('submitSucc', object.createObject(this.props.data, values));
                                             }
                                             else if (action.actionType === 'reload') {
                                                 action.target &&
                                                     this.reloadTarget(Scoped.filterTarget(action.target, values), values);
                                             }
                                             else if (action.actionType === 'dialog') {
-                                                store.openDialog(data, undefined, action.callback, delegate || this.context);
+                                                return [2 /*return*/, new Promise(function (resolve) {
+                                                        store.openDialog(data, 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.openDrawer(data);
+                                                return [2 /*return*/, new Promise(function (resolve) {
+                                                        store.openDrawer(data, 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
+                                                            });
+                                                        });
+                                                    })];
                                             }
                                             else if (api.isEffectiveApi(action.api || api$1, values)) {
                                                 finnalAsyncApi_1 = action.asyncApi || asyncApi;
@@ -735,7 +788,7 @@ var Form = /** @class */ (function (_super) {
                                                                 switch (_a.label) {
                                                                     case 0:
                                                                         clearPersistDataAfterSubmit && store.clearLocalPersistData();
-                                                                        return [4 /*yield*/, dispatchEvent_1('submitSucc', object.createObject(this.props.data, { result: result }))];
+                                                                        return [4 /*yield*/, dispatchEvent_2('submitSucc', object.createObject(this.props.data, { result: result }))];
                                                                     case 1:
                                                                         dispatcher = _a.sent();
                                                                         if (!api.isEffectiveApi(finnalAsyncApi_1, store.data) ||
@@ -747,7 +800,7 @@ var Form = /** @class */ (function (_super) {
                                                                         }
                                                                         cbResult = helper.until(function () { return store.checkRemote(finnalAsyncApi_1, store.data); }, function (ret) { return ret && ret[finishedField || 'finished']; }, function (cancel) { return (_this.asyncCancel = cancel); }, checkInterval).then(function (value) {
                                                                             // 派发asyncApiFinished事件
-                                                                            dispatchEvent_1('asyncApiFinished', store.data);
+                                                                            dispatchEvent_2('asyncApiFinished', store.data);
                                                                         });
                                                                         return [2 /*return*/, {
                                                                                 cbResult: cbResult,
@@ -760,7 +813,7 @@ var Form = /** @class */ (function (_super) {
                                                             var dispatcher;
                                                             return tslib.__generator(this, function (_a) {
                                                                 switch (_a.label) {
-                                                                    case 0: return [4 /*yield*/, dispatchEvent_1('submitFail', object.createObject(this.props.data, { error: result }))];
+                                                                    case 0: return [4 /*yield*/, dispatchEvent_2('submitFail', object.createObject(this.props.data, { error: result }))];
                                                                     case 1:
                                                                         dispatcher = _a.sent();
                                                                         return [2 /*return*/, {
@@ -800,7 +853,7 @@ var Form = /** @class */ (function (_super) {
                                             else {
                                                 clearPersistDataAfterSubmit && store.clearLocalPersistData();
                                                 // type为submit，但是没有配api以及target时，只派发事件
-                                                dispatchEvent_1('submitSucc', object.createObject(this.props.data, values));
+                                                dispatchEvent_2('submitSucc', object.createObject(this.props.data, values));
                                             }
                                             return [2 /*return*/, Promise.resolve(null)];
                                     }
@@ -835,27 +888,45 @@ var Form = /** @class */ (function (_super) {
                             })];
                     case 8:
                         if (action.type === 'reset' || action.actionType === 'reset') {
-                            store.setCurrentAction(action);
+                            store.setCurrentAction(action, this.props.resolveDefinitions);
                             store.reset(onReset);
                         }
                         else if (action.actionType === 'clear') {
-                            store.setCurrentAction(action);
+                            store.setCurrentAction(action, this.props.resolveDefinitions);
                             store.clear(onReset);
                         }
                         else if (action.actionType === 'validate') {
-                            store.setCurrentAction(action);
+                            store.setCurrentAction(action, this.props.resolveDefinitions);
                             return [2 /*return*/, this.validate(true, throwErrors, true, true)];
                         }
                         else if (action.actionType === 'dialog') {
-                            store.setCurrentAction(action);
-                            store.openDialog(data, undefined, action.callback, delegate || this.context);
+                            store.setCurrentAction(action, this.props.resolveDefinitions);
+                            return [2 /*return*/, new Promise(function (resolve) {
+                                    store.openDialog(data, 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(data);
+                            store.setCurrentAction(action, this.props.resolveDefinitions);
+                            return [2 /*return*/, new Promise(function (resolve) {
+                                    store.openDrawer(data, 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
+                                        });
+                                    });
+                                })];
                         }
                         else if (action.actionType === 'ajax') {
-                            store.setCurrentAction(action);
+                            store.setCurrentAction(action, this.props.resolveDefinitions);
                             if (!api.isEffectiveApi(action.api)) {
                                 return [2 /*return*/, env.alert(__("\u5F53 actionType \u4E3A ajax \u65F6\uFF0C\u8BF7\u8BBE\u7F6E api \u5C5E\u6027"))];
                             }
@@ -907,7 +978,7 @@ var Form = /** @class */ (function (_super) {
                                 })];
                         }
                         else if (action.actionType === 'reload') {
-                            store.setCurrentAction(action);
+                            store.setCurrentAction(action, this.props.resolveDefinitions);
                             if (action.target) {
                                 this.reloadTarget(Scoped.filterTarget(action.target, data), data);
                             }
@@ -952,7 +1023,7 @@ var Form = /** @class */ (function (_super) {
             targets[0].props.type === 'form') {
             this.handleBulkChange(values[0], false);
         }
-        store.closeDialog(true);
+        store.closeDialog(true, values);
     };
     Form.prototype.handleDialogClose = function (confirmed) {
         if (confirmed === void 0) { confirmed = false; }
@@ -969,7 +1040,7 @@ var Form = /** @class */ (function (_super) {
             onChange &&
                 onChange(store.data, helper.difference(store.data, store.pristine), this.props);
         }
-        store.closeDrawer(true);
+        store.closeDrawer(true, values);
     };
     Form.prototype.handleDrawerClose = function () {
         var store = this.props.store;
@@ -992,7 +1063,7 @@ var Form = /** @class */ (function (_super) {
                 type: 'button',
                 actionType: 'dialog',
                 dialog: dialog
-            });
+            }, _this.props.resolveDefinitions);
             store.openDialog(ctx, undefined, function (confirmed) {
                 resolve(confirmed);
             }, _this.context);
@@ -1133,14 +1204,14 @@ var Form = /** @class */ (function (_super) {
         return render("".concat(region ? "".concat(region, "/") : '').concat(key), subSchema, subProps);
     };
     Form.prototype.renderBody = function () {
-        var _a = this.props, body = _a.body, mode = _a.mode, className = _a.className, cx = _a.classnames, debug = _a.debug, debugConfig = _a.debugConfig, $path = _a.$path, store = _a.store, columnCount = _a.columnCount, render = _a.render, staticClassName = _a.staticClassName, _b = _a.static, isStatic = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig, testid = _a.testid;
+        var _a = this.props, body = _a.body, mode = _a.mode, className = _a.className, cx = _a.classnames, debug = _a.debug, debugConfig = _a.debugConfig, $path = _a.$path, store = _a.store, columnCount = _a.columnCount, render = _a.render, staticClassName = _a.staticClassName, _b = _a.static, isStatic = _b === void 0 ? false : _b, loadingConfig = _a.loadingConfig; _a.testid;
         var restError = store.restError;
         var WrapperComponent = this.props.wrapperComponent ||
             (/(?:\/|^)form\//.test($path) ? 'div' : 'form');
         var padDom = helper.repeatCount(columnCount && Array.isArray(body)
             ? (columnCount - (body.length % columnCount)) % columnCount
             : 0, function (index) { return (_J$X_("div", { className: cx("Form-item Form-item--".concat(mode, " is-placeholder")), key: index })); });
-        return (_J$X_(WrapperComponent, tslib.__assign({ className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, staticClassName && isStatic ? staticClassName : className, isStatic ? 'Form--isStatic' : null), onSubmit: this.handleFormSubmit, noValidate: true }, helper.buildTestId(testid)),
+        return (_J$X_(WrapperComponent, { className: cx("Form", "Form--".concat(mode || 'normal'), columnCount ? "Form--column Form--column-".concat(columnCount) : null, staticClassName && isStatic ? staticClassName : className, isStatic ? 'Form--isStatic' : null), onSubmit: this.handleFormSubmit, noValidate: true },
             _J$X_("input", { type: "submit", style: { display: 'none' } }),
             debug
                 ? render('form-debug-json', tslib.__assign({ type: 'json', value: store.data, ellipsisThreshold: 120, className: cx('Form--debug') }, debugConfig))
@@ -1414,8 +1485,7 @@ var FormRenderer = /** @class */ (function (_super) {
             onChange(store.data, helper.difference(store.data, store.pristine), this.props);
     };
     FormRenderer.prototype.getData = function () {
-        var store = this.props.store;
-        return store.data;
+        return this.getValues();
     };
     FormRenderer.contextType = Scoped.ScopedContext;
     FormRenderer = tslib.__decorate([