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

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

@@ -6,8 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.FieldTimeRangePicker = 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,50 +17,48 @@ var _jsxRuntime = require("react/jsx-runtime");
  *
  * @param
  */
-var FieldTimePicker = function FieldTimePicker(_ref, ref) {
-  var text = _ref.text,
-    mode = _ref.mode,
-    light = _ref.light,
-    label = _ref.label,
-    _ref$format = _ref.format,
-    format = _ref$format === void 0 ? 'HH:mm:ss' : _ref$format,
-    render = _ref.render,
-    formItemRender = _ref.formItemRender,
-    plain = _ref.plain,
-    fieldProps = _ref.fieldProps,
-    lightLabel = _ref.lightLabel;
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  var intl = (0, _provider.useIntl)();
-  var finalFormat = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || format;
-  var isNumberOrMoment = _dayjs.default.isDayjs(text) || typeof text === 'number';
+const FieldTimePicker = ({
+  text,
+  mode,
+  light,
+  label,
+  format = 'HH:mm:ss',
+  render,
+  formItemRender,
+  plain,
+  fieldProps,
+  lightLabel
+}, ref) => {
+  const [open, setOpen] = (0, _react.useState)(false);
+  const intl = (0, _provider.useIntl)();
+  const finalFormat = fieldProps?.format || format;
+  const isNumberOrMoment = _dayjs.default.isDayjs(text) || typeof text === 'number';
   if (mode === 'read') {
-    var dom = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
       ref: ref,
       children: text ? (0, _dayjs.default)(text, isNumberOrMoment ? undefined : finalFormat).format(finalFormat) : '-'
     });
     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 _dom;
-    var disabled = fieldProps.disabled,
-      value = fieldProps.value;
-    var dayValue = (0, _utils.parseValueToDay)(value, finalFormat);
+    let dom;
+    const {
+      disabled,
+      value
+    } = fieldProps;
+    const dayValue = (0, _utils.parseValueToDay)(value, finalFormat);
     if (light) {
-      var _fieldProps$placehold;
-      _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
-        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);
+      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
+        onClick: () => {
+          fieldProps?.onOpenChange?.(true);
           setOpen(true);
         },
         style: dayValue ? {
@@ -70,39 +66,39 @@ var FieldTimePicker = function FieldTimePicker(_ref, ref) {
         } : undefined,
         label: label,
         disabled: disabled,
-        value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TimePicker, {
           variant: "borderless",
           format: format,
-          ref: ref
-        }, fieldProps), {}, {
-          placeholder: (_fieldProps$placehold = fieldProps.placeholder) !== null && _fieldProps$placehold !== void 0 ? _fieldProps$placehold : intl.getMessage('tableForm.selectPlaceholder', '请选择'),
+          ref: ref,
+          ...fieldProps,
+          placeholder: fieldProps.placeholder ?? intl.getMessage('tableForm.selectPlaceholder', '请选择'),
           value: dayValue,
-          onOpenChange: function onOpenChange(isOpen) {
-            var _fieldProps$onOpenCha2;
+          onOpenChange: isOpen => {
             setOpen(isOpen);
-            fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha2 = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha2 === void 0 || _fieldProps$onOpenCha2.call(fieldProps, isOpen);
+            fieldProps?.onOpenChange?.(isOpen);
           },
           open: open
-        })) : null,
+        }) : null,
         downIcon: dayValue || open ? false : undefined,
         allowClear: false,
         ref: lightLabel
       });
     } else {
-      _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker.TimePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.DatePicker.TimePicker, {
         ref: ref,
         format: format,
-        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined'
-      }, fieldProps), {}, {
+        variant: plain === undefined ? 'outlined' : 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;
 };
