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

package/lib/field/components/RangePicker/index.d.ts

@@ -3,7 +3,7 @@ import type { ProFieldLightProps } from '../../PureProField';
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     text: string[];
     format?: string | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
     showTime?: boolean | undefined;
     picker?: "time" | "date" | "month" | "week" | "year" | "quarter" | undefined;
 } & ProFieldLightProps & React.RefAttributes<any>>;

package/lib/field/components/RangePicker/index.js

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _antd = require("antd");
 var _dayjs = _interopRequireDefault(require("dayjs"));
 var _react = _interopRequireWildcard(require("react"));
@@ -19,43 +17,36 @@ var _jsxRuntime = require("react/jsx-runtime");
  *
  * @param
  */
-var FieldRangePicker = function FieldRangePicker(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    light = _ref.light,
-    label = _ref.label,
-    _ref$format = _ref.format,
-    format = _ref$format === void 0 ? 'YYYY-MM-DD' : _ref$format,
-    render = _ref.render,
-    picker = _ref.picker,
-    formItemRender = _ref.formItemRender,
-    plain = _ref.plain,
-    showTime = _ref.showTime,
-    lightLabel = _ref.lightLabel,
-    variant = _ref.variant,
-    fieldProps = _ref.fieldProps;
-  var intl = (0, _provider.useIntl)();
-  var _ref2 = Array.isArray(text) ? text : [],
-    _ref3 = (0, _slicedToArray2.default)(_ref2, 2),
-    startText = _ref3[0],
-    endText = _ref3[1];
-  var _React$useState = _react.default.useState(false),
-    _React$useState2 = (0, _slicedToArray2.default)(_React$useState, 2),
-    open = _React$useState2[0],
-    setOpen = _React$useState2[1];
+const FieldRangePicker = ({
+  text,
+  mode,
+  light,
+  label,
+  format = 'YYYY-MM-DD',
+  render,
+  picker,
+  formItemRender,
+  plain,
+  showTime,
+  lightLabel,
+  variant,
+  fieldProps
+}, ref) => {
+  const intl = (0, _provider.useIntl)();
+  const [startText, endText] = Array.isArray(text) ? text : [];
+  const [open, setOpen] = _react.default.useState(false);
   // antd 改了一下 交互，这里要兼容一下，不然会导致无法选中第二个数据
-  var genFormatText = (0, _react.useCallback)(function (formatValue) {
-    if (typeof (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) === 'function') {
-      var _fieldProps$format;
-      return fieldProps === null || fieldProps === void 0 || (_fieldProps$format = fieldProps.format) === null || _fieldProps$format === void 0 ? void 0 : _fieldProps$format.call(fieldProps, formatValue);
+  const genFormatText = (0, _react.useCallback)(formatValue => {
+    if (typeof fieldProps?.format === 'function') {
+      return fieldProps?.format?.(formatValue);
     }
-    return (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || format || 'YYYY-MM-DD';
+    return fieldProps?.format || format || 'YYYY-MM-DD';
   }, [fieldProps, format]);
   // activePickerIndex for https://github.com/ant-design/ant-design/issues/22158
-  var parsedStartText = startText ? (0, _dayjs.default)(startText).format(genFormatText((0, _dayjs.default)(startText))) : '';
-  var parsedEndText = endText ? (0, _dayjs.default)(endText).format(genFormatText((0, _dayjs.default)(endText))) : '';
+  const parsedStartText = startText ? (0, _dayjs.default)(startText).format(genFormatText((0, _dayjs.default)(startText))) : '';
+  const parsedEndText = endText ? (0, _dayjs.default)(endText).format(genFormatText((0, _dayjs.default)(endText))) : '';
   if (mode === 'read') {
-    var dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       ref: ref,
       style: {
         display: 'flex',
@@ -70,79 +61,77 @@ var FieldRangePicker = function FieldRangePicker(_ref, ref) {
       })]
     });
     if (render) {
-      return render(text, (0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+      return render(text, {
+        mode,
+        ...fieldProps
+      }, /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
         children: dom
       }));
     }
     return dom;
   }
   if (mode === 'edit' || mode === 'update') {
-    var dayValue = (0, _utils.parseValueToDay)(fieldProps.value);
-    var _dom;
-    var handleRangeChange = function handleRangeChange(value) {
-      var _fieldProps$onChange;
-      fieldProps === null || fieldProps === void 0 || (_fieldProps$onChange = fieldProps.onChange) === null || _fieldProps$onChange === void 0 || _fieldProps$onChange.call(fieldProps, value);
+    const dayValue = (0, _utils.parseValueToDay)(fieldProps.value);
+    let dom;
+    const handleRangeChange = value => {
+      fieldProps?.onChange?.(value);
       if (!value) {
         setOpen(false);
       }
     };
     if (light) {
-      var _fieldProps$placehold;
-      _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
+      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
         label: label,
-        onClick: function onClick() {
-          var _fieldProps$onOpenCha;
-          fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha === void 0 || _fieldProps$onOpenCha.call(fieldProps, true);
+        onClick: () => {
+          fieldProps?.onOpenChange?.(true);
           setOpen(true);
         },
         style: dayValue ? {
           paddingInlineEnd: 0
         } : undefined,
         disabled: fieldProps.disabled,
-        value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker.RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker.RangePicker, {
           picker: picker,
           showTime: showTime,
           format: format,
-          variant: "borderless"
-        }, fieldProps), {}, {
-          placeholder: (_fieldProps$placehold = fieldProps.placeholder) !== null && _fieldProps$placehold !== void 0 ? _fieldProps$placehold : [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')]
+          variant: "borderless",
+          ...fieldProps,
+          placeholder: fieldProps.placeholder ?? [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')]
           // onClear={() => {
           //   setOpen(false);
           //   fieldProps?.onClear?.();
           // }}
           ,
           value: dayValue,
-          onOpenChange: function onOpenChange(isOpen) {
-            var _fieldProps$onOpenCha2;
+          onOpenChange: isOpen => {
             if (dayValue) setOpen(isOpen);
-            fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha2 = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha2 === void 0 || _fieldProps$onOpenCha2.call(fieldProps, isOpen);
+            fieldProps?.onOpenChange?.(isOpen);
           },
           onChange: handleRangeChange
-        })) : null,
+        }) : null,
         allowClear: false,
         variant: variant,
         ref: lightLabel,
         downIcon: dayValue || open ? false : undefined
       });
     } else {
-      _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker.RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker.RangePicker, {
         ref: ref,
         format: format,
         showTime: showTime,
         placeholder: [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')],
-        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined'
-      }, fieldProps), {}, {
+        variant: plain === undefined ? variant : plain ? 'borderless' : 'outlined',
+        ...fieldProps,
         value: dayValue
-      }));
+      });
     }
     if (formItemRender) {
-      return formItemRender(text, (0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

package/lib/field/components/Rate/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -14,40 +13,44 @@ var _jsxRuntime = require("react/jsx-runtime");
  *
  * @param
  */
-var FieldRate = function FieldRate(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps;
+const FieldRate = ({
+  text,
+  mode,
+  render,
+  formItemRender,
+  fieldProps
+}, ref) => {
   if (mode === 'read') {
-    var dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Rate, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Rate, {
       allowHalf: true,
       disabled: true,
-      ref: ref
-    }, fieldProps), {}, {
+      ref: ref,
+      ...fieldProps,
       value: text
-    }));
+    });
     if (render) {
-      return render(text, (0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      return render(text, {
+        mode,
+        ...fieldProps
+      }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
         children: dom
       }));
     }
     return dom;
   }
   if (mode === 'edit' || mode === 'update') {
-    var _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Rate, (0, _objectSpread2.default)({
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Rate, {
       allowHalf: true,
-      ref: ref
-    }, fieldProps));
+      ref: ref,
+      ...fieldProps
+    });
     if (formItemRender) {
-      return formItemRender(text, (0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

package/lib/field/components/Second/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 exports.formatSecond = formatSecond;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _antd = require("antd");
 var _react = _interopRequireDefault(require("react"));
 var _provider = require("../../../provider");
@@ -18,26 +17,26 @@ var _jsxRuntime = require("react/jsx-runtime");
  * @returns {string}
  */
 function formatSecond(result) {
-  var newResult = result;
-  var formatText = '';
-  var past = false;
+  let newResult = result;
+  let formatText = '';
+  let past = false;
   if (newResult < 0) {
     newResult = -newResult;
     past = true;
   }
-  var d = Math.floor(newResult / (3600 * 24));
-  var h = Math.floor(newResult / 3600 % 24);
-  var m = Math.floor(newResult / 60 % 60);
-  var s = Math.floor(newResult % 60);
-  formatText = "".concat(s, "\u79D2");
+  const d = Math.floor(newResult / (3600 * 24));
+  const h = Math.floor(newResult / 3600 % 24);
+  const m = Math.floor(newResult / 60 % 60);
+  const s = Math.floor(newResult % 60);
+  formatText = `${s}秒`;
   if (m > 0) {
-    formatText = "".concat(m, "\u5206\u949F").concat(formatText);
+    formatText = `${m}分钟${formatText}`;
   }
   if (h > 0) {
-    formatText = "".concat(h, "\u5C0F\u65F6").concat(formatText);
+    formatText = `${h}小时${formatText}`;
   }
   if (d > 0) {
-    formatText = "".concat(d, "\u5929").concat(formatText);
+    formatText = `${d}天${formatText}`;
   }
   if (past) {
     formatText += '前';
@@ -50,43 +49,47 @@ function formatSecond(result) {
  *
  * @param FieldSecond
  */
-var Second = function Second(_ref, ref) {
-  var text = _ref.text,
-    type = _ref.mode,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps,
-    placeholder = _ref.placeholder;
-  var intl = (0, _provider.useIntl)();
-  var placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
+const Second = ({
+  text,
+  mode: type,
+  render,
+  formItemRender,
+  fieldProps,
+  placeholder
+}, ref) => {
+  const intl = (0, _provider.useIntl)();
+  const placeholderValue = placeholder || intl.getMessage('tableForm.inputPlaceholder', '请输入');
   if (type === 'read') {
-    var secondText = formatSecond(Number(text));
-    var dom = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    const secondText = formatSecond(Number(text));
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       ref: ref,
       children: secondText
     });
     if (render) {
-      return render(text, (0, _objectSpread2.default)({
-        mode: type
-      }, fieldProps), dom);
+      return render(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
     return dom;
   }
   if (type === 'edit' || type === 'update') {
-    var _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, (0, _objectSpread2.default)({
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.InputNumber, {
       ref: ref,
       min: 0,
       style: {
         width: '100%'
       },
-      placeholder: placeholderValue
-    }, fieldProps));
+      placeholder: placeholderValue,
+      ...fieldProps
+    });
     if (formItemRender) {
-      return formItemRender(text, (0, _objectSpread2.default)({
-        mode: type
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode: type,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

package/lib/field/components/Segmented/index.d.ts

@@ -9,9 +9,8 @@ declare const _default: React.ForwardRefExoticComponent<import("src/provider").B
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
-    children?: React.ReactNode;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;
 export default _default;

package/lib/field/components/Segmented/index.js

@@ -1,86 +1,75 @@
 "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.default = void 0;
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _utils = require("../../../utils");
 var _Select = require("../Select");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["mode", "render", "formItemRender", "fieldProps", "emptyText"];
 /**
  * Segmented https://ant.design/components/segmented-cn/
  *
  * @param
- */
-var FieldSegmented = function FieldSegmented(props, ref) {
-  var mode = props.mode,
-    render = props.render,
-    formItemRender = props.formItemRender,
-    fieldProps = props.fieldProps,
-    _props$emptyText = props.emptyText,
-    emptyText = _props$emptyText === void 0 ? '-' : _props$emptyText,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var inputRef = (0, _react.useRef)();
-  var _useFieldFetchData = (0, _Select.useFieldFetchData)(props),
-    _useFieldFetchData2 = (0, _slicedToArray2.default)(_useFieldFetchData, 3),
-    loading = _useFieldFetchData2[0],
-    options = _useFieldFetchData2[1],
-    _fetchData = _useFieldFetchData2[2];
-  (0, _react.useImperativeHandle)(ref, function () {
-    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, inputRef.current || {}), {}, {
-      fetchData: function fetchData(keyWord) {
-        return _fetchData(keyWord);
-      }
-    });
-  }, [_fetchData]);
+ */const FieldSegmented = (props, ref) => {
+  const {
+    mode,
+    render,
+    formItemRender,
+    fieldProps,
+    emptyText = '-',
+    ...rest
+  } = props;
+  const inputRef = (0, _react.useRef)();
+  const [loading, options, fetchData] = (0, _Select.useFieldFetchData)(props);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    ...(inputRef.current || {}),
+    fetchData: keyWord => fetchData(keyWord)
+  }), [fetchData]);
   if (loading) {
     return /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Spin, {
       size: "small"
     });
   }
   if (mode === 'read') {
-    var optionsValueEnum = options !== null && options !== void 0 && options.length ? options === null || options === void 0 ? void 0 : options.reduce(function (pre, cur) {
-      var _ref;
-      return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, pre), {}, (0, _defineProperty2.default)({}, (_ref = cur.value) !== null && _ref !== void 0 ? _ref : '', cur.label));
+    const optionsValueEnum = options?.length ? options?.reduce((pre, cur) => {
+      return {
+        ...pre,
+        [cur.value ?? '']: cur.label
+      };
     }, {}) : undefined;
-    var dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
       children: (0, _utils.proFieldParsingText)(rest.text, (0, _utils.objectToMap)(rest.valueEnum || optionsValueEnum))
     });
     if (render) {
-      var _render;
-      return (_render = render(rest.text, (0, _objectSpread3.default)({
-        mode: mode
-      }, fieldProps), /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
+      return render(rest.text, {
+        mode,
+        ...fieldProps
+      }, /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
         children: dom
-      }))) !== null && _render !== void 0 ? _render : emptyText;
+      })) ?? emptyText;
     }
     return dom;
   }
   if (mode === 'edit' || mode === 'update') {
-    var _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Segmented, (0, _objectSpread3.default)((0, _objectSpread3.default)({
-      ref: inputRef
-    }, (0, _util.omit)(fieldProps || {}, ['allowClear'])), {}, {
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Segmented, {
+      ref: inputRef,
+      ...(0, _util.omit)(fieldProps || {}, ['allowClear']),
       options: options
-    }));
+    });
     if (formItemRender) {
-      return formItemRender(rest.text, (0, _objectSpread3.default)((0, _objectSpread3.default)({
-        mode: mode
-      }, fieldProps), {}, {
-        options: options,
-        loading: loading
-      }), _dom);
+      return formItemRender(rest.text, {
+        mode,
+        ...fieldProps,
+        options,
+        loading
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

package/lib/field/components/Select/LightSelect/index.d.ts

@@ -30,6 +30,6 @@ declare const _default: React.ForwardRefExoticComponent<SelectProps<any, import(
      */
     fetchDataOnSearch?: boolean | undefined;
     /** 变体类型 */
-    variant?: "filled" | "outlined" | "borderless" | "underlined" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | "underlined" | undefined;
 } & ProFieldLightProps & SelectProps<any, import("antd/es/select").DefaultOptionType> & React.RefAttributes<any>>;
 export default _default;