iglooform 3.2.3 → 3.2.4

package/es/form/element/index.js

@@ -114,7 +114,7 @@ var Element = function Element(_ref) {
     registerDependencies(dependentField, dispatch);
   }, []);
   invariant(type !== 'Pages' && type !== 'Page', "".concat(type, " should not be inner form item"));
-  var _useComponent = useComponent(config),
+  var _useComponent = useComponent(config, parentName),
     Component = _useComponent.Component,
     extraConfig = _useComponent.formItemProps,
     withoutForm = _useComponent.withoutForm;

package/es/form/elements.d.ts

@@ -1,5 +1,6 @@
+import { NamePath } from 'antd/es/form/interface';
 import { FormItemConfig, FormItemExtraConfig } from '../types';
-type UseComponentHook = (config: FormItemConfig) => {
+type UseComponentHook = (config: FormItemConfig, parentName: NamePath) => {
     Component: any;
     formItemProps: FormItemExtraConfig;
     withoutForm: boolean;

package/es/form/elements.js

@@ -1,20 +1,31 @@
+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); }
+var _excluded = ["onChange"];
+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 = 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+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; }
 import { useMemo, useContext } from 'react';
 import Button from "../button";
-import Radio, { RadioGroup, RadioGroupWithOther } from "../radio";
-import Input, { PhoneNumber, Amount, Email, Password, InputNumber, TextArea, InputDate, CreditCard, Otp, ExpiryDate, InputId } from "../input";
-import DatePicker, { IglooBuddhistDatePicker as BuddhistDatePicker, IglooRangePicker as RangePicker, IglooWeekPicker as WeekPicker, IglooMonthPicker as MonthPicker } from "../date-picker";
+import Checkbox, { CheckboxGroup } from "../checkbox";
 import Confirmation from "../confirmation";
+import DatePicker, { IglooBuddhistDatePicker as BuddhistDatePicker, IglooRangePicker as RangePicker, IglooWeekPicker as WeekPicker, IglooMonthPicker as MonthPicker } from "../date-picker";
+import Declaration from "../declaration";
+import formContext from "../form-context";
+import Input, { PhoneNumber, Amount, Email, Password, InputNumber, TextArea, InputDate, CreditCard, Otp, ExpiryDate, InputId } from "../input";
+import OCR from "../ocr";
+import Radio, { RadioGroup, RadioGroupWithOther } from "../radio";
+import SearchBox from "../search-box";
 import { AttachedSelect as Select, TimeSelect } from "../select";
-import Checkbox, { CheckboxGroup } from "../checkbox";
+import Typography from "../typography";
 import Upload from "../upload";
-import Declaration from "../declaration";
-import Divider from "./divider";
 import UploadPhoto from "../upload-photo";
+import Divider from "./divider";
 import RenderElement from "./render";
