iglooform 2.4.7 → 2.4.11

package/lib/form/element/index.js

@@ -25,15 +25,17 @@ var _jsxRuntime = require("react/jsx-runtime");
 
 var _react = require("react");
 
-var _icons = require("@ant-design/icons");
+var _iglooicon = require("iglooicon");
 
 var _formUtils = require("../../utils/form-utils");
 
 var _section = _interopRequireDefault(require("../section"));
 
+var _addableSection = _interopRequireDefault(require("../addable-section"));
+
 var _elements = _interopRequireDefault(require("../elements"));
 
-var _context = _interopRequireDefault(require("../context"));
+var _formContext = _interopRequireDefault(require("../../form-context"));
 
 var _invariant = _interopRequireDefault(require("invariant"));
 
@@ -52,13 +54,13 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableToArray(arr) || _unsupportedIterableToArray(arr) || _nonIterableSpread(); }
 
@@ -93,7 +95,7 @@ var Element = function Element(_ref) {
       previewLabel = config.previewLabel;
   (0, _invariant.default)(!(config.selectValue || config.copyValue || config.initialValue) || config.name, 'Form item with selectValue/copyValue/initialValue should have a name.');
 
-  var _useContext = (0, _react.useContext)(_context.default),
+  var _useContext = (0, _react.useContext)(_formContext.default),
       form = _useContext.form,
       requiredMark = _useContext.requiredMark,
       registerDependencies = _useContext.registerDependencies;
@@ -115,7 +117,8 @@ var Element = function Element(_ref) {
         getOptions = config.getOptions,
         subscribedFields = config.subscribedFields,
         disabled = config.disabled,
-        extraLabel = config.extraLabel;
+        extraLabel = config.extraLabel,
+        requiredAsserts = config.requiredAsserts;
     var dependentField = dependencies || [];
 
     if (Array.isArray(subscribedFields)) {
@@ -129,13 +132,20 @@ var Element = function Element(_ref) {
       });
     }
 
+    if (requiredAsserts && requiredAsserts.length) {
+      requiredAsserts.forEach(function (_ref3) {
+        var field = _ref3.field;
+        return dependentField.push(field);
+      });
+    }
+
     if (copyValue) {
       dependentField.push(copyValue.assert.field);
     }
 
     if (selectValue && selectValue.length) {
-      selectValue.forEach(function (_ref3) {
-        var assert = _ref3.assert;
+      selectValue.forEach(function (_ref4) {
+        var assert = _ref4.assert;
         return dependentField.push(assert.field);
       });
     }
@@ -149,8 +159,8 @@ var Element = function Element(_ref) {
     }
 
     if (Array.isArray(disabled)) {
-      disabled.forEach(function (_ref4) {
-        var field = _ref4.field;
+      disabled.forEach(function (_ref5) {
+        var field = _ref5.field;
         return dependentField.push(field);
       });
     } else if (_typeof(disabled) === 'object') {
@@ -179,6 +189,16 @@ var Element = function Element(_ref) {
     }, void 0);
   }
 
+  if (type === 'AddableSection') {
+    return (0, _jsxRuntime.jsx)(_addableSection.default, {
+      parentName: parentName,
+      config: config,
+      preview: preview,
+      disabled: disabled,
+      setShowStepButton: setShowStepButton
+    }, void 0);
+  }
+
   var _calcFormItemProps = (0, _formUtils.calcFormItemProps)(config, _objectSpread(_objectSpread({}, extraConfig), {}, {
     requiredMark: requiredMark
   }), form, parentName),
@@ -251,17 +271,15 @@ var Element = function Element(_ref) {
       return null;
     }
 
-    return hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, Object.assign({}, restColProps, {
-      className: "igloo-form-item"
-    }, {
-      children: (0, _jsxRuntime.jsx)("div", Object.assign({
+    return hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, _objectSpread(_objectSpread({}, restColProps), {}, {
+      className: "igloo-form-item",
+      children: (0, _jsxRuntime.jsx)("div", {
         style: {
           width: halfRow && md ? '50%' : '100%',
           paddingRight: halfRow && md ? 16 : 0
         },
-        ref: ref
-      }, {
-        children: (0, _jsxRuntime.jsx)(Component, Object.assign({}, otherElementProps, {
+        ref: ref,
+        children: (0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({}, otherElementProps), {}, {
           disabled: elementProps.disabled || disabled,
           containerRef: ref,
           setFieldError: setFieldError,
@@ -270,7 +288,7 @@ var Element = function Element(_ref) {
           getFormInstance: getFormInstance,
           validateField: validateField
         }), void 0)
-      }), void 0)
+      }, void 0)
     }), void 0);
   }
 
@@ -281,74 +299,68 @@ var Element = function Element(_ref) {
       return null;
     }
 
-    return (0, _jsxRuntime.jsx)(_col.default, Object.assign({
+    return (0, _jsxRuntime.jsx)(_col.default, {
       span: 24,
       className: (0, _classnames.default)({
         'igloo-element-preview': !config.hideWhenPreview,
         'igloo-element-preview-hide': config.hideWhenPreview,
         'igloo-element-preview-hide-divider': config.hidePreviewDivider
-      })
-    }, {
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, Object.assign({}, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue']), {
+      }),
+      children: (0, _jsxRuntime.jsx)(_form.default.Item, _objectSpread(_objectSpread({}, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue'])), {}, {
         labelCol: {
           span: 24
         },
         wrapperCol: {
           span: 24
         },
-        label: null
-      }, {
-        children: (0, _jsxRuntime.jsxs)(_row.default, Object.assign({
+        label: null,
+        children: (0, _jsxRuntime.jsxs)(_row.default, {
           className: "igloo-element-preview-item",
           gutter: {
             md: 32,
             sm: 0,
             xs: 0
-          }
-        }, {
-          children: [(previewLabel || label) && (0, _jsxRuntime.jsx)(_col.default, Object.assign({
+          },
+          children: [(previewLabel || label) && (0, _jsxRuntime.jsx)(_col.default, {
             span: 12,
             md: 12,
             sm: 24,
             xs: 24,
-            className: "igloo-element-preview-label"
-          }, {
+            className: "igloo-element-preview-label",
             children: previewLabel || label
-          }), void 0), (0, _jsxRuntime.jsxs)(_col.default, Object.assign({
+          }, void 0), (0, _jsxRuntime.jsxs)(_col.default, {
             span: label ? 12 : 24,
             md: label ? 12 : 24,
             sm: 24,
             xs: 24,
-            className: "igloo-element-preview-value"
-          }, {
-            children: [error && !!error.length && (0, _jsxRuntime.jsx)(_icons.CloseCircleFilled, {
+            className: "igloo-element-preview-value",
+            children: [error && !!error.length && (0, _jsxRuntime.jsx)(_iglooicon.AlertFilled, {
               className: "igloo-element-preview-value-icon"
             }, void 0), previewFormater ? previewFormater(value, form) : value || '-']
-          }), void 0)]
-        }), void 0)
+          }, void 0)]
+        }, void 0)
       }), void 0)
-    }), void 0);
+    }, void 0);
   }
 
-  return config.hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, Object.assign({}, restColProps, {
-    className: "igloo-form-item"
-  }, {
-    children: (0, _jsxRuntime.jsx)("div", Object.assign({
+  return config.hideWhenEdit ? null : (0, _jsxRuntime.jsx)(_col.default, _objectSpread(_objectSpread({}, restColProps), {}, {
+    className: "igloo-form-item",
+    children: (0, _jsxRuntime.jsx)("div", {
       ref: ref,
       style: {
         width: halfRow && md ? '50%' : '100%',
         paddingRight: halfRow && md ? 16 : 0
-      }
-    }, {
-      children: (0, _jsxRuntime.jsx)(_form.default.Item, Object.assign({
+      },
+      children: (0, _jsxRuntime.jsx)(_form.default.Item, _objectSpread(_objectSpread({
         labelCol: {
           span: 24
         },
         wrapperCol: {
           span: 24
         }
-      }, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue']), {
-        children: (0, _jsxRuntime.jsx)(Component, Object.assign({}, elementProps, {
+      }, (0, _omit.default)(formItemProps, ['copiedValue', 'selectedValue'])), {}, {
+        className: "igloo-element-edit",
+        children: (0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({}, elementProps), {}, {
           disabled: elementProps.disabled || disabled,
           containerRef: ref,
           setFieldError: setFieldError,
@@ -358,7 +370,7 @@ var Element = function Element(_ref) {
           validateField: validateField
         }), void 0)
       }), void 0)
-    }), void 0)
+    }, void 0)
   }), void 0);
 };
 

package/lib/form/element/style/index.less

@@ -20,6 +20,11 @@
       white-space: pre-wrap;
       word-break: break-word;
       line-height: 24px;
+
+      .igloo-element-preview-value-icon {
+        color: @error-color;
+        margin-right: 8px;
+      }
     }
   }
 
@@ -69,6 +74,10 @@
   }
 }
 
+.igloo-element-edit {
+  flex-direction: column;
+}
+
 .ant-form-item-control-input {
   min-height: unset;
 }

package/lib/form/elements.js

@@ -1,6 +1,6 @@
 "use strict";
 
-function _typeof(obj) { "@babel/helpers - typeof"; if (typeof Symbol === "function" && typeof Symbol.iterator === "symbol") { _typeof = function _typeof(obj) { return typeof obj; }; } else { _typeof = function _typeof(obj) { return obj && typeof Symbol === "function" && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }; } return _typeof(obj); }
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
 
 Object.defineProperty(exports, "__esModule", {
   value: true

package/lib/form/index.js

@@ -21,7 +21,7 @@ var _steps = _interopRequireDefault(require("./steps"));
 
 var _login = _interopRequireDefault(require("./login"));
 
-var _context3 = _interopRequireDefault(require("./context"));
+var _formContext = _interopRequireDefault(require("../form-context"));
 
 var _messages = _interopRequireDefault(require("./messages"));
 
@@ -35,9 +35,9 @@ var _excluded = ["validateMessages"];
 
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
-function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); if (enumerableOnly) { symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; }); } keys.push.apply(keys, symbols); } return keys; }
+function ownKeys(object, enumerableOnly) { var keys = Object.keys(object); if (Object.getOwnPropertySymbols) { var symbols = Object.getOwnPropertySymbols(object); enumerableOnly && (symbols = symbols.filter(function (sym) { return Object.getOwnPropertyDescriptor(object, sym).enumerable; })), keys.push.apply(keys, symbols); } return keys; }
 
-function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i] != null ? arguments[i] : {}; if (i % 2) { ownKeys(Object(source), true).forEach(function (key) { _defineProperty(target, key, source[key]); }); } else if (Object.getOwnPropertyDescriptors) { Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)); } else { ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } } return target; }
+function _objectSpread(target) { for (var i = 1; i < arguments.length; i++) { var source = null != arguments[i] ? arguments[i] : {}; i % 2 ? ownKeys(Object(source), !0).forEach(function (key) { _defineProperty(target, key, source[key]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) { Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key)); }); } return target; }
 
 function _defineProperty(obj, key, value) { if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 
@@ -80,7 +80,8 @@ var IglooForm = function IglooForm(props, ref) {
     return window;
   } : _props$getScrollConta,
       _props$onFirstModifie = props.onFirstModified,
-      onFirstModified = _props$onFirstModifie === void 0 ? function () {} : _props$onFirstModifie;
+      onFirstModified = _props$onFirstModifie === void 0 ? function () {} : _props$onFirstModifie,
+      uploadApi = props.uploadApi;
 
   var _Form$useForm = _form.default.useForm(),
       _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
@@ -245,13 +246,12 @@ var IglooForm = function IglooForm(props, ref) {
     }
   };
 
