@zat-design/sisyphus-react 3.5.5 → 3.6.0

package/dist/index.esm.css

@@ -4481,6 +4481,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   position: absolute;
   bottom: var(--zaui-space-size-md, 16px);
 }
+.pro-edit-table-toolbar {
+  background-color: #fff;
+}
 .pro-edit-table-toolbar .ant-space {
   gap: var(--zaui-space-size-sm, 8px);
 }

package/dist/less.esm.css

@@ -4481,6 +4481,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   position: absolute;
   bottom: var(--zaui-space-size-md, 16px);
 }
+.pro-edit-table-toolbar {
+  background-color: #fff;
+}
 .pro-edit-table-toolbar .ant-space {
   gap: var(--zaui-space-size-sm, 8px);
 }

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

@@ -11,7 +11,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 import { Fragment as _Fragment, jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -29,8 +29,9 @@ import { FieldProvider } from '../../../ProForm/utils/useFieldProps';
 import { useListChanged } from '../../../ProForm/utils/useListChanged';
 import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
+import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
 var RenderField = function RenderField(_ref) {
-  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps;
+  var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps, _componentProps2;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -58,12 +59,10 @@ var RenderField = function RenderField(_ref) {
     equalWith = column.equalWith,
     className = column.className,
     trim = column.trim,
+    confirm = column.confirm,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
-  if (type && _editRender) {
-    console.warn('type和component为互斥关系, type将不会生效');
-  }
   var mode = config.mode,
     cellName = config.cellName,
     cellNamePath = config.cellNamePath,
@@ -498,6 +497,7 @@ var RenderField = function RenderField(_ref) {
     onChange: _onChange,
     onBlur: _onblur,
     index: index,
+    confirm: confirm,
     otherProps: {
       form: form,
       names: names,
@@ -540,7 +540,9 @@ var RenderField = function RenderField(_ref) {
   }, omit(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
+    children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? _jsx(ConfirmWrapper, _objectSpread(_objectSpread({}, componentProps), {}, {
+      children: /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
+    })) : /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps))
   })) : _jsx(Container, {
     viewEmpty: viewEmpty
   });
@@ -570,7 +572,7 @@ var RenderField = function RenderField(_ref) {
     }))]
   }) : null;
   return _jsx(FieldProvider, {
-    value: (_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps,
+    value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
     children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
       placement: "topLeft",

package/es/ProEditTable/index.js

@@ -1,3 +1,5 @@
+import "antd/es/affix/style";
+import _Affix from "antd/es/affix";
 import "antd/es/table/style";
 import _Table from "antd/es/table";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
@@ -9,11 +11,11 @@ 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", "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", "actionDirection"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection"];
 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';
-import { useLocalStorageState, useSetState } from 'ahooks';
+import { get, isArray, isBoolean } from 'lodash';
+import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
 import { getRandom, getNamePath } from './utils/tools';
@@ -38,6 +40,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     actionWidth = _ref.actionWidth,
     actionProps = _ref.actionProps,
     toolbarProps = _ref.toolbarProps,
+    toolbarSticky = _ref.toolbarSticky,
     rowSelection = _ref.rowSelection,
     onlyOneLineMsg = _ref.onlyOneLineMsg,
     deletePoConfirmMsg = _ref.deletePoConfirmMsg,
@@ -59,6 +62,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
   // 上下文form
   var contentForm = _Form.useFormInstance();
   var formFieldProps = ProForm.useFieldProps() || {};
+  var affixRef = useRef(null);
   var form = contentForm || (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.form) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.form);
   var name = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : resetProps.name) || (resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$id = resetProps.id) === null || _resetProps$id === void 0 ? void 0 : (_resetProps$id$split = _resetProps$id.split) === null || _resetProps$id$split === void 0 ? void 0 : _resetProps$id$split.call(_resetProps$id, '_'));
   var _formFieldProps$isVie = formFieldProps.isView,
