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

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

@@ -1,21 +1,9 @@
-var _excluded = ["format", "disabled", "foreverDate", "foreverText", "valueType", "otherProps", "limit"],
-  _excluded2 = ["mode"];
-function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
-function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
-function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
-function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
-function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
-function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-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; }
-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); }
-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 _isFunction from "lodash/isFunction";
+import _uniq from "lodash/uniq";
+import _isObject from "lodash/isObject";
+import _omit from "lodash/omit";
 import { Checkbox, DatePicker, Space } from 'antd';
 import classNames from 'classnames';
-import { omit, isObject, uniq, isFunction } from 'lodash';
 import dayjs from 'dayjs';
 import React, { useMemo } from 'react';
 import { useProConfig } from "../../../../ProConfigProvider";
@@ -27,35 +15,35 @@ import ProForm from "../../../../ProForm";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 // 永久有效默认值
 
-export var ProTimeLimit = props => {
-  var _props$format = props.format,
-    format = _props$format === void 0 ? 'YYYY-MM-DD' : _props$format,
-    disabled = props.disabled,
-    _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,
-    valueType = _props$valueType === void 0 ? 'format' : _props$valueType,
-    otherProps = props.otherProps,
-    _props$limit = props.limit,
-    limit = _props$limit === void 0 ? true : _props$limit,
-    rest = _objectWithoutProperties(props, _excluded);
-  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 _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
-  if (isFunction(format)) {
+export const ProTimeLimit = props => {
+  const {
+    format = 'YYYY-MM-DD',
+    disabled,
+    foreverDate = '9999-01-01',
+    foreverText = locale.ProTimeLimit.foreverText,
+    valueType = 'format',
+    otherProps,
+    limit = true,
+    ...rest
+  } = props;
+  const {
+    isView: isViewCon,
+    viewEmpty
+  } = ProForm.useFieldProps() || {};
+  const initialConfig = useProConfig('ProTimeLimit');
+  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  const _foreverDate = foreverDate || initialConfig?.foreverDate;
+  const _viewFormat = Array.isArray(format) ? format[0] : format;
+  let tempFormat = Array.isArray(format) ? format : [format];
+  if (_isFunction(format)) {
     tempFormat = [];
   }
-  var _format = uniq([...tempFormat, 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
+  const _format = _uniq([...tempFormat, 'YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD']).filter(formatKey => !!formatKey);
 
   // dateTime模式下默认开启time选择
-  var _rest = _objectSpread({}, rest);
+  const _rest = {
+    ...rest
+  };
 
   // showTime默认值受valueType属性影响
   if (rest.showTime === undefined) {
@@ -66,41 +54,36 @@ export var ProTimeLimit = props => {
       _rest.showTime = false;
     }
   }
-  var _defaultShowTime = {
+  const _defaultShowTime = {
     format: 'HH:mm:ss'
   };
-  var _useMemo = useMemo(() => {
-      // 使用健壮的日期解析方式
-      var foreverDayjs = dayjs(_foreverDate);
-      if (!foreverDayjs.isValid()) {
-        foreverDayjs = dayjs(_foreverDate, format);
-      }
-      if (!foreverDayjs.isValid()) {
-        // 如果还是无效，使用默认的长期日期
-        foreverDayjs = dayjs('9999-01-01');
-      }
-      var foreverString = foreverDayjs.format(format);
-      return [foreverString, foreverDayjs];
-    }, [format, _foreverDate]),
-    _useMemo2 = _slicedToArray(_useMemo, 2),
-    foreverString = _useMemo2[0],
-    foreverDayjs = _useMemo2[1];
+  const [foreverString, foreverDayjs] = useMemo(() => {
+    // 使用健壮的日期解析方式
+    let foreverDayjs = dayjs(_foreverDate);
+    if (!foreverDayjs.isValid()) {
+      foreverDayjs = dayjs(_foreverDate, format);
+    }
+    if (!foreverDayjs.isValid()) {
+      // 如果还是无效，使用默认的长期日期
+      foreverDayjs = dayjs('9999-01-01');
+    }
+    const foreverString = foreverDayjs.format(format);
+    return [foreverString, foreverDayjs];
+  }, [format, _foreverDate]);
 
   // 管理value的受控状态
-  var _useControlled = useControlled(_objectSpread({
-      format
-    }, props)),
-    _useControlled2 = _slicedToArray(_useControlled, 2),
-    value = _useControlled2[0],
-    onChange = _useControlled2[1];
-  var isForever = useMemo(() => {
-    if (isObject(value)) {
+  const [value, onChange] = useControlled({
+    format,
+    ...props
+  });
+  const isForever = useMemo(() => {
+    if (_isObject(value)) {
       return foreverDayjs.format(format) === value.format(format);
     }
     return false;
   }, [foreverDayjs, value]);
-  var foreverChange = e => {
-    var checkedForever = e.target.checked;
+  const foreverChange = e => {
+    const checkedForever = e.target.checked;
     if (checkedForever) {
       // 直接使用计算好的 foreverDayjs，避免重新解析
       onChange(foreverDayjs);
@@ -119,7 +102,7 @@ export var ProTimeLimit = props => {
         children: foreverText
       });
     }
-    if (isObject(value)) {
+    if (_isObject(value)) {
       return /*#__PURE__*/_jsx(Container, {
         viewEmpty: viewEmpty,
         children: value.format(_viewFormat)
@@ -131,26 +114,29 @@ export var ProTimeLimit = props => {
     });
   }
   if (_rest.showTime === true) {
-    _rest.showTime = _objectSpread({}, _defaultShowTime);
+    _rest.showTime = {
+      ..._defaultShowTime
+    };
   }
-  if (isObject(_rest.showTime)) {
+  if (_isObject(_rest.showTime)) {
     _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
   }
-  var className = classNames({
+  const className = classNames({
     'ant-input': true,
     'ant-input-disabled': disabled,
     'forever-checkbox': true
   });
   return /*#__PURE__*/_jsxs(Space.Compact, {
     className: "pro-time-limit",
-    children: [/*#__PURE__*/_jsx(DatePicker, _objectSpread(_objectSpread(_objectSpread({
+    children: [/*#__PURE__*/_jsx(DatePicker, {
       defaultPickerValue: dayjs(),
-      disabled: disabled || isForever
-    }, initialConfig), omit(_rest, ['placeholder'])), {}, {
+      disabled: disabled || isForever,
+      ...initialConfig,
+      ..._omit(_rest, ['placeholder']),
       format: _format,
       value: value,
       onChange: onChange
-    })), limit && /*#__PURE__*/_jsx("div", {
+    }), limit && /*#__PURE__*/_jsx("div", {
       className: className,
       children: /*#__PURE__*/_jsx(Checkbox, {
         checked: isForever,
@@ -161,19 +147,23 @@ export var ProTimeLimit = props => {
     })]
   });
 };
-var 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;
+const LimitPick = props => {
+  const {
+    mode = 'DatePicker',
+    ...rest
+  } = props;
+  const {
+    foreverDate
+  } = useProConfig('ProTimeLimit') || {};
   if (mode === 'RangePicker') {
-    return /*#__PURE__*/_jsx(ProRangeLimit, _objectSpread({
-      foreverDate: foreverDate
-    }, rest));
+    return /*#__PURE__*/_jsx(ProRangeLimit, {
+      foreverDate: foreverDate,
+      ...rest
+    });
   }
-  return /*#__PURE__*/_jsx(ProTimeLimit, _objectSpread({
-    foreverDate: foreverDate
-  }, rest));
+  return /*#__PURE__*/_jsx(ProTimeLimit, {
+    foreverDate: foreverDate,
+    ...rest
+  });
 };
 export default LimitPick;

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

@@ -1,54 +1,48 @@
-var _excluded = ["name", "names", "namesStr", "form", "onDiff", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
-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; }
-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); }
-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 _get from "lodash/get";
 import { Space, Tooltip } from 'antd';
 import classNames from 'classnames';
-import { get } from 'lodash';
 import React, { useMemo } from 'react';
 import { diffOriginal } from "../../utils/diffOriginal";
 import { useProConfig } from "../../../ProConfigProvider";
 import { isEmpty } from "../../../utils";
 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;
-  var name = props.name,
-    names = props.names,
-    namesStr = props.namesStr,
-    form = props.form,
-    onDiff = props.onDiff,
-    children = props.children,
-    type = props.type,
-    diffConfig = props.diffConfig,
-    _props$valuePropName = props.valuePropName,
-    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
-    normalize = props.normalize,
-    getValueProps = props.getValueProps,
-    viewRender = props.viewRender,
-    rest = _objectWithoutProperties(props, _excluded);
-  var _useProConfig = useProConfig('ProForm'),
-    isDiffAll = _useProConfig.isDiffAll;
-  var originalValues = diffConfig.originalValues,
-    changeTipColor = diffConfig.changeTipColor,
-    addTipColor = diffConfig.addTipColor,
-    _diffConfig$scrollFol = diffConfig.scrollFollowParent,
-    scrollFollowParent = _diffConfig$scrollFol === void 0 ? true : _diffConfig$scrollFol;
-  var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
-  var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
-  var originalValue = names !== null && names !== void 0 && names.length ? names.map(name => get(originalValues, name)) : get(originalValues, name);
-  var noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
-  var diffType = useMemo(() => {
+const componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
+const ChangedWrapper = props => {
+  const {
+    name,
+    names,
+    namesStr,
+    form,
+    onDiff,
+    children,
+    type,
+    diffConfig,
+    valuePropName = 'value',
+    normalize,
+    getValueProps,
+    viewRender,
+    ...rest
+  } = props;
+  const {
+    isDiffAll
+  } = useProConfig('ProForm');
+  const {
+    originalValues,
+    changeTipColor,
+    addTipColor,
+    scrollFollowParent = true
+  } = diffConfig;
+  const toolTip = diffConfig.toolTip ?? true;
+  const isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
+  const originalValue = names?.length ? names.map(name => _get(originalValues, name)) : _get(originalValues, name);
+  const noChange = !onDiff && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  const diffType = useMemo(() => {
     if (!isWatch || noChange) return 'same';
-    var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
+    const _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
 
     // fix:修复 DatePicker时，originalValue与最新值一致时，显示为 changed的问题
-    var _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
+    const _originalValue = normalize && ['DatePicker'].includes(props.type) ? normalize(originalValue, undefined, undefined, true) : originalValue;
 
     // fix:修复 InputNumber 时，originalValue与最新值一致都为'0'时，显示为 changed的问题
     if (['InputNumber'].includes(props.type) && normalize && _value === Number(originalValue)) {
@@ -62,49 +56,52 @@ var ChangedWrapper = props => {
       type: props.type
     });
   }, [isWatch, noChange, props[valuePropName], originalValue, typeof onDiff]);
-  var isAdd = diffType === 'add';
-  var isChanged = diffType === 'changed';
-  var tipContent = useMemo(() => {
+  const isAdd = diffType === 'add';
+  const isChanged = diffType === 'changed';
+  const tipContent = useMemo(() => {
     if (!isWatch || noChange) return undefined;
-    var valueProps = getValueProps ? getValueProps(originalValue, true) : {
+    const valueProps = getValueProps ? getValueProps(originalValue, true) : {
       value: originalValue
     };
     if (viewRender) {
-      return viewRender(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value, originalValues, {
+      return viewRender(valueProps?.value, originalValues, {
         form
       });
     }
-    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
+    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+      ...children.props,
       isView: true,
-      [valuePropName]: valueProps === null || valueProps === void 0 ? void 0 : valueProps.value
-    })) : undefined;
+      [valuePropName]: valueProps?.value
+    }) : undefined;
   }, [typeof viewRender, originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
-    var isNestedField = ['ProEditTable'].includes(type);
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({
-      originalValues: isNestedField ? originalValues : undefined
-    }, children.props), rest));
+    const isNestedField = ['ProEditTable'].includes(type);
+    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, {
+      originalValues: isNestedField ? originalValues : undefined,
+      ...children.props,
+      ...rest
+    });
   }
-  var tipOpenCalc = () => {
+  const tipOpenCalc = () => {
     if (!toolTip) return false;
 
     // 传入undefined 鼠标移入显示移出隐藏 获得焦点时不显示气泡
     return isChanged ? undefined : false;
   };
-  var style = {
+  const style = {
     '--zaui-contract-bg': changeTipColor,
     '--zaui-contract-bg-add': addTipColor
   };
 
   // @ts-ignore
-  var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
-  var diffClassName = classNames({
+  const _showEllipse = children.props?.showEllipse || children.props?.tooltip;
+  const diffClassName = classNames({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
-  var open = tipOpenCalc();
-  var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
+  const open = tipOpenCalc();
+  const scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
     scrollFollowParent
   } : {};
   return /*#__PURE__*/_jsx(Tooltip, {
@@ -124,19 +121,29 @@ var ChangedWrapper = props => {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && /*#__PURE__*/_jsxs(Space, {
         className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+          // @ts-ignore
+          ...children.props,
+          ...rest,
+          ...scrollFollowParentConfig,
           isView: true
-        })) : undefined]
+        }) : undefined]
       })]
     }),
     children: /*#__PURE__*/_jsx("div", {
       className: diffClassName,
       style: style,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
-        otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, {
+        // @ts-ignore
+        ...children.props,
+        ...rest,
+        ...scrollFollowParentConfig,
+        otherProps: {
+          // @ts-ignore
+          ...children.props?.otherProps,
           isDiffChange: isChanged
-        })
-      })) : undefined
+        }
+      }) : undefined
     })
   });
 };

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

@@ -1,124 +1,67 @@
-var _excluded = ["onChange", "children", "confirm", "otherProps"];
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-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; }
-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); }
-function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try { var info = gen[key](arg); var value = info.value; } catch (error) { reject(error); return; } if (info.done) { resolve(value); } else { Promise.resolve(value).then(_next, _throw); } }
-function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
-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 { isFunction, isObject } from 'lodash';
+import _isObject from "lodash/isObject";
+import _isFunction from "lodash/isFunction";
 import React from 'react';
 import { Modal } from 'antd';
 import ProForm from "../../index";
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
-var defaultConfirmProps = {
+const defaultConfirmProps = {
   title: '操作提示',
   content: '确定要修改该字段吗？'
 };
-var ConfirmWrapper = props => {
-  var onChange = props.onChange,
-    children = props.children,
-    confirm = props.confirm,
-    otherProps = props.otherProps,
-    rest = _objectWithoutProperties(props, _excluded);
-  var _ProForm$useFieldProp = ProForm.useFieldProps(),
-    form = _ProForm$useFieldProp.form;
-  var handleChange = /*#__PURE__*/function () {
-    var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(value) {
-      var _len,
-        other,
-        _key,
-        _value,
-        confirmProps,
-        _args2 = arguments;
-      return _regeneratorRuntime().wrap(function _callee2$(_context2) {
-        while (1) switch (_context2.prev = _context2.next) {
-          case 0:
-            for (_len = _args2.length, other = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
-              other[_key - 1] = _args2[_key];
-            }
-            _value = value !== null && value !== void 0 && value.target ? value.target.value : value;
-            if (!isFunction(confirm)) {
-              _context2.next = 8;
-              break;
-            }
-            _context2.next = 5;
-            return confirm(value, form.getFieldsValue(), {
-              option: other[0],
-              form,
-              namePath: otherProps.namePath,
-              name: otherProps.name,
-              index: otherProps.index,
-              preValue: form.getFieldValue(otherProps.listName || otherProps.name)
-            });
-          case 5:
-            _context2.t0 = _context2.sent;
-            _context2.next = 9;
-            break;
-          case 8:
-            _context2.t0 = confirm;
-          case 9:
-            confirmProps = _context2.t0;
-            // 只处理 false, true 和 对象的情况
-            if (confirmProps === false) {
-              onChange === null || onChange === void 0 || onChange(_value, ...other);
-            }
-            if (confirmProps === true) {
-              Modal.confirm(_objectSpread(_objectSpread({}, defaultConfirmProps), {}, {
-                onOk: () => onChange === null || onChange === void 0 ? void 0 : onChange(_value, ...other)
-              }));
-            }
-            if (isObject(confirmProps)) {
-              Modal.confirm(_objectSpread(_objectSpread(_objectSpread({}, 'title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps), confirmProps), {}, {
-                onOk: function () {
-                  var _onOk = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-                    var _confirmProps$onOk;
-                    var _len2,
-                      arg,
-                      _key2,
-                      _args = arguments;
-                    return _regeneratorRuntime().wrap(function _callee$(_context) {
-                      while (1) switch (_context.prev = _context.next) {
-                        case 0:
-                          for (_len2 = _args.length, arg = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
-                            arg[_key2] = _args[_key2];
-                          }
-                          _context.next = 3;
-                          return (_confirmProps$onOk = confirmProps.onOk) === null || _confirmProps$onOk === void 0 ? void 0 : _confirmProps$onOk.call(confirmProps, ...arg);
-                        case 3:
-                          onChange === null || onChange === void 0 || onChange(_value, ...other);
-                        case 4:
-                        case "end":
-                          return _context.stop();
-                      }
-                    }, _callee);
-                  }));
-                  function onOk() {
-                    return _onOk.apply(this, arguments);
-                  }
-                  return onOk;
-                }()
-              }));
-            }
-          case 13:
-          case "end":
-            return _context2.stop();
+const ConfirmWrapper = props => {
+  const {
+    onChange,
+    children,
+    confirm,
+    otherProps,
+    ...rest
+  } = props;
+  const {
+    form,
+    namePath,
+    name,
+    index,
+    listName
+  } = ProForm.useFieldProps();
+  const handleChange = async (value, ...other) => {
+    const _value = value?.target ? value.target.value : value;
+    const confirmProps = _isFunction(confirm) ? await confirm(value, form.getFieldsValue(), {
+      option: other[0],
+      form,
+      namePath,
+      name,
+      index,
+      preValue: form.getFieldValue(listName || name)
+    }) : confirm;
+
+    // 只处理 false, true 和 对象的情况
+    if (confirmProps === false) {
+      onChange?.(_value, ...other);
+    }
+    if (confirmProps === true) {
+      Modal.confirm({
+        ...defaultConfirmProps,
+        onOk: () => onChange?.(_value, ...other)
+      });
+    }
+    if (_isObject(confirmProps)) {
+      Modal.confirm({
+        ...('title' in confirmProps || 'content' in confirmProps ? {} : defaultConfirmProps),
+        ...confirmProps,
+        onOk: async (...arg) => {
+          await confirmProps.onOk?.(...arg);
+          onChange?.(_value, ...other);
         }
-      }, _callee2);
-    }));
-    return function handleChange(_x) {
-      return _ref.apply(this, arguments);
-    };
-  }();
+      });
+    }
+  };
   return /*#__PURE__*/_jsx(_Fragment, {
-    children: /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, rest), {}, {
+    children: /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, {
+      ...rest,
       // @ts-ignore
       value: rest.value === undefined ? null : rest.value,
       onChange: handleChange
-    }))
+    })
   });
 };
 export default ConfirmWrapper;