iglooform 3.7.5 → 3.7.6

package/.idea/codeStyles/Project.xml

@@ -0,0 +1,80 @@
+<component name="ProjectCodeStyleConfiguration">
+  <code_scheme name="Project" version="173">
+    <HTMLCodeStyleSettings>
+      <option name="HTML_SPACE_INSIDE_EMPTY_TAG" value="true" />
+    </HTMLCodeStyleSettings>
+    <JSCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </JSCodeStyleSettings>
+    <JetCodeStyleSettings>
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </JetCodeStyleSettings>
+    <TypeScriptCodeStyleSettings version="0">
+      <option name="FORCE_SEMICOLON_STYLE" value="true" />
+      <option name="SPACE_BEFORE_FUNCTION_LEFT_PARENTH" value="false" />
+      <option name="USE_DOUBLE_QUOTES" value="false" />
+      <option name="FORCE_QUOTE_STYlE" value="true" />
+      <option name="ENFORCE_TRAILING_COMMA" value="WhenMultiline" />
+      <option name="SPACES_WITHIN_OBJECT_LITERAL_BRACES" value="true" />
+      <option name="SPACES_WITHIN_IMPORTS" value="true" />
+    </TypeScriptCodeStyleSettings>
+    <VueCodeStyleSettings>
+      <option name="INTERPOLATION_NEW_LINE_AFTER_START_DELIMITER" value="false" />
+      <option name="INTERPOLATION_NEW_LINE_BEFORE_END_DELIMITER" value="false" />
+    </VueCodeStyleSettings>
+    <codeStyleSettings language="HTML">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JAVA">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="JavaScript">
+      <option name="SPACE_BEFORE_METHOD_PARENTHESES" value="true" />
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="TypeScript">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="Vue">
+      <option name="SOFT_MARGINS" value="80" />
+      <indentOptions>
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="XML">
+      <indentOptions>
+        <option name="INDENT_SIZE" value="2" />
+        <option name="CONTINUATION_INDENT_SIZE" value="2" />
+        <option name="TAB_SIZE" value="2" />
+      </indentOptions>
+    </codeStyleSettings>
+    <codeStyleSettings language="kotlin">
+      <option name="CODE_STYLE_DEFAULTS" value="KOTLIN_OFFICIAL" />
+    </codeStyleSettings>
+  </code_scheme>
+</component>

package/.idea/codeStyles/codeStyleConfig.xml

@@ -0,0 +1,5 @@
+<component name="ProjectCodeStyleConfiguration">
+  <state>
+    <option name="USE_PER_PROJECT_SETTINGS" value="true" />
+  </state>
+</component>

package/.idea/iglooformv3.iml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="WEB_MODULE" version="4">
+  <component name="NewModuleRootManager">
+    <content url="file://$MODULE_DIR$">
+      <excludeFolder url="file://$MODULE_DIR$/.tmp" />
+      <excludeFolder url="file://$MODULE_DIR$/temp" />
+      <excludeFolder url="file://$MODULE_DIR$/tmp" />
+    </content>
+    <orderEntry type="inheritedJdk" />
+    <orderEntry type="sourceFolder" forTests="false" />
+  </component>
+</module>

package/.idea/modules.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="ProjectModuleManager">
+    <modules>
+      <module fileurl="file://$PROJECT_DIR$/.idea/iglooformv3.iml" filepath="$PROJECT_DIR$/.idea/iglooformv3.iml" />
+    </modules>
+  </component>
+</project>

package/.idea/prettier.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="PrettierConfiguration">
+    <option name="myConfigurationMode" value="AUTOMATIC" />
+  </component>
+</project>