@@ -72,6 +76,8 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     disabled = (formFieldProps === null || formFieldProps === void 0 ? void 0 : formFieldProps.disabled) || disabled; // formFieldProps?.disabled可能是函数？？
   }
   var tableRef = useRef(null);
+  var valueChangeRef = useRef(null);
+  valueChangeRef.current = 0;
   var _React$useContext = React.useContext(_ConfigProvider.ConfigContext),
     getPrefixCls = _React$useContext.getPrefixCls;
   var prefixCls = getPrefixCls();
@@ -262,24 +268,13 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return null;
   };
+  useDeepCompareEffect(function () {
+    valueChangeRef.current += 1;
+    // 在这里根据需要计算新的数组
+  }, [value, config.name]);
   var _columns = useMemo(function () {
     return transformColumns(columns, config);
-  }, [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page, config.name]);
-  // const setColumns = async () => {
-  //   const nextColumns = transformColumns(columns, config);
-  //   setState({
-  //     _columns: nextColumns,
-  //   });
-  // };
-  // useDebounceEffect(
-  //   () => {
-  //     setColumns();
-  //   },
-  //   [value, cellNamePath, forceUpdate, editingKeys, disabled, actionProps, columns, page], // columns更新修复外部表单无法控制内部表单的问题
-  //   {
-  //     wait: 60,
-  //   },
-  // );
+  }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   useEffect(function () {
     var isAllHasKey = value.every(function (item) {
       return item.rowKey;
@@ -310,6 +305,19 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       setInternalState: setState
     };
   });
+  useEffect(function () {
+    if (toolbarSticky) {
+      var updatePos = function updatePos() {
+        var _affixRef$current;
+        affixRef === null || affixRef === void 0 ? void 0 : (_affixRef$current = affixRef.current) === null || _affixRef$current === void 0 ? void 0 : _affixRef$current.updatePosition();
+      };
+      window.addEventListener('scroll', updatePos, true);
+      return function () {
+        window.removeEventListener('scroll', updatePos, true);
+      };
+    }
+  }, [toolbarSticky]);
+  var _toolbarSticky = isBoolean(toolbarSticky) ? {} : toolbarSticky;
   var _summary = _typeof(summary) === 'object' ? function (data) {
     return _jsx(Summary, {
       data: data,
@@ -372,7 +380,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
           },
           summary: _summary
         }))]
