@zat-design/sisyphus-react 3.5.0 → 3.5.1-beta.11

package/dist/index.esm.css

@@ -2937,6 +2937,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item-label > label {
   white-space: pre-wrap;
+  word-break: break-all;
 }
 .pro-form .suffix-value {
   margin-left: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));
@@ -3736,6 +3737,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-iconEle {
+  margin-right: 8px;
+}
 .pro-tree .ant-tree-node-content-wrapper {
   display: -webkit-box;
   display: -webkit-flex;
@@ -5312,7 +5316,7 @@ input[type='button'] {
 .ant-form .ant-form-item .ant-form-item-label > label,
 .ant-drawer .ant-form-item .ant-form-item-label > label,
 .ant-modal .ant-form-item .ant-form-item-label > label {
-  word-break: break-word;
+  word-break: break-all;
 }
 .ant-form .ant-form-item .ant-form-item-label > label::after,
 .ant-drawer .ant-form-item .ant-form-item-label > label::after,

package/dist/less.esm.css

@@ -2937,6 +2937,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .ant-form-item-label > label {
   white-space: pre-wrap;
+  word-break: break-all;
 }
 .pro-form .suffix-value {
   margin-left: calc(var(--zaui-space-size-sm, 8px) * var(--zaui-size, 1));
@@ -3736,6 +3737,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree {
   height: 100%;
 }
+.pro-tree .ant-tree-iconEle {
+  margin-right: 8px;
+}
 .pro-tree .ant-tree-node-content-wrapper {
   display: -webkit-box;
   display: -webkit-flex;

package/es/ProEditTable/components/DndWrapper/index.d.ts

@@ -3,12 +3,14 @@ interface RowProps extends React.HTMLAttributes<HTMLTableRowElement> {
     'data-row-key': string;
     'data-hide'?: boolean;
     disabled?: boolean;
+    rowDraggable?: any;
 }
 export declare const Row: FC<RowProps>;
-declare const DndWrapper: ({ draggable, value, onChange, disabled, children }: {
+declare const DndWrapper: ({ draggable, value, onChange, onDrag, disabled, children }: {
     draggable: any;
     value: any;
     onChange: any;
+    onDrag: any;
     disabled: any;
     children: any;
 }) => any;

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["disabled", "children"];
+var _excluded = ["disabled", "rowDraggable", "children"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import { DndContext } from '@dnd-kit/core';
@@ -9,6 +9,7 @@ import { CSS } from '@dnd-kit/utilities';
 import ProIcon from '../../../ProIcon';
 export var Row = function Row(props) {
   var disabled = props.disabled,
+    rowDraggable = props.rowDraggable,
     children = props.children,
     restProps = _objectWithoutProperties(props, _excluded);
   var data = useSortable({
@@ -35,16 +36,16 @@ export var Row = function Row(props) {
     style: style
   }, attributes), {}, {
     children: React.Children.map(children, function (child) {
-      if (child.key === 'RC_TABLE_KEY') {
-        console.log('走这里么', child.key);
+      if (child.key === 'RC_TABLE_KEY' && !disabled) {
         var _ref = (child === null || child === void 0 ? void 0 : child.props) || {},
           render = _ref.render,
           record = _ref.record,
           renderIndex = _ref.renderIndex;
+        var isDrag = rowDraggable ? rowDraggable === null || rowDraggable === void 0 ? void 0 : rowDraggable(record) : true;
         return /*#__PURE__*/React.cloneElement(child, {
           children: _jsxs("span", {
             className: "drag-wrapper".concat(props['data-hide'] ? ' no-check' : ''),
-            children: [_jsx(ProIcon, _objectSpread({
+            children: [isDrag ? _jsx(ProIcon, _objectSpread({
               className: "drag-icon",
               style: {
                 touchAction: 'none',
@@ -52,7 +53,9 @@ export var Row = function Row(props) {
               },
               type: "drag",
               size: 20
-            }, listeners)), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
+            }, listeners)) : _jsx(ProIcon, {
+              size: 20
+            }), props['data-hide'] ? null : render === null || render === void 0 ? void 0 : render(null, record, renderIndex)]
           })
         });
       }
@@ -65,12 +68,18 @@ var DndWrapper = function DndWrapper(_ref2) {
   var draggable = _ref2.draggable,
     value = _ref2.value,
     onChange = _ref2.onChange,
+    onDrag = _ref2.onDrag,
     disabled = _ref2.disabled,
     children = _ref2.children;
-  var onDragEnd = function onDragEnd(_ref3) {
-    var active = _ref3.active,
-      over = _ref3.over;
+  var onDragEnd = function onDragEnd(event) {
+    var active = event.active,
+      over = event.over;
     if (active.id !== (over === null || over === void 0 ? void 0 : over.id)) {
+      if (onDrag) {
+        var nextList = onDrag(event, value);
+        onChange(nextList);
+        return;
+      }
       var activeIndex = value.findIndex(function (i) {
         return i.rowKey === active.id;
       });

package/es/ProEditTable/index.js

@@ -9,7 +9,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "footerRender", "scroll"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -25,6 +25,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
     onChange = _ref.onChange,
+    onDrag = _ref.onDrag,
     className = _ref.className,
     columns = _ref.columns,
     type = _ref.type,
@@ -50,6 +51,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
+    rowDraggable = _ref.rowDraggable,
     footerRender = _ref.footerRender,
     scroll = _ref.scroll,
     resetProps = _objectWithoutProperties(_ref, _excluded);
@@ -317,6 +319,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       children: [_jsxs(DndWrapper, {
         value: value,
         onChange: onChange,
+        onDrag: onDrag,
         disabled: disabled,
         draggable: draggable,
         children: [headerRender ? _jsx("div", {
@@ -338,7 +341,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
             return {
               disabled: disabled || virtualKey && !!editingKeys.length,
               'data-hide': isHideCheckBox,
-              onClick: function onClick() {}
+              onClick: function onClick() {},
+              rowDraggable: rowDraggable
             };
           }
         }, resetProps), {}, {

package/es/ProEditTable/propsType.d.ts

@@ -1,4 +1,5 @@
 import { Key, ReactNode } from 'react';
+import { DragEndEvent } from '@dnd-kit/core';
 import type { ButtonProps } from 'antd/es/button';
 import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
@@ -253,5 +254,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      */
     headerRender?: ReactNode;
     rowDisabled?: (record?: T) => string | boolean;
+    rowDraggable?: (record?: T) => string | boolean;
+    onDrag?: (event: DragEndEvent, dataSource: T[]) => T[];
     ref?: any;
 }

package/es/ProEditTable/style/index.less

@@ -222,6 +222,7 @@
 
   .@{ant-prefix}-table-tbody>.is-editing:not(.@{ant-prefix}-table-measure-row)>td {
     border-bottom : 0;
+    // vertical-align: top;
     vertical-align: middle;
   }
 

package/es/ProEditTable/utils/index.js

@@ -18,7 +18,7 @@ import classnames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { tools } from '@zat-design/utils';
 import { actions, defaultBtnNameMap, defaultSingleActionKeys, defaultMultipleActionKeys, defaultEditingActionKeys } from './config';
-import { customValidate, getNamePath, splitNames } from './tools';
+import { customValidate, getNamePath, splitNames, handleScrollToError } from './tools';
 import ProTooltip from '../../ProTooltip';
 import { RenderField, ActionButton } from '../components';
 import tipSvg from '../../assets/tip.svg';
@@ -98,35 +98,7 @@ var getActionColumn = function getActionColumn(config) {
             case 8:
               _context.prev = 8;
               _context.t0 = _context["catch"](3);
-              setTimeout(function () {
-                var errorDom = document.querySelector('.ant-form-item-has-error');
-                if (errorDom) {
-                  var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
-                  var tableCell = errorDom.closest('.ant-table-cell');
-                  if (tableBody && tableCell) {
-                    var previousSibling = tableCell.previousElementSibling;
-                    var childOffsetLeft = 0;
-                    var childFixedLeft = 0;
-                    while (previousSibling) {
-                      if (previousSibling.nodeType === 1) {
-                        var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
-                        var _ref2 = previousSibling.getBoundingClientRect() || {},
-                          _ref2$width = _ref2.width,
-                          width = _ref2$width === void 0 ? 0 : _ref2$width;
-                        childOffsetLeft += width;
-                        if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
-                          childFixedLeft += width;
-                        }
-                      }
-                      previousSibling = previousSibling.previousElementSibling;
-                    }
-                    tableBody.scrollTo({
-                      left: childOffsetLeft - childFixedLeft,
-                      behavior: 'smooth'
-                    });
-                  }
-                }
-              }, 0);
+              handleScrollToError();
               return _context.abrupt("return", Promise.reject(_context.t0));
             case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
@@ -254,10 +226,10 @@ export var transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref3 = tooltip || {},
-          tooltipTitle = _ref3.title,
-          icon = _ref3.icon,
-          resetProps = _objectWithoutProperties(_ref3, _excluded2);
+        var _ref2 = tooltip || {},
+          tooltipTitle = _ref2.title,
+          icon = _ref2.icon,
+          resetProps = _objectWithoutProperties(_ref2, _excluded2);
         item.title = _jsxs("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, _jsx(_Tooltip, _objectSpread(_objectSpread({
@@ -409,13 +381,13 @@ export var transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
-        var _item, key, value, _ref5, service, option;
+      var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(item) {
+        var _item, key, value, _ref4, service, option;
         return _regeneratorRuntime().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = _slicedToArray(item, 2), key = _item[0], value = _item[1];
-              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
+              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -435,7 +407,7 @@ export var transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref4.apply(this, arguments);
+        return _ref3.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

package/es/ProEditTable/utils/tools.d.ts

@@ -26,3 +26,6 @@ export declare const onDelete: ({ name, form, virtualKey, selectedRowKeys }: {
  * @param rowDisabled 行禁用参数
  */
 export declare const getDisabled: ({ globalControl, formDisabled, column, tabledDisabled, columnFieldProps, params, rowDisabled }: any) => any;
+/** 表格自动滚动到报错位置
+ */
+export declare const handleScrollToError: () => void;

package/es/ProEditTable/utils/tools.js

@@ -151,4 +151,37 @@ export var getDisabled = function getDisabled(_ref2) {
     return convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled.apply(columnFieldProps, _toConsumableArray(params)));
   }
   return convertToBoolean(column === null || column === void 0 ? void 0 : column.disabled) || convertToBoolean(columnFieldProps === null || columnFieldProps === void 0 ? void 0 : columnFieldProps.disabled) || convertToBoolean(tabledDisabled);
+};
+/** 表格自动滚动到报错位置
+ */
+export var handleScrollToError = function handleScrollToError() {
+  setTimeout(function () {
+    var errorDom = document.querySelector('.ant-form-item-has-error');
+    if (errorDom) {
+      var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
+      var tableCell = errorDom.closest('.ant-table-cell');
+      if (tableBody && tableCell) {
+        var previousSibling = tableCell.previousElementSibling;
+        var childOffsetLeft = 0;
+        var childFixedLeft = 0;
+        while (previousSibling) {
+          if (previousSibling.nodeType === 1) {
+            var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
+            var _ref3 = previousSibling.getBoundingClientRect() || {},
+              _ref3$width = _ref3.width,
+              width = _ref3$width === void 0 ? 0 : _ref3$width;
+            childOffsetLeft += width;
+            if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
+              childFixedLeft += width;
+            }
+          }
+          previousSibling = previousSibling.previousElementSibling;
+        }
+        tableBody.scrollTo({
+          left: childOffsetLeft - childFixedLeft,
+          behavior: 'smooth'
+        });
+      }
+    }
+  }, 0);
 };

package/es/ProEnum/index.js

@@ -166,7 +166,7 @@ var ProEnum = function ProEnum(props) {
     }
     switch (type) {
       case 'ProSelect':
-        return _jsx(ProSelect, _objectSpread(_objectSpread({}, omit(enumProps, ['showCodeName'])), {}, {
+        return _jsx(ProSelect, _objectSpread(_objectSpread({}, enumProps), {}, {
           otherProps: otherProps,
           dataSource: list,
           fieldNames: {

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

@@ -122,7 +122,7 @@ var ActionButton = function ActionButton(props) {
     var _actionProps = (_props$actionProps = props.actionProps) === null || _props$actionProps === void 0 ? void 0 : _props$actionProps.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_actionProps === null || _actionProps === void 0 ? void 0 : _actionProps.find(function (item) {

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

@@ -46,7 +46,7 @@ var ToolbarButton = function ToolbarButton(props) {
     var _toolbarProps = (_props$toolbarProps = props.toolbarProps) === null || _props$toolbarProps === void 0 ? void 0 : _props$toolbarProps.map(function (item) {
       return _objectSpread(_objectSpread({}, item), {}, {
         // @ts-ignore
-        type: item.actionType
+        type: item.actionType || item.type
       });
     });
     if (!(_toolbarProps === null || _toolbarProps === void 0 ? void 0 : _toolbarProps.find(function (item) {

package/es/ProForm/components/combination/Group/propsType.d.ts

@@ -43,6 +43,7 @@ export type GroupColumnProps<Values = any> = {
     trim?: boolean;
     upperCase?: boolean;
     toISOString?: boolean;
+    toCSTString?: boolean;
     clearNotShow?: boolean;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps>;
     valuePropName?: string;

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

@@ -39,7 +39,7 @@ export declare const getReactiveProps: (params: Params) => {
     component: any;
     fieldProps: boolean;
 };
-type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString'> & {
+type ValueTypeGetterParams = Pick<ProFormColumnProps, 'valueType' | 'switchValue' | 'toISOString' | 'toCSTString'> & {
     type?: any;
     mode?: string;
 };

package/es/ProForm/components/combination/Group/utils.js

@@ -171,6 +171,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       valueType = column.valueType,
       switchValue = column.switchValue,
       toISOString = column.toISOString,
+      toCSTString = column.toCSTString,
       fieldProps = column.fieldProps,
       normalize = column.normalize,
       disabled = column.disabled,
@@ -221,6 +222,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       valueType: valueType,
       switchValue: switchValue,
       toISOString: toISOString,
+      toCSTString: toCSTString,
       mode: mode
     });
     var newValue;
@@ -263,6 +265,7 @@ export var useTransformColumns = function useTransformColumns(params) {
       name: columnName
     }, reactiveProps), {}, {
       disabled: reactiveProps.disabled || groupProps.disabled,
+      getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
         onChange: handleChange,
         value: value === null || value === void 0 ? void 0 : value[index]

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

@@ -655,7 +655,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           selectedRows: []
         });
       }
-      if (!labelInValue && (_value === null || _value === void 0 ? void 0 : _value[valueKey]) && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
+      if (!labelInValue && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
         setState({
           _value: value,
           selectedRowKeys: [],

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

@@ -17,7 +17,7 @@ var formatAmount = tools.formatAmount,
   formatPercent = tools.formatPercent,
   formatPerMill = tools.formatPerMill;
 var ProNumberRange = function ProNumberRange(props) {
-  var _valueProps, _valueProps2, _valueProps3, _valueProps4;
+  var _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -183,8 +183,8 @@ var ProNumberRange = function ProNumberRange(props) {
       },
       addonBefore: addonBefore
     }, valueProps), {}, {
-      min: min || ((_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min),
-      max: (value === null || value === void 0 ? void 0 : value[1]) || range[1] || max || ((_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max)
+      min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
+      max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
     }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
       className: classnames({
         'range-split': true,
@@ -203,8 +203,8 @@ var ProNumberRange = function ProNumberRange(props) {
       },
       addonAfter: addonAfter
     }, valueProps), {}, {
-      max: max || ((_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.max),
-      min: (value === null || value === void 0 ? void 0 : value[0]) || range[0] || min || ((_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.min)
+      min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
+      max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
     }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]
   });
 };

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

@@ -78,12 +78,13 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'ant-input-disabled': _disabled === null || _disabled === void 0 ? void 0 : _disabled[1],
     'forever-checkbox': true
   });
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _isForever = useMemo(function () {
-    return moment(foreverDate, format).isSame(endDate);
+    return moment(_foreverDate, format).isSame(endDate);
   }, [value]);
   var foreverMoment = useMemo(function () {
-    return moment(foreverDate, format);
-  }, [foreverDate, format]);
+    return moment(_foreverDate, format);
+  }, [_foreverDate, format]);
   if (isView) {
     var _props$value3, _props$value4;
     var _separator = (value === null || value === void 0 ? void 0 : value[0]) && (value === null || value === void 0 ? void 0 : value[1]) ? separator : '';

package/es/ProForm/components/combination/ProTimeLimit/index.d.ts

@@ -9,7 +9,7 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     value?: string;
     onChange?: (value: ProTimeLimitProps['value'] | null, valueData: Moment) => void;
     disabled?: boolean;
-    foreverTime?: string;
+    foreverDate?: string;
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;

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

@@ -7,7 +7,7 @@ import _Input from "antd/es/input";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["format", "disabled", "foreverTime", "foreverText", "valueType", "otherProps"],
+var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps"],
   _excluded2 = ["mode"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
@@ -25,7 +25,8 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var _props$format = props.format,
     format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
     disabled = props.disabled,
-    foreverTime = props.foreverTime,
+    _props$foreverDate = props.foreverDate,
+    foreverDate = _props$foreverDate === void 0 ? '9999-01-01' : _props$foreverDate,
     _props$foreverText = props.foreverText,
     foreverText = _props$foreverText === void 0 ? locale.ProTimeLimit.foreverText : _props$foreverText,
     _props$valueType = props.valueType,
@@ -35,12 +36,14 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var initialConfig = useProConfig('ProTimeLimit');
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
   var _useMemo = useMemo(function () {
-      var foreverMoment = foreverTime ? moment(foreverTime, format) : moment('9999-01-01', 'YYYY-MM-DD');
-      var foreverString = foreverTime || foreverMoment.format(format);
+      var foreverMoment = moment(_foreverDate, format);
+      var foreverString = _foreverDate || foreverMoment.format(format);
       return [foreverString, foreverMoment];
-    }, [format, foreverTime]),
+    }, [format, _foreverDate]),
     _useMemo2 = _slicedToArray(_useMemo, 2),
     foreverString = _useMemo2[0],
     foreverMoment = _useMemo2[1];
@@ -51,7 +54,6 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     _useControlled2 = _slicedToArray(_useControlled, 2),
     value = _useControlled2[0],
     onChange = _useControlled2[1];
-  var initialConfig = useProConfig('ProTimeLimit');
   var isForever = useMemo(function () {
     if (isObject(value)) {
       return foreverMoment.format(format) === value.format(format);
@@ -112,9 +114,15 @@ var LimitPick = function LimitPick(props) {
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'DatePicker' : _props$mode,
     rest = _objectWithoutProperties(props, _excluded2);
+  var _ref2 = useProConfig('ProTimeLimit') || {},
+    foreverDate = _ref2.foreverDate;
   if (mode === 'RangePicker') {
-    return _jsx(ProRangeLimit, _objectSpread({}, rest));
+    return _jsx(ProRangeLimit, _objectSpread({
+      foreverDate: foreverDate
+    }, rest));
   }
-  return _jsx(ProTimeLimit, _objectSpread({}, rest));
+  return _jsx(ProTimeLimit, _objectSpread({
+    foreverDate: foreverDate
+  }, rest));
 };
 export default LimitPick;

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

@@ -171,7 +171,7 @@ var Render = function Render(props) {
     };
   }
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'switchValue', 'precision', 'clearNotShow']);
+  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow']);
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】

package/es/ProForm/components/render/propsType.d.ts

@@ -205,6 +205,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
+    toCSTString?: boolean;
     clearNotShow?: boolean;
     index?: number;
     namePath?: NamePath;

package/es/ProForm/index.js

@@ -20,7 +20,7 @@ import { isObject, isString, merge } from 'lodash';
 import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
-import { getLayout, splitNameStr, useControlled, initialValuesToNames } from './utils/index';
+import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
@@ -163,7 +163,7 @@ var ProForm = function ProForm(props, ref) {
     // 暂时通过'-'区分组合组件字段和普通字段
     var keys = Object.keys(changedValue);
     if (!keys.length) {
-      onValuesChange(changedValue, form.getFieldsValue());
+      onValuesChange(filterInternalFields(changedValue), form.getFieldsValue());
     } else {
       var values = keys.map(function (key) {
         if (key.includes('-')) {
@@ -175,7 +175,7 @@ var ProForm = function ProForm(props, ref) {
         }
         return {};
       });
-      onValuesChange(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values))), form.getFieldsValue());
+      onValuesChange(filterInternalFields(merge.apply(void 0, [changedValue].concat(_toConsumableArray(values)))), form.getFieldsValue());
     }
   };
   // 包装一层兼容 names 改变

package/es/ProForm/style/index.less

@@ -215,6 +215,7 @@
   .@{ant-prefix}-form-item-label {
     > label {
       white-space: pre-wrap;
+      word-break: break-all;
     }
   }
 

package/es/ProForm/utils/useForm.d.ts

@@ -1,2 +1,6 @@
 import { FormInstance } from 'antd';
-export declare const useForm: <T>(originForm: FormInstance<T>) => [FormInstance<T>];
+type ModifiedFormInstance<T> = FormInstance<T> & {
+    isModified?: boolean;
+};
+export declare const useForm: <T>(originForm: ModifiedFormInstance<T>) => [ModifiedFormInstance<T>];
+export {};