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

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

@@ -6,12 +6,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.useFieldFetchData = exports.proFieldParsingValueEnumToArray = exports.default = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _util = require("@rc-component/util");
 var _antd = require("antd");
 var _react = _interopRequireWildcard(require("react"));
 var _swr = _interopRequireDefault(require("swr"));
@@ -20,50 +15,52 @@ var _utils = require("../../../utils");
 var _LightSelect = _interopRequireDefault(require("./LightSelect"));
 var _SearchSelect = _interopRequireDefault(require("./SearchSelect"));
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["value", "text"],
-  _excluded2 = ["mode", "valueEnum", "render", "formItemRender", "request", "fieldProps", "light", "proFieldKey", "params", "label", "variant", "id", "lightLabel", "labelTrigger"];
-var Highlight = function Highlight(_ref) {
-  var label = _ref.label,
-    words = _ref.words;
-  var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var lightCls = getPrefixCls('pro-select-item-option-content-light');
-  var optionCls = getPrefixCls('pro-select-item-option-content');
+const Highlight = ({
+  label,
+  words
+}) => {
+  const {
+    getPrefixCls
+  } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
+  const lightCls = getPrefixCls('pro-select-item-option-content-light');
+  const optionCls = getPrefixCls('pro-select-item-option-content');
 
   // css
-  var _useStyle = (0, _utils.useStyle)('Highlight', function (token) {
-      return (0, _defineProperty2.default)((0, _defineProperty2.default)({}, ".".concat(lightCls), {
+  const {
+    wrapSSR
+  } = (0, _utils.useStyle)('Highlight', token => {
+    return {
+      [`.${lightCls}`]: {
         color: token.colorPrimary
-      }), ".".concat(optionCls), {
+      },
+      [`.${optionCls}`]: {
         flex: 'auto',
         overflow: 'hidden',
         whiteSpace: 'nowrap',
         textOverflow: 'ellipsis'
-      });
-    }),
-    wrapSSR = _useStyle.wrapSSR;
-  var matchKeywordsRE = new RegExp(words.map(function (word) {
-    return word.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&');
-  }).join('|'), 'gi');
-  var matchText = label;
-  var elements = [];
+      }
+    };
+  });
+  const matchKeywordsRE = new RegExp(words.map(word => word.replace(/[-[\]/{}()*+?.\\^$|]/g, '\\$&')).join('|'), 'gi');
+  let matchText = label;
+  const elements = [];
   while (matchText.length) {
-    var match = matchKeywordsRE.exec(matchText);
+    const match = matchKeywordsRE.exec(matchText);
     if (!match) {
       elements.push(matchText);
       break;
     }
-    var start = match.index;
-    var matchLength = match[0].length + start;
+    const start = match.index;
+    const matchLength = match[0].length + start;
     elements.push(matchText.slice(0, start), /*#__PURE__*/_react.default.createElement('span', {
       className: lightCls
     }, matchText.slice(start, matchLength)));
     matchText = matchText.slice(matchLength);
   }
-  return wrapSSR( /*#__PURE__*/_react.default.createElement.apply(_react.default, ['div', {
+  return wrapSSR( /*#__PURE__*/_react.default.createElement('div', {
     title: label,
     className: optionCls
-  }].concat(elements)));
+  }, ...elements));
 };
 
 /**
@@ -74,13 +71,12 @@ var Highlight = function Highlight(_ref) {
  * @returns
  */
 function filerByItem(item, keyWords) {
-  var _item$label, _item$value;
   if (!keyWords) return true;
-  if (item !== null && item !== void 0 && (_item$label = item.label) !== null && _item$label !== void 0 && _item$label.toString().toLowerCase().includes(keyWords.toLowerCase()) || item !== null && item !== void 0 && (_item$value = item.value) !== null && _item$value !== void 0 && _item$value.toString().toLowerCase().includes(keyWords.toLowerCase())) {
+  if (item?.label?.toString().toLowerCase().includes(keyWords.toLowerCase()) || item?.value?.toString().toLowerCase().includes(keyWords.toLowerCase())) {
     return true;
   }
   if (item.children || item.options) {
-    var findItem = [].concat((0, _toConsumableArray2.default)(item.children || []), [item.options || []]).find(function (mapItem) {
+    const findItem = [...(item.children || []), item.options || []].find(mapItem => {
       return filerByItem(mapItem, keyWords);
     });
     if (findItem) return true;
@@ -93,19 +89,19 @@ function filerByItem(item, keyWords) {
  *
  * @param valueEnum
  */
-var proFieldParsingValueEnumToArray = exports.proFieldParsingValueEnumToArray = function proFieldParsingValueEnumToArray(valueEnumParams) {
-  var enumArray = [];
-  var valueEnum = (0, _utils.objectToMap)(valueEnumParams);
-  valueEnum.forEach(function (_, key) {
-    var value = valueEnum.get(key) || valueEnum.get("".concat(key));
+const proFieldParsingValueEnumToArray = valueEnumParams => {
+  const enumArray = [];
+  const valueEnum = (0, _utils.objectToMap)(valueEnumParams);
+  valueEnum.forEach((_, key) => {
+    const value = valueEnum.get(key) || valueEnum.get(`${key}`);
     if (!value) {
       return;
     }
-    if ((0, _typeof2.default)(value) === 'object' && value !== null && value !== void 0 && value.text) {
+    if (typeof value === 'object' && value?.text) {
       enumArray.push({
-        text: value === null || value === void 0 ? void 0 : value.text,
+        text: value?.text,
         value: key,
-        label: value === null || value === void 0 ? void 0 : value.text,
+        label: value?.text,
         disabled: value.disabled
       });
       return;
@@ -117,53 +113,51 @@ var proFieldParsingValueEnumToArray = exports.proFieldParsingValueEnumToArray =
   });
   return enumArray;
 };
-var useFieldFetchData = exports.useFieldFetchData = function useFieldFetchData(props) {
-  var _ref5, _props$debounceTime, _props$fieldProps3, _props$fieldProps6;
-  var cacheForSwr = props.cacheForSwr,
-    fieldProps = props.fieldProps;
-  var _useState = (0, _react.useState)(props.defaultKeyWords),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    keyWords = _useState2[0],
-    setKeyWords = _useState2[1];
+exports.proFieldParsingValueEnumToArray = proFieldParsingValueEnumToArray;
+const useFieldFetchData = props => {
+  const {
+    cacheForSwr,
+    fieldProps
+  } = props;
+  const [keyWords, setKeyWords] = (0, _react.useState)(props.defaultKeyWords);
   /** Key 是用来缓存请求的，如果不在是有问题 */
-  var _useState3 = (0, _react.useState)(function () {
-      if (props.proFieldKey) {
-        return props.proFieldKey.toString();
-      }
-      if (props.request) {
-        return (0, _utils.nanoid)();
-      }
-      return 'no-fetch';
-    }),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 1),
-    cacheKey = _useState4[0];
-  var proFieldKeyRef = (0, _react.useRef)(cacheKey);
-  var getOptionsFormValueEnum = (0, _utils.useRefFunction)(function (coverValueEnum) {
-    return proFieldParsingValueEnumToArray((0, _utils.objectToMap)(coverValueEnum)).map(function (_ref3) {
-      var value = _ref3.value,
-        text = _ref3.text,
-        rest = (0, _objectWithoutProperties2.default)(_ref3, _excluded);
-      return (0, _objectSpread2.default)({
-        label: text,
-        value: value,
-        key: value
-      }, rest);
-    });
+  const [cacheKey] = (0, _react.useState)(() => {
+    if (props.proFieldKey) {
+      return props.proFieldKey.toString();
+    }
+    if (props.request) {
+      return (0, _utils.nanoid)();
+    }
+    return 'no-fetch';
   });
-  var defaultOptions = (0, _utils.useDeepCompareMemo)(function () {
+  const proFieldKeyRef = (0, _react.useRef)(cacheKey);
+  const getOptionsFormValueEnum = (0, _utils.useRefFunction)(coverValueEnum => {
+    return proFieldParsingValueEnumToArray((0, _utils.objectToMap)(coverValueEnum)).map(({
+      value,
+      text,
+      ...rest
+    }) => ({
+      label: text,
+      value,
+      key: value,
+      ...rest
+    }));
+  });
+  const defaultOptions = (0, _utils.useDeepCompareMemo)(() => {
     if (!fieldProps) return undefined;
-    var data = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.options) || (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.treeData);
+    const data = fieldProps?.options || fieldProps?.treeData;
     if (!data) return undefined;
-    var _ref4 = fieldProps.fieldNames || {},
-      children = _ref4.children,
-      label = _ref4.label,
-      value = _ref4.value;
-    var traverseFieldKey = function traverseFieldKey(_options, type) {
-      if (!(_options !== null && _options !== void 0 && _options.length)) return;
-      var length = _options.length;
-      var i = 0;
+    const {
+      children,
+      label,
+      value
+    } = fieldProps.fieldNames || {};
+    const traverseFieldKey = (_options, type) => {
+      if (!_options?.length) return;
+      const length = _options.length;
+      let i = 0;
       while (i < length) {
-        var cur = _options[i++];
+        const cur = _options[i++];
         if (cur[children] || cur[label] || cur[value]) {
           cur[type] = cur[type === 'children' ? children : type === 'label' ? label : value];
           traverseFieldKey(cur[children], type);
@@ -175,50 +169,35 @@ var useFieldFetchData = exports.useFieldFetchData = function useFieldFetchData(p
     if (value) traverseFieldKey(data, 'value');
     return data;
   }, [fieldProps]);
-  var _useMountMergeState = (0, _utils.useMountMergeState)(function () {
-      if (props.valueEnum) {
-        return getOptionsFormValueEnum(props.valueEnum);
-      }
-      return [];
-    }, {
-      value: defaultOptions
-    }),
-    _useMountMergeState2 = (0, _slicedToArray2.default)(_useMountMergeState, 2),
-    options = _useMountMergeState2[0],
-    setOptions = _useMountMergeState2[1];
-  (0, _utils.useDeepCompareEffect)(function () {
-    var _props$fieldProps, _props$fieldProps2;
+  const [options, setOptions] = (0, _util.useControlledState)(() => props.valueEnum ? getOptionsFormValueEnum(props.valueEnum) : [], defaultOptions);
+  (0, _utils.useDeepCompareEffect)(() => {
     // 优先使用 fieldProps?.options
-    if (!props.valueEnum || (_props$fieldProps = props.fieldProps) !== null && _props$fieldProps !== void 0 && _props$fieldProps.options || (_props$fieldProps2 = props.fieldProps) !== null && _props$fieldProps2 !== void 0 && _props$fieldProps2.treeData) return;
+    if (!props.valueEnum || props.fieldProps?.options || props.fieldProps?.treeData) return;
     setOptions(getOptionsFormValueEnum(props.valueEnum));
   }, [props.valueEnum]);
-  var swrKey = (0, _utils.useDebounceValue)([proFieldKeyRef.current, props.params, keyWords], (_ref5 = (_props$debounceTime = props.debounceTime) !== null && _props$debounceTime !== void 0 ? _props$debounceTime : props === null || props === void 0 || (_props$fieldProps3 = props.fieldProps) === null || _props$fieldProps3 === void 0 ? void 0 : _props$fieldProps3.debounceTime) !== null && _ref5 !== void 0 ? _ref5 : 0, [props.params, keyWords]);
-  var _useSWR = (0, _swr.default)(function () {
-      if (!props.request) {
-        return null;
-      }
-      return swrKey;
-    }, function (_ref6) {
-      var _ref7 = (0, _slicedToArray2.default)(_ref6, 3),
-        params = _ref7[1],
-        kw = _ref7[2];
-      return props.request((0, _objectSpread2.default)((0, _objectSpread2.default)({}, params), {}, {
-        keyWords: kw
-      }), props);
-    }, {
-      revalidateIfStale: !cacheForSwr,
-      // 打开 cacheForSwr 的时候才应该支持两个功能
-      revalidateOnReconnect: cacheForSwr,
-      shouldRetryOnError: false,
-      // @todo 这个功能感觉应该搞个API出来
-      revalidateOnFocus: false
-    }),
-    data = _useSWR.data,
-    setLocaleData = _useSWR.mutate,
-    isValidating = _useSWR.isValidating;
-  var resOptions = (0, _react.useMemo)(function () {
-    var _props$fieldProps4, _props$fieldProps5;
-    var opt = options === null || options === void 0 ? void 0 : options.map(function (item) {
+  const swrKey = (0, _utils.useDebounceValue)([proFieldKeyRef.current, props.params, keyWords], props.debounceTime ?? props?.fieldProps?.debounceTime ?? 0, [props.params, keyWords]);
+  const {
+    data,
+    mutate: setLocaleData,
+    isValidating
+  } = (0, _swr.default)(() => {
+    if (!props.request) {
+      return null;
+    }
+    return swrKey;
+  }, ([, params, kw]) => props.request({
+    ...params,
+    keyWords: kw
+  }, props), {
+    revalidateIfStale: !cacheForSwr,
+    // 打开 cacheForSwr 的时候才应该支持两个功能
+    revalidateOnReconnect: cacheForSwr,
+    shouldRetryOnError: false,
+    // @todo 这个功能感觉应该搞个API出来
+    revalidateOnFocus: false
+  });
+  const resOptions = (0, _react.useMemo)(() => {
+    const opt = options?.map(item => {
       if (typeof item === 'string') {
         return {
           label: item,
@@ -226,30 +205,31 @@ var useFieldFetchData = exports.useFieldFetchData = function useFieldFetchData(p
         };
       }
       if (item.children || item.options) {
-        var childrenOptions = [].concat((0, _toConsumableArray2.default)(item.children || []), (0, _toConsumableArray2.default)(item.options || [])).filter(function (mapItem) {
+        const childrenOptions = [...(item.children || []), ...(item.options || [])].filter(mapItem => {
           return filerByItem(mapItem, keyWords);
         });
-        return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
+        return {
+          ...item,
           children: childrenOptions,
           options: childrenOptions
-        });
+        };
       }
       return item;
     });
 
     // filterOption 为 true 时 filter数据, filterOption 默认为true
-    if (((_props$fieldProps4 = props.fieldProps) === null || _props$fieldProps4 === void 0 ? void 0 : _props$fieldProps4.filterOption) === true || ((_props$fieldProps5 = props.fieldProps) === null || _props$fieldProps5 === void 0 ? void 0 : _props$fieldProps5.filterOption) === undefined) {
-      return opt === null || opt === void 0 ? void 0 : opt.filter(function (item) {
+    if (props.fieldProps?.filterOption === true || props.fieldProps?.filterOption === undefined) {
+      return opt?.filter(item => {
         if (!item) return false;
         if (!keyWords) return true;
         return filerByItem(item, keyWords);
       });
     }
     return opt;
-  }, [options, keyWords, (_props$fieldProps6 = props.fieldProps) === null || _props$fieldProps6 === void 0 ? void 0 : _props$fieldProps6.filterOption]);
-  return [isValidating, props.request ? data : resOptions, function (fetchKeyWords) {
+  }, [options, keyWords, props.fieldProps?.filterOption]);
+  return [isValidating, props.request ? data : resOptions, fetchKeyWords => {
     setKeyWords(fetchKeyWords);
-  }, function () {
+  }, () => {
     setKeyWords(undefined);
     setLocaleData([], false);
   }];
@@ -260,65 +240,60 @@ var useFieldFetchData = exports.useFieldFetchData = function useFieldFetchData(p
  *
  * @param
  */
-var FieldSelect = function FieldSelect(props, ref) {
-  var _ConfigProvider$useCo;
-  var mode = props.mode,
-    valueEnum = props.valueEnum,
-    render = props.render,
-    formItemRender = props.formItemRender,
-    request = props.request,
-    fieldProps = props.fieldProps,
-    light = props.light,
-    proFieldKey = props.proFieldKey,
-    params = props.params,
-    label = props.label,
-    variant = props.variant,
-    id = props.id,
-    lightLabel = props.lightLabel,
-    labelTrigger = props.labelTrigger,
-    rest = (0, _objectWithoutProperties2.default)(props, _excluded2);
-  var inputRef = (0, _react.useRef)();
-  var intl = (0, _provider.useIntl)();
-  var keyWordsRef = (0, _react.useRef)('');
-  var fieldNames = fieldProps.fieldNames;
-  (0, _react.useEffect)(function () {
-    keyWordsRef.current = fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.searchValue;
-  }, [fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.searchValue]);
-  var _useFieldFetchData = useFieldFetchData(props),
-    _useFieldFetchData2 = (0, _slicedToArray2.default)(_useFieldFetchData, 4),
-    loading = _useFieldFetchData2[0],
-    options = _useFieldFetchData2[1],
-    _fetchData = _useFieldFetchData2[2],
-    resetData = _useFieldFetchData2[3];
-  var _ref8 = (_antd.ConfigProvider === null || _antd.ConfigProvider === void 0 || (_ConfigProvider$useCo = _antd.ConfigProvider.useConfig) === null || _ConfigProvider$useCo === void 0 ? void 0 : _ConfigProvider$useCo.call(_antd.ConfigProvider)) || {
-      componentSize: 'middle'
-    },
-    componentSize = _ref8.componentSize;
-  (0, _react.useImperativeHandle)(ref, function () {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, inputRef.current || {}), {}, {
-      fetchData: function fetchData(keyWord) {
-        return _fetchData(keyWord);
-      }
-    });
-  }, [_fetchData]);
-  var optionsValueEnum = (0, _react.useMemo)(function () {
+exports.useFieldFetchData = useFieldFetchData;
+const FieldSelect = (props, ref) => {
+  const {
+    mode,
+    valueEnum,
+    render,
+    formItemRender,
+    request,
+    fieldProps,
+    light,
+    proFieldKey,
+    params,
+    label,
+    variant,
+    id,
+    lightLabel,
+    labelTrigger,
+    ...rest
+  } = props;
+  const inputRef = (0, _react.useRef)();
+  const intl = (0, _provider.useIntl)();
+  const keyWordsRef = (0, _react.useRef)('');
+  const {
+    fieldNames
+  } = fieldProps;
+  (0, _react.useEffect)(() => {
+    keyWordsRef.current = fieldProps?.searchValue;
+  }, [fieldProps?.searchValue]);
+  const [loading, options, fetchData, resetData] = useFieldFetchData(props);
+  const {
+    componentSize
+  } = _antd.ConfigProvider?.useConfig?.() || {
+    componentSize: 'middle'
+  };
+  (0, _react.useImperativeHandle)(ref, () => ({
+    ...(inputRef.current || {}),
+    fetchData: keyWord => fetchData(keyWord)
+  }), [fetchData]);
+  const optionsValueEnum = (0, _react.useMemo)(() => {
     if (mode !== 'read') return;
-    var _ref9 = fieldNames || {},
-      _ref9$label = _ref9.label,
-      labelPropsName = _ref9$label === void 0 ? 'label' : _ref9$label,
-      _ref9$value = _ref9.value,
-      valuePropsName = _ref9$value === void 0 ? 'value' : _ref9$value,
-      _ref9$options = _ref9.options,
-      optionsPropsName = _ref9$options === void 0 ? 'options' : _ref9$options;
-    var valuesMap = new Map();
-    var traverseOptions = function traverseOptions(_options) {
-      if (!(_options !== null && _options !== void 0 && _options.length)) {
+    const {
+      label: labelPropsName = 'label',
+      value: valuePropsName = 'value',
+      options: optionsPropsName = 'options'
+    } = fieldNames || {};
+    const valuesMap = new Map();
+    const traverseOptions = _options => {
+      if (!_options?.length) {
         return valuesMap;
       }
-      var length = _options.length;
-      var i = 0;
+      const length = _options.length;
+      let i = 0;
       while (i < length) {
-        var cur = _options[i++];
+        const cur = _options[i++];
         valuesMap.set(cur[valuePropsName], cur[labelPropsName]);
         traverseOptions(cur[optionsPropsName]);
       }
@@ -327,21 +302,21 @@ var FieldSelect = function FieldSelect(props, ref) {
     return traverseOptions(options);
   }, [fieldNames, mode, options]);
   if (mode === 'read') {
-    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)(valueEnum || optionsValueEnum))
     });
     if (render) {
-      var _render;
-      return (_render = render(dom, (0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), dom)) !== null && _render !== void 0 ? _render : null;
+      return render(dom, {
+        mode,
+        ...fieldProps
+      }, dom) ?? null;
     }
     return dom;
   }
   if (mode === 'edit' || mode === 'update') {
-    var renderDom = function renderDom() {
+    const renderDom = () => {
       if (light) {
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_LightSelect.default, (0, _objectSpread2.default)({
+        return /*#__PURE__*/(0, _jsxRuntime.jsx)(_LightSelect.default, {
           variant: variant,
           id: id,
           loading: loading,
@@ -353,14 +328,16 @@ var FieldSelect = function FieldSelect(props, ref) {
           placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
           lightLabel: lightLabel,
           labelTrigger: labelTrigger,
-          fetchData: _fetchData
-        }, fieldProps));
+          fetchData: fetchData,
+          ...fieldProps
+        });
       }
-      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchSelect.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(_SearchSelect.default, {
         className: rest.className,
-        style: (0, _objectSpread2.default)({
-          minWidth: 100
-        }, rest.style),
+        style: {
+          minWidth: 100,
+          ...rest.style
+        },
         variant: variant,
         id: id,
         loading: loading,
@@ -369,17 +346,17 @@ var FieldSelect = function FieldSelect(props, ref) {
         defaultSearchValue: props.defaultKeyWords,
         notFoundContent: loading ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Spin, {
           size: "small"
-        }) : fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.notFoundContent,
-        fetchData: function fetchData(keyWord) {
-          keyWordsRef.current = keyWord !== null && keyWord !== void 0 ? keyWord : '';
-          _fetchData(keyWord);
+        }) : fieldProps?.notFoundContent,
+        fetchData: keyWord => {
+          keyWordsRef.current = keyWord ?? '';
+          fetchData(keyWord);
           // 当 keyWord 为 undefined 时，清空 keyWordsRef 以确保 filterOption 不进行过滤
           if (keyWord === undefined) {
             keyWordsRef.current = '';
           }
         },
         resetData: resetData,
-        optionItemRender: function optionItemRender(item) {
+        optionItemRender: item => {
           if (typeof item.label === 'string' && keyWordsRef.current) {
             return /*#__PURE__*/(0, _jsxRuntime.jsx)(Highlight, {
               label: item.label,
@@ -389,22 +366,21 @@ var FieldSelect = function FieldSelect(props, ref) {
           return item.label;
         },
         placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
-        label: label
-      }, fieldProps), {}, {
+        label: label,
+        ...fieldProps,
         options: options
-      }), "SearchSelect");
+      }, "SearchSelect");
     };
-    var _dom = renderDom();
+    const dom = renderDom();
     if (formItemRender) {
-      var _formItemRender;
-      return (_formItemRender = formItemRender(rest.text, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), {}, {
-        options: options,
-        loading: loading
-      }), _dom)) !== null && _formItemRender !== void 0 ? _formItemRender : null;
+      return formItemRender(rest.text, {
+        mode,
+        ...fieldProps,
+        options,
+        loading
+      }, dom) ?? null;
     }
-    return _dom;
+    return dom;
   }
   return null;
 };

package/lib/field/components/Slider/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,18 +13,20 @@ var _jsxRuntime = require("react/jsx-runtime");
  *
  * @param
  */
-var FieldSlider = function FieldSlider(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    fieldProps = _ref.fieldProps;
+const FieldSlider = ({
+  text,
+  mode,
+  render,
+  formItemRender,
+  fieldProps
+}, ref) => {
   if (mode === 'read') {
-    var dom = text;
+    const dom = 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
       }));
     }
@@ -34,19 +35,21 @@ var FieldSlider = function FieldSlider(_ref, ref) {
     });
   }
   if (mode === 'edit' || mode === 'update') {
-    var _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Slider, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-      ref: ref
-    }, fieldProps), {}, {
-      style: (0, _objectSpread2.default)({
-        minWidth: 120
-      }, fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.style)
-    }));
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Slider, {
+      ref: ref,
+      ...fieldProps,
+      style: {
+        minWidth: 120,
+        ...fieldProps?.style
+      }
+    });
     if (formItemRender) {
-      return formItemRender(text, (0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), _dom);
+      return formItemRender(text, {
+        mode,
+        ...fieldProps
+      }, dom);
     }
-    return _dom;
+    return dom;
   }
   return null;
 };