-      }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? _jsx("div", {
+      }), !isView && (value === null || value === void 0 ? void 0 : value.length) ? toolbarSticky ? _jsx(_Affix, _objectSpread(_objectSpread({
+        ref: affixRef
+      }, _toolbarSticky), {}, {
+        children: _jsx("div", {
+          className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
+          children: _jsx(RenderToolbar, _objectSpread({}, config))
+        })
+      })) : _jsx("div", {
         className: "pro-edit-table-toolbar".concat(pagination ? ' pro-edit-table-toolbar-fixed' : ''),
         children: _jsx(RenderToolbar, _objectSpread({}, config))
       }) : null, footerRender ? _jsx("div", {

package/es/ProEditTable/propsType.d.ts

@@ -1,3 +1,4 @@
+import { AffixProps, ModalFuncProps } from 'antd';
 import { Key, ReactNode } from 'react';
 import { DragEndEvent } from '@dnd-kit/core';
 import type { ButtonProps } from 'antd/es/button';
@@ -5,7 +6,7 @@ import type { TooltipProps } from 'antd/es/tooltip';
 import type { NamePath } from 'antd/es/form/interface';
 import type { ColumnType, TableProps } from 'antd/es/table';
 import type { FormInstance, FormItemProps } from 'antd/es/form';
-import type { ProRule } from '../ProForm/propsType';
+import type { FunctionArgs, ProRule } from '../ProForm/propsType';
 import { ProFormValueType, ColumnPropsMap } from '../ProForm/components/render/propsType';
 export type ActionType = 'edit' | 'delete' | 'save' | 'cancel' | 'add' | 'mulDelete' | 'custom';
 export type ShowFunction<T> = (record?: T, options?: {
@@ -98,6 +99,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
+    confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
     [key: string]: any;
 }
 export type ProEditTableColumnsProps<K = any> = ProColumnsProps & ColumnPropsMap<K, 'ProEditTable'>;
@@ -229,6 +231,11 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @default           -
      */
     toolbarProps?: BaseActionProps<T>[] | boolean;
+    /**
+     *  @description      自定义底部操作栏跟随页面滚动
+     *  @default           -
+     */
+    toolbarSticky?: boolean | Omit<AffixProps, 'children'>;
     /**
      * @description       最大可添加数量
      * @default           -

package/es/ProEditTable/style/index.less

@@ -303,6 +303,7 @@
 }
 
 .pro-edit-table-toolbar {
+  background-color: #fff;
   .@{ant-prefix}-space {
     gap: var(--zaui-space-size-sm, 8px);
 

package/es/ProEditTable/utils/index.js

@@ -256,6 +256,7 @@ export var transformColumns = function transformColumns() {
     var columnName = (item === null || item === void 0 ? void 0 : item.name) || dataIndex || key;
     item.dataIndex = columnName;
     item.key = columnName;
+    // item.shouldCellUpdate = item.shouldCellUpdate || ((record, perRecord) => !isEqual(record, perRecord));
     var required = isBoolean(item.required) ? item.required : false;
     if (typeof item.required === 'function') {
       var namePath = getNamePath(name, virtualKey);

package/es/ProEnum/propsType.d.ts

@@ -49,7 +49,7 @@ export interface ProEnum {
     /** 用于自定义组件 */
     component?: ReactNode;
     /** 用于提交 code */
-    code: string | string[];
+    code?: string | string[];
     /** 字段别名 */
     fieldNames?: Record<string, string>;
     /** 是否查看模式 */

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

@@ -64,20 +64,17 @@ var DatePicker = function DatePicker(props) {
     format: 'HH:mm:ss'
   };
   // dateTime模式下默认开启time选择
-  var _rest = _objectSpread(_objectSpread({}, rest), {}, {
-    showTime: rest.showTime === undefined && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = _objectSpread({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+  }
   // 字符串时间格式兼容
   if (isString(_rest.value)) {
     _rest.value = moment(_rest.value);
   }
-  if (['dateStartTime', 'dateEndTime'].includes(valueType) && rest.showTime === undefined) {
-    _rest.showTime = {
-      value: moment(valueType === 'dateStartTime' ? '00:00:00' : '23:59:59', 'HH:mm:ss'),
-      disabled: true,
-      _defaultShowTime: _defaultShowTime
-    };
-  }
   if (_rest.showTime === true) {
     _rest.showTime = _objectSpread({}, _defaultShowTime);
   }

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

@@ -15,7 +15,7 @@ import { jsx as _jsx } from "react/jsx-runtime";
  */
 // @ts-check
 
-import { isFunction, isString, omit, uniq } from 'lodash';
+import { isFunction, isObject, isString, omit, uniq } from 'lodash';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
 import ProForm from '../../../../ProForm';
@@ -41,12 +41,19 @@ var RangePicker = function RangePicker(props) {
     disabledDate: rest.disabledDate
   });
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon;
-  var _res = _objectSpread(_objectSpread({}, rest), {}, {
-    showTime: !rest.showTime && valueType === 'dateTime' || rest.showTime
-  });
+  var _rest = _objectSpread({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+    if (valueType === 'dateStartEndTime') {
+      _rest.showTime = false;
+    }
+  }
   // 字符串时间格式兼容
-  if (Array.isArray(_res.value) && isString(_res.value[0]) && isString(_res.value[1])) {
-    _res.value = [moment(_res.value[0]), moment(_res.value[1])];
+  if (Array.isArray(_rest.value) && isString(_rest.value[0]) && isString(_rest.value[1])) {
+    _rest.value = [moment(_rest.value[0]), moment(_rest.value[1])];
   }
   var _viewFormat = Array.isArray(format) ? format[0] : format;
   var tempFormat = Array.isArray(format) ? format : [format];
@@ -57,11 +64,11 @@ var RangePicker = function RangePicker(props) {
     return !!formatKey;
   });
   var _defaultShowTime = {
-    format: 'YYYY-MM-DD HH:mm:ss'
+    format: 'HH:mm:ss'
   };
   if (isView) {
-    var _res$value = _res.value,
-      value = _res$value === void 0 ? [] : _res$value;
+    var _rest$value = _rest.value,
+      value = _rest$value === void 0 ? [] : _rest$value;
     var viewChildren = null;
     if (!value || !value[0] || !value[1]) {
       viewChildren = null;
@@ -83,10 +90,13 @@ var RangePicker = function RangePicker(props) {
       children: viewChildren
     });
   }
-  if (_res.showTime === true) {
-    _res.showTime = _objectSpread({}, _defaultShowTime);
+  if (_rest.showTime === true) {
+    _rest.showTime = _objectSpread({}, _defaultShowTime);
+  }
+  if (isObject(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_res, ['separator'])), rangeRegulator), {}, {
+  return _jsx(AntRangePicker, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, initialConfig), omit(_rest, ['separator'])), rangeRegulator), {}, {
     format: _format
   }));
 };

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

@@ -13,7 +13,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
-var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator"];
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
 import { omit } from 'lodash';
@@ -79,6 +79,7 @@ var ProCascader = function ProCascader(props) {
     tooltip = props.tooltip,
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '' : _props$separator,
+    detailPlaceholder = props.detailPlaceholder,
     otherProps = _objectWithoutProperties(props, _excluded);
   var _ref3 = ProForm.useFieldProps() || {},
     isViewCon = _ref3.isView;
@@ -247,7 +248,7 @@ var ProCascader = function ProCascader(props) {
       disabled: disabled,
       value: detail,
       maxLength: detailMaxLength,
-      placeholder: locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder,
+      placeholder: detailPlaceholder || (locale === null || locale === void 0 ? void 0 : (_locale$ProAddressBar2 = locale.ProAddressBar) === null || _locale$ProAddressBar2 === void 0 ? void 0 : _locale$ProAddressBar2.detailPlaceholder),
       onChange: handleAddressChange
     }))]
   });

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

