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

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

@@ -13,7 +13,8 @@ var Menu = function Menu(props) {
     pure = _ref.pure,
     theme = _ref.theme,
     sideMenuFooterRender = _ref.sideMenuFooterRender,
-    sideMenuHeaderRender = _ref.sideMenuHeaderRender;
+    sideMenuHeaderRender = _ref.sideMenuHeaderRender,
+    onMenuClick = _ref.onMenuClick;
   var menus = [];
   var menuCls = classnames({
     'pro-layout-menu': true,
@@ -39,6 +40,7 @@ var Menu = function Menu(props) {
         height: headerHeight + (notice ? 32 : 0) + 48
       },
       theme: theme,
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'block' : 'none'
       }
@@ -51,6 +53,7 @@ var Menu = function Menu(props) {
         collapsed: collapsed,
         headerHeight: headerHeight
       },
+      onMenuClick: onMenuClick,
       style: {
         display: collapsed ? 'none' : 'block',
         height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0) + 48 || 0, "px)")

package/es/ProLayout/components/ProCollapse/style/index.less

@@ -99,7 +99,7 @@
     }
 
     .pro-collapse-content {
-      padding: var(--zaui-space-size-sm, 8px) 0 !important;
+      padding: var(--zaui-space-size-md, 16px) !important;
     }
 
     .pro-collapse-level2-collapse {
@@ -150,6 +150,9 @@
       .@{ant-prefix}-collapse-expand-icon {
         display: none;
       }
+      .pro-collapse-content{
+        padding: var(--zaui-space-size-sm, 8px) 0 !important;
+      }
     }
   }
 
@@ -254,7 +257,11 @@
       }
     }
 
-   
+    .pro-collapse-level3-no-collapse{
+      .@{ant-prefix}-collapse-header{
+        padding: 0 !important;
+      }
+    }
 
     .@{ant-prefix}-collapse-header {
       height: 48px !important;
@@ -332,10 +339,9 @@
       background: #F8F8F8 !important;
     }
   }
-      // 当pro-collapse-content直接包含level3且不包含level2时，添加padding
-    .pro-collapse-content:has(> .pro-collapse-level3):not(:has(> .pro-collapse-level2)) {
-      padding: var(--zaui-space-size-md, 16px) !important;
-      padding-right: 0 !important;
-    }
-    
+  // 当pro-collapse-content直接包含level3且不包含level2时，添加padding
+ .pro-collapse-level2 .pro-collapse-content:has(.pro-collapse-level3) {
+    padding: var(--zaui-space-size-md, 16px) !important;
+    padding-right: 0 !important;
+  } 
 }

package/es/ProLayout/index.js

