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

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

@@ -1,110 +1,103 @@
 "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 = exports.LightSelect = void 0;
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
-var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _icons = require("@ant-design/icons");
 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 _utils = require("../../../../utils");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["label", "prefixCls", "onChange", "value", "mode", "children", "defaultValue", "size", "showSearch", "disabled", "style", "className", "options", "onSearch", "allowClear", "labelInValue", "fieldNames", "lightLabel", "labelTrigger", "optionFilterProp", "optionLabelProp", "valueMaxLength", "fetchDataOnSearch", "fetchData", "variant"];
 /**
  * 如果有 label 就优先使用 label
  *
  * @param valueMap
  * @param v
  */
-var getValueOrLabel = function getValueOrLabel(valueMap, v) {
-  if ((0, _typeof2.default)(v) !== 'object') {
+const getValueOrLabel = (valueMap, v) => {
+  if (typeof v !== 'object') {
     return valueMap[v] || v;
   }
-  return valueMap[v === null || v === void 0 ? void 0 : v.value] || v.label;
+  return valueMap[v?.value] || v.label;
 };
-var LightSelect = exports.LightSelect = function LightSelect(props, ref) {
-  var label = props.label,
-    customizePrefixCls = props.prefixCls,
-    _onChange = props.onChange,
-    value = props.value,
-    mode = props.mode,
-    children = props.children,
-    defaultValue = props.defaultValue,
-    size = props.size,
-    showSearch = props.showSearch,
-    disabled = props.disabled,
-    style = props.style,
-    className = props.className,
-    options = props.options,
-    onSearch = props.onSearch,
-    allowClear = props.allowClear,
-    labelInValue = props.labelInValue,
-    fieldNames = props.fieldNames,
-    lightLabel = props.lightLabel,
-    labelTrigger = props.labelTrigger,
-    optionFilterProp = props.optionFilterProp,
-    _props$optionLabelPro = props.optionLabelProp,
-    optionLabelProp = _props$optionLabelPro === void 0 ? '' : _props$optionLabelPro,
-    _props$valueMaxLength = props.valueMaxLength,
-    valueMaxLength = _props$valueMaxLength === void 0 ? 41 : _props$valueMaxLength,
-    _props$fetchDataOnSea = props.fetchDataOnSearch,
-    fetchDataOnSearch = _props$fetchDataOnSea === void 0 ? false : _props$fetchDataOnSea,
-    fetchData = props.fetchData,
-    _props$variant = props.variant,
-    variant = _props$variant === void 0 ? 'outlined' : _props$variant,
-    restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _props$placeholder = props.placeholder,
-    placeholder = _props$placeholder === void 0 ? label : _props$placeholder;
-  var _ref = fieldNames || {},
-    _ref$label = _ref.label,
-    labelPropsName = _ref$label === void 0 ? 'label' : _ref$label,
-    _ref$value = _ref.value,
-    valuePropsName = _ref$value === void 0 ? 'value' : _ref$value;
-  var _useContext = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
-  var prefixCls = getPrefixCls('pro-field-select-light-select');
-  var _useState = (0, _react.useState)(false),
-    _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    open = _useState2[0],
-    setOpen = _useState2[1];
-  var _useState3 = (0, _react.useState)(''),
-    _useState4 = (0, _slicedToArray2.default)(_useState3, 2),
-    keyword = _useState4[0],
-    setKeyword = _useState4[1];
+const LightSelect = (props, ref) => {
+  const {
+    label,
+    prefixCls: customizePrefixCls,
+    onChange,
+    value,
+    mode,
+    defaultValue,
+    size,
+    showSearch,
+    disabled,
+    style,
+    className,
+    options,
+    onSearch,
+    allowClear,
+    labelInValue,
+    fieldNames,
+    lightLabel,
+    labelTrigger,
+    optionFilterProp,
+    optionLabelProp = '',
+    valueMaxLength = 41,
+    fetchDataOnSearch = false,
+    fetchData,
+    variant = 'outlined',
+    ...restProps
+  } = props;
+  const {
+    placeholder = label
+  } = props;
+  const {
+    label: labelPropsName = 'label',
+    value: valuePropsName = 'value'
+  } = fieldNames || {};
+  const {
+    getPrefixCls
+  } = (0, _react.useContext)(_antd.ConfigProvider.ConfigContext);
+  const prefixCls = getPrefixCls('pro-field-select-light-select');
+  const [open, setOpen] = (0, _react.useState)(false);
+  const [keyword, setKeyword] = (0, _react.useState)('');
 
   // css
-  var _useStyle = (0, _utils.useStyle)('LightSelect', function (token) {
-      return (0, _defineProperty2.default)({}, ".".concat(prefixCls), (0, _defineProperty2.default)((0, _defineProperty2.default)({}, "".concat(token.antCls, "-select"), {
-        position: 'absolute',
-        width: '153px',
-        height: '28px',
-        visibility: 'hidden',
-        '&-selector': {
-          height: 28
+  const {
+    wrapSSR,
+    hashId
+  } = (0, _utils.useStyle)('LightSelect', token => {
+    return {
+      [`.${prefixCls}`]: {
+        [`${token.antCls}-select`]: {
+          position: 'absolute',
+          width: '153px',
+          height: '28px',
+          visibility: 'hidden',
+          '&-selector': {
+            height: 28
+          }
+        },
+        [`&.${prefixCls}-searchable`]: {
+          [`${token.antCls}-select`]: {
+            width: '200px',
+            '&-selector': {
+              height: 28
+            }
+          }
         }
-      }), "&.".concat(prefixCls, "-searchable"), (0, _defineProperty2.default)({}, "".concat(token.antCls, "-select"), {
-        width: '200px',
-        '&-selector': {
-          height: 28
-        }
-      })));
-    }),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
-  var valueMap = (0, _react.useMemo)(function () {
-    var values = {};
-    options === null || options === void 0 || options.forEach(function (item) {
-      var optionLabel = item[optionLabelProp] || item[labelPropsName];
-      var optionValue = item[valuePropsName];
+      }
+    };
+  });
+  const valueMap = (0, _react.useMemo)(() => {
+    const values = {};
+    options?.forEach(item => {
+      const optionLabel = item[optionLabelProp] || item[labelPropsName];
+      const optionValue = item[valuePropsName];
       values[optionValue] = optionLabel || optionValue;
     });
     return values;
@@ -112,28 +105,28 @@ var LightSelect = exports.LightSelect = function LightSelect(props, ref) {
 
   // 修复用户在使用ProFormSelect组件时，在fieldProps中使用open属性，不生效。
   // ProComponents文档中写到"与select相同，且fieldProps同antd组件中的props"描述方案不相符
-  var mergeOpen = (0, _react.useMemo)(function () {
+  const mergeOpen = (0, _react.useMemo)(() => {
     if (Reflect.has(restProps, 'open')) {
-      return restProps === null || restProps === void 0 ? void 0 : restProps.open;
+      return restProps?.open;
     }
     return open;
   }, [open, restProps]);
-  var filterValue = Array.isArray(value) ? value.map(function (v) {
-    return getValueOrLabel(valueMap, v);
-  }) : getValueOrLabel(valueMap, value);
+  const filterValue = Array.isArray(value) ? value.map(v => getValueOrLabel(valueMap, v)) : getValueOrLabel(valueMap, value);
   return wrapSSR( /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
-    className: (0, _classnames.default)(prefixCls, hashId, (0, _defineProperty2.default)({}, "".concat(prefixCls, "-searchable"), showSearch), "".concat(prefixCls, "-container-").concat(restProps.placement || 'bottomLeft'), className),
+    className: (0, _clsx.clsx)(prefixCls, hashId, {
+      [`${prefixCls}-searchable`]: showSearch
+    }, `${prefixCls}-container-${restProps.placement || 'bottomLeft'}`, className),
     style: style,
-    onClick: function onClick(e) {
-      var _lightLabel$current;
+    onClick: e => {
       if (disabled) return;
       // Only handle clicks outside the label
-      var isLabelClick = lightLabel === null || lightLabel === void 0 || (_lightLabel$current = lightLabel.current) === null || _lightLabel$current === void 0 || (_lightLabel$current = _lightLabel$current.labelRef) === null || _lightLabel$current === void 0 || (_lightLabel$current = _lightLabel$current.current) === null || _lightLabel$current === void 0 ? void 0 : _lightLabel$current.contains(e.target);
+      const isLabelClick = lightLabel?.current?.labelRef?.current?.contains(e.target);
       if (!isLabelClick) {
         setOpen(true);
       }
     },
-    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, restProps), {}, {
+    children: [/*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, {
+      ...restProps,
       allowClear: allowClear,
       value: value,
       mode: mode,
@@ -141,21 +134,21 @@ var LightSelect = exports.LightSelect = function LightSelect(props, ref) {
       size: size,
       disabled: disabled,
       variant: variant,
-      onChange: function onChange(v, option) {
-        _onChange === null || _onChange === void 0 || _onChange(v, option);
+      onChange: (v, option) => {
+        onChange?.(v, option);
         if (mode !== 'multiple') {
           setOpen(false);
         }
       },
       showSearch: showSearch,
-      onSearch: showSearch ? function (keyValue) {
+      onSearch: showSearch ? keyValue => {
         if (fetchDataOnSearch && fetchData) {
           fetchData(keyValue);
         }
-        onSearch === null || onSearch === void 0 || onSearch(keyValue);
+        onSearch?.(keyValue);
       } : void 0,
       style: style,
-      popupRender: function popupRender(menuNode) {
+      popupRender: menuNode => {
         return /*#__PURE__*/(0, _jsxRuntime.jsxs)("div", {
           ref: ref,
           children: [showSearch && /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
@@ -165,14 +158,14 @@ var LightSelect = exports.LightSelect = function LightSelect(props, ref) {
             children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
               value: keyword,
               allowClear: !!allowClear,
-              onChange: function onChange(e) {
+              onChange: e => {
                 setKeyword(e.target.value);
                 if (fetchDataOnSearch && fetchData) {
                   fetchData(e.target.value);
                 }
-                onSearch === null || onSearch === void 0 || onSearch(e.target.value);
+                onSearch?.(e.target.value);
               },
-              onKeyDown: function onKeyDown(e) {
+              onKeyDown: e => {
                 // 避免按下删除键把选项也删除了
                 if (e.key === 'Backspace') {
                   e.stopPropagation();
@@ -191,8 +184,7 @@ var LightSelect = exports.LightSelect = function LightSelect(props, ref) {
         });
       },
       open: mergeOpen,
-      onOpenChange: function onOpenChange(isOpen) {
-        var _restProps$onOpenChan;
+      onOpenChange: isOpen => {
         if (!isOpen) {
           //  测试环境下直接跑
           setKeyword('');
@@ -200,28 +192,27 @@ var LightSelect = exports.LightSelect = function LightSelect(props, ref) {
         if (!labelTrigger) {
           setOpen(isOpen);
         }
-        restProps === null || restProps === void 0 || (_restProps$onOpenChan = restProps.onOpenChange) === null || _restProps$onOpenChan === void 0 || _restProps$onOpenChan.call(restProps, isOpen);
+        restProps?.onOpenChange?.(isOpen);
       },
       prefixCls: customizePrefixCls,
-      options: onSearch || !keyword ? options : options === null || options === void 0 ? void 0 : options.filter(function (o) {
-        var _String, _o$valuePropsName;
+      options: onSearch || !keyword ? options : options?.filter(o => {
         if (optionFilterProp) {
           return (0, _util.toArray)(o[optionFilterProp]).join('').toLowerCase().includes(keyword);
         }
-        return ((_String = String(o[labelPropsName])) === null || _String === void 0 || (_String = _String.toLowerCase()) === null || _String === void 0 ? void 0 : _String.includes(keyword === null || keyword === void 0 ? void 0 : keyword.toLowerCase())) || ((_o$valuePropsName = o[valuePropsName]) === null || _o$valuePropsName === void 0 || (_o$valuePropsName = _o$valuePropsName.toString()) === null || _o$valuePropsName === void 0 || (_o$valuePropsName = _o$valuePropsName.toLowerCase()) === null || _o$valuePropsName === void 0 ? void 0 : _o$valuePropsName.includes(keyword === null || keyword === void 0 ? void 0 : keyword.toLowerCase()));
+        return String(o[labelPropsName])?.toLowerCase()?.includes(keyword?.toLowerCase()) || o[valuePropsName]?.toString()?.toLowerCase()?.includes(keyword?.toLowerCase());
       })
-    })), /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
+    }), /*#__PURE__*/(0, _jsxRuntime.jsx)(_utils.FieldLabel, {
       ellipsis: true,
       label: label,
       placeholder: placeholder,
       disabled: disabled,
       variant: variant,
       allowClear: !!allowClear,
-      value: filterValue || (value === null || value === void 0 ? void 0 : value.label) || value,
-      onClear: function onClear() {
-        _onChange === null || _onChange === void 0 || _onChange(undefined, undefined);
+      value: filterValue || value?.label || value,
+      onClear: () => {
+        onChange?.(undefined, undefined);
       },
-      onClick: function onClick() {
+      onClick: () => {
         if (disabled) return;
         setOpen(!open);
       },
@@ -230,4 +221,5 @@ var LightSelect = exports.LightSelect = function LightSelect(props, ref) {
     })]
   }));
 };
+exports.LightSelect = LightSelect;
 var _default = exports.default = /*#__PURE__*/_react.default.forwardRef(LightSelect);

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

@@ -1,7 +1,12 @@
 import type { SelectProps } from 'antd';
-import type { LabeledValue } from 'antd/lib/select';
 import React from 'react';
 import type { RequestOptionsType } from '../../../../utils';
+export type LabeledValue = {
+    key?: string;
+    label: React.ReactNode;
+    value: string | number;
+};
+export type DefaultOptionType = NonNullable<SelectProps['options']>[number];
 export type KeyLabel = Partial<LabeledValue> & RequestOptionsType;
 /** 用户扩展数据后的值类型 */
 export type DataValueType<T> = KeyLabel & T;