@@ -32,4 +32,6 @@ export interface ProCascaderProps {
     otherProps?: any;
     /** 查看分隔符 */
     separator?: string;
+    /** 详情框占位符 */
+    detailPlaceholder?: string;
 }

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

@@ -11,6 +11,8 @@ export type Props = Omit<RangePickerProps, 'value' | 'onChange' | 'format' | 'se
     format?: string;
     separator?: any;
     isView?: boolean;
+    showTime?: any;
+    valueType?: any;
 };
 type Value = [Moment?, Moment?, boolean?] | null;
 type ValueStr = [string?, string?, string?] | null;

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

@@ -2,6 +2,7 @@ import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import "antd/es/date-picker/style";
@@ -10,7 +11,7 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 var _excluded = ["disabled", "foreverText", "foreverDate", "format", "otherProps", "separator"];
 import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
 import { useMemo, useState } from 'react';
-import { omit } from 'lodash';
+import { omit, isFunction, uniq, isObject } from 'lodash';
 import classNames from 'classnames';
 import moment from 'moment';
 import { useProConfig } from '../../../../ProConfigProvider';
@@ -79,6 +80,28 @@ var ProRangeLimit = function ProRangeLimit(props) {
     'forever-checkbox': true
   });
   var _foreverDate = foreverDate || (initialConfig === null || initialConfig === void 0 ? void 0 : initialConfig.foreverDate);
