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

package/lib/form/BaseForm/EditOrReadOnlyContext.js

@@ -6,6 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.EditOrReadOnlyContext = void 0;
 var _react = _interopRequireDefault(require("react"));
-var EditOrReadOnlyContext = exports.EditOrReadOnlyContext = /*#__PURE__*/_react.default.createContext({
+const EditOrReadOnlyContext = exports.EditOrReadOnlyContext = /*#__PURE__*/_react.default.createContext({
   mode: 'edit'
 });

package/lib/form/BaseForm/LightWrapper/index.js

@@ -1,74 +1,61 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.LightWrapper = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _antd = require("antd");
-var _classnames = _interopRequireDefault(require("classnames"));
+var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../../../utils");
 var _style = require("./style");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["label", "size", "disabled", "onChange", "className", "style", "children", "valuePropName", "placeholder", "labelFormatter", "variant", "footerRender", "allowClear", "otherFieldProps", "valueType", "placement"];
-var LightWrapper = exports.LightWrapper = function LightWrapper(props) {
-  var label = props.label,
-    size = props.size,
-    disabled = props.disabled,
-    propsOnChange = props.onChange,
-    className = props.className,
-    style = props.style,
-    children = props.children,
-    valuePropName = props.valuePropName,
-    placeholder = props.placeholder,
-    labelFormatter = props.labelFormatter,
-    variant = props.variant,
-    footerRender = props.footerRender,
-    allowClear = props.allowClear,
-    otherFieldProps = props.otherFieldProps,
-    valueType = props.valueType,
-    placement = props.placement,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('pro-field-light-wrapper');
-  var _useStyle = (0, _style.useStyle)(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
-  var _useState = (0, _react.useState)(props[valuePropName]),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    tempValue = _useState2[0],
-    setTempValue = _useState2[1];
-  var _useMountMergeState = (0, _utils.useMountMergeState)(false),
-    _useMountMergeState2 = (0, _slicedToArray2.default)(_useMountMergeState, 2),
-    open = _useMountMergeState2[0],
-    setOpen = _useMountMergeState2[1];
-  var onChange = function onChange() {
-    var _otherFieldProps$onCh;
-    for (var _len = arguments.length, restParams = new Array(_len), _key = 0; _key < _len; _key++) {
-      restParams[_key] = arguments[_key];
-    }
-    otherFieldProps === null || otherFieldProps === void 0 || (_otherFieldProps$onCh = otherFieldProps.onChange) === null || _otherFieldProps$onCh === void 0 || _otherFieldProps$onCh.call.apply(_otherFieldProps$onCh, [otherFieldProps].concat(restParams));
-    propsOnChange === null || propsOnChange === void 0 || propsOnChange.apply(void 0, restParams);
+const LightWrapper = props => {
+  const {
+    label,
+    size,
+    disabled,
+    onChange: propsOnChange,
+    className,
+    style,
+    children,
+    valuePropName,
+    placeholder,
+    labelFormatter,
+    variant,
+    footerRender,
+    allowClear,
+    otherFieldProps,
+    valueType,
+    placement,
+    ...rest
+  } = props;
+  const {
+    getPrefixCls
+  } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
+  const prefixCls = getPrefixCls('pro-field-light-wrapper');
+  const {
+    wrapSSR,
+    hashId
+  } = (0, _style.useStyle)(prefixCls);
+  const [tempValue, setTempValue] = (0, _react.useState)(props[valuePropName]);
+  const [open, setOpen] = (0, _react.useState)(false);
+  const onChange = (...restParams) => {
+    otherFieldProps?.onChange?.(...restParams);
+    propsOnChange?.(...restParams);
   };
-  var labelValue = props[valuePropName];
+  const labelValue = props[valuePropName];
 
   /** DateRange的转化，dayjs 的 toString 有点不好用 */
-  var labelValueText = (0, _react.useMemo)(function () {
-    var _valueType$toLowerCas;
+  const labelValueText = (0, _react.useMemo)(() => {
     if (!labelValue) return labelValue;
-    if (valueType !== null && valueType !== void 0 && (_valueType$toLowerCas = valueType.toLowerCase()) !== null && _valueType$toLowerCas !== void 0 && _valueType$toLowerCas.endsWith('range') && valueType !== 'digitRange' && !labelFormatter) {
-      return (0, _utils.dateArrayFormatter)(labelValue, _utils.dateFormatterMap[valueType] || 'YYYY-MM-DD');
+    const lowerValueType = valueType?.toLowerCase?.();
+    if (lowerValueType?.endsWith('range') && lowerValueType !== 'digitrange' && !labelFormatter) {
+      return (0, _utils.dateArrayFormatter)(labelValue, valueType && _utils.dateFormatterMap[valueType] || 'YYYY-MM-DD');
     }
-    if (Array.isArray(labelValue)) return labelValue.map(function (item) {
-      if ((0, _typeof2.default)(item) === 'object' && item.label && item.value) {
+    if (Array.isArray(labelValue)) return labelValue.map(item => {
+      if (typeof item === 'object' && item.label && item.value) {
         return item.label;
       }
       return item;
@@ -83,8 +70,8 @@ var LightWrapper = exports.LightWrapper = function LightWrapper(props) {
     label: /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
       ellipsis: true,
       size: size,
-      onClear: function onClear() {
-        onChange === null || onChange === void 0 || onChange();
+      onClear: () => {
+        onChange?.();
         setTempValue(null);
       },
       variant: variant,
@@ -98,21 +85,25 @@ var LightWrapper = exports.LightWrapper = function LightWrapper(props) {
       allowClear: allowClear
     }),
     footer: {
-      onClear: function onClear() {
-        return setTempValue(null);
-      },
-      onConfirm: function onConfirm() {
-        onChange === null || onChange === void 0 || onChange(tempValue);
+      onClear: () => setTempValue(null),
+      onConfirm: () => {
+        onChange?.(tempValue);
         setOpen(false);
       }
     },
     footerRender: footerRender,
     children: /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
-      className: (0, _classnames.default)("".concat(prefixCls, "-container"), hashId, className),
+      className: (0, _clsx.clsx)(`${prefixCls}-container`, hashId, className),
       style: style,
-      children: /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, rest), {}, (0, _defineProperty2.default)((0, _defineProperty2.default)({}, valuePropName, tempValue), "onChange", function onChange(e) {
-        setTempValue(e !== null && e !== void 0 && e.target ? e.target.value : e);
-      }), children.props))
+      children: /*#__PURE__*/_react.default.cloneElement(children, {
+        ...rest,
+        [valuePropName]: tempValue,
+        onChange: e => {
+          setTempValue(e?.target ? e.target.value : e);
+        },
+        ...children.props
+      })
     })
   }));
-};
+};
+exports.LightWrapper = LightWrapper;

package/lib/form/BaseForm/LightWrapper/style.d.ts

@@ -4,6 +4,6 @@ export interface ProToken extends ProAliasToken {
     componentCls: string;
 }
 export declare function useStyle(prefixCls: string): {
-    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>;
     hashId: string;
 };

package/lib/form/BaseForm/LightWrapper/style.js

@@ -1,26 +1,29 @@
 "use strict";
 
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useStyle = useStyle;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _provider = require("../../../provider");
-var genProStyle = function genProStyle(token) {
-  return (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(token.componentCls, "-collapse-label"), {
-    paddingInline: 1,
-    paddingBlock: 1
-  }), "".concat(token.componentCls, "-container"), (0, _defineProperty2.default)({}, "".concat(token.antCls, "-form-item"), {
-    marginBlockEnd: 0
-  }));
+const genProStyle = token => {
+  return {
+    [`${token.componentCls}-collapse-label`]: {
+      paddingInline: 1,
+      paddingBlock: 1
+    },
+    [`${token.componentCls}-container`]: {
+      [`${token.antCls}-form-item`]: {
+        marginBlockEnd: 0
+      }
+    }
+  };
 };
 function useStyle(prefixCls) {
-  return (0, _provider.useStyle)('LightWrapper', function (token) {
-    var proToken = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, token), {}, {
-      componentCls: ".".concat(prefixCls)
-    });
+  return (0, _provider.useStyle)('LightWrapper', token => {
+    const proToken = {
+      ...token,
+      componentCls: `.${prefixCls}`
+    };
     return [genProStyle(proToken)];
   });
 }

package/lib/form/BaseForm/Submitter/index.js

@@ -1,12 +1,10 @@
 "use strict";
 
 var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
-var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
@@ -20,70 +18,72 @@ var _jsxRuntime = require("react/jsx-runtime");
  * @param props
  */
 
-var Submitter = function Submitter(props) {
-  var intl = (0, _provider.useIntl)();
-  var form = _antd.Form.useFormInstance();
+const Submitter = props => {
+  const intl = (0, _provider.useIntl)();
+  const form = _antd.Form.useFormInstance();
   if (props.render === false) {
     return null;
   }
-  var onSubmit = props.onSubmit,
-    render = props.render,
-    onReset = props.onReset,
-    _props$searchConfig = props.searchConfig,
-    searchConfig = _props$searchConfig === void 0 ? {} : _props$searchConfig,
-    submitButtonProps = props.submitButtonProps,
-    resetButtonProps = props.resetButtonProps;
-  var _proTheme$useToken = _provider.proTheme.useToken(),
-    token = _proTheme$useToken.token;
-  var submit = function submit() {
+  const {
+    onSubmit,
+    render,
+    onReset,
+    searchConfig = {},
+    submitButtonProps,
+    resetButtonProps
+  } = props;
+  const {
+    token
+  } = _provider.proTheme.useToken();
+  const submit = () => {
     form.submit();
-    onSubmit === null || onSubmit === void 0 || onSubmit();
+    onSubmit?.();
   };
-  var reset = function reset() {
+  const reset = () => {
     form.resetFields();
-    onReset === null || onReset === void 0 || onReset();
+    onReset?.();
   };
-  var _searchConfig$submitT = searchConfig.submitText,
-    submitText = _searchConfig$submitT === void 0 ? intl.getMessage('tableForm.submit', '提交') : _searchConfig$submitT,
-    _searchConfig$resetTe = searchConfig.resetText,
-    resetText = _searchConfig$resetTe === void 0 ? intl.getMessage('tableForm.reset', '重置') : _searchConfig$resetTe;
+  const {
+    submitText = intl.getMessage('tableForm.submit', '提交'),
+    resetText = intl.getMessage('tableForm.reset', '重置')
+  } = searchConfig;
   /** 默认的操作的逻辑 */
-  var dom = [];
+  const dom = [];
   if (resetButtonProps !== false) {
-    dom.push( /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _util.omit)(resetButtonProps !== null && resetButtonProps !== void 0 ? resetButtonProps : {}, ['preventDefault'])), {}, {
+    dom.push( /*#__PURE__*/(0, _react.createElement)(_antd.Button, {
+      ...(0, _util.omit)(resetButtonProps ?? {}, ['preventDefault']),
       key: "rest",
-      onClick: function onClick(e) {
-        var _resetButtonProps$onC;
-        if (!(resetButtonProps !== null && resetButtonProps !== void 0 && resetButtonProps.preventDefault)) reset();
-        resetButtonProps === null || resetButtonProps === void 0 || (_resetButtonProps$onC = resetButtonProps.onClick) === null || _resetButtonProps$onC === void 0 || _resetButtonProps$onC.call(resetButtonProps, e);
+      onClick: e => {
+        if (!resetButtonProps?.preventDefault) reset();
+        resetButtonProps?.onClick?.(e);
       }
-    }), resetText));
+    }, resetText));
   }
   if (submitButtonProps !== false) {
-    dom.push( /*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      type: "primary"
-    }, (0, _util.omit)(submitButtonProps || {}, ['preventDefault'])), {}, {
+    dom.push( /*#__PURE__*/(0, _react.createElement)(_antd.Button, {
+      type: "primary",
+      ...(0, _util.omit)(submitButtonProps || {}, ['preventDefault']),
       key: "submit",
-      onClick: function onClick(e) {
-        var _submitButtonProps$on;
-        if (!(submitButtonProps !== null && submitButtonProps !== void 0 && submitButtonProps.preventDefault)) submit();
-        submitButtonProps === null || submitButtonProps === void 0 || (_submitButtonProps$on = submitButtonProps.onClick) === null || _submitButtonProps$on === void 0 || _submitButtonProps$on.call(submitButtonProps, e);
+      onClick: e => {
+        if (!submitButtonProps?.preventDefault) submit();
+        submitButtonProps?.onClick?.(e);
       }
-    }), submitText));
+    }, submitText));
   }
-  var renderDom = render ? render((0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-    form: form,
-    submit: submit,
-    reset: reset
-  }), dom) : dom;
+  const renderDom = render ? render({
+    ...props,
+    form,
+    submit,
+    reset
+  }, dom) : dom;
   if (!renderDom) {
     return null;
   }
   if (Array.isArray(renderDom)) {
-    if ((renderDom === null || renderDom === void 0 ? void 0 : renderDom.length) < 1) {
+    if (renderDom?.length < 1) {
       return null;
     }
-    if ((renderDom === null || renderDom === void 0 ? void 0 : renderDom.length) === 1) {
+    if (renderDom?.length === 1) {
       return renderDom[0];
     }
     return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {

package/lib/form/BaseForm/index.js

@@ -9,7 +9,7 @@ Object.keys(_warpField).forEach(function (key) {
   if (key in exports && exports[key] === _warpField[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _warpField[key];
     }
   });
@@ -20,7 +20,7 @@ Object.keys(_BaseForm).forEach(function (key) {
   if (key in exports && exports[key] === _BaseForm[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _BaseForm[key];
     }
   });
@@ -31,7 +31,7 @@ Object.keys(_LightWrapper).forEach(function (key) {
   if (key in exports && exports[key] === _LightWrapper[key]) return;
   Object.defineProperty(exports, key, {
     enumerable: true,
-    get: function get() {
+    get: function () {
       return _LightWrapper[key];
     }
   });

package/lib/form/FieldContext.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = exports.FieldContext = void 0;
 var _react = _interopRequireDefault(require("react"));
-var FieldContext = exports.FieldContext = /*#__PURE__*/_react.default.createContext({});
+const FieldContext = exports.FieldContext = /*#__PURE__*/_react.default.createContext({});
 var _default = exports.default = FieldContext;

package/lib/form/components/Captcha/index.d.ts

@@ -19,8 +19,14 @@ export type ProFormCaptchaProps = ProFormFieldItemProps<InputProps> & {
     onChange?: any;
 };
 export type CaptFieldRef = {
-    startTiming: () => never;
-    endTiming: () => never;
+    /** 原生 DOM 元素引用 */
+    nativeElement: HTMLDivElement;
+    /** 聚焦方法 */
+    focus: () => void;
+    /** 开始计时 */
+    startTiming: () => void;
+    /** 结束计时 */
+    endTiming: () => void;
 };
 declare const ProFormCaptcha: React.FC<ProFormCaptchaProps>;
 export default ProFormCaptcha;