-  return (0, _jsxRuntime.jsx)("div", Object.assign({
+  return (0, _jsxRuntime.jsx)("div", {
     className: (0, _classnames.default)(className, {
       'igloo-form-without-button': !showSubmitButton
     }),
-    style: style
-  }, {
-    children: (0, _jsxRuntime.jsx)(_context3.default.Provider, Object.assign({
+    style: style,
+    children: (0, _jsxRuntime.jsx)(_formContext.default.Provider, {
       value: _objectSpread({
         form: form,
         onCancel: onCancel,
@@ -259,18 +259,17 @@ var IglooForm = function IglooForm(props, ref) {
         requiredMark: requiredMark,
         showSubmitButton: showSubmitButton,
         getScrollContainer: getScrollContainer,
-        registerDependencies: registerDependencies
-      }, locales)
-    }, {
-      children: (0, _jsxRuntime.jsxs)(_form.default, Object.assign({
+        registerDependencies: registerDependencies,
+        uploadApi: uploadApi
+      }, locales),
+      children: (0, _jsxRuntime.jsxs)(_form.default, {
         form: form,
         onFinish: handleSubmit,
         onFieldsChange: handleValuesChange,
         colon: false,
         validateMessages: validateMessages || _messages.default,
         initialValues: initialValues,
-        scrollToFirstError: true
-      }, {
+        scrollToFirstError: true,
         children: [type === 'Pages' && (0, _jsxRuntime.jsx)(_pages.default, {
           config: config
         }, void 0), type === 'Page' && (0, _jsxRuntime.jsx)(_page.default, {
@@ -280,9 +279,9 @@ var IglooForm = function IglooForm(props, ref) {
         }, void 0), type === 'Login' && (0, _jsxRuntime.jsx)(_login.default, {
           config: config
         }, void 0)]
-      }), void 0)
-    }), void 0)
-  }), void 0);
+      }, void 0)
+    }, void 0)
+  }, void 0);
 };
 
 var ExportedForm = function () {

package/lib/form/login/index.js

@@ -29,7 +29,7 @@ var _element = _interopRequireDefault(require("../element"));
 
 var _formUtils = require("../../utils/form-utils");
 
-var _context = _interopRequireDefault(require("../context"));
+var _formContext = _interopRequireDefault(require("../../form-context"));
 
 var _locale = require("../../locale");
 
@@ -45,7 +45,7 @@ var Login = function Login(_ref) {
       name = _ref$config.name,
       label = _ref$config.label;
 
-  var _useContext = (0, _react.useContext)(_context.default),
+  var _useContext = (0, _react.useContext)(_formContext.default),
       submitText = _useContext.submitText,
       submitting = _useContext.submitting,
       showSubmitButton = _useContext.showSubmitButton;
@@ -53,40 +53,35 @@ var Login = function Login(_ref) {
   var _useContext2 = (0, _react.useContext)(_locale.LocaleContext),
       formatMessage = _useContext2.formatMessage;
 
-  return (0, _jsxRuntime.jsxs)(_col.default, Object.assign({
+  return (0, _jsxRuntime.jsxs)(_col.default, {
     span: 24,
-    className: 'igloo-login'
-  }, {
-    children: [label && (0, _jsxRuntime.jsx)("div", Object.assign({
-      className: 'igloo-login-label'
-    }, {
+    className: 'igloo-login',
+    children: [label && (0, _jsxRuntime.jsx)("div", {
+      className: 'igloo-login-label',
       children: label
-    }), void 0), (0, _jsxRuntime.jsx)("div", Object.assign({
-      className: 'igloo-login-content'
-    }, {
-      children: (0, _jsxRuntime.jsx)(_row.default, Object.assign({
-        gutter: [32, 24]
-      }, {
+    }, void 0), (0, _jsxRuntime.jsx)("div", {
+      className: 'igloo-login-content',
+      children: (0, _jsxRuntime.jsx)(_row.default, {
+        gutter: [32, 24],
         children: elements.map(function (child, index) {
           return (0, _jsxRuntime.jsx)(_element.default, {
             parentName: (0, _formUtils.calcNamePath)(parentName, name),
             config: child
           }, index);
         })
-      }), void 0)
-    }), void 0), showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
-      children: (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+      }, void 0)
+    }, void 0), showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
+      children: (0, _jsxRuntime.jsx)(_button.default, {
         type: "primary",
         htmlType: "submit",
         className: 'igloo-login-button',
-        loading: submitting
-      }, {
+        loading: submitting,
         children: submitText || formatMessage({
           id: 'Log in'
         })
-      }), void 0)
+      }, void 0)
     }, void 0)]
-  }), void 0);
+  }, void 0);
 };
 
 var _default = Login;

