iglooform 2.5.42 → 2.5.44

package/es/date-picker/index.js

@@ -62,7 +62,7 @@ var IglooDatePicker = function IglooDatePicker(_ref) {
       setFocus = _useState2[1];
 
   return _jsx(_DatePicker, _objectSpread(_objectSpread({}, omit(props, formMethods)), {}, {
-    value: value ? moment(value) : value,
+    value: moment(value),
     placeholder: placeholder || dateFormater,
     format: format || dateFormater,
     inputReadOnly: true,
@@ -89,7 +89,7 @@ IglooDatePicker.formItemPropsHandler = function (_ref2) {
       return moment(value).format(format || dateFormater);
     },
     valueFormater: function valueFormater(value) {
-      return value ? +moment(value) : value;
+      return +moment(value);
     },
     'element-allowClear': false
   };

package/es/form/index.js

@@ -95,22 +95,24 @@ var IglooForm = function IglooForm(props, ref) {
 
   var handleSubmit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
-      var errors;
+      var allValues, errors;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              allValues = form.getFieldsValue(true);
+
               if (!(typeof onSubmit === 'function')) {
-                _context.next = 10;
+                _context.next = 11;
                 break;
               }
 
               setSubmitting(true);
-              _context.prev = 2;
-              _context.next = 5;
-              return onSubmit(values);
+              _context.prev = 3;
+              _context.next = 6;
+              return onSubmit(values, allValues);
 
-            case 5:
+            case 6:
               errors = _context.sent;
 
               if (Array.isArray(errors)) {
@@ -118,17 +120,17 @@ var IglooForm = function IglooForm(props, ref) {
                 form.scrollToField(errors[0].name);
               }
 
-            case 7:
-              _context.prev = 7;
+            case 8:
+              _context.prev = 8;
               setSubmitting(false);
-              return _context.finish(7);
+              return _context.finish(8);
 
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[2,, 7, 10]]);
+      }, _callee, null, [[3,, 8, 11]]);
     }));
 
     return function handleSubmit(_x) {
@@ -139,7 +141,7 @@ var IglooForm = function IglooForm(props, ref) {
   useImperativeHandle(ref, function () {
     return {
       getValues: function () {
-        var _getValues = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+        var _getValues = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(getAll) {
           return regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
@@ -148,7 +150,7 @@ var IglooForm = function IglooForm(props, ref) {
                   return form.validateFields();
 
                 case 2:
-                  return _context2.abrupt("return", form.getFieldsValue());
+                  return _context2.abrupt("return", getAll ? form.getFieldsValue(true) : form.getFieldsValue());
 
                 case 3:
                 case "end":
@@ -158,7 +160,7 @@ var IglooForm = function IglooForm(props, ref) {
           }, _callee2);
         }));
 
-        function getValues() {
+        function getValues(_x2) {
           return _getValues.apply(this, arguments);
         }
 
@@ -241,6 +243,7 @@ var IglooForm = function IglooForm(props, ref) {
         validateMessages: validateMessages || messages,
         initialValues: initialValues,
         scrollToFirstError: true,
+        preserve: true,
         children: [type === 'Pages' && _jsx(Pages, {
           config: config
         }), type === 'Page' && _jsx(Page, {

package/es/types.d.ts

@@ -21,7 +21,7 @@ export interface FormBasicConfig {
     initialValues?: any;
     form?: FormInstance;
     onCancel?(): void;
-    onSubmit?(values: Object): any;
+    onSubmit?(values: Object, allValues?: Object): any;
     requiredMark?: boolean;
     showSubmitButton?: boolean;
     getScrollContainer?: () => HTMLElement | null;
@@ -103,11 +103,19 @@ export interface FormItemExtraConfig extends FormItemProps {
     relativeRangeStart?: {
         type: 'day' | 'month' | 'year';
         quantity: number;
+        pattern?: string;
+        dependField?: NamePath;
     };
     relativeRangeEnd?: {
         type: 'day' | 'month' | 'year';
         quantity: number;
+        pattern?: string;
+        dependField?: NamePath;
     };
+    validationCode?: {
+        code: string;
+        errorMessage: string;
+    }[];
     length?: number;
     minLength?: number;
     maxLength?: number;

package/es/utils/form-utils.js

@@ -1,4 +1,4 @@
-var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd"],
+var _excluded = ["type", "name", "required", "requiredAsserts", "showOptional", "rules", "initialValue", "normalize", "mergeRules", "getValueFromEvent", "getValueProps", "extra", "help", "label", "previewLabel", "extraLabel", "copyValue", "selectValue", "span", "halfRow", "fullRow", "valuePropName", "dependencies", "asserts", "messageVariables", "requiredMessage", "previewFormater", "disabled", "ignore", "shouldRender", "valueFormater", "antdDependencies", "dateLimitationType", "absoluteRangeEnd", "absoluteRangeStart", "relativeRangeStart", "relativeRangeEnd", "dependField", "validationCode"],
     _excluded2 = ["initialValue", "normalize", "rules", "extra", "help", "getValueFromEvent", "span", "valuePropName", "fullRow", "halfRow", "messageVariables", "requiredMessage", "previewFormater", "valueFormater", "required", "requiredMark", "className"];
 
 function _createForOfIteratorHelper(o, allowArrayLike) { var it = typeof Symbol !== "undefined" && o[Symbol.iterator] || o["@@iterator"]; if (!it) { if (Array.isArray(o) || (it = _unsupportedIterableToArray(o)) || allowArrayLike && o && typeof o.length === "number") { if (it) o = it; var i = 0; var F = function F() {}; return { s: F, n: function n() { if (i >= o.length) return { done: true }; return { done: false, value: o[i++] }; }, e: function e(_e) { throw _e; }, f: F }; } throw new TypeError("Invalid attempt to iterate non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); } var normalCompletion = true, didErr = false, err; return { s: function s() { it = it.call(o); }, n: function n() { var step = it.next(); normalCompletion = step.done; return step; }, e: function e(_e2) { didErr = true; err = _e2; }, f: function f() { try { if (!normalCompletion && it.return != null) it.return(); } finally { if (didErr) throw err; } } }; }
@@ -103,11 +103,7 @@ export var testAssert = function testAssert(form, assert) {
   return true;
 };
 
-var calcRequired = function calcRequired() {
-  var required = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : true;
-  var form = arguments.length > 1 ? arguments[1] : undefined;
-  var requiredAsserts = arguments.length > 2 ? arguments[2] : undefined;
-
+var calcRequired = function calcRequired(required, form, requiredAsserts) {
   if (Array.isArray(requiredAsserts)) {
     return requiredAsserts.every(function (assert) {
       return form && testAssert(form, assert);
@@ -120,7 +116,8 @@ var calcRequired = function calcRequired() {
 export var calcFormItemProps = function calcFormItemProps(config, extraProps, form, parentName) {
   var type = config.type,
       nameProp = config.name,
-      required = config.required,
+      _config$required = config.required,
+      required = _config$required === void 0 ? true : _config$required,
       requiredAsserts = config.requiredAsserts,
       _config$showOptional = config.showOptional,
       showOptional = _config$showOptional === void 0 ? false : _config$showOptional,
@@ -160,6 +157,9 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       absoluteRangeStart = config.absoluteRangeStart,
       relativeRangeStart = config.relativeRangeStart,
       relativeRangeEnd = config.relativeRangeEnd,
+      dependField = config.dependField,
+      _config$validationCod = config.validationCode,
+      validationCode = _config$validationCod === void 0 ? [] : _config$validationCod,
       rest = _objectWithoutProperties(config, _excluded);
 
   invariant(nameProp !== undefined || type === 'Divider' || type === 'Section' || type === 'Typography' || !type, "name property is required for form item config (type: ".concat(type, ")"));
@@ -184,14 +184,13 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       extraValueFormater = _extraProps$valueForm === void 0 ? function (value) {
     return value;
   } : _extraProps$valueForm,
-      _extraProps$required = extraProps.required,
-      extraRequired = _extraProps$required === void 0 ? true : _extraProps$required,
+      extraRequired = extraProps.required,
       _extraProps$requiredM = extraProps.requiredMark,
       requiredMark = _extraProps$requiredM === void 0 ? false : _extraProps$requiredM,
       className = extraProps.className,
       extraRest = _objectWithoutProperties(extraProps, _excluded2);
 
-  var rules = calcRequired(required || extraRequired, form, requiredAsserts) ? [{
+  var rules = calcRequired(required !== null && required !== void 0 ? required : extraRequired, form, requiredAsserts) ? [{
     required: type !== 'Declaration',
     message: requiredMessage || extraRequiredMessage
   }].concat(_toConsumableArray(propsRules)) : _toConsumableArray(propsRules);
@@ -221,71 +220,84 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
   elementProps.disabled = calcDisabled(disabled, form) || copiedValue.disabled || selectedValue.disabled;
 
   if (dateLimitationType) {
-    if (['DatePicker', 'BuddhistDatePicker'].includes(type)) {
-      var rangeStart = Number.MIN_SAFE_INTEGER;
-      var rangeEnd = Number.MAX_SAFE_INTEGER;
+    var rangeStart;
+    var rangeEnd;
 
-      if (dateLimitationType === 'absolute' && absoluteRangeStart) {
-        rangeStart = +moment(absoluteRangeStart).startOf('day');
-      }
+    if (dateLimitationType === 'absolute' && absoluteRangeStart) {
+      rangeStart = moment(absoluteRangeStart).startOf('day');
+    }
 
-      if (dateLimitationType === 'relative' && (relativeRangeStart === null || relativeRangeStart === void 0 ? void 0 : relativeRangeStart.quantity) !== undefined) {
-        rangeStart = +moment().add(relativeRangeStart.quantity, relativeRangeStart.type).startOf('day');
-      }
+    if (dateLimitationType === 'relative' && (relativeRangeStart === null || relativeRangeStart === void 0 ? void 0 : relativeRangeStart.quantity) !== undefined) {
+      var dependFieldValue = relativeRangeStart.dependField ? form === null || form === void 0 ? void 0 : form.getFieldValue(relativeRangeStart.dependField) : undefined;
+      rangeStart = moment(dependFieldValue).add(relativeRangeStart.quantity, relativeRangeStart.type).startOf('day');
+    }
 
-      if (dateLimitationType === 'absolute' && absoluteRangeEnd) {
-        rangeEnd = +moment(absoluteRangeEnd).endOf('day');
-      }
+    if (dateLimitationType === 'relative' && (relativeRangeStart === null || relativeRangeStart === void 0 ? void 0 : relativeRangeStart.pattern)) {
+      var result = Array.from(relativeRangeStart.pattern.matchAll(/^(([-|+]{0,1}\d+)y){0,1}(([-|+]{0,1}\d+)m){0,1}(([-|+]{0,1}\d+)d){0,1}$/g));
+
+      if (result.length) {
+        var year = result[0][2] || 0;
+        var month = result[0][4] || 0;
+        var day = result[0][6] || 0;
 
-      if (dateLimitationType === 'relative' && (relativeRangeEnd === null || relativeRangeEnd === void 0 ? void 0 : relativeRangeEnd.quantity) !== undefined) {
-        rangeEnd = +moment().add(relativeRangeEnd.quantity, relativeRangeEnd.type).endOf('day');
+        var _dependFieldValue = relativeRangeStart.dependField ? form === null || form === void 0 ? void 0 : form.getFieldValue(relativeRangeStart.dependField) : undefined;
+
+        rangeStart = moment(_dependFieldValue).add(year, 'year').add(month, 'month').add(day, 'day').startOf('day');
       }
+    }
 
-      elementProps.disabledDate = function (current) {
-        return +current < rangeStart || +current > (rangeEnd || Number.MAX_SAFE_INTEGER);
-      };
+    if (dateLimitationType === 'absolute' && absoluteRangeEnd) {
+      rangeEnd = moment(absoluteRangeEnd).endOf('day');
     }
 
-    if (type === 'InputDate') {
-      var _rangeStart;
+    if (dateLimitationType === 'relative' && (relativeRangeEnd === null || relativeRangeEnd === void 0 ? void 0 : relativeRangeEnd.quantity) !== undefined) {
+      var _dependFieldValue2 = relativeRangeEnd.dependField ? form === null || form === void 0 ? void 0 : form.getFieldValue(relativeRangeEnd.dependField) : undefined;
 
-      var _rangeEnd;
+      rangeEnd = moment(_dependFieldValue2).add(relativeRangeEnd.quantity, relativeRangeEnd.type).endOf('day');
+    }
 
-      if (dateLimitationType === 'absolute' && absoluteRangeStart) {
-        _rangeStart = moment(absoluteRangeStart).startOf('day');
-      }
+    if (dateLimitationType === 'relative' && (relativeRangeEnd === null || relativeRangeEnd === void 0 ? void 0 : relativeRangeEnd.pattern)) {
+      var _result = Array.from(relativeRangeEnd.pattern.matchAll(/^(([-|+]{0,1}\d+)y){0,1}(([-|+]{0,1}\d+)m){0,1}(([-|+]{0,1}\d+)d){0,1}$/g));
 
-      if (dateLimitationType === 'relative' && (relativeRangeStart === null || relativeRangeStart === void 0 ? void 0 : relativeRangeStart.quantity) !== undefined) {
-        _rangeStart = moment().add(relativeRangeStart.quantity, relativeRangeStart.type).startOf('day');
-      }
+      if (_result.length) {
+        var _year = _result[0][2] || 0;
 
-      if (dateLimitationType === 'absolute' && absoluteRangeEnd) {
-        _rangeEnd = moment(absoluteRangeEnd).endOf('day');
-      }
+        var _month = _result[0][4] || 0;
+
+        var _day = _result[0][6] || 0;
 
-      if (dateLimitationType === 'relative' && (relativeRangeEnd === null || relativeRangeEnd === void 0 ? void 0 : relativeRangeEnd.quantity) !== undefined) {
-        _rangeEnd = moment().add(relativeRangeEnd.quantity, relativeRangeEnd.type).endOf('day');
+        var _dependFieldValue3 = relativeRangeEnd.dependField ? form === null || form === void 0 ? void 0 : form.getFieldValue(relativeRangeEnd.dependField) : undefined;
+
+        rangeEnd = moment(_dependFieldValue3).add(_year, 'year').add(_month, 'month').add(_day, 'day').endOf('day');
       }
+    }
 
+    if (['DatePicker', 'BuddhistDatePicker'].includes(type)) {
+      elementProps.disabledDate = function (current) {
+        return +current < (rangeStart ? +rangeStart : Number.MIN_SAFE_INTEGER) || +current > (rangeEnd ? +rangeEnd : Number.MAX_SAFE_INTEGER);
+      };
+    }
+
+    if (type === 'InputDate') {
       rules.push({
         validator: function validator(_, date) {
           var trimedDate = date.replaceAll(/\s/g, '');
           var format = elementProps.format ? elementProps.format.replaceAll(/\s/g, '') : 'DD/MM/YYYY';
 
-          if (_rangeStart && moment(trimedDate, format) < _rangeStart) {
+          if (rangeStart && moment(trimedDate, format) < rangeStart) {
             return Promise.reject(_jsx(FormattedMessage, {
               id: "Please input a date after {date}",
               values: {
-                date: _rangeStart.format(format)
+                date: rangeStart.format(format)
               }
             }));
           }
 
-          if (_rangeEnd && moment(trimedDate, format) > _rangeEnd) {
+          if (rangeEnd && moment(trimedDate, format) > rangeEnd) {
             return Promise.reject(_jsx(FormattedMessage, {
               id: "Please input a date before {date}",
               values: {
-                date: _rangeEnd.format(format)
+                date: rangeEnd.format(format)
               }
             }));
           }
@@ -296,6 +308,27 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
     }
   }
 
+  if (validationCode.length) {
+    rules.push.apply(rules, _toConsumableArray(validationCode.map(function (_ref2) {
+      var code = _ref2.code,
+          errorMessage = _ref2.errorMessage;
+      return {
+        validator: function validator(_, value) {
+          try {
+            var fn = eval(code);
+            var formValues = form === null || form === void 0 ? void 0 : form.getFieldsValue(true);
+
+            var _result2 = fn(value, formValues);
+
+            return _result2 ? Promise.resolve() : Promise.reject(errorMessage);
+          } catch (_unused) {
+            return Promise.reject(errorMessage);
+          }
+        }
+      };
+    })));
+  }
+
   return {
     colProps: {
       span: extraFullRow && fullRow === undefined || fullRow || extraHalfRow && halfRow === undefined || halfRow ? 24 : span || extraSpan || 12,
@@ -307,7 +340,7 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
     formItemProps: {
       name: name,
       className: className,
-      initialValue: (valueFormater || extraValueFormater)(initialValue || extraInitialValue),
+      initialValue: (valueFormater || extraValueFormater)(initialValue !== null && initialValue !== void 0 ? initialValue : extraInitialValue),
       copiedValue: copiedValue,
       selectedValue: selectedValue,
       normalize: normalize || extraNormalize,

package/lib/date-picker/index.js

@@ -89,7 +89,7 @@ var IglooDatePicker = function IglooDatePicker(_ref) {
       setFocus = _useState2[1];
 
   return (0, _jsxRuntime.jsx)(_datePicker.default, _objectSpread(_objectSpread({}, (0, _omit.default)(props, _formMethods.default)), {}, {
-    value: value ? (0, _moment.default)(value) : value,
+    value: (0, _moment.default)(value),
     placeholder: placeholder || dateFormater,
     format: format || dateFormater,
     inputReadOnly: true,
@@ -116,7 +116,7 @@ IglooDatePicker.formItemPropsHandler = function (_ref2) {
       return (0, _moment.default)(value).format(format || dateFormater);
     },
     valueFormater: function valueFormater(value) {
-      return value ? +(0, _moment.default)(value) : value;
+      return +(0, _moment.default)(value);
     },
     'element-allowClear': false
   };

package/lib/form/index.js

@@ -117,22 +117,24 @@ var IglooForm = function IglooForm(props, ref) {
 
   var handleSubmit = /*#__PURE__*/function () {
     var _ref = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee(values) {
-      var errors;
+      var allValues, errors;
       return regeneratorRuntime.wrap(function _callee$(_context) {
         while (1) {
           switch (_context.prev = _context.next) {
             case 0:
+              allValues = form.getFieldsValue(true);
+
               if (!(typeof onSubmit === 'function')) {
-                _context.next = 10;
+                _context.next = 11;
                 break;
               }
 
               setSubmitting(true);
-              _context.prev = 2;
-              _context.next = 5;
-              return onSubmit(values);
+              _context.prev = 3;
+              _context.next = 6;
+              return onSubmit(values, allValues);
 
-            case 5:
+            case 6:
               errors = _context.sent;
 
               if (Array.isArray(errors)) {
@@ -140,17 +142,17 @@ var IglooForm = function IglooForm(props, ref) {
                 form.scrollToField(errors[0].name);
               }
 
-            case 7:
-              _context.prev = 7;
+            case 8:
+              _context.prev = 8;
               setSubmitting(false);
-              return _context.finish(7);
+              return _context.finish(8);
 
-            case 10:
+            case 11:
             case "end":
               return _context.stop();
           }
         }
-      }, _callee, null, [[2,, 7, 10]]);
+      }, _callee, null, [[3,, 8, 11]]);
     }));
 
     return function handleSubmit(_x) {
@@ -161,7 +163,7 @@ var IglooForm = function IglooForm(props, ref) {
   (0, _react.useImperativeHandle)(ref, function () {
     return {
       getValues: function () {
-        var _getValues = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2() {
+        var _getValues = _asyncToGenerator( /*#__PURE__*/regeneratorRuntime.mark(function _callee2(getAll) {
           return regeneratorRuntime.wrap(function _callee2$(_context2) {
             while (1) {
               switch (_context2.prev = _context2.next) {
@@ -170,7 +172,7 @@ var IglooForm = function IglooForm(props, ref) {
                   return form.validateFields();
 
                 case 2:
-                  return _context2.abrupt("return", form.getFieldsValue());
+                  return _context2.abrupt("return", getAll ? form.getFieldsValue(true) : form.getFieldsValue());
 
                 case 3:
                 case "end":
@@ -180,7 +182,7 @@ var IglooForm = function IglooForm(props, ref) {
           }, _callee2);
         }));
 
-        function getValues() {
+        function getValues(_x2) {
           return _getValues.apply(this, arguments);
         }
 
@@ -263,6 +265,7 @@ var IglooForm = function IglooForm(props, ref) {
         validateMessages: validateMessages || _messages.default,
         initialValues: initialValues,
         scrollToFirstError: true,
+        preserve: true,
         children: [type === 'Pages' && (0, _jsxRuntime.jsx)(_pages.default, {
           config: config
         }), type === 'Page' && (0, _jsxRuntime.jsx)(_page.default, {

package/lib/types.d.ts

@@ -21,7 +21,7 @@ export interface FormBasicConfig {
     initialValues?: any;
     form?: FormInstance;
     onCancel?(): void;
-    onSubmit?(values: Object): any;
+    onSubmit?(values: Object, allValues?: Object): any;
     requiredMark?: boolean;
     showSubmitButton?: boolean;
     getScrollContainer?: () => HTMLElement | null;
@@ -103,11 +103,19 @@ export interface FormItemExtraConfig extends FormItemProps {
     relativeRangeStart?: {
         type: 'day' | 'month' | 'year';
         quantity: number;
+        pattern?: string;
+        dependField?: NamePath;
     };
     relativeRangeEnd?: {
         type: 'day' | 'month' | 'year';
         quantity: number;
+        pattern?: string;
+        dependField?: NamePath;
     };
+    validationCode?: {
+        code: string;
+        errorMessage: string;
+    }[];
     length?: number;
     minLength?: number;
     maxLength?: number;