package/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="" vcs="Git" />
+  </component>
+</project>

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),

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),

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.5",
+  "version": "3.7.6",
   "scripts": {
     "start": "dumi dev",
     "build-dev": "dumi build",

package/es/checkbox/index.d.ts

@@ -1,24 +0,0 @@
-/// <reference types="react" />
-import { CheckboxProps, CheckboxGroupProps } from 'antd/es/checkbox';
-import { FC, IglooComponentProps } from '../types';
-import { ComponentProps } from '../utils/option-utils';
-import { DefaultOptionType } from 'rc-select/lib/Select';
-import './style';
-interface Props extends IglooComponentProps, CheckboxProps {
-}
-export interface Option extends DefaultOptionType {
-    extraInfo?: {
-        content: any;
-        shownTrigger: 'unchecked' | 'checked' | 'all';
-    };
-}
-export interface IProps extends IglooComponentProps, Omit<CheckboxGroupProps, 'options'>, ComponentProps {
-    className?: string;
-    radioType?: string;
-    options: Option[];
-    preview?: boolean;
-    mutuallyExclusions?: Record<string, string[]>;
-}
-declare const IglooCheckbox: FC<Props>;
-export default IglooCheckbox;
-export declare const CheckboxGroup: FC<import("react").PropsWithChildren<import("../utils/option-utils").HOCProps & IProps>>;

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/es/utils/option-utils.d.ts

@@ -1,29 +0,0 @@
-import { PropsWithChildren } from 'react';
-import { FC, IglooComponentProps } from '../types';
-import { FormInstance } from 'antd/es/form';
-import { NamePath } from 'antd/es/form/interface';
-import { SelectProps, SelectValue } from 'antd/es/select';
-export declare const compareOptions: (newOptions: any[], oldOptions?: any[]) => boolean;
-export declare const compareSelected: (newValue: any | any[], oldValue: any | any[]) => boolean;
-type Options = SelectProps<SelectValue>['options'];
-export interface HOCProps extends IglooComponentProps {
-    options?: Options;
-    onSearch?: any;
-    getOptions?: (form: FormInstance) => any[];
-    optionGroups?: {
-        parentKey: string;
-        options: Options;
-    }[];
-    datasourceFilters?: string[];
-    datasourceKey?: string;
-    datasourceApi?: string;
-    dependField?: NamePath;
-    passCompareOptions?: boolean;
-}
-export interface ComponentProps extends IglooComponentProps {
-    options?: Options;
-    clearWhenOptionsUpdated?: boolean;
-}
-export declare function optionsHOC<T>(Component: FC<T>): FC<PropsWithChildren<HOCProps & T>>;
-export declare function previewSelectedOptions(options: Options, value: any): any;
-export {};

package/lib/checkbox/index.d.ts

@@ -1,24 +0,0 @@
-/// <reference types="react" />
-import { CheckboxProps, CheckboxGroupProps } from 'antd/es/checkbox';
-import { FC, IglooComponentProps } from '../types';
-import { ComponentProps } from '../utils/option-utils';
-import { DefaultOptionType } from 'rc-select/lib/Select';
-import './style';
-interface Props extends IglooComponentProps, CheckboxProps {
-}
-export interface Option extends DefaultOptionType {
-    extraInfo?: {
-        content: any;
-        shownTrigger: 'unchecked' | 'checked' | 'all';
-    };
-}
-export interface IProps extends IglooComponentProps, Omit<CheckboxGroupProps, 'options'>, ComponentProps {
-    className?: string;
-    radioType?: string;
-    options: Option[];
-    preview?: boolean;
-    mutuallyExclusions?: Record<string, string[]>;
-}
-declare const IglooCheckbox: FC<Props>;
-export default IglooCheckbox;
-export declare const CheckboxGroup: FC<import("react").PropsWithChildren<import("../utils/option-utils").HOCProps & IProps>>;

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;

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

@@ -1,29 +0,0 @@
-import { PropsWithChildren } from 'react';
-import { FC, IglooComponentProps } from '../types';
-import { FormInstance } from 'antd/es/form';
-import { NamePath } from 'antd/es/form/interface';
-import { SelectProps, SelectValue } from 'antd/es/select';
-export declare const compareOptions: (newOptions: any[], oldOptions?: any[]) => boolean;
-export declare const compareSelected: (newValue: any | any[], oldValue: any | any[]) => boolean;
-type Options = SelectProps<SelectValue>['options'];
-export interface HOCProps extends IglooComponentProps {
-    options?: Options;
-    onSearch?: any;
-    getOptions?: (form: FormInstance) => any[];
-    optionGroups?: {
-        parentKey: string;
-        options: Options;
-    }[];
-    datasourceFilters?: string[];
-    datasourceKey?: string;
-    datasourceApi?: string;
-    dependField?: NamePath;
-    passCompareOptions?: boolean;
-}
-export interface ComponentProps extends IglooComponentProps {
-    options?: Options;
-    clearWhenOptionsUpdated?: boolean;
-}
-export declare function optionsHOC<T>(Component: FC<T>): FC<PropsWithChildren<HOCProps & T>>;
-export declare function previewSelectedOptions(options: Options, value: any): any;
-export {};