@@ -113,34 +109,28 @@ var FieldTimePicker = function FieldTimePicker(_ref, ref) {
  * @param param0
  * @param ref
  */
-var FieldTimeRangePickerComponents = function FieldTimeRangePickerComponents(_ref2, ref) {
-  var text = _ref2.text,
-    light = _ref2.light,
-    label = _ref2.label,
-    mode = _ref2.mode,
-    lightLabel = _ref2.lightLabel,
-    _ref2$format = _ref2.format,
-    format = _ref2$format === void 0 ? 'HH:mm:ss' : _ref2$format,
-    render = _ref2.render,
-    formItemRender = _ref2.formItemRender,
-    plain = _ref2.plain,
-    fieldProps = _ref2.fieldProps;
-  var intl = (0, _provider.useIntl)();
-  var _useState3 = (0, _react.useState)(false),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    open = _useState4[0],
-    setOpen = _useState4[1];
-  var finalFormat = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.format) || format;
-  var _ref3 = Array.isArray(text) ? text : [],
-    _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
-    startText = _ref4[0],
-    endText = _ref4[1];
-  var startTextIsNumberOrMoment = _dayjs.default.isDayjs(startText) || typeof startText === 'number';
-  var endTextIsNumberOrMoment = _dayjs.default.isDayjs(endText) || typeof endText === 'number';
-  var parsedStartText = startText ? (0, _dayjs.default)(startText, startTextIsNumberOrMoment ? undefined : finalFormat).format(finalFormat) : '';
-  var parsedEndText = endText ? (0, _dayjs.default)(endText, endTextIsNumberOrMoment ? undefined : finalFormat).format(finalFormat) : '';
+const FieldTimeRangePickerComponents = ({
+  text,
+  light,
+  label,
+  mode,
+  lightLabel,
+  format = 'HH:mm:ss',
+  render,
+  formItemRender,
+  plain,
+  fieldProps
+}, ref) => {
+  const intl = (0, _provider.useIntl)();
+  const [open, setOpen] = (0, _react.useState)(false);
+  const finalFormat = fieldProps?.format || format;
+  const [startText, endText] = Array.isArray(text) ? text : [];
+  const startTextIsNumberOrMoment = _dayjs.default.isDayjs(startText) || typeof startText === 'number';
+  const endTextIsNumberOrMoment = _dayjs.default.isDayjs(endText) || typeof endText === 'number';
+  const parsedStartText = startText ? (0, _dayjs.default)(startText, startTextIsNumberOrMoment ? undefined : finalFormat).format(finalFormat) : '';
+  const parsedEndText = endText ? (0, _dayjs.default)(endText, endTextIsNumberOrMoment ? undefined : finalFormat).format(finalFormat) : '';
   if (mode === 'read') {
-    var dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
+    const dom = /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
       ref: ref,
       children: [/*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
         children: parsedStartText || '-'
@@ -149,25 +139,26 @@ var FieldTimeRangePickerComponents = function FieldTimeRangePickerComponents(_re
       })]
     });
     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, finalFormat);
-    var _dom2;
+    const dayValue = (0, _utils.parseValueToDay)(fieldProps.value, finalFormat);
+    let dom;
     if (light) {
-      var disabled = fieldProps.disabled,
-        _fieldProps$placehold2 = fieldProps.placeholder,
-        placeholder = _fieldProps$placehold2 === void 0 ? [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')] : _fieldProps$placehold2;
-      _dom2 = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
-        onClick: function onClick() {
-          var _fieldProps$onOpenCha3;
-          fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha3 = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha3 === void 0 || _fieldProps$onOpenCha3.call(fieldProps, true);
+      const {
+        disabled,
+        placeholder = [intl.getMessage('tableForm.selectPlaceholder', '请选择'), intl.getMessage('tableForm.selectPlaceholder', '请选择')]
+      } = fieldProps;
+      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
+        onClick: () => {
+          fieldProps?.onOpenChange?.(true);
           setOpen(true);
         },
         style: dayValue ? {
@@ -176,41 +167,41 @@ var FieldTimeRangePickerComponents = function FieldTimeRangePickerComponents(_re
         label: label,
         disabled: disabled,
         placeholder: placeholder,
-        value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TimePicker.RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+        value: dayValue || open ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TimePicker.RangePicker, {
           variant: "borderless",
           format: format,
-          ref: ref
-        }, fieldProps), {}, {
+          ref: ref,
+          ...fieldProps,
           placeholder: placeholder,
           value: dayValue,
-          onOpenChange: function onOpenChange(isOpen) {
-            var _fieldProps$onOpenCha4;
+          onOpenChange: isOpen => {
             setOpen(isOpen);
-            fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha4 = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha4 === void 0 || _fieldProps$onOpenCha4.call(fieldProps, isOpen);
+            fieldProps?.onOpenChange?.(isOpen);
           },
           open: open
-        })) : null,
+        }) : null,
         downIcon: dayValue || open ? false : undefined,
         allowClear: false,
         ref: lightLabel
       });
     } else {
-      _dom2 = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TimePicker.RangePicker, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TimePicker.RangePicker, {
         ref: ref,
         format: format,
-        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined'
-      }, fieldProps), {}, {
+        variant: plain === undefined ? 'outlined' : plain ? 'borderless' : 'outlined',
+        ...fieldProps,
         value: dayValue
-      }));
+      });
     }
     if (formItemRender) {
-      return formItemRender(text, (0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), _dom2);
+      return formItemRender(text, {
+        mode,
+        ...fieldProps
+      }, dom);
     }
-    return _dom2;
+    return dom;
   }
   return null;
 };
-var FieldTimeRangePicker = exports.FieldTimeRangePicker = /*#__PURE__*/_react.default.forwardRef(FieldTimeRangePickerComponents);
+const FieldTimeRangePicker = exports.FieldTimeRangePicker = /*#__PURE__*/_react.default.forwardRef(FieldTimeRangePickerComponents);
 var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(FieldTimePicker);

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

@@ -17,7 +17,7 @@ export type TreeSelectFieldProps = TreeSelectProps<any> & {
 declare const _default: React.ForwardRefExoticComponent<import("../../../provider").BaseProFieldFC & import("../../../provider").ProRenderFieldPropsType & {
     options?: (string | number | import("antd").CheckboxOptionType<any>)[] | undefined;
     radioType?: "button" | "radio" | undefined;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
 } & {
     text: string;
     valueEnum?: import("src/utils/typing").ProFieldValueEnumType | undefined;
@@ -25,7 +25,7 @@ declare const _default: React.ForwardRefExoticComponent<import("../../../provide
     request?: import("src/utils/typing").ProFieldRequestData | undefined;
     params?: any;
     fieldProps?: any;
-    variant?: "filled" | "outlined" | "borderless" | undefined;
+    variant?: "outlined" | "filled" | "borderless" | undefined;
     id?: string | undefined;
     defaultKeyWords?: string | undefined;
 } & import("../../PureProField").ProFieldLightProps & React.RefAttributes<any>>;

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

@@ -1,218 +1,199 @@
 "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 _objectSpread2 = _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 _classnames = _interopRequireDefault(require("classnames"));
+var _clsx = require("clsx");
 var _react = _interopRequireWildcard(require("react"));
 var _provider = require("../../../provider");
 var _utils = require("../../../utils");
 var _Select = require("../Select");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["radioType", "formItemRender", "mode", "light", "label", "render", "variant"],
-  _excluded2 = ["onSearch", "onClear", "onChange", "onBlur", "showSearch", "autoClearSearchValue", "treeData", "fetchDataOnSearch", "searchValue"];
 /**
  * Tree select
  * A function that returns a React component.
  * @param ref
  */
-var FieldTreeSelect = function FieldTreeSelect(_ref, ref) {
-  var radioType = _ref.radioType,
-    formItemRender = _ref.formItemRender,
-    mode = _ref.mode,
-    light = _ref.light,
-    label = _ref.label,
-    render = _ref.render,
-    variant = _ref.variant,
-    rest = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var layoutClassName = getPrefixCls('pro-field-tree-select');
-  var treeSelectRef = (0, _react.useRef)(null);
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  var _ref2 = rest.fieldProps,
-    onSearch = _ref2.onSearch,
-    _onClear = _ref2.onClear,
-    propsOnChange = _ref2.onChange,
-    _onBlur = _ref2.onBlur,
-    showSearch = _ref2.showSearch,
-    autoClearSearchValue = _ref2.autoClearSearchValue,
-    treeData = _ref2.treeData,
-    fetchDataOnSearch = _ref2.fetchDataOnSearch,
-    propsSearchValue = _ref2.searchValue,
-    fieldProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
-  var intl = (0, _provider.useIntl)();
-  var _useFieldFetchData = (0, _Select.useFieldFetchData)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
-      defaultKeyWords: propsSearchValue
-    })),
-    _useFieldFetchData2 = (0, _slicedToArray2.default)(_useFieldFetchData, 3),
-    loading = _useFieldFetchData2[0],
-    options = _useFieldFetchData2[1],
-    _fetchData = _useFieldFetchData2[2];
-  var _useMergedState = (0, _util.useMergedState)(undefined, {
-      onChange: onSearch,
-      value: propsSearchValue
-    }),
-    _useMergedState2 = (0, _slicedToArray2.default)(_useMergedState, 2),
-    searchValue = _useMergedState2[0],
-    setSearchValue = _useMergedState2[1];
-  (0, _react.useImperativeHandle)(ref, function () {
-    return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, treeSelectRef.current || {}), {}, {
-      fetchData: function fetchData(keyWord) {
-        return _fetchData(keyWord);
-      }
-    });
+const FieldTreeSelect = ({
+  radioType,
+  formItemRender,
+  mode,
+  light,
+  label,
+  render,
+  variant,
+  ...rest
+}, ref) => {
+  const {
+    getPrefixCls
+  } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
+  const layoutClassName = getPrefixCls('pro-field-tree-select');
+  const treeSelectRef = (0, _react.useRef)(null);
+  const [open, setOpen] = (0, _react.useState)(false);
+  const {
+    onSearch,
+    onClear,
+    onChange: propsOnChange,
+    onBlur,
+    showSearch,
+    autoClearSearchValue,
+    treeData,
+    fetchDataOnSearch,
+    searchValue: propsSearchValue,
+    ...fieldProps
+  } = rest.fieldProps;
+  const intl = (0, _provider.useIntl)();
+  const [loading, options, fetchData] = (0, _Select.useFieldFetchData)({
+    ...rest,
+    defaultKeyWords: propsSearchValue
   });
-  var optionsValueEnum = (0, _react.useMemo)(function () {
+  const [searchValue, setSearchValueInner] = (0, _util.useControlledState)(undefined, propsSearchValue);
+  const setSearchValue = (0, _react.useCallback)(updater => {
+    setSearchValueInner(prev => {
+      const next = typeof updater === 'function' ? updater(prev) : updater;
+      onSearch?.(next);
+      return next;
+    });
+  }, [onSearch]);
+  (0, _react.useImperativeHandle)(ref, () => ({
+    ...(treeSelectRef.current || {}),
+    fetchData: keyWord => fetchData(keyWord)
+  }));
+  const optionsValueEnum = (0, _react.useMemo)(() => {
     if (mode !== 'read') return;
     /**
      * Support TreeSelect fieldNames
      * @see https://ant.design/components/tree-select-cn
      */
-    var _ref3 = (fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.fieldNames) || {},
-      _ref3$value = _ref3.value,
-      valuePropsName = _ref3$value === void 0 ? 'value' : _ref3$value,
-      _ref3$label = _ref3.label,
-      labelPropsName = _ref3$label === void 0 ? 'label' : _ref3$label,
-      _ref3$children = _ref3.children,
-      childrenPropsName = _ref3$children === void 0 ? 'children' : _ref3$children;
-    var valuesMap = new Map();
-    var traverseOptions = function traverseOptions(_options) {
-      if (!(_options !== null && _options !== void 0 && _options.length)) {
+    const {
+      value: valuePropsName = 'value',
+      label: labelPropsName = 'label',
+      children: childrenPropsName = 'children'
+    } = fieldProps?.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[childrenPropsName]);
       }
       return valuesMap;
     };
     return traverseOptions(options);
-  }, [fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.fieldNames, mode, options]);
-  var onChange = function onChange(value, optionList, extra) {
+  }, [fieldProps?.fieldNames, mode, options]);
+  const onChange = (value, optionList, extra) => {
     // 将搜索框置空 和 antd 行为保持一致
     if (showSearch && autoClearSearchValue) {
-      _fetchData(undefined);
+      fetchData(undefined);
       setSearchValue(undefined);
     }
-    propsOnChange === null || propsOnChange === void 0 || propsOnChange(value, optionList, extra);
+    propsOnChange?.(value, optionList, extra);
   };
   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)(rest.valueEnum || optionsValueEnum))
     });
     if (render) {
-      var _render;
-      return (_render = render(rest.text, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), {}, {
+      return render(rest.text, {
+        mode,
+        ...fieldProps,
         treeData: options
-      }), dom)) !== null && _render !== void 0 ? _render : null;
+      }, dom) ?? null;
     }
     return dom;
   }
   if (mode === 'edit') {
-    var _fieldProps$value;
-    var valuesLength = Array.isArray(fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.value) ? fieldProps === null || fieldProps === void 0 || (_fieldProps$value = fieldProps.value) === null || _fieldProps$value === void 0 ? void 0 : _fieldProps$value.length : 0;
-    var _dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Spin, {
+    const valuesLength = Array.isArray(fieldProps?.value) ? fieldProps?.value?.length : 0;
+    let dom = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Spin, {
       spinning: loading,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TreeSelect, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.TreeSelect, {
         open: open,
-        onOpenChange: function onOpenChange(isOpen) {
-          var _fieldProps$onOpenCha;
-          fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha === void 0 || _fieldProps$onOpenCha.call(fieldProps, isOpen);
+        onOpenChange: isOpen => {
+          fieldProps?.onOpenChange?.(isOpen);
           setOpen(isOpen);
         },
         ref: treeSelectRef,
         popupMatchSelectWidth: !light,
         placeholder: intl.getMessage('tableForm.selectPlaceholder', '请选择'),
-        tagRender: light ? function (item) {
-          var _fieldProps$value2;
+        tagRender: light ? item => {
           if (valuesLength < 2) return /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {
             children: item.label
           });
           /**
            * 性能不好，等我给 antd 提个issue
            */
-          var itemIndex = fieldProps === null || fieldProps === void 0 || (_fieldProps$value2 = fieldProps.value) === null || _fieldProps$value2 === void 0 ? void 0 : _fieldProps$value2.findIndex(function (v) {
-            return v === item.value || v.value === item.value;
-          });
+          const itemIndex = fieldProps?.value?.findIndex(v => v === item.value || v.value === item.value);
           return /*#__PURE__*/(0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
             children: [item.label, " ", itemIndex < valuesLength - 1 ? ',' : '']
           });
         } : undefined,
-        variant: !light ? 'outlined' : 'borderless'
-      }, fieldProps), {}, {
+        variant: !light ? variant : 'borderless',
+        ...fieldProps,
         treeData: options,
         showSearch: showSearch,
-        style: (0, _objectSpread2.default)({
-          minWidth: 60
-        }, fieldProps.style),
+        style: {
+          minWidth: 60,
+          ...fieldProps.style
+        },
         allowClear: fieldProps.allowClear !== false,
         searchValue: searchValue,
         autoClearSearchValue: autoClearSearchValue,
-        onClear: function onClear() {
-          _onClear === null || _onClear === void 0 || _onClear();
-          _fetchData(undefined);
+        onClear: () => {
+          onClear?.();
+          fetchData(undefined);
           if (showSearch) {
             setSearchValue(undefined);
           }
         },
         onChange: onChange,
-        onSearch: function onSearch(value) {
+        onSearch: value => {
           // fix 不支持请求的情况下不刷新options
-          if (fetchDataOnSearch && rest !== null && rest !== void 0 && rest.request) {
-            _fetchData(value);
+          if (fetchDataOnSearch && rest?.request) {
+            fetchData(value);
           }
           setSearchValue(value);
         },
-        onBlur: function onBlur(event) {
+        onBlur: event => {
           setSearchValue(undefined);
-          _fetchData(undefined);
-          _onBlur === null || _onBlur === void 0 || _onBlur(event);
+          fetchData(undefined);
+          onBlur?.(event);
         },
-        className: (0, _classnames.default)(fieldProps === null || fieldProps === void 0 ? void 0 : fieldProps.className, layoutClassName)
-      }))
+        className: (0, _clsx.clsx)(fieldProps?.className, layoutClassName)
+      })
     });
     if (formItemRender) {
-      var _formItemRender;
-      _dom = (_formItemRender = formItemRender(rest.text, (0, _objectSpread2.default)((0, _objectSpread2.default)({
-        mode: mode
-      }, fieldProps), {}, {
-        options: options,
-        loading: loading
-      }), _dom)) !== null && _formItemRender !== void 0 ? _formItemRender : null;
+      dom = formItemRender(rest.text, {
+        mode,
+        ...fieldProps,
+        options,
+        loading
+      }, dom) ?? null;
     }
     if (light) {
-      var _fieldProps$value3;
-      var disabled = fieldProps.disabled,
-        placeholder = fieldProps.placeholder;
-      var notEmpty = !!fieldProps.value && ((_fieldProps$value3 = fieldProps.value) === null || _fieldProps$value3 === void 0 ? void 0 : _fieldProps$value3.length) !== 0;
+      const {
+        disabled,
+        placeholder
+      } = fieldProps;
+      const notEmpty = !!fieldProps.value && fieldProps.value?.length !== 0;
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
         label: label,
         disabled: disabled,
         placeholder: placeholder,
-        onClick: function onClick() {
-          var _fieldProps$onOpenCha2;
+        onClick: () => {
           setOpen(true);
-          fieldProps === null || fieldProps === void 0 || (_fieldProps$onOpenCha2 = fieldProps.onOpenChange) === null || _fieldProps$onOpenCha2 === void 0 || _fieldProps$onOpenCha2.call(fieldProps, true);
+          fieldProps?.onOpenChange?.(true);
         },
         variant: variant,
-        value: notEmpty || open ? _dom : null,
+        value: notEmpty || open ? dom : null,
         style: notEmpty ? {
           paddingInlineEnd: 0
         } : undefined,
@@ -220,7 +201,7 @@ var FieldTreeSelect = function FieldTreeSelect(_ref, ref) {
         downIcon: false
       });
     }
-    return _dom;
+    return dom;
   }
   return null;
 };