@zat-design/sisyphus-react 3.13.17 → 3.13.18-beta.10

package/dist/index.esm.css

@@ -753,7 +753,7 @@
   margin-right: var(--zaui-space-size-sm, 8px);
 }
 .pro-collapse.pro-collapse-level2 .pro-collapse-content {
-  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+  padding: var(--zaui-space-size-md, 16px) !important;
 }
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse {
   margin-bottom: var(--zaui-space-size-md, 16px);
@@ -789,6 +789,9 @@
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .ant-collapse-expand-icon {
   display: none;
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .pro-collapse-content {
+  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+}
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }
@@ -828,6 +831,29 @@
 .pro-collapse.pro-collapse-level3 {
   margin-bottom: var(--zaui-space-size-md, 16px);
 }
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 {
+  margin-top: 8px !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .pro-collapse-panel {
+  border: none !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header {
+  height: auto !important;
+  background: #fff !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header:hover {
+  background: #fff !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header .ant-collapse-header-text:before {
+  display: block;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header .ant-collapse-extra .extra-info {
+  font-size: var(--zaui-font-size, 14px);
+  color: var(--zaui-text, #343434);
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-content .ant-collapse-content-box .pro-collapse-content {
+  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+}
 .pro-collapse.pro-collapse-level3 .ant-collapse-item-active {
   margin-bottom: 0 !important;
 }
@@ -841,6 +867,9 @@
   margin-bottom: 0;
   border-bottom: 1px solid #d9d9d9;
 }
+.pro-collapse.pro-collapse-level3 .pro-collapse-level3-no-collapse .ant-collapse-header {
+  padding: 0 !important;
+}
 .pro-collapse.pro-collapse-level3 .ant-collapse-header {
   height: 48px !important;
   padding: 0 var(--zaui-space-size-md, 16px) !important;
@@ -887,7 +916,7 @@
   padding: 0 !important;
 }
 .pro-collapse.pro-collapse-level3 .pro-collapse-level3-collapse .ant-collapse-header:hover {
-  background: #f0f0f0 !important;
+  background: #f0f0f0;
 }
 .pro-collapse.pro-collapse-level3 .pro-collapse-level3-no-collapse .ant-collapse-expand-icon {
   display: none !important;
@@ -901,7 +930,7 @@
   cursor: default;
   background: #F8F8F8 !important;
 }
-.pro-collapse .pro-collapse-content:has(.pro-collapse-level3):not(:has(.pro-collapse-level2)) {
+.pro-collapse .pro-collapse-level2 .pro-collapse-content:has(.pro-collapse-level3) {
   padding: var(--zaui-space-size-md, 16px) !important;
   padding-right: 0 !important;
 }

package/dist/less.esm.css

@@ -753,7 +753,7 @@
   margin-right: var(--zaui-space-size-sm, 8px);
 }
 .pro-collapse.pro-collapse-level2 .pro-collapse-content {
-  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+  padding: var(--zaui-space-size-md, 16px) !important;
 }
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-collapse {
   margin-bottom: var(--zaui-space-size-md, 16px);
@@ -789,6 +789,9 @@
 .pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .ant-collapse-expand-icon {
   display: none;
 }
+.pro-collapse.pro-collapse-level2 .pro-collapse-level2-no-collapse .pro-collapse-content {
+  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+}
 .pro-collapse .ant-collapse-extra .extra-info {
   margin-right: 24px;
 }
@@ -828,6 +831,29 @@
 .pro-collapse.pro-collapse-level3 {
   margin-bottom: var(--zaui-space-size-md, 16px);
 }
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 {
+  margin-top: 8px !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .pro-collapse-panel {
+  border: none !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header {
+  height: auto !important;
+  background: #fff !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header:hover {
+  background: #fff !important;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header .ant-collapse-header-text:before {
+  display: block;
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-header .ant-collapse-extra .extra-info {
+  font-size: var(--zaui-font-size, 14px);
+  color: var(--zaui-text, #343434);
+}
+.pro-collapse.pro-collapse-level3 .pro-collapse-level2 .ant-collapse-content .ant-collapse-content-box .pro-collapse-content {
+  padding: var(--zaui-space-size-sm, 8px) 0 !important;
+}
 .pro-collapse.pro-collapse-level3 .ant-collapse-item-active {
   margin-bottom: 0 !important;
 }
@@ -841,6 +867,9 @@
   margin-bottom: 0;
   border-bottom: 1px solid #d9d9d9;
 }
+.pro-collapse.pro-collapse-level3 .pro-collapse-level3-no-collapse .ant-collapse-header {
+  padding: 0 !important;
+}
 .pro-collapse.pro-collapse-level3 .ant-collapse-header {
   height: 48px !important;
   padding: 0 var(--zaui-space-size-md, 16px) !important;
@@ -887,7 +916,7 @@
   padding: 0 !important;
 }
 .pro-collapse.pro-collapse-level3 .pro-collapse-level3-collapse .ant-collapse-header:hover {
-  background: #f0f0f0 !important;
+  background: #f0f0f0;
 }
 .pro-collapse.pro-collapse-level3 .pro-collapse-level3-no-collapse .ant-collapse-expand-icon {
   display: none !important;
@@ -901,7 +930,7 @@
   cursor: default;
   background: #F8F8F8 !important;
 }
-.pro-collapse .pro-collapse-content:has(.pro-collapse-level3):not(:has(.pro-collapse-level2)) {
+.pro-collapse .pro-collapse-level2 .pro-collapse-content:has(.pro-collapse-level3) {
   padding: var(--zaui-space-size-md, 16px) !important;
   padding-right: 0 !important;
 }

package/es/ProForm/components/base/DatePicker/index.js

@@ -1,10 +1,9 @@
 import "antd/es/date-picker/style";
 import _DatePicker from "antd/es/date-picker";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _uniq from "lodash/uniq";
+import _omit from "lodash/omit";
 import _isObject from "lodash/isObject";
 import _isString from "lodash/isString";
 import _isFunction from "lodash/isFunction";
@@ -25,18 +24,11 @@ var DatePicker = function DatePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-  var initialConfig = useProConfig('DatePicker');
-  var _className = classNames(_defineProperty({
+  var initialConfig = useProConfig('DatePicker') || {};
+  var nextFormat = format;
+  var nextClassName = classNames(_defineProperty({
     'full-form-item': true
   }, className, !!className));
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
-  if (_isFunction(format)) {
-    tempFormat = [];
-  }
-  var _format = _uniq([].concat(_toConsumableArray(tempFormat), ['YYYY-MM-DD', 'YYYYMMDD', 'YYYY/MM/DD', 'YYYY_MM_DD', 'YYYY.MM.DD'])).filter(function (formatKey) {
-    return !!formatKey;
-  });
   if (isView) {
     var value = rest.value;
     var viewChildren = null;
@@ -47,38 +39,30 @@ var DatePicker = function DatePicker(props) {
     } else if (_isFunction(format)) {
       viewChildren = format(value);
     } else if (_isString(value)) {
-      viewChildren = moment(value).format(_viewFormat);
+      viewChildren = moment(value).format(format);
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
       children: viewChildren
     });
   }
-  var _defaultShowTime = {
-    format: 'HH:mm:ss'
-  };
   // dateTime模式下默认开启time选择
-  var _rest = _objectSpread({}, rest);
+  var restProps = _objectSpread({}, rest);
   // showTime默认值受valueType属性影响
-  if (rest.showTime === undefined) {
-    if (valueType === 'dateTime') {
-      _rest.showTime = true;
-    }
+  if (restProps.showTime === false) {
+    restProps.showTime = false;
+  } else if (valueType === 'dateTime') {
+    restProps.showTime = true;
+    nextFormat = 'YYYY-MM-DD HH:mm:ss';
   }
   // 字符串时间格式兼容
-  if (_isString(_rest.value)) {
-    _rest.value = moment(_rest.value);
-  }
-  if (_rest.showTime === true) {
-    _rest.showTime = _objectSpread({}, _defaultShowTime);
-  }
-  if (_isObject(_rest.showTime)) {
-    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  if (_isString(restProps.value)) {
+    restProps.value = moment(restProps.value);
   }
   return _jsx(_DatePicker, _objectSpread(_objectSpread(_objectSpread({}, initialConfig), {}, {
-    format: _format
-  }, _rest), {}, {
-    className: _className
+    format: nextFormat
+  }, _omit(restProps, ['otherProps'])), {}, {
+    className: nextClassName
   }));
 };
 export default DatePicker;

package/es/ProForm/components/combination/Group/hooks/index.js

@@ -165,14 +165,9 @@ export var useTransformColumns = function useTransformColumns(params) {
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
         onChange: handleChange,
-        onBlur: handleBlur
-      }, names ? {
-        value: form.getFieldValue(columnName)
-      } // 独立字段模式
-      : {
+        onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]
-      } // 数组值模式
-      )
+      })
     });
   });
 };

package/es/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -62,7 +62,7 @@ export function useRequestList(service, options, useRequestOptions) {
       queryBean: _condition !== null && _condition !== void 0 ? _condition : {}
     }) : _condition;
     return transformParams ? transformParams(tempParams) : tempParams;
-  }, [page, searchValues]);
+  }, [page, searchValues, _defaultParams, transformParams]);
   // 调接口
   var result = useRequest(service || defaultService, _objectSpread(_objectSpread({}, useRequestOptions), {}, {
     defaultParams: [params]
@@ -98,9 +98,7 @@ export function useRequestList(service, options, useRequestOptions) {
   }, [onChange, searchValues]);
   // 重置查询条件
   var onReset = useCallback(function () {
-    onSearch({
-      d: Date.now()
-    });
+    onSearch({});
   }, [onSearch]);
   var dataSource = useMemo(function () {
     if (data) {

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -1,9 +1,9 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/spin/style";
 import _Spin from "antd/es/spin";
 import "antd/es/space/style";
@@ -19,11 +19,13 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
+import _isObject from "lodash/isObject";
 import _isFunction from "lodash/isFunction";
 import _isEqual from "lodash/isEqual";
+import _isBoolean from "lodash/isBoolean";
 import _isArray from "lodash/isArray";
 import _debounce from "lodash/debounce";
-var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
+var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames", "readOnly", "mode", "addonAfter", "configOption", "title", "onFormat", "showCodeName", "optionRender", "customRender", "style", "className", "beforeOpen", "afterOpen", "isTooltip", "tooltip", "searchForm", "searchKey", "defaultOne", "otherProps"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
@@ -48,6 +50,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     fieldNames = props.fieldNames,
     _props$readOnly = props.readOnly,
     readOnly = _props$readOnly === void 0 ? true : _props$readOnly,
+    _props$mode = props.mode,
+    mode = _props$mode === void 0 ? 'select' : _props$mode,
     addonAfter = props.addonAfter,
     configOption = props.configOption,
     title = props.title,
@@ -60,11 +64,19 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     beforeOpen = props.beforeOpen,
     afterOpen = props.afterOpen,
     isTooltip = props.isTooltip,
+    tooltip = props.tooltip,
     searchForm = props.searchForm,
     searchKey = props.searchKey,
     defaultOne = props.defaultOne,
     otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
+  var _tooltip = tooltip !== null && tooltip !== void 0 ? tooltip : isTooltip;
+  var nextMode = useMemo(function () {
+    if (_isBoolean(readOnly) && readOnly === false) {
+      return 'input';
+    }
+    return mode;
+  }, [mode, readOnly]);
   var contentForm = _Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -171,8 +183,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformParams: transformParams,
       transformResponse: transformResponse
     }, _objectSpread({
-      manual: true,
-      ready: (initParams || defaultOne) && !readOnly || visible
+      ready: (initParams || defaultOne) && nextMode === 'input' || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -203,7 +214,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     if (typeof data === 'string' || typeof data === 'number') {
       return data;
     }
-    if (Object.prototype.toString.call(data) === '[object Object]') {
+    if (_isObject(data)) {
       return handleFormat(_objectSpread(_objectSpread({}, data), {}, {
         value: data[valueKey],
         label: data[labelKey]
@@ -240,7 +251,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
    * @returns {any}
    */
   var getRowKey = function getRowKey(record) {
-    if (typeof rowKey === 'function') {
+    if (_isFunction(rowKey)) {
       return rowKey(record);
     }
     return record[rowKey];
@@ -262,7 +273,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var handleChangeValue = function handleChangeValue(e) {
     onChange(e.target.value);
     preValue.current = e.target.value;
-    if (!readOnly) {
+    if (nextMode === 'input') {
       setState({
         _value: e.target.value
       });
@@ -520,7 +531,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
                 });
-              } else if (!readOnly) {
+              } else if (nextMode === 'input') {
                 // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
                 setState({
                   _value: value,
@@ -608,13 +619,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || [],
         _value: undefined
       });
-    } else if (Object.prototype.toString.call(value) === '[object Array]') {
+    } else if (_isArray(value)) {
       setState({
         selectedRowKeys: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRowKeys) || value,
         selectedRows: (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || value,
         _value: value
       });
-    } else if (Object.prototype.toString.call(value) === '[object Object]') {
+    } else if (_isObject(value)) {
       var initialValue = _defineProperty(_defineProperty({}, valueKey, value[valueKey]), labelKey, value[labelKey]);
       setState({
         selectedRowKeys: [value],
@@ -637,7 +648,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRowKeys = [];
           nextState.selectedRows = [];
         }
-        if (Object.prototype.toString.call(value) === '[object Object]') {
+        if (_isObject(value)) {
           nextState.selectedRowKeys = [getRowKey(value)];
           nextState.selectedRows = [value];
         }
@@ -663,12 +674,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     hideTooltipIfOpen(fieldRef.current, visible);
   }, [visible]);
   useEffect(function () {
-    if (value && !visible && isInit && !readOnly) {
+    if (value && !visible && isInit && nextMode === 'input') {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   useDebounceEffect(function () {
-    if (value && !visible && readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !visible && nextMode === 'select' && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
       var _options$some;
       preValue.current = value;
       var _data3 = labelInValue ? value[valueKey] : value;
@@ -735,7 +746,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (!readOnly) {
+    if (nextMode === 'input') {
       if (labelInValue && _value && !_isEqual(value, _value)) {
         setState({
           _value: value,
@@ -758,7 +769,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? _jsx(ProSelect, _objectSpread({
+    children: [nextMode === 'select' ? _jsx(ProSelect, _objectSpread({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -774,16 +785,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: handleSelectFocus,
       onSearch: handleSelectSearch,
+      tooltip: _tooltip,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : _jsx(_Input, _objectSpread({
-      value: viewText,
-      onChange: handleChangeValue,
-      disabled: disabled,
-      autoComplete: "off",
-      allowClear: true
-    }, restProps)), isView || disabled ? null : _jsx(_Button, {
+    }, restProps)) : _jsx(_Tooltip, {
+      title: _tooltip ? viewText : null,
+      placement: "topLeft",
+      children: _jsx(_Input, _objectSpread({
+        value: viewText,
+        onChange: handleChangeValue,
+        disabled: disabled,
+        autoComplete: "off",
+        allowClear: true
+      }, restProps))
+    }), isView || disabled ? null : _jsx(_Button, {
       icon: _jsx(ReactSVG, {
         className: "viewSvg",
         src: viewSvg,
@@ -798,41 +814,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  useDeepCompareEffect(function () {
-    if (isTooltip && value) {
-      var dom = document.getElementById(uuid);
-      dom.addEventListener('mouseover', function (e) {
-        if (value && e.target.tagName === 'INPUT') {
-          setState({
-            open: true
-          });
-        }
-      });
-      dom.addEventListener('mouseout', function (e) {
-        if (e.target.tagName === 'INPUT') {
-          setState({
-            open: false
-          });
-        }
-      });
-      return function () {
-        dom.removeEventListener('mouseover', function (e) {
-          if (value && e.target.tagName === 'INPUT') {
-            setState({
-              open: true
-            });
-          }
-        });
-        dom.removeEventListener('mouseout', function (e) {
-          if (e.target.tagName === 'INPUT') {
-            setState({
-              open: false
-            });
-          }
-        });
-      };
-    }
-  }, [value, isTooltip]);
   useDeepCompareEffect(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -870,14 +851,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: isTooltip && viewText ? _jsx(_Tooltip, {
-        placement: "topLeft",
-        open: open,
-        title: viewText,
-        children: initRender
-      }) : initRender
+      children: initRender
     }), _jsxs(ProDrawerForm, _objectSpread(_objectSpread({
-      showType: "Modal",
+      mode: "Modal",
       title: title,
       onOk: handleFinish,
       // @ts-ignore

package/es/ProForm/components/combination/ProModalSelect/propsType.d.ts

@@ -80,17 +80,21 @@ interface ProModalPropsType {
     beforeOpen?: any;
     /** 打开弹框后的回调函数 */
     afterOpen?: any;
-    /** 是否启用tooltip提示 */
+    /** 废弃 是否启用tooltip提示 */
     isTooltip?: boolean;
+    /** 是否启用tooltip提示 */
+    tooltip?: boolean;
     /** 是否以"值-名称"形式展示 */
     showCodeName?: boolean;
     /** 查询表单实例，用于获取查询表单数据 */
     searchForm?: FormInstance;
     /** 模糊查询的字段名 */
     searchKey?: string;
+    /** 展示形式 */
+    mode?: 'input' | 'select';
 }
 /** 模态框选择器属性类型（结合Select和Input属性） */
-export declare type ProModalSelectPropsType = SelectProps & InputProps & ProModalPropsType;
+export declare type ProModalSelectPropsType = Omit<SelectProps & InputProps, 'mode'> & ProModalPropsType;
 /** 配置选项类型 */
 export type ProModalSelectConfigType = ConfigOption;
 /** 模态框属性类型 */
@@ -98,5 +102,5 @@ export type ProModalType = Omit<ProModalPropsType, 'configOption'> & {
     configOption: ProModalSelectConfigType;
 };
 /** 模态框选择器类型（结合Select和Input属性） */
-export type ProModalSelectType = SelectProps & InputProps & ProModalType;
+export type ProModalSelectType = Omit<SelectProps & InputProps, 'mode'> & ProModalType;
 export {};

package/es/ProForm/components/combination/ProModalSelect/style/index.less

@@ -53,7 +53,7 @@
     }
   }
 
-  // 新加适用于 readonly false
+  // 新加适用于 _readOnly false
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
@@ -100,7 +100,7 @@
   }
 
   .@{ant-prefix}-input-affix-wrapper-status-error{
-    
+
   }
 
 

package/es/ProLayout/components/Layout/Menu/FoldMenu/index.js

@@ -10,10 +10,11 @@ import { Link } from 'react-router-dom';
 import { Icon } from '../../index';
 import SideMenu from '../SideMenu';
 import { LayoutContext } from '../../../../index';
-import { getUrlParams, getPathNameKey } from '../../../../utils';
+import { getUrlParams, getPathNameKey, findMenuItemByKey } from '../../../../utils';
 var FoldMenu = function FoldMenu(props) {
   var style = props.style,
-    dataSource = props.dataSource;
+    dataSource = props.dataSource,
+    onMenuClick = props.onMenuClick;
   var menus = dataSource.menus,
     iconfontUrl = dataSource.iconfontUrl,
     notice = dataSource.notice,
@@ -82,7 +83,8 @@ var FoldMenu = function FoldMenu(props) {
           content: _jsx(SideMenu, {
             dataSource: _objectSpread(_objectSpread({}, dataSource), {}, {
               menus: item
-            })
+            }),
+            onMenuClick: onMenuClick
           }),
           color: "#fff",
           overlayClassName: noticeCls,
@@ -91,12 +93,42 @@ var FoldMenu = function FoldMenu(props) {
             height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0), "px)")
           },
           placement: "rightTop",
-          children: LiNode
+          children: _jsx("span", {
+            onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = findMenuItemByKey(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
+            },
+            children: LiNode
+          })
         }, "".concat(id, "-").concat(name)) : !collapsed ? _jsx(_Tooltip, {
           placement: "right",
           title: name,
           children: _jsx("span", {
             onClick: function onClick() {
+              // 查找完整的菜单项数据
+              var menuItem = findMenuItemByKey(menus, String(id));
+              var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+                return String(id);
+              }) : [String(id)];
+              // 调用用户传入的onMenuClick回调
+              if (onMenuClick) {
+                onMenuClick({
+                  item: menuItem,
+                  key: String(id),
+                  keyPath: menuKeyPath
+                });
+              }
               onSelected({
                 selectedPath: toPath
               });
@@ -106,10 +138,27 @@ var FoldMenu = function FoldMenu(props) {
               children: LiNode
             }, toPath)
           })
-        }, toPath) : _jsx(Link, {
-          to: toPath,
-          children: LiNode
-        }, toPath);
+        }, toPath) : _jsx("span", {
+          onClick: function onClick() {
+            // 查找完整的菜单项数据
+            var menuItem = findMenuItemByKey(menus, String(id));
+            var menuKeyPath = (menuItem === null || menuItem === void 0 ? void 0 : menuItem.keyIdPath) ? menuItem.keyIdPath.map(function (id) {
+              return String(id);
+            }) : [String(id)];
+            // 调用用户传入的onMenuClick回调
+            if (onMenuClick) {
+              onMenuClick({
+                item: menuItem,
+                key: String(id),
+                keyPath: menuKeyPath
+              });
+            }
+          },
+          children: _jsx(Link, {
+            to: toPath,
+            children: LiNode
+          }, toPath)
+        });
       })
     })
   });