iglooform 3.7.4 → 3.7.6

package/.dumi/tmp/dumi/theme/ContextWrapper.tsx

@@ -30,7 +30,7 @@ export default function DumiContextWrapper() {
 
   return (
     <SiteContext.Provider value={{
-      pkg: {"name":"iglooform","version":"3.7.2","license":"MIT"},
+      pkg: {"name":"iglooform","version":"3.7.5","license":"MIT"},
       historyType: "browser",
       entryExports,
       demos,

package/es/form/addable-section/index.js

@@ -14,8 +14,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-import React, { useReducer, useContext, useCallback } from 'react';
-import { Col, Divider, Row, Grid } from 'antd';
+import React, { useReducer, useContext, useCallback, useEffect } from 'react';
+import { Col, Divider, Row, Grid, Form } from 'antd';
 import Element from "../element";
 import FormContext from "../../form-context";
 import { calcNamePath, calcFormItemProps, calcAddableSectionAssertField } from "../../utils/form-utils";
@@ -66,6 +66,21 @@ var AddableSection = function AddableSection(_ref) {
     if (action.type === 'add') {
       return [].concat(_toConsumableArray(state), [action.key]);
     }
+    if (action.type === 'sync' && action.count !== undefined) {
+      var targetCount = Math.min(max, Math.max(min, action.count, initCount));
+      if (targetCount === state.length) {
+        return state;
+      }
+      if (targetCount > state.length) {
+        var newKeys = [];
+        for (var i = state.length; i < targetCount; i++) {
+          newKeys.push(Date.now() + Math.random());
+        }
+        return [].concat(_toConsumableArray(state), newKeys);
+      }
+      // targetCount < state.length
+      return state.slice(0, targetCount);
+    }
     var found = false;
     return state.filter(function (key, index) {
       if (key === action.key) {
@@ -86,7 +101,7 @@ var AddableSection = function AddableSection(_ref) {
       }
       return key !== action.key;
     });
-  }, []);
+  }, [min, max, initCount]);
   var _useReducer = useReducer(reducer, function () {
       var init = [];
       var value = (form === null || form === void 0 ? void 0 : form.getFieldValue(namePath)) || [];
@@ -98,6 +113,18 @@ var AddableSection = function AddableSection(_ref) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     groupKeys = _useReducer2[0],
     dispath = _useReducer2[1];
+
+  // 监听外部通过 form.setFieldsValue 设置的值变化
+  Form.useWatch(namePath, form);
+  var fieldValue = form === null || form === void 0 ? void 0 : form.getFieldValue(namePath);
+  useEffect(function () {
+    if (Array.isArray(fieldValue)) {
+      dispath({
+        type: 'sync',
+        count: fieldValue.length
+      });
+    }
+  }, [fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.length]);
   var _calcFormItemProps = calcFormItemProps(config, {
       requiredMark: requiredMark
     }, form, parentName, validationCodeExtraParams),
@@ -182,6 +209,23 @@ var AddableSection = function AddableSection(_ref) {
                 return calcAddableSectionAssertField(namePath, path, index, elements);
               });
             }
+            if (child.copyValue) {
+              _child.copyValue = _objectSpread(_objectSpread({}, child.copyValue), {}, {
+                assert: _objectSpread(_objectSpread({}, child.copyValue.assert), {}, {
+                  field: calcAddableSectionAssertField(namePath, child.copyValue.assert.field, index, elements)
+                }),
+                copyFrom: calcAddableSectionAssertField(namePath, child.copyValue.copyFrom, index, elements)
+              });
+            }
+            if (Array.isArray(child.selectValue)) {
+              _child.selectValue = child.selectValue.map(function (sv) {
+                return _objectSpread(_objectSpread({}, sv), {}, {
+                  assert: _objectSpread(_objectSpread({}, sv.assert), {}, {
+                    field: calcAddableSectionAssertField(namePath, sv.assert.field, index, elements)
+                  })
+                });
+              });
+            }
             return /*#__PURE__*/_jsx(Element, {
               parentName: parentName,
               config: _child,

package/es/free-form/addable-section/index.js

@@ -15,7 +15,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import React, { useReducer, useContext, useEffect, useCallback, cloneElement, isValidElement } from 'react';
-import { Col, Row } from 'antd';
+import { Col, Row, Form } from 'antd';
 import FormContext from "../../form-context";
 import { calcNamePath, calcFormItemProps, calcAddableSectionAssertField } from "../../utils/form-utils";
 import Typography from "../../typography";
@@ -68,6 +68,21 @@ var AddableSection = function AddableSection(props) {
     if (action.type === 'add') {
       return [].concat(_toConsumableArray(state), [action.key]);
     }
+    if (action.type === 'sync' && action.count !== undefined) {
+      var targetCount = Math.min(max, Math.max(min, action.count, initCount));
+      if (targetCount === state.length) {
+        return state;
+      }
+      if (targetCount > state.length) {
+        var newKeys = [];
+        for (var i = state.length; i < targetCount; i++) {
+          newKeys.push(Date.now() + Math.random());
+        }
+        return [].concat(_toConsumableArray(state), newKeys);
+      }
+      // targetCount < state.length
+      return state.slice(0, targetCount);
+    }
     var found = false;
     return state.filter(function (key, index) {
       if (key === action.key) {
@@ -88,7 +103,7 @@ var AddableSection = function AddableSection(props) {
       }
       return key !== action.key;
     });
-  }, []);
+  }, [min, max, initCount]);
   var _useReducer3 = useReducer(reducer, function () {
       var init = [];
       var value = (form === null || form === void 0 ? void 0 : form.getFieldValue(namePath)) || [];
@@ -100,6 +115,18 @@ var AddableSection = function AddableSection(props) {
     _useReducer4 = _slicedToArray(_useReducer3, 2),
     groupKeys = _useReducer4[0],
     dispath = _useReducer4[1];
+
+  // 监听外部通过 form.setFieldsValue 设置的值变化
+  Form.useWatch(namePath, form);
+  var fieldValue = form === null || form === void 0 ? void 0 : form.getFieldValue(namePath);
+  useEffect(function () {
+    if (Array.isArray(fieldValue)) {
+      dispath({
+        type: 'sync',
+        count: fieldValue.length
+      });
+    }
+  }, [fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.length]);
   useEffect(function () {
     var dependencies = props.dependencies,
       asserts = props.asserts,

package/lib/form/addable-section/index.js

@@ -74,6 +74,21 @@ var AddableSection = function AddableSection(_ref) {
     if (action.type === 'add') {
       return [].concat(_toConsumableArray(state), [action.key]);
     }
+    if (action.type === 'sync' && action.count !== undefined) {
+      var targetCount = Math.min(max, Math.max(min, action.count, initCount));
+      if (targetCount === state.length) {
+        return state;
+      }
+      if (targetCount > state.length) {
+        var newKeys = [];
+        for (var i = state.length; i < targetCount; i++) {
+          newKeys.push(Date.now() + Math.random());
+        }
+        return [].concat(_toConsumableArray(state), newKeys);
+      }
+      // targetCount < state.length
+      return state.slice(0, targetCount);
+    }
     var found = false;
     return state.filter(function (key, index) {
       if (key === action.key) {
@@ -94,7 +109,7 @@ var AddableSection = function AddableSection(_ref) {
       }
       return key !== action.key;
     });
-  }, []);
+  }, [min, max, initCount]);
   var _useReducer = (0, _react.useReducer)(reducer, function () {
       var init = [];
       var value = (form === null || form === void 0 ? void 0 : form.getFieldValue(namePath)) || [];
@@ -106,6 +121,18 @@ var AddableSection = function AddableSection(_ref) {
     _useReducer2 = _slicedToArray(_useReducer, 2),
     groupKeys = _useReducer2[0],
     dispath = _useReducer2[1];
+
+  // 监听外部通过 form.setFieldsValue 设置的值变化
+  _antd.Form.useWatch(namePath, form);
+  var fieldValue = form === null || form === void 0 ? void 0 : form.getFieldValue(namePath);
+  (0, _react.useEffect)(function () {
+    if (Array.isArray(fieldValue)) {
+      dispath({
+        type: 'sync',
+        count: fieldValue.length
+      });
+    }
+  }, [fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.length]);
   var _calcFormItemProps = (0, _formUtils.calcFormItemProps)(config, {
       requiredMark: requiredMark
     }, form, parentName, validationCodeExtraParams),
@@ -190,6 +217,23 @@ var AddableSection = function AddableSection(_ref) {
                 return (0, _formUtils.calcAddableSectionAssertField)(namePath, path, index, elements);
               });
             }
+            if (child.copyValue) {
+              _child.copyValue = _objectSpread(_objectSpread({}, child.copyValue), {}, {
+                assert: _objectSpread(_objectSpread({}, child.copyValue.assert), {}, {
+                  field: (0, _formUtils.calcAddableSectionAssertField)(namePath, child.copyValue.assert.field, index, elements)
+                }),
+                copyFrom: (0, _formUtils.calcAddableSectionAssertField)(namePath, child.copyValue.copyFrom, index, elements)
+              });
+            }
+            if (Array.isArray(child.selectValue)) {
+              _child.selectValue = child.selectValue.map(function (sv) {
+                return _objectSpread(_objectSpread({}, sv), {}, {
+                  assert: _objectSpread(_objectSpread({}, sv.assert), {}, {
+                    field: (0, _formUtils.calcAddableSectionAssertField)(namePath, sv.assert.field, index, elements)
+                  })
+                });
+              });
+            }
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(_element.default, {
               parentName: parentName,
               config: _child,

package/lib/free-form/addable-section/index.js

@@ -75,6 +75,21 @@ var AddableSection = function AddableSection(props) {
     if (action.type === 'add') {
       return [].concat(_toConsumableArray(state), [action.key]);
     }
+    if (action.type === 'sync' && action.count !== undefined) {
+      var targetCount = Math.min(max, Math.max(min, action.count, initCount));
+      if (targetCount === state.length) {
+        return state;
+      }
+      if (targetCount > state.length) {
+        var newKeys = [];
+        for (var i = state.length; i < targetCount; i++) {
+          newKeys.push(Date.now() + Math.random());
+        }
+        return [].concat(_toConsumableArray(state), newKeys);
+      }
+      // targetCount < state.length
+      return state.slice(0, targetCount);
+    }
     var found = false;
     return state.filter(function (key, index) {
       if (key === action.key) {
@@ -95,7 +110,7 @@ var AddableSection = function AddableSection(props) {
       }
       return key !== action.key;
     });
-  }, []);
+  }, [min, max, initCount]);
   var _useReducer3 = (0, _react.useReducer)(reducer, function () {
       var init = [];
       var value = (form === null || form === void 0 ? void 0 : form.getFieldValue(namePath)) || [];
@@ -107,6 +122,18 @@ var AddableSection = function AddableSection(props) {
     _useReducer4 = _slicedToArray(_useReducer3, 2),
     groupKeys = _useReducer4[0],
     dispath = _useReducer4[1];
+
+  // 监听外部通过 form.setFieldsValue 设置的值变化
+  _antd.Form.useWatch(namePath, form);
+  var fieldValue = form === null || form === void 0 ? void 0 : form.getFieldValue(namePath);
+  (0, _react.useEffect)(function () {
+    if (Array.isArray(fieldValue)) {
+      dispath({
+        type: 'sync',
+        count: fieldValue.length
+      });
+    }
+  }, [fieldValue === null || fieldValue === void 0 ? void 0 : fieldValue.length]);
   (0, _react.useEffect)(function () {
     var dependencies = props.dependencies,
       asserts = props.asserts,

package/package.json

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

package/es/form/index.d.ts

@@ -1,4 +0,0 @@
-import { Form as FormType } from '../types';
-import './style';
-declare const ExportedForm: FormType;
-export default ExportedForm;

package/es/free-form/index.d.ts

@@ -1,11 +0,0 @@
-import { FC, PropsWithChildren } from 'react';
-import { Form } from 'antd';
-import { FormBasicConfig } from '../types';
-import './style';
-interface FreeFormProps extends Omit<FormBasicConfig, 'config'> {
-}
-interface FreeFormType extends FC<PropsWithChildren<FreeFormProps>> {
-    useForm: typeof Form.useForm;
-}
-declare const FreeForm: FreeFormType;
-export default FreeForm;

package/lib/form/index.d.ts

@@ -1,4 +0,0 @@
-import { Form as FormType } from '../types';
-import './style';
-declare const ExportedForm: FormType;
-export default ExportedForm;

package/lib/free-form/index.d.ts

@@ -1,11 +0,0 @@
-import { FC, PropsWithChildren } from 'react';
-import { Form } from 'antd';
-import { FormBasicConfig } from '../types';
-import './style';
-interface FreeFormProps extends Omit<FormBasicConfig, 'config'> {
-}
-interface FreeFormType extends FC<PropsWithChildren<FreeFormProps>> {
-    useForm: typeof Form.useForm;
-}
-declare const FreeForm: FreeFormType;
-export default FreeForm;