iglooform 3.2.4 → 3.2.6

package/lib/utils/form-utils.js

@@ -4,7 +4,7 @@ function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" =
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.testAssert = exports.getRuleValidation = exports.calcShouldRender = exports.calcSelectValue = exports.calcNamePath = exports.calcFormItemProps = exports.calcDisabled = exports.calcCopyValue = exports.calcAutomaticCalculate = exports.calcAddableSectionAssertField = void 0;
+exports.testAssert = exports.getRuleValidation = exports.calcShouldRender = exports.calcSelectValue = exports.calcNamePath = exports.calcFormItemProps = exports.calcDisabled = exports.calcCopyValue = exports.calcAddableSectionAssertField = exports.automaticCalculate = void 0;
 var _react = _interopRequireDefault(require("react"));
 var _invariant = _interopRequireDefault(require("invariant"));
 var _typography = _interopRequireDefault(require("../typography"));
@@ -330,6 +330,9 @@ var calcFormItemProps = function calcFormItemProps(config, extraProps, form, par
       };
     })));
   }
+  if (enableAutomaticCalc) {
+    automaticCalculate(name, parentName, automaticCalcCode, form);
+  }
   return {
     colProps: {
       span: extraFullRow && fullRow === undefined || fullRow || extraHalfRow && halfRow === undefined || halfRow ? 24 : span || extraSpan || 12,
@@ -393,9 +396,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
         }, {
@@ -462,12 +465,12 @@ var calcSelectValue = function calcSelectValue(selectValue, form) {
     for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
       var select = _step2.value;
       var assert = select.assert,
-        _value2 = select.value,
+        value = select.value,
         disabled = select.disabled;
       if (testAssert(form, assert)) {
         return {
           selected: true,
-          value: _value2,
+          value: value,
           disabled: disabled
         };
       }
@@ -510,9 +513,9 @@ var calcShouldRender = function calcShouldRender(name, parentName) {
     var fn = eval(shouldRenderCode);
     if (typeof fn === 'function') {
       try {
-        var _value3 = form.getFieldValue(name);
+        var value = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        return fn(_value3, values, {
+        return fn(value, values, {
           moment: _dayjs.default,
           get: _lodash.get
         }, {
@@ -540,28 +543,33 @@ var calcShouldRender = function calcShouldRender(name, parentName) {
   return true;
 };
 exports.calcShouldRender = calcShouldRender;
-var calcAutomaticCalculate = function calcAutomaticCalculate(name, parentName, automaticCalcCode, form, onChange) {
-  if (!form) return undefined;
-  if (automaticCalcCode) {
+var automaticCalculate = function automaticCalculate(name, parentName, automaticCalcCode, form) {
+  if (form && automaticCalcCode) {
     var calcValue = undefined;
-    var fn = eval(automaticCalcCode);
-    if (typeof fn === 'function') {
-      try {
-        var _value4 = form.getFieldValue(name);
+    try {
+      var fn = eval(automaticCalcCode);
+      if (typeof fn === 'function') {
+        var value = form.getFieldValue(name);
         var values = form.getFieldsValue(true);
-        calcValue = fn(_value4, values, {
+        calcValue = fn(value, values, {
           moment: _dayjs.default,
           get: _lodash.get
         }, {
           name: name,
           parentName: parentName
         });
-      } catch (_unused4) {}
+      }
+    } catch (_unused4) {}
+    if (form && !(0, _lodash.isEqual)(form === null || form === void 0 ? void 0 : form.getFieldValue(name), calcValue)) {
+      form.setFields([{
+        name: name,
+        value: calcValue
+      }]);
+      form.validateFields([name]);
     }
-    onChange === null || onChange === void 0 ? void 0 : onChange(calcValue, true);
   }
 };
-exports.calcAutomaticCalculate = calcAutomaticCalculate;
+exports.automaticCalculate = automaticCalculate;
 var getRuleValidation = /*#__PURE__*/function () {
   var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(url, rule, values) {
     var lang,

package/package.json

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

package/es/hooks/useWrapperOnChangeForAutomaticCalc.d.ts

@@ -1,5 +0,0 @@
-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

@@ -1,26 +0,0 @@
-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/lib/hooks/useWrapperOnChangeForAutomaticCalc.d.ts

@@ -1,5 +0,0 @@
-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

@@ -1,34 +0,0 @@
-"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;