package/lib/form/page/index.js

@@ -27,7 +27,7 @@ var _element = _interopRequireDefault(require("../element"));
 
 var _formUtils = require("../../utils/form-utils");
 
-var _context = _interopRequireDefault(require("../context"));
+var _formContext = _interopRequireDefault(require("../../form-context"));
 
 var _locale = require("../../locale");
 
@@ -58,7 +58,7 @@ var Page = function Page(_ref) {
       _ref$showFooter = _ref.showFooter,
       showFooter = _ref$showFooter === void 0 ? true : _ref$showFooter;
 
-  var _useContext = (0, _react.useContext)(_context.default),
+  var _useContext = (0, _react.useContext)(_formContext.default),
       onCancel = _useContext.onCancel,
       cancelText = _useContext.cancelText,
       submitText = _useContext.submitText,
@@ -85,49 +85,43 @@ var Page = function Page(_ref) {
       registerDependencies('SUBSCRIBE_ALL', dispatch);
     }
   }, []);
-  return (0, _jsxRuntime.jsxs)("div", Object.assign({
-    className: 'igloo-page-container'
-  }, {
-    children: [(0, _jsxRuntime.jsx)("div", Object.assign({
-      className: 'igloo-page-content'
-    }, {
-      children: (0, _jsxRuntime.jsx)(_row.default, Object.assign({
-        gutter: [32, 24]
-      }, {
+  return (0, _jsxRuntime.jsxs)("div", {
+    className: 'igloo-page-container',
+    children: [(0, _jsxRuntime.jsx)("div", {
+      className: 'igloo-page-content',
+      children: (0, _jsxRuntime.jsx)(_row.default, {
+        gutter: [32, 24],
         children: elements.map(function (child, index) {
           return (0, _jsxRuntime.jsx)(_element.default, {
             config: child,
             parentName: (0, _formUtils.calcNamePath)(parentName, name)
           }, index);
         })
-      }), void 0)
-    }), void 0), showFooter && showSubmitButton && (0, _jsxRuntime.jsxs)("div", Object.assign({
-      className: 'igloo-page-footer'
-    }, {
+      }, void 0)
+    }, void 0), showFooter && showSubmitButton && (0, _jsxRuntime.jsxs)("div", {
+      className: 'igloo-page-footer',
       children: [onCancel && (0, _jsxRuntime.jsx)(_col.default, {
-        children: (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+        children: (0, _jsxRuntime.jsx)(_button.default, {
           className: 'igloo-page-cancel-button',
-          onClick: onCancel
-        }, {
+          onClick: onCancel,
           children: cancelText || formatMessage({
             id: 'Cancel'
           })
-        }), void 0)
+        }, void 0)
       }, void 0), !onCancel && (0, _jsxRuntime.jsx)("div", {}, void 0), (0, _jsxRuntime.jsx)(_form.default.Item, {
-        children: (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+        children: (0, _jsxRuntime.jsx)(_button.default, {
           type: "primary",
           htmlType: "submit",
           className: 'igloo-page-submit-button',
           loading: submitting,
-          disabled: buttonDisabled
-        }, {
+          disabled: buttonDisabled,
           children: submitText || formatMessage({
             id: 'Submit'
           })
-        }), void 0)
+        }, void 0)
       }, void 0)]
-    }), void 0)]
-  }), void 0);
+    }, void 0)]
+  }, void 0);
 };
 
 var _default = Page;

