@ccs-ui/rc-pro 2.3.6-beta-40 → 2.4.0-beta.1

package/es/pro-table/tree.d.ts

@@ -4,12 +4,12 @@ import { RefObject } from 'react';
 import CCS from '..';
 import { CcsFieldNamesType } from '../context';
 import { TableRefType } from '../table';
-import { CcsProTableProps } from './table';
+import { CcsProTableProps, TableEvent } from './table';
 export type TreeInstance<T> = {
-    onRequestTree: (query: any, record: T | any) => void;
+    onRequestTree: (eventType: TableEvent, query: any, record: T | any) => void;
     onExpandKeys: (ids: string[]) => void;
 };
-type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode'> & {
+type TreeTableProps<T> = Pick<CcsProTableProps<T>, 'table' | 'parentFieldName' | 'leafNode' | 'onEvent'> & {
     data: CCS.TableData<T>;
     sticky: boolean | TableSticky;
     tableRowSize: TableProps['size'];

package/es/pro-table/tree.js

@@ -21,7 +21,8 @@ import CcsUtils from '@ccs-ui/utils';
 import { useImperativeHandle, useState } from 'react';
 import { CcsTable } from '..';
 import { useProTableTreeFields } from "../hooks/use-app";
-import { getDataFromFields } from "../select";
+import { getDataByNamePath } from "../select";
+import { TableEvent } from "./table";
 import { jsx as _jsx } from "react/jsx-runtime";
 var TableTree = function TableTree(props) {
   var data = props.data,
@@ -34,7 +35,8 @@ var TableTree = function TableTree(props) {
     tableContentRef = props.tableContentRef,
     parentFieldName = props.parentFieldName,
     handlePageChange = props.handlePageChange,
-    setData = props.setData;
+    setData = props.setData,
+    onEvent = props.onEvent;
   // async tree expand key
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
@@ -53,8 +55,8 @@ var TableTree = function TableTree(props) {
   var fieldNames = _objectSpread(_objectSpread({}, globalFieldNames), props.fieldNames);
 
   // 获取数据
-  var _onRequestTree = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+  var onRequestTree = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(eventType) {
       var query,
         record,
         params,
@@ -64,13 +66,18 @@ var TableTree = function TableTree(props) {
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            query = _args.length > 0 && _args[0] !== undefined ? _args[0] : {};
-            record = _args.length > 1 ? _args[1] : undefined;
+            query = _args.length > 1 && _args[1] !== undefined ? _args[1] : {};
+            record = _args.length > 2 ? _args[2] : undefined;
             params = query;
             if (record) {
               params[parentFieldName] = record[rowKey];
             }
 
+            // 事件回调，请求中
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: true,
+              params: params
+            });
             // 发起请求
             setData(function (d) {
               return _objectSpread(_objectSpread({}, d), {}, {
@@ -79,19 +86,25 @@ var TableTree = function TableTree(props) {
             });
             _context.t0 = httpRequest;
             if (!_context.t0) {
-              _context.next = 10;
+              _context.next = 11;
               break;
             }
-            _context.next = 9;
+            _context.next = 10;
             return httpRequest(params);
-          case 9:
-            _context.t0 = _context.sent;
           case 10:
+            _context.t0 = _context.sent;
+          case 11:
             requestResult = _context.t0;
+            onEvent === null || onEvent === void 0 || onEvent(eventType, {
+              loading: true,
+              params: params,
+              data: requestResult
+            });
+
             // 请求结果
             if (requestResult) {
               // 获取table数据
-              dataSource = getDataFromFields(requestResult, fieldNames.dataSource); // 判断非叶子节点，添加children
+              dataSource = getDataByNamePath(requestResult, fieldNames.dataSource); // 判断非叶子节点，添加children
               if (leafNode && dataSource && Array.isArray(dataSource)) {
                 dataSource.forEach(function (d) {
                   if (typeof leafNode === 'string' && !d[leafNode]) {
@@ -126,21 +139,19 @@ var TableTree = function TableTree(props) {
                 });
               });
             }
-          case 12:
+          case 14:
           case "end":
             return _context.stop();
         }
       }, _callee);
     }));
-    return function onRequestTree() {
+    return function onRequestTree(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
   useImperativeHandle(treeRef, function () {
     return {
-      onRequestTree: function onRequestTree(query, record) {
-        _onRequestTree(query, record);
-      },
+      onRequestTree: onRequestTree,
       onExpandKeys: function onExpandKeys(ids) {
         setExpandKeys(expandKeys.filter(function (e) {
           return !ids.includes(e);
@@ -158,7 +169,7 @@ var TableTree = function TableTree(props) {
       var _record$childrenColum;
       expandKeys.push(expandId);
       if (((_record$childrenColum = record[childrenColumnName]) === null || _record$childrenColum === void 0 ? void 0 : _record$childrenColum.length) > 0) return;
-      _onRequestTree({}, record);
+      onRequestTree(TableEvent.Expand, {}, record);
     } else {
       setExpandKeys(expandKeys.filter(function (e) {
         return e !== expandId;

package/es/select/ modal.d.ts

@@ -1,16 +1,10 @@
 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'> {
     /** 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;
+    children?: ReactElement | ((props: SelectChildrenProps) => ReactNode);
 }
-export default function ModalSelect({ modal, select, value, children, onChange: onOkChange, }: ModalSelectProps): import("react/jsx-runtime").JSX.Element;
+export default function ModalSelect({ style, mode, modal, value, children, labelInValue, onChange: onOkChange, ...otherProps }: ModalSelectProps): import("react/jsx-runtime").JSX.Element;

package/es/select/ modal.js

@@ -1,27 +1,33 @@
-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 = ["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 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 +35,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 +58,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 +82,49 @@ 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: style,
       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: {
@@ -94,7 +135,7 @@ export default function ModalSelect(_ref) {
       forceRender: true,
       onOk: onModalOk
     }, modal), {}, {
-      children: typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps)
+      children: children && (typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps))
     }))]
   });
 }

package/es/select/customize.d.ts

@@ -1,33 +1,25 @@
 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;
     /** 自定义内容 */
-    children: ReactElement | ((props: SelectChildrenProps) => ReactNode);
-    /** form item value */
-    value?: any;
-    /** form item onChange */
-    onChange?: (e: any) => void;
+    children?: ReactElement | ((props: SelectChildrenProps) => ReactNode);
 }
 /**
  *  自定义弹框
  * @param SelectCustomizeProps
  * @returns
  */
-declare function SelectIndex({ width, title, children, contentWidth, value, onChange, style, ...otherProps }: CustomizeSelectProps): import("react/jsx-runtime").JSX.Element;
+declare function SelectIndex({ 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", "children", "contentWidth", "value", "onChange", "style"];
+var _excluded = ["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";
 /**
  *  自定义弹框
@@ -25,13 +24,13 @@ import { Fragment as _Fragment } from "react/jsx-runtime";
  * @returns
  */
 function SelectIndex(_ref) {
-  var width = _ref.width,
-    title = _ref.title,
+  var value = _ref.value,
+    style = _ref.style,
+    mode = _ref.mode,
     children = _ref.children,
     contentWidth = _ref.contentWidth,
-    value = _ref.value,
+    labelInValue = _ref.labelInValue,
     _onChange = _ref.onChange,
-    style = _ref.style,
     otherProps = _objectWithoutProperties(_ref, _excluded);
   // 初始加载
   var _useState = useState(true),
@@ -39,12 +38,20 @@ function SelectIndex(_ref) {
     open = _useState2[0],
     setOpen = _useState2[1];
   var ref = useRef(null);
-
-  // 选择说明
   var _useState3 = useState(undefined),
     _useState4 = _slicedToArray(_useState3, 2),
-    options = _useState4[0],
-    setOptions = _useState4[1];
+    labelText = _useState4[0],
+    setLabelText = _useState4[1];
+  var _useState5 = useState(false),
+    _useState6 = _slicedToArray(_useState5, 2),
+    loading = _useState6[0],
+    setLoading = _useState6[1];
+
+  // 选择说明
+  var _useState7 = useState(undefined),
+    _useState8 = _slicedToArray(_useState7, 2),
+    options = _useState8[0],
+    setOptions = _useState8[1];
 
   // 确定按钮
   var onClose = function onClose(e) {
@@ -52,46 +59,27 @@ function SelectIndex(_ref) {
     setOpen(false);
   };
 
-  // 多选
-  var isMulti = otherProps.mode === 'multiple';
-
   // children 参数
   var childrenProps = {
     value: value,
     onClose: onClose,
-    onChange: function onChange(e) {
-      _onChange === null || _onChange === void 0 || _onChange(e);
-      if (!isMulti) setOpen(false);
+    onChange: function onChange(v, option) {
+      _onChange === null || _onChange === void 0 || _onChange(labelInValue ? option : v);
+      // 单选关闭弹框
+      if (!mode) setOpen(false);
     },
-    multiple: isMulti,
+    onLoading: setLoading,
+    onChangeLabel: setLabelText,
+    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: children && (typeof children === 'function' ? children(childrenProps) : /*#__PURE__*/React.cloneElement(children, childrenProps))
     });
   }, [value]);
   useEffect(function () {
@@ -104,25 +92,47 @@ function SelectIndex(_ref) {
       }
     }
   }, [open]);
+  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__*/_jsx(_Fragment, {
     children: /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({
       open: open,
       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;
       },
-      value: value,
-      style: _objectSpread(_objectSpread({}, style), {}, {
-        width: width
-      }),
+      mode: !!labelText ? undefined : mode,
+      value: loading ? undefined : renderValueText(),
+      style: _objectSpread({}, style),
       onChange: _onChange,
-      options: options,
-      loading: true
+      options: options
     }))
   });
 }

package/es/select/index.d.ts

@@ -1,8 +1,9 @@
 import { SelectProps } from 'antd';
+import { NamePath } from 'antd/es/form/interface';
 import ModalSelect from './ modal';
 import ApiSelect from './api';
 import CustomizeSelect from './customize';
-export declare function getDataFromFields(data: Record<string, any>, fields: string[]): any;
+export declare function getDataByNamePath(data: Record<string, any>, name: NamePath): any;
 export interface CcsSelectProps extends Omit<SelectProps, 'fieldNames'> {
     /** 配置全部选项 */
     showAll?: boolean | {

package/es/select/index.js

@@ -20,13 +20,16 @@ import ModalSelect from "./ modal";
 import ApiSelect from "./api";
 import CustomizeSelect from "./customize";
 import { jsx as _jsx } from "react/jsx-runtime";
-export function getDataFromFields(data, fields) {
-  if (!data || fields.length === 0) return;
-  var newFields = _toConsumableArray(fields);
+export function getDataByNamePath(data, name) {
+  if (!data || !name) return;
+  if (typeof name === 'string') {
+    return data[name];
+  }
+  var newFields = _toConsumableArray(name);
   var field = newFields.shift();
   var newData = data[field];
   if (_typeof(newData) === 'object' && newFields.length > 0) {
-    return getDataFromFields(newData, newFields);
+    return getDataByNamePath(newData, newFields);
   }
   return newData;
 }
@@ -64,8 +67,8 @@ function InternalSelect(_ref) {
     while (labelField.length > 0 || valueField.length > 0) {
       if (Array.isArray(ops)) {
         ops.forEach(function (r) {
-          r.label = getDataFromFields(r, labelField);
-          r.value = getDataFromFields(r, valueField);
+          r.label = getDataByNamePath(r, labelField);
+          r.value = getDataByNamePath(r, valueField);
         });
         break;
       }
@@ -87,9 +90,6 @@ function InternalSelect(_ref) {
   }, [options]);
   return /*#__PURE__*/_jsx(Select, _objectSpread({
     options: selectOptions,
-    style: {
-      width: '100%'
-    },
     filterOption: onFilterOption,
     placeholder: "\u8BF7\u9009\u62E9",
     allowClear: true,