@zat-design/sisyphus-react 4.1.3-beta.6 → 4.2.0-beta.1

package/es/ProAction/components/CheckModalContent/index.js

@@ -1,6 +1,5 @@
 import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var CheckModalContent = props => {
   var _ref = props !== null && props !== void 0 ? props : {},
     errorTitle = _ref.errorTitle,

package/es/ProAction/index.js

@@ -20,9 +20,7 @@ import CheckModalContent from "./components/CheckModalContent";
 import { ProDrawerForm } from "../index";
 import locale from "../locale";
 import "./index.less";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var ProAction = props => {
   var _config$, _config$2, _locale$ProAction2, _config$index;
   var children = props.children,

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -27,8 +27,7 @@ import locale from "../../../locale";
 /**
  * 抽屉组件
  */
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var ProDrawer = _ref => {
   var form = _ref.form,
     title = _ref.title,

package/es/ProDrawerForm/components/ProModal/index.js

@@ -20,8 +20,7 @@ import { Space, Button, Modal } from 'antd';
 import { useScroll, useSize } from 'ahooks';
 import classnames from 'classnames';
 import { isArray } from 'lodash';
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /**
  * 弹窗组件
  */

package/es/ProEditLabel/components/RenderProForm.js

@@ -9,9 +9,7 @@ import { InfoCircleOutlined } from '@ant-design/icons';
 import { Space } from 'antd';
 import { ProForm } from "../../index";
 import { matchFormValue } from "../utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var RenderProForm = props => {
   var _props3, _props6, _props7;
   var columns = [];

package/es/ProEditLabel/index.js

@@ -23,9 +23,7 @@ import React, { useEffect, useRef } from 'react';
 import { omit } from 'lodash';
 import RenderProForm from "./components/RenderProForm";
 import { matchFormValue } from "./utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var ProEditLabel = _ref => {
   var _ref$open = _ref.open,
     open = _ref$open === void 0 ? false : _ref$open,

package/es/ProEditTable/components/ActionButton/index.js

@@ -8,8 +8,7 @@ import { Button, Popconfirm } from 'antd';
 import { isFunction, omit } from 'lodash';
 import { iconMap } from "../../utils/config";
 import locale from "../../../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 var OMIT_DOM_INVALID_KEYS = ['buttonProps', 'isEditable', 'onEvent', 'isSelectModal'];
 
 // 渲染操作按钮

package/es/ProEditTable/components/RcTable/BaseTable.js

@@ -16,9 +16,7 @@ import { memo, useCallback } from 'react';
 import { Badge, Table } from 'antd';
 import { isFunction } from 'lodash';
 import useEditTableError from "../../utils/useEditTableError";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var BaseTable = _ref => {
   var _value$;
   var tableProps = _ref.tableProps,

package/es/ProEditTable/components/RcTable/DraggableTable.js

@@ -14,8 +14,7 @@ import { arrayMove, useSortable, SortableContext, verticalListSortingStrategy }
 import { CSS } from '@dnd-kit/utilities';
 import dragSvg from "../../../assets/drag.svg";
 import ProIcon from "../../../ProIcon";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Row = props => {
   var _restProps$className;
   var disabled = props.disabled,

package/es/ProEditTable/components/RenderField/ListChangedWrapper.js

@@ -15,8 +15,7 @@ import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
 
 /** 克隆子元素时需从 props 中剔除，避免透传到 div 等 DOM 导致 React 警告 */
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 var OMIT_FROM_DOM_KEYS = ['disabled',
 // div 不支持 disabled，且值可能非 string/number
 'toCSTString', 'toISOString', 'format', 'switchValue', 'precision', 'clearNotShow', 'dependNames'];

package/es/ProEditTable/components/RenderField/index.js

@@ -39,8 +39,7 @@ import ListChangedWrapper from "./ListChangedWrapper";
 import useShouldUpdateForTable from "../../utils/useShouldUpdateForTable";
 
 /** 列配置中不应透传到 Form.Item 或 DOM 的字段（与 ProForm Render 保持一致） */
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 var OMIT_FORM_ITEM_AND_DOM_KEYS = ['format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames', 'shouldCellUpdate' // 表格内部性能优化属性，不应传递给 Form.Item
 ];
 var RenderField = _ref => {

package/es/ProEditTable/components/Summary/index.js

@@ -1,8 +1,7 @@
 import { Table, Space } from 'antd';
 import { tools } from '@zat-design/utils';
 import { valueTypeRender } from "../../../ProUtils/utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var calc = tools.calc;
 var formatSummaryColumns = (columns, _ref) => {
   var rowSelection = _ref.rowSelection;

package/es/ProEditTable/components/Validator/index.js

@@ -1,7 +1,6 @@
 import { memo } from 'react';
 import { Form, message } from 'antd';
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 var Validator = _ref => {
   var name = _ref.name,
     virtualKey = _ref.virtualKey,

package/es/ProEditTable/index.js

@@ -1,5 +1,5 @@
 var _excluded = ["value", "onChange", "onDrag", "onDragEnd", "className", "columns", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"],
-  _excluded2 = ["_dragIndex"];
+  _excluded2 = ["_dragIndex", "_rowIndex"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -28,9 +28,7 @@ import ProForm from "../ProForm";
 import Empty from "../assets/empty.png";
 import locale, { formatMessage } from "../locale";
 import { BaseTable, DraggableTable } from "./components/RcTable";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var ProEditTable = (_ref, ref) => {
   var _resetProps$id, _resetProps$id$split, _ref2, _formFieldProps$shoul, _themeConfig$data2;
   var _ref$value = _ref.value,
@@ -427,14 +425,16 @@ var ProEditTable = (_ref, ref) => {
   var TableComponent = draggable ? DraggableTable : BaseTable;
 
   // 给每个 record 附加编辑状态标识，让 shouldCellUpdate 能检测到状态变化
-  // draggable 时同时注入 _dragIndex，供 shouldCellUpdate 感知行位置变化（拖拽后同一行数据不变但位置变了）
+  // 始终注入 _rowIndex，供 shouldCellUpdate 感知行位置变化（增删行后同一行数据不变但位置变了）
+  // draggable 时同时注入 _dragIndex
   var enrichedValue = useMemo(() => {
-    if (!virtualKey && !draggable) return value;
-    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
+    return value === null || value === void 0 ? void 0 : value.map((record, idx) => _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, record), virtualKey ? {
       _isEditing: editingKeys.includes(record.rowKey) || record._addFlag
     } : {}), draggable ? {
       _dragIndex: idx
-    } : {}));
+    } : {}), {}, {
+      _rowIndex: idx
+    }));
   }, [value, virtualKey, editingKeys, draggable]);
   var tableRowKey = useMemo(() => buildTableRowKey(rowKey), [rowKey]);
   var tableProps = useMemo(() => ({
@@ -461,10 +461,12 @@ var ProEditTable = (_ref, ref) => {
     handlePageChange
   }), [_className, _columns, _rowClassName, disabled, editingKeys, formatMessage, handlePageChange, headerRender, isHideCheckBox, locale, page, pagination, renderRowSelection, rowDraggable, rowKey, tableRowKey, scroll, _summary, tableRef, enrichedValue, virtualKey]);
 
-  // 拖拽排序后，enrichedValue 中含 _dragIndex（内部字段），需清除后再传给外部 onChange
+  // 拖拽排序后，enrichedValue 中含 _dragIndex/_rowIndex（内部字段），需清除后再传给外部 onChange
   var handleDragChange = useCallback(newValue => {
+    // eslint-disable-next-line @typescript-eslint/no-unused-vars
     var cleanValue = newValue === null || newValue === void 0 ? void 0 : newValue.map(_ref6 => {
-      var _ = _ref6._dragIndex,
+      var _d = _ref6._dragIndex,
+        _r = _ref6._rowIndex,
         rest = _objectWithoutProperties(_ref6, _excluded2);
       return rest;
     });

package/es/ProEditTable/utils/index.js

@@ -22,8 +22,7 @@ import { filterInternalFields } from "../../ProForm/utils";
 import ProTooltip from "../../ProTooltip";
 import { RenderField, ActionButton } from "../components";
 import locale from "../../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var columnDataSourceRefCache = new Map();
 /** 追踪 component 函数引用，用于检测外部状态（如异步 list）变化导致的闭包更新 */
 var columnComponentRefCache = new Map();
@@ -407,6 +406,10 @@ export var transformColumns = function transformColumns() {
         if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) {
           return true;
         }
+        // 行位置变化时（增删其他行导致 index 移位），需强制重渲染以更新 Form.Item name 路径
+        if ((record === null || record === void 0 ? void 0 : record._rowIndex) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._rowIndex)) {
+          return true;
+        }
         // 拖拽排序时，行数据不变但位置（_dragIndex）变化，需强制重渲染以更新 cellName（Form.Item name）
         if ((record === null || record === void 0 ? void 0 : record._dragIndex) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._dragIndex)) {
           return true;

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -14,13 +14,13 @@ var useShouldUpdateForTable = props => {
     shouldUpdateDebounce = props.shouldUpdateDebounce;
 
   // refs 存储当前值
-  var isEditableRef = useRef();
-  var requiredRef = useRef();
-  var rulesRef = useRef();
-  var fieldPropsRef = useRef();
-  var desensitizationRef = useRef();
-  var valueTypeRef = useRef();
-  var componentRef = useRef();
+  var isEditableRef = useRef(undefined);
+  var requiredRef = useRef(undefined);
+  var rulesRef = useRef(undefined);
+  var fieldPropsRef = useRef(undefined);
+  var desensitizationRef = useRef(undefined);
+  var valueTypeRef = useRef(undefined);
+  var componentRef = useRef(undefined);
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];

package/es/ProEnum/index.js

@@ -27,8 +27,7 @@ import getEnumLabel from "./utils/getEnumLabel";
 import useEnum from "./hooks/useEnum";
 import locale from "../locale";
 import { useFieldProps } from "../ProForm/utils/useFieldProps";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 var ProEnum = props => {
   var _otherProps$isView, _enumProps$showCodeNa;
   var code = props.code,

package/es/ProForm/components/FormFooter/index.js

@@ -7,8 +7,7 @@ import { Space, Button } from 'antd';
 import React, { useEffect, useMemo } from 'react';
 import { useProConfig } from "../../../ProConfigProvider";
 import locale from "../../../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 export var PRO_FORM_CACHE = 'PRO_FORM_CACHE';
 var FormFooter = props => {
   var initialConfig = useProConfig('FormFooter');

package/es/ProForm/components/base/Checkbox/index.js

@@ -6,13 +6,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 React from 'react';
+import React, { createElement as _createElement } from 'react';
 import { Checkbox as AntCheckbox } from 'antd';
 import Container from "../../Container";
 import { useProConfig } from "../../../../ProConfigProvider";
 import ProForm from "../../../index";
 import { jsx as _jsx } from "react/jsx-runtime";
-import { createElement as _createElement } from "react";
 var Checkbox = props => {
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,

package/es/ProForm/components/base/Input/index.js

@@ -18,8 +18,7 @@ import { maskStringRangeWithRegex } from "../../../utils/valueType";
 
 // 参数优先级
 // 组件内默认值 < config默认值 < props
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var Input = function Input(props) {
   var label = props.label,
     form = props.form,

package/es/ProForm/components/base/InputNumber/index.js

@@ -23,9 +23,7 @@ import Container from "../../Container";
 import { getDecimalDigits } from "../../../utils/index";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var calc = tools.calc;
 var rangeReg = /^[([](-?\d+(\.\d+)?)?,\s*(-?\d+(\.\d+)?)?[)\]]$/;
 

package/es/ProForm/components/base/Select/index.js

@@ -13,8 +13,7 @@ import Container from "../../Container";
 import { useProConfig } from "../../../../ProConfigProvider";
 import locale from "../../../../locale";
 import ProForm from "../../../index";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 var Select = props => {
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,

package/es/ProForm/components/base/Switch/index.js

@@ -13,8 +13,7 @@ import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 var Switch = props => {
   var disabled = props.disabled,
     otherProps = props.otherProps,

package/es/ProForm/components/base/SwitchCheckbox/index.js

@@ -13,8 +13,7 @@ import classnames from 'classnames';
 import { useProConfig } from "../../../../ProConfigProvider";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var SwitchCheckbox = props => {
   var onChange = props.onChange,
     disabled = props.disabled,

package/es/ProForm/components/combination/Container/index.js

@@ -9,9 +9,7 @@ import classnames from 'classnames';
 import RenderFields from "../../render/RenderFields";
 import ProCollapse from "../../../../ProLayout/components/ProCollapse";
 import ProForm from "../../../../ProForm";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 var Container = props => {
   var children = props.children,
     className = props.className,

package/es/ProForm/components/combination/FormList/components/ActionButton.js

@@ -13,15 +13,13 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 import { Button, Popconfirm, Space } from 'antd';
 import { isFunction, omit } from 'lodash';
 import classNames from 'classnames';
-import React, { useMemo } from 'react';
+import React, { useMemo, createElement as _createElement } from 'react';
 import { CopyOutlined, PlusSquareOutlined, ArrowUpOutlined, ArrowDownOutlined } from '@ant-design/icons';
 import ProIcon from "../../../../../ProIcon";
 import locale from "../../../../../locale";
 import deleteSvg from "../../../../../assets/delete.svg";
 import close2Svg from "../../../../../assets/close2.svg";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { createElement as _createElement } from "react";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 var filterKeys = ['actionType'];
 var getDefaultActions = mode => {
   var originActions = {

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -6,8 +6,7 @@ import ActionButton from "./ActionButton";
 import RenderFields from "../../../render/RenderFields";
 import ProCollapse from "../../../../../ProLayout/components/ProCollapse";
 import { memoWith } from "../utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
 var BlockFields = props => {
   var title = props.title,

package/es/ProForm/components/combination/FormList/components/Empty.js

@@ -5,9 +5,7 @@ import { Button } from 'antd';
 import { isFunction } from 'lodash';
 import EmptyImg from "../../../../../assets/empty.png";
 import locale from "../../../../../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // 空列表状态
 var Empty = _ref => {
   var disabled = _ref.disabled,

package/es/ProForm/components/combination/FormList/components/LineFields.js

@@ -13,8 +13,7 @@ import ProIcon from "../../../../../ProIcon";
 import ActionButton from "./ActionButton";
 import RenderFields from "../../../render/RenderFields";
 import { memoWith } from "../utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var MemoRenderFields = /*#__PURE__*/React.memo(RenderFields, memoWith);
 var LineFields = props => {
   var mode = props.mode,

package/es/ProForm/components/combination/FormList/components/ToolbarButton.js

@@ -10,14 +10,12 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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(t) { var i = _toPrimitive(t, "string"); return "symbol" == typeof i ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != typeof i) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-/* eslint-disable react/no-array-index-key */
 import { Space, Button } from 'antd';
 import { PlusOutlined } from '@ant-design/icons';
 import { isFunction, omit } from 'lodash';
 import React, { useMemo } from 'react';
 import locale from "../../../../../locale";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 var actions = {
   add: {
     onClick: (value, _ref) => {
@@ -32,7 +30,7 @@ var actions = {
 var defaultActionProps = [{
   type: 'add'
 }];
-var filterKeys = ['actionType'];
+var filterKeys = ['actionType', 'addIndex'];
 var ToolbarButton = props => {
   var namePath = props.namePath,
     form = props.form,

package/es/ProForm/components/combination/FormList/index.js

@@ -16,8 +16,7 @@ import LineFields from "./components/LineFields";
 import Empty from "./components/Empty";
 import ProForm from "../../../../ProForm";
 import { useProConfig } from "../../../../ProConfigProvider";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var FormList = (props, ref) => {
   var columns = props.columns,
     min = props.min,

package/es/ProForm/components/combination/Group/component/AddonWrapper/index.js

@@ -1,7 +1,6 @@
 import React from 'react';
 import "./index.less";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var AddonWrapper = props => {
   var before = props.before,
     after = props.after,

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -13,9 +13,7 @@ import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
 import { FieldProvider } from "../../../../utils/useFieldProps";
 import * as componentMap from "../../../../../index";
 import AddonWrapper from "./AddonWrapper";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: ConfirmWrapper,
@@ -66,11 +64,11 @@ var ComRender = props => {
   }));
   var nextProps = mergedGetValueProps(fieldProps.value);
   var componentProps = omit(_objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), nextProps), ['onFieldChange']);
-  var isSeparator = (props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 || (_props$component = _props$component.props) === null || _props$component === void 0 ? void 0 : _props$component.className) === 'group-separator';
+  var componentElementProps = props === null || props === void 0 || (_props$component = props.component) === null || _props$component === void 0 ? void 0 : _props$component.props;
+  var isSeparator = (componentElementProps === null || componentElementProps === void 0 ? void 0 : componentElementProps.className) === 'group-separator';
   if (isSeparator && isView) {
-    var _props$component2;
     return /*#__PURE__*/_jsxs(_Fragment, {
-      children: [" ", props === null || props === void 0 || (_props$component2 = props.component) === null || _props$component2 === void 0 || (_props$component2 = _props$component2.props) === null || _props$component2 === void 0 ? void 0 : _props$component2.children, " "]
+      children: [" ", componentElementProps === null || componentElementProps === void 0 ? void 0 : componentElementProps.children, " "]
     });
   }
   if (viewRender && isView) {

package/es/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,35 +75,36 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    id?: string;
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    style?: React.CSSProperties;
+    htmlFor?: string;
     className?: string;
     hidden?: boolean;
-    style?: React.CSSProperties;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
+    id?: string;
     onReset?: () => void;
     prefixCls?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
     rootClassName?: string;
-    isView?: boolean;
+    status?: "" | "warning" | "error" | "success" | "validating";
+    vertical?: boolean;
+    validateTrigger?: string | false | string[];
+    preserve?: boolean;
     colon?: boolean;
-    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
-    vertical?: boolean;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
-    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
-    preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
+    isView?: boolean;
     noStyle?: boolean;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
@@ -121,7 +122,6 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
         index?: number;
     }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
-    trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;

package/es/ProForm/components/combination/ProCascader/index.js

@@ -23,8 +23,7 @@ import useEnum from "../../../../ProEnum/hooks/useEnum";
 import locale from "../../../../locale";
 import ProForm from "../../..";
 import Container from "../../Container";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var defaultFieldNames = {
   label: 'name',
   value: 'code',

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -30,9 +30,7 @@ import viewSvg from "../../../../assets/view.svg";
 import useRequestList from "./hooks/useRequestList";
 import locale from "../../../../locale";
 import { hideTooltipIfOpen } from "./utils";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { Fragment as _Fragment } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 var ProModalSelect = (props, ref) => {
   var _useRequest$options, _useRequest$options2, _useRequest$options3, _formColumns$;
   var value = props.value,

package/es/ProForm/components/combination/ProNumberRange/index.js

@@ -18,8 +18,7 @@ import { tools } from '@zat-design/utils';
 import Container from "../../Container";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 var formatAmount = tools.formatAmount;
 var ProNumberRange = props => {
   var _ref2, _valueProps, _ref3, _ref4, _value$, _valueProps2, _ref5, _ref6, _value$2, _valueProps3, _valueProps4;

package/es/ProForm/components/combination/ProRangeLimit/index.js

@@ -21,8 +21,7 @@ import { useProConfig } from "../../../../ProConfigProvider";
 import Container from "../../Container";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 var defaultPickerValue = [dayjs(), dayjs()];
 var useControlled = props => {
   var _useState = useState(),

package/es/ProForm/components/combination/ProTimeLimit/index.js

@@ -24,8 +24,7 @@ import useControlled from "./hooks/useControlled";
 import ProRangeLimit from "../ProRangeLimit";
 import locale from "../../../../locale";
 import ProForm from "../../../../ProForm";
-import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // 永久有效默认值
 
 export var ProTimeLimit = props => {

package/es/ProForm/components/render/ChangedWrapper.js

@@ -13,8 +13,7 @@ import React, { useMemo } from 'react';
 import { diffOriginal } from "../../utils/diffOriginal";
 import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
-import { jsxs as _jsxs } from "react/jsx-runtime";
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
 var ChangedWrapper = props => {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;