@ccs-ui/rc-pro 2.3.6-alpha-2 → 2.3.6-alpha-3

package/es/dialog/button.d.ts

@@ -16,7 +16,7 @@ export type DialogButtonsProps<T> = Pick<CcsDialogModalProps, 'okText' | 'onClos
 export type DialogButtonRef = {
     onSetButtons: (e: React.ReactElement) => void;
 };
-export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "onClose" | "auth" | "request" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
+export declare const DialogButtonHolder: <TParams, TData>({ auth, extraBtn, formRef, request, onOk, onClose, buttonRef, requestFieldNames, formInitialValues, preventRequestHandle, }: Pick<CcsDialogModalProps<TParams, TData>, "auth" | "request" | "onClose" | "onOk" | "extraBtn" | "requestFieldNames" | "preventRequestHandle"> & {
     formRef: React.RefObject<DialogFormRef<TParams>>;
     formInitialValues: FormProps['initialValues'];
     buttonRef: RefObject<DialogButtonRef>;

package/es/hooks/use-selection.d.ts

@@ -1,28 +1,19 @@
-import { RowSelectMethod } from 'antd/es/table/interface';
+import { SelectProps } from 'antd';
+import { RowSelectionType, TableRowSelection } from 'antd/es/table/interface';
 import React from 'react';
-interface PropsType<T> {
-    /** 表单受控 value */
-    value?: any[];
+type PropsType<T> = Pick<SelectProps, 'value' | 'onChange'> & {
+    /** rowKey 字段，选中key值 */
+    keyField: string;
     /** 默认选择行数据,一般用于回显数据 */
     defaultRows?: T[];
-    /** 是否多选 */
-    multiple?: boolean;
-    /** 字段配置,默认 { key: 'key'; label: 'label' } */
-    keyField: string;
-    /** 表单受控 onChange*/
-    onChange?: (value: any) => void;
-    /** 设置选项 */
+    /** 是否多选,默认多选 checkbox 模式 */
+    type?: RowSelectionType;
+    /** 选中行数据回调 */
     onChangeRows?: (options: any[]) => void;
-}
-export default function useTableSelection<T = any>(props: PropsType<T>): {
-    onChange: (keys: React.Key[], rows: T[], info: {
-        type: RowSelectMethod;
-    }) => void;
-    onClear: (key?: React.Key) => void;
-    selectedRowKeys?: React.Key[] | undefined;
-    selectedRows?: T[] | undefined;
-    info: {
-        type: RowSelectMethod;
-    };
 };
+interface ReturnType<T> extends TableRowSelection<T> {
+    selectedRows?: T[];
+    onClear: (key?: React.Key) => void;
+}
+export default function useTableSelection<T = any>(props: PropsType<T>): ReturnType<T>;
 export {};

package/es/hooks/use-selection.js

@@ -3,13 +3,13 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 import { useMemoizedFn, useUpdateEffect } from 'ahooks';
 import { useEffect, useRef, useState } from 'react';
 // 判断相对
@@ -21,35 +21,50 @@ function isEq(obj1, obj2) {
   }
   return JSON.stringify(o1) !== JSON.stringify(o2);
 }
+function onGetKeys(value, keyField) {
+  if (value === undefined) return value;
+  if (Array.isArray(value)) {
+    return value.map(function (item) {
+      return _typeof(item) === 'object' ? item[keyField] : item;
+    });
+  }
+  if (_typeof(value) === 'object') {
+    return value[keyField];
+  }
+  return [value];
+}
 export default function useTableSelection(props) {
   var _ref = props || {},
     value = _ref.value,
+    _ref$type = _ref.type,
+    type = _ref$type === void 0 ? 'checkbox' : _ref$type,
     defaultRows = _ref.defaultRows,
     _ref$keyField = _ref.keyField,
     keyField = _ref$keyField === void 0 ? 'key' : _ref$keyField,
-    multiple = _ref.multiple,
-    onChangeValue = _ref.onChange,
-    onChangeRows = _ref.onChangeRows;
+    onChangeRows = _ref.onChangeRows,
+    onChangeValue = _ref.onChange;
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     setUpdate = _useState2[1];
   var selectionRef = useRef({
-    selectedRowKeys: ['number', 'string'].includes(_typeof(value)) ? [value] : value,
+    selectedRowKeys: onGetKeys(value, keyField),
     selectedRows: defaultRows,
     info: {
       type: 'none'
     }
   });
+  var isMultiple = type === 'checkbox';
   var handleOnChange = useMemoizedFn(function () {
     var _selectionRef$current = selectionRef.current,
       _selectionRef$current2 = _selectionRef$current.selectedRowKeys,
       selectedRowKeys = _selectionRef$current2 === void 0 ? [] : _selectionRef$current2,
-      selectedRows = _selectionRef$current.selectedRows;
-    if (multiple) {
+      _selectionRef$current3 = _selectionRef$current.selectedRows,
+      selectedRows = _selectionRef$current3 === void 0 ? [] : _selectionRef$current3;
+    if (isMultiple) {
       // 受控调用onChange
-      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys);
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys, selectedRows);
     } else {
-      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys[0]);
+      onChangeValue === null || onChangeValue === void 0 || onChangeValue(selectedRowKeys[0], selectedRows[0]);
     }
     onChangeRows === null || onChangeRows === void 0 || onChangeRows(selectedRows || []);
     if (!onChangeValue) setUpdate({});
@@ -68,15 +83,16 @@ export default function useTableSelection(props) {
 
   // value 变更,与当前选中数据不匹配
   useUpdateEffect(function () {
-    if (isEq(value, selectionRef.current.selectedRowKeys)) {
-      var _selectionRef$current3;
-      var rows = (_selectionRef$current3 = selectionRef.current.selectedRows) === null || _selectionRef$current3 === void 0 ? void 0 : _selectionRef$current3.filter(function () {
+    var newValue = onGetKeys(value, keyField);
+    if (isEq(newValue, selectionRef.current.selectedRowKeys)) {
+      var _selectionRef$current4;
+      var rows = (_selectionRef$current4 = selectionRef.current.selectedRows) === null || _selectionRef$current4 === void 0 ? void 0 : _selectionRef$current4.filter(function () {
         var _ref2;
         var row = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
-        return (_ref2 = value || []) === null || _ref2 === void 0 ? void 0 : _ref2.includes(row[keyField]);
+        return (_ref2 = newValue || []) === null || _ref2 === void 0 ? void 0 : _ref2.includes(row[keyField]);
       });
       selectionRef.current = {
-        selectedRowKeys: value,
+        selectedRowKeys: newValue,
         selectedRows: rows,
         info: {
           type: 'none'
@@ -119,11 +135,11 @@ export default function useTableSelection(props) {
         }
       };
     } else {
-      var _selectionRef$current4 = selectionRef.current,
-        _selectionRef$current5 = _selectionRef$current4.selectedRowKeys,
-        selectedRowKeys = _selectionRef$current5 === void 0 ? [] : _selectionRef$current5,
-        _selectionRef$current6 = _selectionRef$current4.selectedRows,
-        selectedRows = _selectionRef$current6 === void 0 ? [] : _selectionRef$current6;
+      var _selectionRef$current5 = selectionRef.current,
+        _selectionRef$current6 = _selectionRef$current5.selectedRowKeys,
+        selectedRowKeys = _selectionRef$current6 === void 0 ? [] : _selectionRef$current6,
+        _selectionRef$current7 = _selectionRef$current5.selectedRows,
+        selectedRows = _selectionRef$current7 === void 0 ? [] : _selectionRef$current7;
       var newRows = selectedRows.filter(function () {
         var r = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
         return r[keyField] !== key;
@@ -143,6 +159,7 @@ export default function useTableSelection(props) {
   });
   return _objectSpread(_objectSpread({}, selectionRef.current), {}, {
     onChange: onChange,
-    onClear: onClear
+    onClear: onClear,
+    type: type
   });
 }

package/es/select/ modal.d.ts

@@ -1,16 +1,12 @@
 import { ModalProps, SelectProps } from 'antd';
 import { ReactElement, ReactNode } from 'react';
 import { SelectChildrenProps } from './customize';
-export interface ModalSelectProps {
+export interface ModalSelectProps extends Omit<SelectProps, 'children' | 'title'> {
+    /** 选择触发器宽度 */
+    width?: number;
     /** modal props */
     modal?: ModalProps;
-    /** select props */
-    select?: SelectProps;
     /** 自定义内容 */
     children: ReactElement | ((props: SelectChildrenProps) => ReactNode);
-    /** form item value */
-    value?: any;
-    /** form item onChange */
-    onChange?: (e: any) => void;
 }
-export default function ModalSelect({ modal, select, value, children, onChange: onOkChange, }: ModalSelectProps): import("react/jsx-runtime").JSX.Element;
+export default function ModalSelect({ width, style, mode, modal, value, children, labelInValue, onChange: onOkChange, ...otherProps }: ModalSelectProps): import("react/jsx-runtime").JSX.Element;

package/es/select/ modal.js

@@ -1,27 +1,34 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
+var _excluded = ["width", "style", "mode", "modal", "value", "children", "labelInValue", "onChange"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { SelectOutlined } from '@ant-design/icons';
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import { LoadingOutlined, SelectOutlined } from '@ant-design/icons';
 import { Modal, Select } from 'antd';
 import React, { useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 export default function ModalSelect(_ref) {
-  var modal = _ref.modal,
-    select = _ref.select,
+  var width = _ref.width,
+    style = _ref.style,
+    mode = _ref.mode,
+    modal = _ref.modal,
     value = _ref.value,
     children = _ref.children,
-    onOkChange = _ref.onChange;
+    labelInValue = _ref.labelInValue,
+    onOkChange = _ref.onChange,
+    otherProps = _objectWithoutProperties(_ref, _excluded);
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     open = _useState2[0],
@@ -29,14 +36,22 @@ export default function ModalSelect(_ref) {
   var onClick = function onClick() {
     setOpen(true);
   };
-  var _useState3 = useState(value),
+  var _useState3 = useState(undefined),
     _useState4 = _slicedToArray(_useState3, 2),
-    valueState = _useState4[0],
-    setValueState = _useState4[1];
-  var _useState5 = useState(undefined),
+    labelText = _useState4[0],
+    setLabelText = _useState4[1];
+  var _useState5 = useState(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    options = _useState6[0],
-    setOptions = _useState6[1];
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+  var _useState7 = useState(value),
+    _useState8 = _slicedToArray(_useState7, 2),
+    valueState = _useState8[0],
+    setValueState = _useState8[1];
+  var _useState9 = useState(undefined),
+    _useState10 = _slicedToArray(_useState9, 2),
+    options = _useState10[0],
+    setOptions = _useState10[1];
 
   // 确定按钮
   var onClose = function onClose(e) {
@@ -44,15 +59,16 @@ export default function ModalSelect(_ref) {
     setOpen(false);
   };
 
-  // 多选
-  var isMulti = (select === null || select === void 0 ? void 0 : select.mode) === 'multiple';
-
   // children 参数
   var childrenProps = {
     value: valueState,
-    multiple: isMulti,
+    mode: mode,
     onClose: onClose,
-    onChange: setValueState,
+    onLoading: setLoading,
+    onChangeLabel: setLabelText,
+    onChange: function onChange(v, option) {
+      setValueState(labelInValue ? option : v);
+    },
     onChangeOptions: setOptions
   };
 
@@ -67,23 +83,51 @@ export default function ModalSelect(_ref) {
     setValueState(value);
     setOpen(false);
   };
+  var renderValueText = function renderValueText() {
+    if (value === undefined || Array.isArray(value) && value.length === 0) {
+      return undefined;
+    }
+
+    // 优先显示 labelText
+    if (!!labelText) return labelText;
+
+    // 如果value是数组对象，则获取value对象
+    if (Array.isArray(value)) {
+      return value.map(function (item) {
+        var _otherProps$fieldName;
+        return _typeof(item) === 'object' ? item[((_otherProps$fieldName = otherProps.fieldNames) === null || _otherProps$fieldName === void 0 ? void 0 : _otherProps$fieldName.value) || 'value'] : item;
+      });
+    }
+
+    // 如果value是对象，则获取value
+    if (_typeof(value) === 'object') {
+      var _otherProps$fieldName2;
+      return value[((_otherProps$fieldName2 = otherProps.fieldNames) === null || _otherProps$fieldName2 === void 0 ? void 0 : _otherProps$fieldName2.value) || 'value'];
+    }
+    return value;
+  };
   return /*#__PURE__*/_jsxs(_Fragment, {
-    children: [/*#__PURE__*/_jsx(Select, _objectSpread({
+    children: [/*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({
       allowClear: true,
-      suffixIcon: /*#__PURE__*/_jsx(SelectOutlined, {}),
+      suffixIcon: loading ? /*#__PURE__*/_jsx(LoadingOutlined, {}) : /*#__PURE__*/_jsx(SelectOutlined, {}),
       open: false,
       dropdownRender: function dropdownRender() {
         return /*#__PURE__*/_jsx("div", {});
       },
-      value: value,
+      value: loading ? undefined : renderValueText(),
       onClick: onClick,
-      placeholder: (select === null || select === void 0 ? void 0 : select.placeholder) || '请选择',
+      placeholder: '请选择'
+    }, otherProps), {}, {
+      mode: !!labelText ? undefined : mode,
+      style: _objectSpread(_objectSpread({}, style), {}, {
+        width: width
+      }),
       options: options,
       onChange: function onChange(e) {
         setValueState(e);
         onOkChange === null || onOkChange === void 0 || onOkChange(e);
       }
-    }, select)), /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
+    })), /*#__PURE__*/_jsx(Modal, _objectSpread(_objectSpread({
       open: open,
       onCancel: onModalClose,
       styles: {

package/es/select/customize.d.ts

@@ -1,37 +1,27 @@
 import { SelectProps } from 'antd';
 import { ReactElement, ReactNode } from 'react';
-export type SelectChildrenProps = {
-    /** 当前选中的值 */
-    value?: any;
-    /** 是否多选 */
-    multiple?: boolean;
+export type SelectChildrenProps = Pick<SelectProps, 'value' | 'onChange' | 'mode'> & {
     /** 关闭弹框 */
     onClose?: (e?: any) => void;
-    /** form item onChange */
-    onChange?: (value: any) => void;
     /** 更改select options */
     onChangeOptions?: (options: any[]) => void;
     /** 自定义显示选中详情 */
     onChangeLabel?: (labelText?: string) => void;
+    /** 加载状态 */
+    onLoading?: (loading: boolean) => void;
 };
 export interface CustomizeSelectProps extends Omit<SelectProps, 'children'> {
     /** 选择触发器宽度 */
     width?: number;
     /** 内容宽度 */
     contentWidth?: number;
-    /** 单选自动关闭弹框 */
-    autoClose?: boolean;
     /** 自定义内容 */
     children: ReactElement | ((props: SelectChildrenProps) => ReactNode);
-    /** form item value */
-    value?: any;
-    /** form item onChange */
-    onChange?: (e: any) => void;
 }
 /**
  *  自定义弹框
  * @param SelectCustomizeProps
  * @returns
  */
-declare function SelectIndex({ width, title, value, style, mode, children, autoClose, contentWidth, onChange, ...otherProps }: CustomizeSelectProps): import("react/jsx-runtime").JSX.Element;
+declare function SelectIndex({ width, value, style, mode, children, contentWidth, labelInValue, onChange, ...otherProps }: CustomizeSelectProps): import("react/jsx-runtime").JSX.Element;
 export default SelectIndex;

package/es/select/customize.js

@@ -1,10 +1,10 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["width", "title", "value", "style", "mode", "children", "autoClose", "contentWidth", "onChange"];
+var _excluded = ["width", "value", "style", "mode", "children", "contentWidth", "labelInValue", "onChange"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -13,11 +13,10 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-import { CloseOutlined, SelectOutlined } from '@ant-design/icons';
-import { Button, Select } from 'antd';
+import { LoadingOutlined, SelectOutlined } from '@ant-design/icons';
+import { Select } from 'antd';
 import React, { useEffect, useMemo, useRef, useState } from 'react';
 import { jsx as _jsx } from "react/jsx-runtime";
-import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
 /**
  *  自定义弹框
@@ -26,13 +25,12 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
  */
 function SelectIndex(_ref) {
   var width = _ref.width,
-    title = _ref.title,
     value = _ref.value,
     style = _ref.style,
     mode = _ref.mode,
     children = _ref.children,
-    autoClose = _ref.autoClose,
     contentWidth = _ref.contentWidth,
+    labelInValue = _ref.labelInValue,
     _onChange = _ref.onChange,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   // 初始加载
@@ -45,12 +43,16 @@ function SelectIndex(_ref) {
     _useState4 = _slicedToArray(_useState3, 2),
     labelText = _useState4[0],
     setLabelText = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
 
   // 选择说明
-  var _useState5 = useState(undefined),
-    _useState6 = _slicedToArray(_useState5, 2),
-    options = _useState6[0],
-    setOptions = _useState6[1];
+  var _useState7 = useState(undefined),
+    _useState8 = _slicedToArray(_useState7, 2),
+    options = _useState8[0],
+    setOptions = _useState8[1];
 
   // 确定按钮
   var onClose = function onClose(e) {
@@ -58,48 +60,27 @@ function SelectIndex(_ref) {
     setOpen(false);
   };
 
-  // 多选
-  var isMulti = mode === 'multiple';
-
   // children 参数
   var childrenProps = {
     value: value,
     onClose: onClose,
-    onChange: function onChange(e) {
-      _onChange === null || _onChange === void 0 || _onChange(e);
+    onChange: function onChange(v, option) {
+      _onChange === null || _onChange === void 0 || _onChange(labelInValue ? option : v);
       // 单选关闭弹框
-      if (!isMulti && autoClose !== false) setOpen(false);
+      if (!mode) setOpen(false);
     },
+    onLoading: setLoading,
     onChangeLabel: setLabelText,
-    multiple: isMulti,
+    mode: mode,
     onChangeOptions: setOptions
   };
   var _dropdownRender = useMemo(function () {
-    return /*#__PURE__*/_jsxs("div", {
+    return /*#__PURE__*/_jsx("div", {
       style: {
         display: 'none'
       },
       ref: ref,
-      children: [title && /*#__PURE__*/_jsxs("div", {
-        style: {
-          padding: 10,
-          borderBottom: '1px solid #f5f5f5',
-          display: 'flex',
-          justifyContent: 'space-between'
-        },
-        children: [/*#__PURE__*/_jsx("div", {
-          children: title
-        }), /*#__PURE__*/_jsx(Button, {
-          type: "text",
-          size: "small",
-          onClick: onClose,
-          children: /*#__PURE__*/_jsx(CloseOutlined, {
-            style: {
-              color: 'rgba(0,0,0,0.55)'
-            }
-          })
-        })]
-      }), typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps)]
+      children: typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps)
     });
   }, [value]);
   useEffect(function () {
@@ -119,6 +100,20 @@ function SelectIndex(_ref) {
 
     // 优先显示 labelText
     if (!!labelText) return labelText;
+
+    // 如果value是数组对象，则获取value对象
+    if (Array.isArray(value)) {
+      return value.map(function (item) {
+        var _otherProps$fieldName;
+        return _typeof(item) === 'object' ? item[((_otherProps$fieldName = otherProps.fieldNames) === null || _otherProps$fieldName === void 0 ? void 0 : _otherProps$fieldName.value) || 'value'] : item;
+      });
+    }
+
+    // 如果value是对象，则获取value
+    if (_typeof(value) === 'object') {
+      var _otherProps$fieldName2;
+      return value[((_otherProps$fieldName2 = otherProps.fieldNames) === null || _otherProps$fieldName2 === void 0 ? void 0 : _otherProps$fieldName2.value) || 'value'];
+    }
     return value;
   };
   return /*#__PURE__*/_jsx(_Fragment, {
@@ -127,14 +122,15 @@ function SelectIndex(_ref) {
       onDropdownVisibleChange: setOpen,
       allowClear: true,
       defaultActiveFirstOption: true,
-      suffixIcon: /*#__PURE__*/_jsx(SelectOutlined, {})
+      suffixIcon: loading ? /*#__PURE__*/_jsx(LoadingOutlined, {}) : /*#__PURE__*/_jsx(SelectOutlined, {}),
+      placeholder: "\u8BF7\u9009\u62E9"
     }, otherProps), {}, {
       popupMatchSelectWidth: contentWidth,
       dropdownRender: function dropdownRender() {
         return _dropdownRender;
       },
       mode: !!labelText ? undefined : mode,
-      value: renderValueText(),
+      value: loading ? undefined : renderValueText(),
       style: _objectSpread(_objectSpread({}, style), {}, {
         width: width
       }),

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ccs-ui/rc-pro",
-  "version": "2.3.6-alpha-2",
+  "version": "2.3.6-alpha-3",
   "description": "",
   "license": "MIT",
   "author": {