package/lib/form/page/style/index.less

@@ -39,11 +39,11 @@
     .igloo-page-footer {
       display: flex;
       flex-direction: column-reverse;
-      row-gap: 16px;
 
       .igloo-page-cancel-button {
         min-width: none;
         width: 100%;
+        margin-top: 16px;
       }
 
       .igloo-page-submit-button {

package/lib/form/pages/index.js

@@ -23,7 +23,7 @@ var _page = _interopRequireDefault(require("../page"));
 
 var _formUtils = require("../../utils/form-utils");
 
-var _context2 = _interopRequireDefault(require("../context"));
+var _formContext = _interopRequireDefault(require("../../form-context"));
 
 var _locale = require("../../locale");
 
@@ -76,7 +76,7 @@ var Pages = function Pages(_ref) {
   var _useContext = (0, _react.useContext)(_locale.LocaleContext),
       formatMessage = _useContext.formatMessage;
 
-  var _useContext2 = (0, _react.useContext)(_context2.default),
+  var _useContext2 = (0, _react.useContext)(_formContext.default),
       form = _useContext2.form,
       submitText = _useContext2.submitText,
       previewText = _useContext2.previewText,
@@ -102,7 +102,6 @@ var Pages = function Pages(_ref) {
       md = _useBreakpoint.md;
 
   var renderElements = elements.filter(function (page) {
-    page.key = page.name || page.key || Math.random();
     return typeof page.shouldRender !== 'function' || page.shouldRender(form);
   });
 
@@ -190,75 +189,67 @@ var Pages = function Pages(_ref) {
       getPreviousDisabledState = _renderElements$curre2.getPreviousDisabledState;
   var buttonDisabled = getButtonDisabledState && form && getButtonDisabledState(form);
   var previousDisabled = getPreviousDisabledState && form && getPreviousDisabledState(form);
-  return (0, _jsxRuntime.jsxs)("div", Object.assign({
-    className: 'igloo-pages-container'
-  }, {
-    children: [(0, _jsxRuntime.jsx)(_typography.default, Object.assign({
+  return (0, _jsxRuntime.jsxs)("div", {
+    className: 'igloo-pages-container',
+    children: [(0, _jsxRuntime.jsx)(_typography.default, {
       className: "igloo-pages-page-title",
       level: md ? 'h3b' : 'body1',
       wrapElement: "div",
       style: {
         padding: md ? 0 : '0 16px'
-      }
-    }, {
+      },
       children: renderElements[current].label
-    }), void 0), (0, _jsxRuntime.jsxs)("div", Object.assign({
-      className: 'igloo-pages-content'
-    }, {
+    }, void 0), (0, _jsxRuntime.jsxs)("div", {
+      className: 'igloo-pages-content',
       children: [renderElements.map(function (child, index) {
         (0, _invariant.default)(child.type === 'Page', 'Child of Pages should be Page');
-        return (0, _jsxRuntime.jsx)("div", Object.assign({
+        return (0, _jsxRuntime.jsx)("div", {
           className: 'igloo-pages-page',
           style: current === index ? {
             display: 'block'
           } : {
             display: 'none'
-          }
-        }, {
+          },
           children: (0, _jsxRuntime.jsx)(_page.default, {
             config: child,
             parentName: (0, _formUtils.calcNamePath)(parentName, name),
             showFooter: false
           }, void 0)
-        }), child.key);
-      }), (0, _jsxRuntime.jsxs)("div", Object.assign({
-        className: 'igloo-pages-footer'
-      }, {
-        children: [current === 0 && (0, _jsxRuntime.jsx)("div", {}, void 0), current > 0 && (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+        }, child.key || child.name);
+      }), (0, _jsxRuntime.jsxs)("div", {
+        className: 'igloo-pages-footer',
+        children: [current === 0 && (0, _jsxRuntime.jsx)("div", {}, void 0), current > 0 && (0, _jsxRuntime.jsx)(_button.default, {
           className: 'igloo-pages-preview-button',
           onClick: function onClick() {
             return setCurrent(current - 1);
           },
-          disabled: previousDisabled
-        }, {
+          disabled: previousDisabled,
           children: previewText || formatMessage({
             id: 'Previous'
           })
-        }), void 0), current < renderElements.length - 1 && (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+        }, void 0), current < renderElements.length - 1 && (0, _jsxRuntime.jsx)(_button.default, {
           className: 'igloo-pages-next-button',
           onClick: handleNext,
           disabled: buttonDisabled,
-          type: "primary"
-        }, {
+          type: "primary",
           children: nextText || formatMessage({
             id: 'Next'
           })
-        }), void 0), current === renderElements.length - 1 && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
-          children: (0, _jsxRuntime.jsx)(_button.default, Object.assign({
+        }, void 0), current === renderElements.length - 1 && showSubmitButton && (0, _jsxRuntime.jsx)(_form.default.Item, {
+          children: (0, _jsxRuntime.jsx)(_button.default, {
             type: "primary",
             htmlType: "submit",
             className: 'igloo-pages-submit-button',
             loading: submitting,
-            disabled: buttonDisabled
-          }, {
+            disabled: buttonDisabled,
             children: submitText || formatMessage({
               id: 'Submit'
             })
-          }), void 0)
+          }, void 0)
         }, void 0)]
-      }), void 0)]
-    }), void 0)]
-  }), void 0);
+      }, void 0)]
+    }, void 0)]
+  }, void 0);
 };
 
 var _default = Pages;