@ant-design/pro-components 3.0.2-0 → 3.1.1-0

package/es/form/components/Segmented/index.js

@@ -1,6 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["fieldProps", "request", "params", "proFieldProps"];
 import React from 'react';
 import { FieldSegmented } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
@@ -12,28 +9,27 @@ import ProFormField from "../Field";
  * @param
  */
 import { jsx as _jsx } from "react/jsx-runtime";
-var ProFormSegmented = function ProFormSegmented(_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    request = _ref.request,
-    params = _ref.params,
-    proFieldProps = _ref.proFieldProps,
-    rest = _objectWithoutProperties(_ref, _excluded);
+const ProFormSegmented = ({
+  fieldProps,
+  request,
+  params,
+  proFieldProps,
+  ...rest
+}, ref) => {
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: {
       segmented: {
-        render: function render(text, props) {
-          return /*#__PURE__*/_jsx(FieldSegmented, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/_jsx(FieldSegmented, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/_jsx(FieldSegmented, {
+          ...props,
+          text: text
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/_jsx(FieldSegmented, {
+          ...props,
+          text: text
+        })
       }
     },
-    children: /*#__PURE__*/_jsx(ProFormField, _objectSpread({
+    children: /*#__PURE__*/_jsx(ProFormField, {
       valueType: "segmented",
       fieldProps: fieldProps,
       ref: ref,
@@ -42,9 +38,10 @@ var ProFormSegmented = function ProFormSegmented(_ref, ref) {
       fieldConfig: {
         customLightMode: true
       },
-      proFieldProps: proFieldProps
-    }, rest))
+      proFieldProps: proFieldProps,
+      ...rest
+    })
   });
 };
-var WarpProFormSegmented = /*#__PURE__*/React.forwardRef(ProFormSegmented);
+const WarpProFormSegmented = /*#__PURE__*/React.forwardRef(ProFormSegmented);
 export default WarpProFormSegmented;

package/es/form/components/Select/index.js

@@ -1,7 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["fieldProps", "children", "params", "proFieldProps", "mode", "valueEnum", "request", "showSearch", "options"],
-  _excluded2 = ["fieldProps", "children", "params", "proFieldProps", "mode", "valueEnum", "request", "options"];
 import React, { useContext } from 'react';
 import { FieldSelect } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
@@ -14,34 +10,33 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *
  * @param
  */
-var ProFormSelectComponents = function ProFormSelectComponents(_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    children = _ref.children,
-    params = _ref.params,
-    proFieldProps = _ref.proFieldProps,
-    mode = _ref.mode,
-    valueEnum = _ref.valueEnum,
-    request = _ref.request,
-    showSearch = _ref.showSearch,
-    options = _ref.options,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  var context = useContext(FieldContext);
+const ProFormSelectComponents = ({
+  fieldProps,
+  children,
+  params,
+  proFieldProps,
+  mode,
+  valueEnum,
+  request,
+  showSearch,
+  options,
+  ...rest
+}, ref) => {
+  const context = useContext(FieldContext);
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: {
       select: {
-        render: function render(text, props) {
-          return /*#__PURE__*/_jsx(FieldSelect, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/_jsx(FieldSelect, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/_jsx(FieldSelect, {
+          ...props,
+          text: text
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/_jsx(FieldSelect, {
+          ...props,
+          text: text
+        })
       }
     },
-    children: /*#__PURE__*/_jsx(ProFormField, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(ProFormField, {
       valueEnum: runFunction(valueEnum),
       request: request,
       params: params,
@@ -49,57 +44,57 @@ var ProFormSelectComponents = function ProFormSelectComponents(_ref, ref) {
       fieldConfig: {
         customLightMode: true
       },
-      fieldProps: _objectSpread({
-        options: options,
-        mode: mode,
-        showSearch: showSearch,
-        getPopupContainer: context.getPopupContainer
-      }, fieldProps),
+      fieldProps: {
+        options,
+        mode,
+        showSearch,
+        getPopupContainer: context.getPopupContainer,
+        ...fieldProps
+      },
       ref: ref,
-      proFieldProps: proFieldProps
-    }, rest), {}, {
+      proFieldProps: proFieldProps,
+      ...rest,
       children: children
-    }))
+    })
   });
 };
-var SearchSelect = /*#__PURE__*/React.forwardRef(function (_ref2, ref) {
-  var fieldProps = _ref2.fieldProps,
-    children = _ref2.children,
-    params = _ref2.params,
-    proFieldProps = _ref2.proFieldProps,
-    mode = _ref2.mode,
-    valueEnum = _ref2.valueEnum,
-    request = _ref2.request,
-    options = _ref2.options,
-    rest = _objectWithoutProperties(_ref2, _excluded2);
-  var finalMode = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.mode) || mode || 'multiple';
-  var props = _objectSpread(_objectSpread({
-    options: options,
+const SearchSelect = /*#__PURE__*/React.forwardRef(({
+  fieldProps,
+  children,
+  params,
+  proFieldProps,
+  mode,
+  valueEnum,
+  request,
+  options,
+  ...rest
+}, ref) => {
+  const finalMode = fieldProps?.mode || mode || 'multiple';
+  const props = {
+    options,
     labelInValue: true,
     showSearch: true,
     suffixIcon: null,
     autoClearSearchValue: true,
-    optionLabelProp: 'label'
-  }, fieldProps), {}, {
+    optionLabelProp: 'label',
+    ...fieldProps,
     mode: finalMode === 'single' ? undefined : finalMode // 确保mode正确设置
-  });
-  var context = useContext(FieldContext);
+  };
+  const context = useContext(FieldContext);
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: {
       select: {
-        render: function render(text, valueTypeProps) {
-          return /*#__PURE__*/_jsx(FieldSelect, _objectSpread(_objectSpread({}, valueTypeProps), {}, {
-            text: text
-          }));
-        },
-        formItemRender: function formItemRender(text, valueTypeProps) {
-          return /*#__PURE__*/_jsx(FieldSelect, _objectSpread(_objectSpread({}, valueTypeProps), {}, {
-            text: text
-          }));
-        }
+        render: (text, valueTypeProps) => /*#__PURE__*/_jsx(FieldSelect, {
+          ...valueTypeProps,
+          text: text
+        }),
+        formItemRender: (text, valueTypeProps) => /*#__PURE__*/_jsx(FieldSelect, {
+          ...valueTypeProps,
+          text: text
+        })
       }
     },
-    children: /*#__PURE__*/_jsx(ProFormField, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(ProFormField, {
       valueEnum: runFunction(valueEnum),
       request: request,
       params: params,
@@ -107,19 +102,20 @@ var SearchSelect = /*#__PURE__*/React.forwardRef(function (_ref2, ref) {
       fieldConfig: {
         customLightMode: true
       },
-      fieldProps: _objectSpread({
-        getPopupContainer: context.getPopupContainer
-      }, props),
+      fieldProps: {
+        getPopupContainer: context.getPopupContainer,
+        ...props
+      },
       ref: ref,
-      proFieldProps: proFieldProps
-    }, rest), {}, {
+      proFieldProps: proFieldProps,
+      ...rest,
       children: children
-    }))
+    })
   });
 });
-var ProFormSelect = /*#__PURE__*/React.forwardRef(ProFormSelectComponents);
-var ProFormSearchSelect = SearchSelect;
-var WrappedProFormSelect = ProFormSelect;
+const ProFormSelect = /*#__PURE__*/React.forwardRef(ProFormSelectComponents);
+const ProFormSearchSelect = SearchSelect;
+const WrappedProFormSelect = ProFormSelect;
 WrappedProFormSelect.SearchSelect = ProFormSearchSelect;
 
 // @ts-ignore

package/es/form/components/Slider/index.js

@@ -1,6 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["fieldProps", "proFieldProps", "min", "max", "step", "marks", "vertical", "range"];
 import React from 'react';
 import { FieldSlider } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
@@ -11,48 +8,49 @@ import { jsx as _jsx } from "react/jsx-runtime";
  *
  * @param
  */
-var ProFormSlider = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    min = _ref.min,
-    max = _ref.max,
-    step = _ref.step,
-    marks = _ref.marks,
-    vertical = _ref.vertical,
-    range = _ref.range,
-    rest = _objectWithoutProperties(_ref, _excluded);
+const ProFormSlider = /*#__PURE__*/React.forwardRef(({
+  fieldProps,
+  proFieldProps,
+  min,
+  max,
+  step,
+  marks,
+  vertical,
+  range,
+  ...rest
+}, ref) => {
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: {
       slider: {
-        render: function render(text, props) {
-          return /*#__PURE__*/_jsx(FieldSlider, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/_jsx(FieldSlider, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/_jsx(FieldSlider, {
+          ...props,
+          text: text
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/_jsx(FieldSlider, {
+          ...props,
+          text: text
+        })
       }
     },
-    children: /*#__PURE__*/_jsx(ProField, _objectSpread({
+    children: /*#__PURE__*/_jsx(ProField, {
       valueType: "slider",
-      fieldProps: _objectSpread(_objectSpread({}, fieldProps), {}, {
-        min: min,
-        max: max,
-        step: step,
-        marks: marks,
-        vertical: vertical,
-        range: range,
-        style: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style
-      }),
+      fieldProps: {
+        ...fieldProps,
+        min,
+        max,
+        step,
+        marks,
+        vertical,
+        range,
+        style: fieldProps?.style
+      },
       ref: ref,
       proFieldProps: proFieldProps,
       fieldConfig: {
         ignoreWidth: true
-      }
-    }, rest))
+      },
+      ...rest
+    })
   });
 });
 export default ProFormSlider;

package/es/form/components/Switch/index.js

@@ -1,6 +1,3 @@
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["fieldProps", "unCheckedChildren", "checkedChildren", "proFieldProps"];
 import React from 'react';
 import { FieldSwitch } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
@@ -10,33 +7,33 @@ import { jsx as _jsx } from "react/jsx-runtime";
  * @zh-cn 单选 Switch
  * @en-us Single Choice Switch
  */
-var ProFormSwitch = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
-  var fieldProps = _ref.fieldProps,
-    unCheckedChildren = _ref.unCheckedChildren,
-    checkedChildren = _ref.checkedChildren,
-    proFieldProps = _ref.proFieldProps,
-    rest = _objectWithoutProperties(_ref, _excluded);
+const ProFormSwitch = /*#__PURE__*/React.forwardRef(({
+  fieldProps,
+  unCheckedChildren,
+  checkedChildren,
+  proFieldProps,
+  ...rest
+}, ref) => {
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: {
       switch: {
-        render: function render(text, props) {
-          return /*#__PURE__*/_jsx(FieldSwitch, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/_jsx(FieldSwitch, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/_jsx(FieldSwitch, {
+          ...props,
+          text: text
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/_jsx(FieldSwitch, {
+          ...props,
+          text: text
+        })
       }
     },
-    children: /*#__PURE__*/_jsx(ProField, _objectSpread({
+    children: /*#__PURE__*/_jsx(ProField, {
       valueType: "switch",
-      fieldProps: _objectSpread({
-        unCheckedChildren: unCheckedChildren,
-        checkedChildren: checkedChildren
-      }, fieldProps),
+      fieldProps: {
+        unCheckedChildren,
+        checkedChildren,
+        ...fieldProps
+      },
       ref: ref,
       valuePropName: "checked",
       proFieldProps: proFieldProps,
@@ -44,8 +41,9 @@ var ProFormSwitch = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
         valuePropName: 'checked',
         ignoreWidth: true,
         customLightMode: true
-      }
-    }, rest))
+      },
+      ...rest
+    })
   });
 });
 export default ProFormSwitch;

package/es/form/components/Text/index.js

@@ -1,65 +1,59 @@
-import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["fieldProps", "proFieldProps"],
-  _excluded2 = ["fieldProps", "proFieldProps"];
-import { omit } from '@rc-component/util';
+import { omit, useControlledState } from '@rc-component/util';
 import { Form, Popover } from 'antd';
-import React, { useState } from 'react';
+import React, { useCallback, useState } from 'react';
 import { FieldPassword } from "../../../field";
 import { ProConfigProvider } from "../../../provider";
-import { useMountMergeState } from "../../../utils";
 import ProField from "../Field";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
-var valueType = 'text';
+const valueType = 'text';
 /**
  * 文本组件
  *
  * @param
  */
-var ProFormText = function ProFormText(_ref) {
-  var fieldProps = _ref.fieldProps,
-    proFieldProps = _ref.proFieldProps,
-    rest = _objectWithoutProperties(_ref, _excluded);
-  return /*#__PURE__*/_jsx(ProField, _objectSpread({
+const ProFormText = ({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}) => {
+  return /*#__PURE__*/_jsx(ProField, {
     valueType: valueType,
     fieldProps: fieldProps,
     fieldConfig: {
-      valueType: valueType
+      valueType
     },
-    proFieldProps: proFieldProps
-  }, rest));
+    proFieldProps: proFieldProps,
+    ...rest
+  });
 };
-var PassWordStrength = function PassWordStrength(props) {
-  var _useMountMergeState = useMountMergeState(props.open || false, {
-      value: props.open,
-      onChange: props.onOpenChange
-    }),
-    _useMountMergeState2 = _slicedToArray(_useMountMergeState, 2),
-    open = _useMountMergeState2[0],
-    setOpen = _useMountMergeState2[1];
+const PassWordStrength = props => {
+  const [open, setOpenInner] = useControlledState(props.open || false, props.open);
+  const setOpen = useCallback(updater => {
+    setOpenInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      props.onOpenChange?.(next);
+      return next;
+    });
+  }, [props.onOpenChange]);
   return /*#__PURE__*/_jsx(Form.Item, {
     shouldUpdate: true,
     noStyle: true,
-    children: function children(form) {
-      var _props$statusRender;
-      var value = form.getFieldValue(props.name || []);
-      return /*#__PURE__*/_jsx(Popover, _objectSpread(_objectSpread({
-        getPopupContainer: function getPopupContainer(node) {
+    children: form => {
+      const value = form.getFieldValue(props.name || []);
+      return /*#__PURE__*/_jsx(Popover, {
+        getPopupContainer: node => {
           if (node && node.parentNode) {
             return node.parentNode;
           }
           return node;
         },
-        onOpenChange: function onOpenChange(e) {
-          return setOpen(e);
-        },
+        onOpenChange: e => setOpen(e),
         content: /*#__PURE__*/_jsxs("div", {
           style: {
             padding: '4px 0'
           },
-          children: [(_props$statusRender = props.statusRender) === null || _props$statusRender === void 0 ? void 0 : _props$statusRender.call(props, value), props.strengthText ? /*#__PURE__*/_jsx("div", {
+          children: [props.statusRender?.(value), props.strengthText ? /*#__PURE__*/_jsx("div", {
             style: {
               marginTop: 10
             },
@@ -68,68 +62,66 @@ var PassWordStrength = function PassWordStrength(props) {
             })
           }) : null]
         }),
-        overlayStyle: {
-          width: 240
+        styles: {
+          root: {
+            width: 240
+          }
         },
-        placement: "rightTop"
-      }, props.popoverProps), {}, {
+        placement: "rightTop",
+        ...props.popoverProps,
         open: open,
         children: props.children
-      }));
+      });
     }
   });
 };
-var Password = function Password(_ref2) {
-  var fieldProps = _ref2.fieldProps,
-    proFieldProps = _ref2.proFieldProps,
-    rest = _objectWithoutProperties(_ref2, _excluded2);
-  var _useState = useState(false),
-    _useState2 = _slicedToArray(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  if (fieldProps !== null && fieldProps !== void 0 && fieldProps.statusRender && rest.name) {
+const Password = ({
+  fieldProps,
+  proFieldProps,
+  ...rest
+}) => {
+  const [open, setOpen] = useState(false);
+  if (fieldProps?.statusRender && rest.name) {
     return /*#__PURE__*/_jsx(ProConfigProvider, {
       valueTypeMap: {
         password: {
-          render: function render(text, props) {
-            return /*#__PURE__*/_jsx(FieldPassword, _objectSpread(_objectSpread({}, props), {}, {
-              text: text
-            }));
-          },
-          formItemRender: function formItemRender(text, props) {
-            return /*#__PURE__*/_jsx(FieldPassword, _objectSpread(_objectSpread({}, props), {}, {
-              text: text
-            }));
-          }
+          render: (text, props) => /*#__PURE__*/_jsx(FieldPassword, {
+            ...props,
+            text: text
+          }),
+          formItemRender: (text, props) => /*#__PURE__*/_jsx(FieldPassword, {
+            ...props,
+            text: text
+          })
         }
       },
       children: /*#__PURE__*/_jsx(PassWordStrength, {
         name: rest.name,
-        statusRender: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.statusRender,
-        popoverProps: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.popoverProps,
-        strengthText: fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.strengthText,
+        statusRender: fieldProps?.statusRender,
+        popoverProps: fieldProps?.popoverProps,
+        strengthText: fieldProps?.strengthText,
         open: open,
         onOpenChange: setOpen,
         children: /*#__PURE__*/_jsx("div", {
-          children: /*#__PURE__*/_jsx(ProField, _objectSpread({
+          children: /*#__PURE__*/_jsx(ProField, {
             valueType: "password",
-            fieldProps: _objectSpread(_objectSpread({}, omit(fieldProps, ['statusRender', 'popoverProps', 'strengthText'])), {}, {
-              onBlur: function onBlur(e) {
-                var _fieldProps$onBlur;
-                fieldProps === null || fieldProps === void 0 || (_fieldProps$onBlur = fieldProps.onBlur) === null || _fieldProps$onBlur === void 0 || _fieldProps$onBlur.call(fieldProps, e);
+            fieldProps: {
+              ...omit(fieldProps, ['statusRender', 'popoverProps', 'strengthText']),
+              onBlur: e => {
+                fieldProps?.onBlur?.(e);
                 setOpen(false);
               },
-              onClick: function onClick(e) {
-                var _fieldProps$onClick;
-                fieldProps === null || fieldProps === void 0 || (_fieldProps$onClick = fieldProps.onClick) === null || _fieldProps$onClick === void 0 || _fieldProps$onClick.call(fieldProps, e);
+              onClick: e => {
+                fieldProps?.onClick?.(e);
                 setOpen(true);
               }
-            }),
+            },
             proFieldProps: proFieldProps,
             fieldConfig: {
-              valueType: valueType
-            }
-          }, rest))
+              valueType
+            },
+            ...rest
+          })
         })
       })
     });
@@ -137,29 +129,28 @@ var Password = function Password(_ref2) {
   return /*#__PURE__*/_jsx(ProConfigProvider, {
     valueTypeMap: {
       password: {
-        render: function render(text, props) {
-          return /*#__PURE__*/_jsx(FieldPassword, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        },
-        formItemRender: function formItemRender(text, props) {
-          return /*#__PURE__*/_jsx(FieldPassword, _objectSpread(_objectSpread({}, props), {}, {
-            text: text
-          }));
-        }
+        render: (text, props) => /*#__PURE__*/_jsx(FieldPassword, {
+          ...props,
+          text: text
+        }),
+        formItemRender: (text, props) => /*#__PURE__*/_jsx(FieldPassword, {
+          ...props,
+          text: text
+        })
       }
     },
-    children: /*#__PURE__*/_jsx(ProField, _objectSpread({
+    children: /*#__PURE__*/_jsx(ProField, {
       valueType: "password",
       fieldProps: fieldProps,
       proFieldProps: proFieldProps,
       fieldConfig: {
-        valueType: valueType
-      }
-    }, rest))
+        valueType
+      },
+      ...rest
+    })
   });
 };
-var WrappedProFormText = ProFormText;
+const WrappedProFormText = ProFormText;
 WrappedProFormText.Password = Password;
 
 // @ts-ignore