-import Typography from "../typography";
-import SearchBox from "../search-box";
-import formContext from "../form-context";
-import OCR from "../ocr";
+import useWrapperOnChangeForAutomaticCalc from "../hooks/useWrapperOnChangeForAutomaticCalc";
+import { jsx as _jsx } from "react/jsx-runtime";
 var elementMap = {
   Input: Input,
   PhoneNumber: PhoneNumber,
@@ -53,12 +64,13 @@ var elementMap = {
 var Unknown = function Unknown() {
   return 'Unknown Form Item';
 };
-var useComponent = function useComponent(config) {
+var useComponent = function useComponent(config, parentName) {
   var _useContext = useContext(formContext),
     _useContext$customize = _useContext.customizeComponents,
     customizeComponents = _useContext$customize === void 0 ? {} : _useContext$customize;
   var type = config.type,
-    render = config.render;
+    render = config.render,
+    enableAutomaticCalc = config.enableAutomaticCalc;
   if (!type && !render) {
     return {
       Component: Unknown,
@@ -69,8 +81,16 @@ var useComponent = function useComponent(config) {
   return useMemo(function () {
     var Component = type ? elementMap[type] || customizeComponents[type] || Unknown : RenderElement;
     var formItemProps = typeof Component.formItemPropsHandler === 'function' ? Component.formItemPropsHandler(config) : {};
+    var WrapperComponent = function WrapperComponent(_ref) {
+      var onChange = _ref.onChange,
+        props = _objectWithoutProperties(_ref, _excluded);
+      var handleOnChange = useWrapperOnChangeForAutomaticCalc(config, parentName, onChange);
+      return /*#__PURE__*/_jsx(Component, _objectSpread(_objectSpread({}, props), {}, {
+        onChange: handleOnChange
+      }));
+    };
     return {
-      Component: Component,
+      Component: enableAutomaticCalc ? WrapperComponent : Component,
       formItemProps: formItemProps,
       withoutForm: type === 'Divider' || Boolean(config.withoutForm) || config.name === undefined
     };

package/es/hooks/useWrapperOnChangeForAutomaticCalc.d.ts

@@ -0,0 +1,5 @@
+import { FormItemConfig } from '../types';
+import { NamePath } from 'antd/es/form/interface';
+type UseWrapperOnChangeForAutomaticCalcHook = (config: FormItemConfig, parentName: NamePath, onChange: any) => (value: any, automaticCalc?: boolean) => void;
+declare const useWrapperOnChangeForAutomaticCalc: UseWrapperOnChangeForAutomaticCalcHook;
+export default useWrapperOnChangeForAutomaticCalc;

package/es/hooks/useWrapperOnChangeForAutomaticCalc.js

@@ -0,0 +1,26 @@
+import { useUpdateEffect } from '@umijs/hooks';
+import { useContext } from 'react';
+import { isEqual } from 'lodash';
+import { calcAutomaticCalculate } from "../utils/form-utils";
+import formContext from "../form-context";
+var useWrapperOnChangeForAutomaticCalc = function useWrapperOnChangeForAutomaticCalc(config, parentName, onChange) {
+  var _useContext = useContext(formContext),
+    form = _useContext.form;
+  var name = config.name,
+    enableAutomaticCalc = config.enableAutomaticCalc,
+    automaticCalcCode = config.automaticCalcCode;
+  var handleOnChange = function handleOnChange(value) {
+    var automaticCalc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (automaticCalc && isEqual(form === null || form === void 0 ? void 0 : form.getFieldValue(name), value)) {
+      return;
+    }
+    onChange(value);
+  };
+  useUpdateEffect(function () {
+    if (form && enableAutomaticCalc && automaticCalcCode) {
+      calcAutomaticCalculate(name, parentName, automaticCalcCode, form, handleOnChange);
+    }
+  });
+  return handleOnChange;
+};
+export default useWrapperOnChangeForAutomaticCalc;

package/es/utils/form-utils.d.ts

@@ -74,6 +74,6 @@ export declare const calcSelectValue: (selectValue?: FormItemSelectValue[], form
     disabled: boolean | undefined;
 };
 export declare const calcShouldRender: (name: NamePath, parentName: NamePath, dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance) => boolean) | undefined, shouldRenderCode?: string, form?: FormInstance) => any;
-export declare const calcAutomaticCalculate: (name: NamePath, parentName: NamePath, automaticCalcCode?: string, form?: FormInstance) => undefined;
+export declare const calcAutomaticCalculate: (name: NamePath, parentName: NamePath, automaticCalcCode?: string, form?: FormInstance, onChange?: ((value: any, automaticCalc?: boolean) => any) | undefined) => undefined;
 export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string) => Promise<any>;
 export declare const calcAddableSectionAssertField: (name: any[], field: FormItemAssert['field'], index: number, elements: FormItemConfig[] | React.ReactElement[]) => any;

package/es/utils/form-utils.js

@@ -226,7 +226,7 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
   Object.keys(_objectSpread(_objectSpread({}, extraRest), rest)).forEach(function (key) {
     elementProps[key.replace('element-', '')] = rest[key];
   });
-  elementProps.disabled = calcDisabled(disabled, form, disabledCode, name, parentName) || copiedValue.disabled || selectedValue.disabled;
+  elementProps.disabled = enableAutomaticCalc || calcDisabled(disabled, form, disabledCode, name, parentName) || copiedValue.disabled || selectedValue.disabled;
   if (dateLimitationType) {
     var rangeStart;
     var rangeEnd;
@@ -322,9 +322,6 @@ export var calcFormItemProps = function calcFormItemProps(config, extraProps, fo
       };
     })));
   }
-  if (enableAutomaticCalc) {
-    calcAutomaticCalculate(name, parentName, automaticCalcCode, form);
-  }
   return {
     colProps: {
       span: extraFullRow && fullRow === undefined || fullRow || extraHalfRow && halfRow === undefined || halfRow ? 24 : span || extraSpan || 12,
@@ -387,9 +384,9 @@ export var calcDisabled = function calcDisabled(disabled, form, disabledCode, na
     var fn = eval(disabledCode);
     if (typeof fn === 'function') {
       try {
-        var value = form.getFieldValue(name);
+        var _value = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        return fn(value, values, {
+        return fn(_value, values, {
           moment: moment,
           get: get
         }, {
@@ -454,12 +451,12 @@ export var calcSelectValue = function calcSelectValue(selectValue, form) {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var select = _step2.value;
       var assert = select.assert,
-        value = select.value,
+        _value2 = select.value,
         disabled = select.disabled;
       if (testAssert(form, assert)) {
         return {
           selected: true,
-          value: value,
+          value: _value2,
           disabled: disabled
         };
       }
@@ -501,9 +498,9 @@ export var calcShouldRender = function calcShouldRender(name, parentName) {
     var fn = eval(shouldRenderCode);
     if (typeof fn === 'function') {
       try {
-        var value = form.getFieldValue(name);
+        var _value3 = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        return fn(value, values, {
+        return fn(_value3, values, {
           moment: moment,
           get: get
         }, {
@@ -530,16 +527,16 @@ export var calcShouldRender = function calcShouldRender(name, parentName) {
   }
   return true;
 };
-export var calcAutomaticCalculate = function calcAutomaticCalculate(name, parentName, automaticCalcCode, form) {
+export var calcAutomaticCalculate = function calcAutomaticCalculate(name, parentName, automaticCalcCode, form, onChange) {
   if (!form) return undefined;
   if (automaticCalcCode) {
     var calcValue = undefined;
     var fn = eval(automaticCalcCode);
     if (typeof fn === 'function') {
       try {
-        var value = form.getFieldValue(name);
+        var _value4 = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        calcValue = fn(value, values, {
+        calcValue = fn(_value4, values, {
           moment: moment,
           get: get
         }, {
@@ -548,10 +545,7 @@ export var calcAutomaticCalculate = function calcAutomaticCalculate(name, parent
         });
       } catch (_unused4) {}
     }
-    form.setFields([{
-      name: name,
-      value: calcValue
-    }]);
+    onChange === null || onChange === void 0 ? void 0 : onChange(calcValue, true);
   }
 };
 export var getRuleValidation = /*#__PURE__*/function () {

package/lib/form/element/index.js

@@ -120,7 +120,7 @@ var Element = function Element(_ref) {
     registerDependencies(dependentField, dispatch);
   }, []);
   (0, _invariant.default)(type !== 'Pages' && type !== 'Page', "".concat(type, " should not be inner form item"));
-  var _useComponent = (0, _elements.default)(config),
+  var _useComponent = (0, _elements.default)(config, parentName),
     Component = _useComponent.Component,
     extraConfig = _useComponent.formItemProps,
     withoutForm = _useComponent.withoutForm;

package/lib/form/elements.d.ts

@@ -1,5 +1,6 @@
+import { NamePath } from 'antd/es/form/interface';
 import { FormItemConfig, FormItemExtraConfig } from '../types';
-type UseComponentHook = (config: FormItemConfig) => {
+type UseComponentHook = (config: FormItemConfig, parentName: NamePath) => {
     Component: any;
     formItemProps: FormItemExtraConfig;
     withoutForm: boolean;

package/lib/form/elements.js

@@ -7,24 +7,34 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _react = require("react");
 var _button = _interopRequireDefault(require("../button"));
-var _radio = _interopRequireWildcard(require("../radio"));
-var _input = _interopRequireWildcard(require("../input"));
-var _datePicker = _interopRequireWildcard(require("../date-picker"));
+var _checkbox = _interopRequireWildcard(require("../checkbox"));
 var _confirmation = _interopRequireDefault(require("../confirmation"));
+var _datePicker = _interopRequireWildcard(require("../date-picker"));
+var _declaration = _interopRequireDefault(require("../declaration"));
+var _formContext = _interopRequireDefault(require("../form-context"));
+var _input = _interopRequireWildcard(require("../input"));
+var _ocr = _interopRequireDefault(require("../ocr"));
+var _radio = _interopRequireWildcard(require("../radio"));
+var _searchBox = _interopRequireDefault(require("../search-box"));
 var _select = require("../select");
-var _checkbox = _interopRequireWildcard(require("../checkbox"));
+var _typography = _interopRequireDefault(require("../typography"));
 var _upload = _interopRequireDefault(require("../upload"));
-var _declaration = _interopRequireDefault(require("../declaration"));
-var _divider = _interopRequireDefault(require("./divider"));
 var _uploadPhoto = _interopRequireDefault(require("../upload-photo"));
+var _divider = _interopRequireDefault(require("./divider"));
 var _render = _interopRequireDefault(require("./render"));
-var _typography = _interopRequireDefault(require("../typography"));
-var _searchBox = _interopRequireDefault(require("../search-box"));
-var _formContext = _interopRequireDefault(require("../form-context"));
-var _ocr = _interopRequireDefault(require("../ocr"));
+var _useWrapperOnChangeForAutomaticCalc = _interopRequireDefault(require("../hooks/useWrapperOnChangeForAutomaticCalc"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _excluded = ["onChange"];
 function _getRequireWildcardCache(nodeInterop) { if (typeof WeakMap !== "function") return null; var cacheBabelInterop = new WeakMap(); var cacheNodeInterop = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(nodeInterop) { return nodeInterop ? cacheNodeInterop : cacheBabelInterop; })(nodeInterop); }
 function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj && obj.__esModule) { return obj; } if (obj === null || _typeof(obj) !== "object" && typeof obj !== "function") { return { default: obj }; } var cache = _getRequireWildcardCache(nodeInterop); if (cache && cache.has(obj)) { return cache.get(obj); } var newObj = {}; var hasPropertyDescriptor = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var key in obj) { if (key !== "default" && Object.prototype.hasOwnProperty.call(obj, key)) { var desc = hasPropertyDescriptor ? Object.getOwnPropertyDescriptor(obj, key) : null; if (desc && (desc.get || desc.set)) { Object.defineProperty(newObj, key, desc); } else { newObj[key] = obj[key]; } } } newObj.default = obj; if (cache) { cache.set(obj, newObj); } return newObj; }
 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); 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 = 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) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+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; }
 var elementMap = {
   Input: _input.default,
   PhoneNumber: _input.PhoneNumber,
@@ -63,12 +73,13 @@ var elementMap = {
 var Unknown = function Unknown() {
   return 'Unknown Form Item';
 };
-var useComponent = function useComponent(config) {
+var useComponent = function useComponent(config, parentName) {
   var _useContext = (0, _react.useContext)(_formContext.default),
     _useContext$customize = _useContext.customizeComponents,
     customizeComponents = _useContext$customize === void 0 ? {} : _useContext$customize;
   var type = config.type,
-    render = config.render;
+    render = config.render,
+    enableAutomaticCalc = config.enableAutomaticCalc;
   if (!type && !render) {
     return {
       Component: Unknown,
@@ -79,8 +90,16 @@ var useComponent = function useComponent(config) {
   return (0, _react.useMemo)(function () {
     var Component = type ? elementMap[type] || customizeComponents[type] || Unknown : _render.default;
     var formItemProps = typeof Component.formItemPropsHandler === 'function' ? Component.formItemPropsHandler(config) : {};
+    var WrapperComponent = function WrapperComponent(_ref) {
+      var onChange = _ref.onChange,
+        props = _objectWithoutProperties(_ref, _excluded);
+      var handleOnChange = (0, _useWrapperOnChangeForAutomaticCalc.default)(config, parentName, onChange);
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(Component, _objectSpread(_objectSpread({}, props), {}, {
+        onChange: handleOnChange
+      }));
+    };
     return {
-      Component: Component,
+      Component: enableAutomaticCalc ? WrapperComponent : Component,
       formItemProps: formItemProps,
       withoutForm: type === 'Divider' || Boolean(config.withoutForm) || config.name === undefined
     };

package/lib/hooks/useWrapperOnChangeForAutomaticCalc.d.ts

@@ -0,0 +1,5 @@
+import { FormItemConfig } from '../types';
+import { NamePath } from 'antd/es/form/interface';
+type UseWrapperOnChangeForAutomaticCalcHook = (config: FormItemConfig, parentName: NamePath, onChange: any) => (value: any, automaticCalc?: boolean) => void;
+declare const useWrapperOnChangeForAutomaticCalc: UseWrapperOnChangeForAutomaticCalcHook;
+export default useWrapperOnChangeForAutomaticCalc;

package/lib/hooks/useWrapperOnChangeForAutomaticCalc.js

@@ -0,0 +1,34 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _hooks = require("@umijs/hooks");
+var _react = require("react");
+var _lodash = require("lodash");
+var _formUtils = require("../utils/form-utils");
+var _formContext = _interopRequireDefault(require("../form-context"));
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+var useWrapperOnChangeForAutomaticCalc = function useWrapperOnChangeForAutomaticCalc(config, parentName, onChange) {
+  var _useContext = (0, _react.useContext)(_formContext.default),
+    form = _useContext.form;
+  var name = config.name,
+    enableAutomaticCalc = config.enableAutomaticCalc,
+    automaticCalcCode = config.automaticCalcCode;
+  var handleOnChange = function handleOnChange(value) {
+    var automaticCalc = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : false;
+    if (automaticCalc && (0, _lodash.isEqual)(form === null || form === void 0 ? void 0 : form.getFieldValue(name), value)) {
+      return;
+    }
+    onChange(value);
+  };
+  (0, _hooks.useUpdateEffect)(function () {
+    if (form && enableAutomaticCalc && automaticCalcCode) {
+      (0, _formUtils.calcAutomaticCalculate)(name, parentName, automaticCalcCode, form, handleOnChange);
+    }
+  });
+  return handleOnChange;
+};
+var _default = useWrapperOnChangeForAutomaticCalc;
+exports.default = _default;

package/lib/utils/form-utils.d.ts

@@ -74,6 +74,6 @@ export declare const calcSelectValue: (selectValue?: FormItemSelectValue[], form
     disabled: boolean | undefined;
 };
 export declare const calcShouldRender: (name: NamePath, parentName: NamePath, dependencies?: NamePath[], asserts?: FormItemAssert[], shouldRender?: ((form?: FormInstance) => boolean) | undefined, shouldRenderCode?: string, form?: FormInstance) => any;
-export declare const calcAutomaticCalculate: (name: NamePath, parentName: NamePath, automaticCalcCode?: string, form?: FormInstance) => undefined;
+export declare const calcAutomaticCalculate: (name: NamePath, parentName: NamePath, automaticCalcCode?: string, form?: FormInstance, onChange?: ((value: any, automaticCalc?: boolean) => any) | undefined) => undefined;
 export declare const getRuleValidation: (url: string, rule: string | string[], values?: any, lang?: string) => Promise<any>;
 export declare const calcAddableSectionAssertField: (name: any[], field: FormItemAssert['field'], index: number, elements: FormItemConfig[] | React.ReactElement[]) => any;

package/lib/utils/form-utils.js

@@ -234,7 +234,7 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
   Object.keys(_objectSpread(_objectSpread({}, extraRest), rest)).forEach(function (key) {
     elementProps[key.replace('element-', '')] = rest[key];
   });
-  elementProps.disabled = calcDisabled(disabled, form, disabledCode, name, parentName) || copiedValue.disabled || selectedValue.disabled;
+  elementProps.disabled = enableAutomaticCalc || calcDisabled(disabled, form, disabledCode, name, parentName) || copiedValue.disabled || selectedValue.disabled;
   if (dateLimitationType) {
     var rangeStart;
     var rangeEnd;
@@ -330,9 +330,6 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       };
     })));
   }
-  if (enableAutomaticCalc) {
-    calcAutomaticCalculate(name, parentName, automaticCalcCode, form);
-  }
   return {
     colProps: {
       span: extraFullRow && fullRow === undefined || fullRow || extraHalfRow && halfRow === undefined || halfRow ? 24 : span || extraSpan || 12,
@@ -396,9 +393,9 @@ var calcDisabled = function calcDisabled(disabled, form, disabledCode, name, par
     var fn = eval(disabledCode);
     if (typeof fn === 'function') {
       try {
-        var value = form.getFieldValue(name);
+        var _value = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        return fn(value, values, {
+        return fn(_value, values, {
           moment: _dayjs.default,
           get: _lodash.get
         }, {
@@ -465,12 +462,12 @@ var calcSelectValue = function calcSelectValue(selectValue, form) {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var select = _step2.value;
       var assert = select.assert,
-        value = select.value,
+        _value2 = select.value,
         disabled = select.disabled;
       if (testAssert(form, assert)) {
         return {
           selected: true,
-          value: value,
+          value: _value2,
           disabled: disabled
         };
       }
@@ -513,9 +510,9 @@ var calcShouldRender = function calcShouldRender(name, parentName) {
     var fn = eval(shouldRenderCode);
     if (typeof fn === 'function') {
       try {
-        var value = form.getFieldValue(name);
+        var _value3 = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        return fn(value, values, {
+        return fn(_value3, values, {
           moment: _dayjs.default,
           get: _lodash.get
         }, {
@@ -543,16 +540,16 @@ var calcShouldRender = function calcShouldRender(name, parentName) {
   return true;
 };
 exports.calcShouldRender = calcShouldRender;
-var calcAutomaticCalculate = function calcAutomaticCalculate(name, parentName, automaticCalcCode, form) {
+var calcAutomaticCalculate = function calcAutomaticCalculate(name, parentName, automaticCalcCode, form, onChange) {
   if (!form) return undefined;
   if (automaticCalcCode) {
     var calcValue = undefined;
     var fn = eval(automaticCalcCode);
     if (typeof fn === 'function') {
       try {
-        var value = form.getFieldValue(name);
+        var _value4 = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        calcValue = fn(value, values, {
+        calcValue = fn(_value4, values, {
           moment: _dayjs.default,
           get: _lodash.get
         }, {
@@ -561,10 +558,7 @@ var calcAutomaticCalculate = function calcAutomaticCalculate(name, parentName, a
         });
       } catch (_unused4) {}
     }
-    form.setFields([{
-      name: name,
-      value: calcValue
-    }]);
+    onChange === null || onChange === void 0 ? void 0 : onChange(calcValue, true);
   }
 };
 exports.calcAutomaticCalculate = calcAutomaticCalculate;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "iglooform",
-  "version": "3.2.3",
+  "version": "3.2.4",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",

package/es/types.d.ts

@@ -1,187 +0,0 @@
-/// <reference path="../typings.d.ts" />
-import { BlinkIdSingleSideRecognizerResult } from '@microblink/blinkid-in-browser-sdk';
-import { FormItemProps, FormInstance } from 'antd/es/form';
-import { ReactNode } from 'react';
-import { NamePath } from 'rc-field-form/lib/interface';
-import { CheckboxOptionType } from 'antd/es/checkbox';
-import { SelectProps } from 'antd/es/select';
-export { Rule } from 'rc-field-form/lib/interface';
-export interface OCRHooks {
-    microBlink?: {
-        initResult: {
-            error?: string;
-            failed: boolean;
-        };
-        recognize: ((file: File) => Promise<BlinkIdSingleSideRecognizerResult | null>) | null;
-        loading?: boolean;
-    };
-}
-export interface OCRConfig {
-    microBlink?: {
-        licenseKey: string;
-    };
-}
-export type FormItemName = NamePath;
-export interface FormBasicConfig {
-    config: FormItemConfig;
-    className?: string;
-    style?: Object;
-    locales?: {
-        cancelText?: string;
-        submitText?: string;
-        previewText?: string;
-        nextText?: string;
-        continueText?: string;
-        validateMessages?: Object;
-    };
-    initialValues?: any;
-    form?: FormInstance;
-    onCancel?(): void;
-    onSubmit?(values: Object, allValues?: Object): any;
-    requiredMark?: boolean;
-    showSubmitButton?: boolean;
-    getScrollContainer?: () => HTMLElement | null;
-    onFirstModified?: () => any;
-    uploadApi?: string;
-    selectDatasourceApi?: string;
-    validationRule?: string;
-    getRuleValidationApi?: string;
-    stepDirection?: 'vertical' | 'horizontal';
-    customizeComponents?: {
-        [name: string]: FC;
-    };
-    ocr?: OCRConfig;
-    validationCodeExtraParams?: Record<string, any>;
-}
-export type FormItemAssert = {
-    field: NamePath;
-    value?: any;
-    operation?: 'eq' | 'ne' | 'in' | 'ni' | 'lt' | 'le' | 'gt' | 'ge' | 'co' | 'nc' | 'filled' | 'unfilled' | 'co-some' | 'co-every' | 'some-in' | 'every-in';
-};
-export type FormItemCopyValue = {
-    assert: FormItemAssert;
-    copyFrom: NamePath;
-    disabled?: boolean;
-};
-export type FormItemSelectValue = {
-    assert: FormItemAssert;
-    value: any;
-    disabled?: boolean;
-};
-export interface FormItemExtraConfig extends FormItemProps {
-    elements?: FormItemConfig[];
-    required?: boolean;
-    requiredAsserts?: FormItemAssert[];
-    extraLabel?: any;
-    xl?: number;
-    md?: number;
-    xs?: number;
-    span?: number;
-    areaCode?: number | string | (number | string)[];
-    phoneNumber?: number | string;
-    mergeRules?: boolean;
-    dependencies?: NamePath[];
-    antdDependencies?: NamePath[];
-    asserts?: FormItemAssert[];
-    shouldRender?: (form?: FormInstance) => boolean;
-    ignore?: boolean;
-    copyValue?: FormItemCopyValue;
-    selectValue?: FormItemSelectValue[];
-    disabled?: boolean | FormItemAssert | FormItemAssert[];
-    halfRow?: boolean;
-    fullRow?: boolean;
-    limit?: number;
-    hideWhenPreview?: boolean;
-    hideWhenEdit?: boolean;
-    requiredMessage?: string | ReactNode;
-    showOptional?: boolean;
-    previewFormater?(value: any, form?: FormInstance): any;
-    handleNext?(values: any): any;
-    render?(preview: boolean, form?: FormInstance, value?: any, onChange?: (params: any) => any, setShowStepButton?: IglooComponentProps['setShowStepButton']): any;
-    locales?: {
-        [key: string]: string;
-    };
-    options?: (CheckboxOptionType & {
-        extraInfo?: {
-            content: any;
-            shownTrigger: 'unchecked' | 'checked' | 'all';
-        };
-    })[] | SelectProps['options'];
-    sendOtp?: (value: any) => any;
-    dependField?: FormItemName;
-    countDownSeconds?: number;
-    getButtonDisabledState?: (form: FormInstance) => boolean;
-    getPreviousDisabledState?: (form: FormInstance) => boolean;
-    handleUpload?(file: File): PromiseLike<string>;
-    withoutForm?: boolean;
-    disableEditButton?: boolean;
-    hidePreviewDivider?: boolean;
-    valueFormater?: (value: any) => any;
-    currentStep?: number;
-    subscribedFields?: FormItemName[];
-    description?: string | React.ReactNode;
-    dateLimitationType?: 'relative' | 'absolute';
-    absoluteRangeStart?: number;
-    absoluteRangeEnd?: number;
-    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;
-        warningOnly?: boolean;
-    }[];
-    length?: number;
-    minLength?: number;
-    maxLength?: number;
-    idType?: 'KTP' | 'NIK';
-    validationRule?: string;
-    shouldRenderCode?: string;
-    disabledCode?: string;
-    automaticCalcCode?: string;
-    enableAutomaticCalc?: boolean;
-    [key: string]: any;
-}
-export interface FormItemConfig extends FormItemExtraConfig {
-    type?: string;
-    name?: NamePath;
-    label?: string | React.ReactNode;
-    previewLabel?: string | React.ReactNode;
-    labelProps?: any;
-    contentProps?: any;
-    ocr?: {
-        vender: string;
-        outputMap: {
-            field: string[];
-            source: string[];
-        }[];
-    };
-}
-export type FormItemPropsHandler = (config: FormItemConfig) => FormItemConfig;
-export interface FC<P = {}> extends React.FunctionComponent<P> {
-    formItemPropsHandler?: FormItemPropsHandler;
-    isPreviewSupport?: boolean;
-}
-export interface Form extends React.ForwardRefExoticComponent<FormBasicConfig & React.RefAttributes<any>> {
-    useForm: () => FormInstance;
-}
-export interface IglooComponentProps {
-    validateField?: (nameList?: NamePath[]) => Promise<any>;
-    containerRef?: React.RefObject<any>;
-    setFieldError?(errorMsg?: string): void;
-    setFieldValue?(value?: any): void;
-    setShowStepButton?: (showButton: boolean) => void;
-    getFormInstance?: () => FormInstance;
-    locales?: {
-        [key: string]: string;
-    };
-}

package/lib/types.d.ts

@@ -1,187 +0,0 @@
-/// <reference path="../typings.d.ts" />
-import { BlinkIdSingleSideRecognizerResult } from '@microblink/blinkid-in-browser-sdk';
-import { FormItemProps, FormInstance } from 'antd/es/form';
-import { ReactNode } from 'react';
-import { NamePath } from 'rc-field-form/lib/interface';
-import { CheckboxOptionType } from 'antd/es/checkbox';
-import { SelectProps } from 'antd/es/select';
-export { Rule } from 'rc-field-form/lib/interface';
-export interface OCRHooks {
-    microBlink?: {
-        initResult: {
-            error?: string;
-            failed: boolean;
-        };
-        recognize: ((file: File) => Promise<BlinkIdSingleSideRecognizerResult | null>) | null;
-        loading?: boolean;
-    };
-}
-export interface OCRConfig {
-    microBlink?: {
-        licenseKey: string;
-    };
-}
-export type FormItemName = NamePath;
-export interface FormBasicConfig {
-    config: FormItemConfig;
-    className?: string;
-    style?: Object;
-    locales?: {
-        cancelText?: string;
-        submitText?: string;
-        previewText?: string;
-        nextText?: string;
-        continueText?: string;
-        validateMessages?: Object;
-    };
-    initialValues?: any;
-    form?: FormInstance;
-    onCancel?(): void;
-    onSubmit?(values: Object, allValues?: Object): any;
-    requiredMark?: boolean;
-    showSubmitButton?: boolean;
-    getScrollContainer?: () => HTMLElement | null;
-    onFirstModified?: () => any;
-    uploadApi?: string;
-    selectDatasourceApi?: string;
-    validationRule?: string;
-    getRuleValidationApi?: string;
-    stepDirection?: 'vertical' | 'horizontal';
-    customizeComponents?: {
-        [name: string]: FC;
-    };
-    ocr?: OCRConfig;
-    validationCodeExtraParams?: Record<string, any>;
-}
-export type FormItemAssert = {
-    field: NamePath;
-    value?: any;
-    operation?: 'eq' | 'ne' | 'in' | 'ni' | 'lt' | 'le' | 'gt' | 'ge' | 'co' | 'nc' | 'filled' | 'unfilled' | 'co-some' | 'co-every' | 'some-in' | 'every-in';
-};
-export type FormItemCopyValue = {
-    assert: FormItemAssert;
-    copyFrom: NamePath;
-    disabled?: boolean;
-};
-export type FormItemSelectValue = {
-    assert: FormItemAssert;
-    value: any;
-    disabled?: boolean;
-};
-export interface FormItemExtraConfig extends FormItemProps {
-    elements?: FormItemConfig[];
-    required?: boolean;
-    requiredAsserts?: FormItemAssert[];
-    extraLabel?: any;
-    xl?: number;
-    md?: number;
-    xs?: number;
-    span?: number;
-    areaCode?: number | string | (number | string)[];
-    phoneNumber?: number | string;
-    mergeRules?: boolean;
-    dependencies?: NamePath[];
-    antdDependencies?: NamePath[];
-    asserts?: FormItemAssert[];
-    shouldRender?: (form?: FormInstance) => boolean;
-    ignore?: boolean;
-    copyValue?: FormItemCopyValue;
-    selectValue?: FormItemSelectValue[];
-    disabled?: boolean | FormItemAssert | FormItemAssert[];
-    halfRow?: boolean;
-    fullRow?: boolean;
-    limit?: number;
-    hideWhenPreview?: boolean;
-    hideWhenEdit?: boolean;
-    requiredMessage?: string | ReactNode;
-    showOptional?: boolean;
-    previewFormater?(value: any, form?: FormInstance): any;
-    handleNext?(values: any): any;
-    render?(preview: boolean, form?: FormInstance, value?: any, onChange?: (params: any) => any, setShowStepButton?: IglooComponentProps['setShowStepButton']): any;
-    locales?: {
-        [key: string]: string;
-    };
-    options?: (CheckboxOptionType & {
-        extraInfo?: {
-            content: any;
-            shownTrigger: 'unchecked' | 'checked' | 'all';
-        };
-    })[] | SelectProps['options'];
-    sendOtp?: (value: any) => any;
-    dependField?: FormItemName;
-    countDownSeconds?: number;
-    getButtonDisabledState?: (form: FormInstance) => boolean;
-    getPreviousDisabledState?: (form: FormInstance) => boolean;
-    handleUpload?(file: File): PromiseLike<string>;
-    withoutForm?: boolean;
-    disableEditButton?: boolean;
-    hidePreviewDivider?: boolean;
-    valueFormater?: (value: any) => any;
-    currentStep?: number;
-    subscribedFields?: FormItemName[];
-    description?: string | React.ReactNode;
-    dateLimitationType?: 'relative' | 'absolute';
-    absoluteRangeStart?: number;
-    absoluteRangeEnd?: number;
-    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;
-        warningOnly?: boolean;
-    }[];
-    length?: number;
-    minLength?: number;
-    maxLength?: number;
-    idType?: 'KTP' | 'NIK';
-    validationRule?: string;
-    shouldRenderCode?: string;
-    disabledCode?: string;
-    automaticCalcCode?: string;
-    enableAutomaticCalc?: boolean;
-    [key: string]: any;
-}
-export interface FormItemConfig extends FormItemExtraConfig {
-    type?: string;
-    name?: NamePath;
-    label?: string | React.ReactNode;
-    previewLabel?: string | React.ReactNode;
-    labelProps?: any;
-    contentProps?: any;
-    ocr?: {
-        vender: string;
-        outputMap: {
-            field: string[];
-            source: string[];
-        }[];
-    };
-}
-export type FormItemPropsHandler = (config: FormItemConfig) => FormItemConfig;
-export interface FC<P = {}> extends React.FunctionComponent<P> {
-    formItemPropsHandler?: FormItemPropsHandler;
-    isPreviewSupport?: boolean;
-}
-export interface Form extends React.ForwardRefExoticComponent<FormBasicConfig & React.RefAttributes<any>> {
-    useForm: () => FormInstance;
-}
-export interface IglooComponentProps {
-    validateField?: (nameList?: NamePath[]) => Promise<any>;
-    containerRef?: React.RefObject<any>;
-    setFieldError?(errorMsg?: string): void;
-    setFieldValue?(value?: any): void;
-    setShowStepButton?: (showButton: boolean) => void;
-    getFormInstance?: () => FormInstance;
-    locales?: {
-        [key: string]: string;
-    };
-}