+  var _rest = _objectSpread({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    var valueType = props.valueType;
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+    if (valueType === 'dateStartEndTime') {
+      _rest.showTime = false;
+    }
+  }
+  var _viewFormat = Array.isArray(format) ? format[0] : format;
+  var tempFormat = Array.isArray(format) ? format : [format];
+  if (isFunction(format)) {
+    tempFormat = [];
+  }
+  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+    return !!formatKey;
+  });
+  var _defaultShowTime = {
+    format: 'HH:mm:ss'
+  };
   var _isForever = useMemo(function () {
     return moment(_foreverDate, format).isSame(endDate);
   }, [value]);
@@ -134,6 +157,12 @@ var ProRangeLimit = function ProRangeLimit(props) {
       onChange([start, null]);
     }
   };
+  if (_rest.showTime === true) {
+    _rest.showTime = _objectSpread({}, _defaultShowTime);
+  }
+  if (isObject(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  }
   return _jsxs(_Input.Group, {
     compact: true,
     className: "pro-range-limit",
@@ -141,8 +170,8 @@ var ProRangeLimit = function ProRangeLimit(props) {
       allowClear: true,
       disabled: [_disabled === null || _disabled === void 0 ? void 0 : _disabled[0], (_disabled === null || _disabled === void 0 ? void 0 : _disabled[1]) || _isForever],
       defaultPickerValue: defaultPickerValue
-    }, initialConfig), omit(rest, ['placeholder', 'separator'])), {}, {
-      format: format,
+    }, initialConfig), omit(_rest, ['placeholder', 'separator'])), {}, {
+      format: _format,
       value: value,
       onChange: handleRangeChange
     })), _jsx("div", {

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

@@ -1,4 +1,5 @@
-import { DatePickerProps } from 'antd';
+import { DatePickerProps, TimePickerProps } from 'antd';
+import { PickerPanelDateProps } from 'antd/lib/calendar/generateCalendar';
 import { Moment } from 'moment';
 import React from 'react';
 import { ProFormOtherProps } from '../../../propsType';
@@ -13,10 +14,13 @@ export type ProTimeLimitProps = DistributiveOmit<DatePickerProps, 'value' | 'onC
     foreverText?: string;
     viewEmpty?: React.ReactNode;
     format?: string;
-    valueType?: 'moment' | 'format' | 'ISO';
+    valueType?: 'moment' | 'format' | 'ISO' | 'dateTime' | 'dateStartEndTime';
     otherProps?: ProFormOtherProps;
     mode?: 'DatePicker';
     isView?: boolean;
+} & TimePickerProps & {
+    showTime?: PickerPanelDateProps<Moment>['showTime'];
+    showNow?: boolean;
 };
 export declare const ProTimeLimit: React.FC<ProTimeLimitProps>;
 export type ProLimitProps = ProTimeLimitProps | (ProRangeLimitProps & {

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

@@ -4,14 +4,15 @@ import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 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';
-import { omit, isObject } from 'lodash';
+import { omit, isObject, uniq, isFunction } from 'lodash';
 import moment from 'moment';
 import { useMemo } from 'react';
 import { useProConfig } from '../../../../ProConfigProvider';
@@ -39,6 +40,28 @@ export var ProTimeLimit = function ProTimeLimit(props) {
   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 _viewFormat = Array.isArray(format) ? format[0] : format;
+  var tempFormat = Array.isArray(format) ? format : [format];
+  if (isFunction(format)) {
+    tempFormat = [];
+  }
+  var _format = uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
+    return !!formatKey;
+  });
+  // dateTime模式下默认开启time选择
+  var _rest = _objectSpread({}, rest);
+  // showTime默认值受valueType属性影响
+  if (rest.showTime === undefined) {
+    if (valueType === 'dateTime') {
+      _rest.showTime = true;
+    }
+    if (valueType === 'dateStartEndTime') {
+      _rest.showTime = false;
+    }
+  }
+  var _defaultShowTime = {
+    format: 'HH:mm:ss'
+  };
   var _useMemo = useMemo(function () {
       var foreverMoment = moment(_foreverDate, format);
       var foreverString = _foreverDate || foreverMoment.format(format);
@@ -78,7 +101,7 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     if (isObject(value)) {
       return _jsx(Container, {
         viewEmpty: viewEmpty,
-        children: value.format(format)
+        children: value.format(_viewFormat)
       });
     }
     return _jsx(Container, {
@@ -86,6 +109,12 @@ export var ProTimeLimit = function ProTimeLimit(props) {
       children: props.value
     });
   }
+  if (_rest.showTime === true) {
+    _rest.showTime = _objectSpread({}, _defaultShowTime);
+  }
+  if (isObject(_rest.showTime)) {
+    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  }
   var className = classNames({
     'ant-input': true,
     'ant-input-disabled': disabled,
@@ -96,7 +125,8 @@ export var ProTimeLimit = function ProTimeLimit(props) {
     className: "pro-time-limit",
     children: [_jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({
       disabled: disabled || isForever
-    }, initialConfig), omit(rest, ['placeholder'])), {}, {
+    }, initialConfig), omit(_rest, ['placeholder'])), {}, {
+      format: _format,
       value: value,
       onChange: onChange
     })), _jsx("div", {

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

@@ -45,6 +45,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
               option: other[0],
               form: form,
               namePath: otherProps.namePath,
+              name: otherProps.name,
               index: otherProps.index
             });
           case 5:

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

@@ -22,7 +22,7 @@ import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-run
 import React, { useMemo } from 'react';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
-import { isFunction, isString, omit, set } from 'lodash';
+import { isFunction, isString, omit, set, debounce } from 'lodash';
 import useShouldUpdate from '../../utils/useShouldUpdate';
 import { isTrim, isUpperCase, findOptionByValue, parseNamePath } from '../../utils/index';
 import { useProConfig } from '../../../ProConfigProvider';
@@ -241,7 +241,7 @@ var Render = function Render(props) {
   /**
    * onChange参数重置 (value, record, { form, index, namePath, option }) => void
    */
-  var handleChange = function handleChange() {
+  var defaultHandleChange = function defaultHandleChange() {
     var _otherFormItemProps$n3, _lastComponentProps$c2;
     for (var _len = arguments.length, args = new Array(_len), _key = 0; _key < _len; _key++) {
       args[_key] = arguments[_key];
@@ -282,21 +282,41 @@ var Render = function Render(props) {
     }
     (_lastComponentProps$c2 = lastComponentProps[changeKey]) === null || _lastComponentProps$c2 === void 0 ? void 0 : _lastComponentProps$c2.call.apply(_lastComponentProps$c2, [lastComponentProps].concat(_toConsumableArray(_args)));
   };
+  var debouncedHandleChange = debounce(defaultHandleChange, lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait);
+  var handleChange = function handleChange() {
+    for (var _len2 = arguments.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
+      args[_key2] = arguments[_key2];
+    }
+    var _args = [].concat(args);
+    if (lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.debounceWait) {
+      // 为了兼容 Input 和 TextArea 的 onChange 事件，需要将 event 对象转换为 value
+      if (['Input', 'TextArea'].includes(type)) {
+        _args[0] = {
+          target: {
+            value: _args[0].target.value
+          }
+        };
+      }
+      debouncedHandleChange.apply(void 0, _toConsumableArray(_args));
+    } else {
+      defaultHandleChange.apply(void 0, _toConsumableArray(_args));
+    }
+  };
   /**
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
     var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _len2,
+      var _len3,
         args,
-        _key2,
+        _key3,
         _args,
         _args3 = arguments;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            for (_len2 = _args3.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-              args[_key2] = _args3[_key2];
+            for (_len3 = _args3.length, args = new Array(_len3), _key3 = 0; _key3 < _len3; _key3++) {
+              args[_key3] = _args3[_key3];
             }
             _args = functionArgs([].concat(args));
             _context.t0 = lastComponentProps === null || lastComponentProps === void 0 ? void 0 : lastComponentProps.onBlur;