@@ -30,7 +30,8 @@ var ProLayout = function ProLayout(props) {
     pathPrefix = _props$pathPrefix === void 0 ? '' : _props$pathPrefix,
     theme = props.theme,
     target = props.target,
-    onCollapsedChange = props.onCollapsedChange;
+    onCollapsedChange = props.onCollapsedChange,
+    onMenuClick = props.onMenuClick;
   var _useSetState = useSetState({
       notice: headerNotice || noticeIn,
       menus: [],
@@ -95,6 +96,7 @@ var ProLayout = function ProLayout(props) {
         } : menus,
         notice: notice,
         collapsed: collapsed,
+        onMenuClick: onMenuClick,
         onToggle: function onToggle() {
           toggle();
           onCollapsedChange && onCollapsedChange(!collapsed);

package/es/ProLayout/propTypes.d.ts

@@ -180,6 +180,15 @@ export interface ProLayoutType {
      * @default -
      */
     onCollapsedChange?: (collapsed: boolean) => void;
+    /**
+     * @description 菜单点击回调事件，返回命中的菜单项数据和完整路径
+     * @default -
+     */
+    onMenuClick?: (params: {
+        item: MenusType | null;
+        key: string;
+        keyPath: string[];
+    }) => void;
     /**
      * @description 规定在何处打开被链接文档
      * @default "_self"

package/es/ProLayout/utils/index.d.ts

@@ -34,3 +34,10 @@ export declare const getPathNameKey: ({ menus, pathName, }: {
     menus: any[];
     pathName: string;
 }) => any;
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+export declare const findMenuItemByKey: (menus: any[], key: string) => any;

package/es/ProLayout/utils/index.js

@@ -1,3 +1,4 @@
+import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _isPlainObject from "lodash/isPlainObject";
@@ -159,4 +160,33 @@ export var getPathNameKey = function getPathNameKey(_ref) {
   };
   _menuDeep3(menus);
   return result;
-};
+};
+/**
+ * 根据key查找完整的菜单项数据
+ * @param menus 菜单数据数组
+ * @param key 要查找的菜单项key
+ * @returns 找到的菜单项数据或null
+ */
+var _findMenuItemByKey = function findMenuItemByKey(menus, key) {
+  // eslint-disable-next-line no-restricted-syntax
+  var _iterator = _createForOfIteratorHelper(menus),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
+      if (String(item.id) === key) {
+        return item;
+      }
+      if (Array.isArray(item.children) && item.children.length) {
+        var found = _findMenuItemByKey(item.children, key);
+        if (found) return found;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return null;
+};
+export { _findMenuItemByKey as findMenuItemByKey };

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

@@ -8,10 +8,9 @@ exports.default = void 0;
 require("antd/es/date-picker/style");
 var _datePicker = _interopRequireDefault(require("antd/es/date-picker"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
-var _uniq2 = _interopRequireDefault(require("lodash/uniq"));
+var _omit2 = _interopRequireDefault(require("lodash/omit"));
 var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isString2 = _interopRequireDefault(require("lodash/isString"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
@@ -32,18 +31,11 @@ var DatePicker = function DatePicker(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-  var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker');
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)({
+  var initialConfig = (0, _ProConfigProvider.useProConfig)('DatePicker') || {};
+  var nextFormat = format;
+  var nextClassName = (0, _classnames.default)((0, _defineProperty2.default)({
     'full-form-item': true
   }, className, !!className));
-  var _viewFormat = Array.isArray(format) ? format[0] : format;
-  var tempFormat = Array.isArray(format) ? format : [format];
-  if ((0, _isFunction2.default)(format)) {
-    tempFormat = [];
-  }
-  var _format = (0, _uniq2.default)([].concat((0, _toConsumableArray2.default)(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;
@@ -54,38 +46,30 @@ var DatePicker = function DatePicker(props) {
     } else if ((0, _isFunction2.default)(format)) {
       viewChildren = format(value);
     } else if ((0, _isString2.default)(value)) {
-      viewChildren = (0, _moment.default)(value).format(_viewFormat);
+      viewChildren = (0, _moment.default)(value).format(format);
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
       children: viewChildren
     });
   }
-  var _defaultShowTime = {
-    format: 'HH:mm:ss'
-  };
   // dateTime模式下默认开启time选择
-  var _rest = (0, _objectSpread2.default)({}, rest);
+  var restProps = (0, _objectSpread2.default)({}, 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 ((0, _isString2.default)(_rest.value)) {
-    _rest.value = (0, _moment.default)(_rest.value);
-  }
-  if (_rest.showTime === true) {
-    _rest.showTime = (0, _objectSpread2.default)({}, _defaultShowTime);
-  }
-  if ((0, _isObject2.default)(_rest.showTime)) {
-    _rest.showTime = Object.assign(_defaultShowTime, _rest.showTime);
+  if ((0, _isString2.default)(restProps.value)) {
+    restProps.value = (0, _moment.default)(restProps.value);
   }
   return (0, _jsxRuntime.jsx)(_datePicker.default, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, initialConfig), {}, {
-    format: _format
-  }, _rest), {}, {
-    className: _className
+    format: nextFormat
+  }, (0, _omit2.default)(restProps, ['otherProps'])), {}, {
+    className: nextClassName
   }));
 };
 var _default = exports.default = DatePicker;

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

@@ -173,14 +173,9 @@ var useTransformColumns = exports.useTransformColumns = function useTransformCol
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
       fieldProps: (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -71,7 +71,7 @@ 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 = (0, _ahooks.useRequest)(service || defaultService, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, useRequestOptions), {}, {
     defaultParams: [params]
@@ -107,9 +107,7 @@ function useRequestList(service, options, useRequestOptions) {
   }, [onChange, searchValues]);
   // 重置查询条件
   var onReset = (0, _react.useCallback)(function () {
-    onSearch({
-      d: Date.now()
-    });
+    onSearch({});
   }, [onSearch]);
   var dataSource = (0, _react.useMemo)(function () {
     if (data) {

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

@@ -6,12 +6,12 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = void 0;
-require("antd/es/tooltip/style");
-var _tooltip = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/button/style");
 var _button = _interopRequireDefault(require("antd/es/button"));
 require("antd/es/input/style");
 var _input = _interopRequireDefault(require("antd/es/input"));
+require("antd/es/tooltip/style");
+var _tooltip2 = _interopRequireDefault(require("antd/es/tooltip"));
 require("antd/es/spin/style");
 var _spin = _interopRequireDefault(require("antd/es/spin"));
 require("antd/es/space/style");
@@ -27,8 +27,10 @@ var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/sli
 require("antd/es/form/style");
 var _form = _interopRequireDefault(require("antd/es/form"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _isObject2 = _interopRequireDefault(require("lodash/isObject"));
 var _isFunction2 = _interopRequireDefault(require("lodash/isFunction"));
 var _isEqual2 = _interopRequireDefault(require("lodash/isEqual"));
+var _isBoolean2 = _interopRequireDefault(require("lodash/isBoolean"));
 var _isArray2 = _interopRequireDefault(require("lodash/isArray"));
 var _debounce2 = _interopRequireDefault(require("lodash/debounce"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -43,7 +45,7 @@ var _view = _interopRequireDefault(require("../../../../assets/view.svg"));
 var _useRequestList3 = _interopRequireDefault(require("./hooks/useRequestList"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _utils = require("./utils");
-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"];
 var ProModalSelect = function ProModalSelect(props, ref) {
@@ -56,6 +58,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,
@@ -68,11 +72,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 = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _tooltip = tooltip !== null && tooltip !== void 0 ? tooltip : isTooltip;
+  var nextMode = (0, _react.useMemo)(function () {
+    if ((0, _isBoolean2.default)(readOnly) && readOnly === false) {
+      return 'input';
+    }
+    return mode;
+  }, [mode, readOnly]);
   var contentForm = _form.default.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
@@ -179,8 +191,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformParams: transformParams,
       transformResponse: transformResponse
     }, (0, _objectSpread5.default)({
-      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,
@@ -211,7 +222,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 ((0, _isObject2.default)(data)) {
       return handleFormat((0, _objectSpread5.default)((0, _objectSpread5.default)({}, data), {}, {
         value: data[valueKey],
         label: data[labelKey]
@@ -248,7 +259,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
    * @returns {any}
    */
   var getRowKey = function getRowKey(record) {
-    if (typeof rowKey === 'function') {
+    if ((0, _isFunction2.default)(rowKey)) {
       return rowKey(record);
     }
     return record[rowKey];
@@ -270,7 +281,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
       });
@@ -528,7 +539,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
                 });
-              } else if (!readOnly) {
+              } else if (nextMode === 'input') {
                 // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
                 setState({
                   _value: value,
@@ -616,13 +627,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 ((0, _isArray2.default)(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 ((0, _isObject2.default)(value)) {
       var initialValue = (0, _defineProperty2.default)((0, _defineProperty2.default)({}, valueKey, value[valueKey]), labelKey, value[labelKey]);
       setState({
         selectedRowKeys: [value],
@@ -645,7 +656,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRowKeys = [];
           nextState.selectedRows = [];
         }
-        if (Object.prototype.toString.call(value) === '[object Object]') {
+        if ((0, _isObject2.default)(value)) {
           nextState.selectedRowKeys = [getRowKey(value)];
           nextState.selectedRows = [value];
         }
@@ -671,12 +682,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     (0, _utils.hideTooltipIfOpen)(fieldRef.current, visible);
   }, [visible]);
   (0, _react.useEffect)(function () {
-    if (value && !visible && isInit && !readOnly) {
+    if (value && !visible && isInit && nextMode === 'input') {
       getInitValues();
     }
   }, [JSON.stringify(value), visible, isInit]);
   (0, _ahooks.useDebounceEffect)(function () {
-    if (value && !visible && readOnly && (!(0, _isEqual2.default)(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !visible && nextMode === 'select' && (!(0, _isEqual2.default)(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;
@@ -743,7 +754,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (!readOnly) {
+    if (nextMode === 'input') {
       if (labelInValue && _value && !(0, _isEqual2.default)(value, _value)) {
         setState({
           _value: value,
@@ -766,7 +777,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
+    children: [nextMode === 'select' ? (0, _jsxRuntime.jsx)(_index.ProSelect, (0, _objectSpread5.default)({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -782,16 +793,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: handleSelectFocus,
       onSearch: handleSelectSearch,
+      tooltip: _tooltip,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread5.default)({
-      value: viewText,
-      onChange: handleChangeValue,
-      disabled: disabled,
-      autoComplete: "off",
-      allowClear: true
-    }, restProps)), isView || disabled ? null : (0, _jsxRuntime.jsx)(_button.default, {
+    }, restProps)) : (0, _jsxRuntime.jsx)(_tooltip2.default, {
+      title: _tooltip ? viewText : null,
+      placement: "topLeft",
+      children: (0, _jsxRuntime.jsx)(_input.default, (0, _objectSpread5.default)({
+        value: viewText,
+        onChange: handleChangeValue,
+        disabled: disabled,
+        autoComplete: "off",
+        allowClear: true
+      }, restProps))
+    }), isView || disabled ? null : (0, _jsxRuntime.jsx)(_button.default, {
       icon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
         className: "viewSvg",
         src: _view.default,
@@ -806,41 +822,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  (0, _ahooks.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]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     setState({
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
@@ -878,14 +859,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: isTooltip && viewText ? (0, _jsxRuntime.jsx)(_tooltip.default, {
-        placement: "topLeft",
-        open: open,
-        title: viewText,
-        children: initRender
-      }) : initRender
+      children: initRender
     }), (0, _jsxRuntime.jsxs)(_index.ProDrawerForm, (0, _objectSpread5.default)((0, _objectSpread5.default)({
-      showType: "Modal",
+      mode: "Modal",
       title: title,
       onOk: handleFinish,
       // @ts-ignore

package/lib/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/lib/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{
-    
+
   }