@zat-design/sisyphus-react 4.0.0-beta.3 → 4.0.0-beta.4

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

@@ -1,14 +1,13 @@
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
-import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent", "desensitization", "otherProps"];
-import { useEffect, useState, memo, useMemo } from 'react';
-import { Cascader, Tooltip } from 'antd';
+import { useEffect, useState, memo, useMemo, useCallback } from 'react';
+import { Cascader, Tooltip, message } from 'antd';
 import { omit, find as _find, isBoolean, isEqual } from 'lodash';
+import { useRequest as useRequestFunc, useDeepCompareEffect } from 'ahooks';
 import { transformDataName } from "./utils/index";
 import { useProConfig } from "../../../../ProConfigProvider";
 import Input from "../../base/Input";
@@ -50,7 +49,7 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref5, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _useRequest$options3, _value$slice, _ref7, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
@@ -113,10 +112,6 @@ var ProCascader = function ProCascader(props) {
     }
     return disabled;
   }, [disabled]);
-  var _useRequest = _objectSpread({}, useRequest),
-    service = _useRequest.service,
-    _useRequest$defaultPa = _useRequest.defaultParams,
-    defaultParams = _useRequest$defaultPa === void 0 ? {} : _useRequest$defaultPa;
   var _useState = useState([]),
     _useState2 = _slicedToArray(_useState, 2),
     serviceData = _useState2[0],
@@ -125,54 +120,112 @@ var ProCascader = function ProCascader(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
-  var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
-      var _yield$service, data, newData, transFormData, serviceData;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
-          case 0:
-            _context.next = 2;
-            return service(defaultParams);
-          case 2:
-            _yield$service = _context.sent;
-            data = _yield$service.data;
-            newData = data;
-            if (transformResponse) {
-              newData = transformResponse(data);
-            }
-            transFormData = transformDataName(newData, {
-              label: fieldNames.label,
-              value: fieldNames.value,
-              children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
-            });
-            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
-            setServiceData(serviceData);
-          case 9:
-          case "end":
-            return _context.stop();
-        }
-      }, _callee);
-    }));
-    return function getFirstLevelOptions() {
-      return _ref4.apply(this, arguments);
-    };
-  }();
+
+  // 默认成功处理函数
+  var defaultOnSuccessFun = function defaultOnSuccessFun(res) {
+    var _ref4 = res || {},
+      _ref4$status = _ref4.status,
+      status = _ref4$status === void 0 ? 200 : _ref4$status,
+      msg = _ref4.message,
+      data = _ref4.data;
+    if (status !== 200) {
+      message.error(msg);
+      return;
+    }
+    var newData = data;
+    if (transformResponse) {
+      newData = transformResponse(data);
+    }
+    var transFormData = transformDataName(newData, {
+      label: fieldNames.label,
+      value: fieldNames.value,
+      children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+    });
+    var serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+    setServiceData(serviceData);
+  };
+
+  // 数据转换处理
+  var successTransformDataHandle = useCallback(function (res) {
+    if (transformResponse && typeof transformResponse === 'function') {
+      return transformResponse(res);
+    }
+    var _ref5 = res || {},
+      _ref5$status = _ref5.status,
+      status = _ref5$status === void 0 ? 200 : _ref5$status,
+      msg = _ref5.message,
+      data = _ref5.data;
+    if (status !== 200) {
+      message.error(msg);
+      return;
+    }
+    return data;
+  }, [transformResponse]);
+
+  // 使用ahooks的useRequest
+  var fetchFunction = useRequestFunc(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, _objectSpread(_objectSpread({
+    manual: true,
+    debounceWait: 300
+  }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
+    onSuccess: function onSuccess(data) {
+      var _useRequest$options, _useRequest$options$o, _useRequest$options2;
+      if (transformResponse && typeof transformResponse === 'function') {
+        var responseData = transformResponse(data);
+        var transFormData = transformDataName(responseData, {
+          label: fieldNames.label,
+          value: fieldNames.value,
+          children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
+        });
+        var _serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
+        setServiceData(_serviceData);
+      } else {
+        defaultOnSuccessFun(data);
+      }
+      // 执行传入的onSuccess
+      useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 || (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 || _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
+    }
+  }));
+
+  // 缓存数据处理
+  var cacheList = useRequest !== null && useRequest !== void 0 && (_useRequest$options3 = useRequest.options) !== null && _useRequest$options3 !== void 0 && _useRequest$options3.cacheKey ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
 
   // 提取出来默认每次都执行
   if (transformResponse) {
     realDataSource = transformResponse(realDataSource);
   }
-  useEffect(function () {
-    if (service) {
-      // 传入useRequest时，初次加载级联第一级数据源
-      getFirstLevelOptions();
+
+  // 设置缓存数据
+  useDeepCompareEffect(function () {
+    var _useRequest$options4;
+    if (!(serviceData !== null && serviceData !== void 0 && serviceData.length) && useRequest !== null && useRequest !== void 0 && (_useRequest$options4 = useRequest.options) !== null && _useRequest$options4 !== void 0 && _useRequest$options4.cacheKey) {
+      if (cacheList !== null && cacheList !== void 0 && cacheList.length) {
+        setServiceData(cacheList);
+      }
+    }
+  }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
+
+  // 初始化请求数据
+  useDeepCompareEffect(function () {
+    var _useRequest$options5;
+    if (!(useRequest !== null && useRequest !== void 0 && useRequest.service)) {
+      return;
     }
-  }, [service]);
+    var _ref6 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
+      manual = _ref6.manual;
+    if (manual || cacheList !== null && cacheList !== void 0 && cacheList.length) {
+      return;
+    }
+
+    // 向后兼容性：优先使用 options.defaultParams，fallback 到 useRequest.defaultParams
+    var defaultParams = (useRequest === null || useRequest === void 0 || (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.defaultParams) || (useRequest === null || useRequest === void 0 ? void 0 : useRequest.defaultParams);
+    var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
+    fetchFunction.run(params);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
   useEffect(function () {
     if (realIsView && value) {
       var _realDataSource;
       // 传入dataSource + 查看时初始化展示
-      if (service) {
+      if (useRequest !== null && useRequest !== void 0 && useRequest.service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
@@ -212,9 +265,9 @@ var ProCascader = function ProCascader(props) {
   var addressValue = isAddressMode ? value && (_value$slice = value.slice(0, realLevel)) !== null && _value$slice !== void 0 && _value$slice.some(function (item) {
     return !!item;
   }) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref5 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 || (_ref5 = _ref5.filter(function (item) {
+  var viewValue = isAddressMode ? ((_ref7 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 || (_ref7 = _ref7.filter(function (item) {
     return !!item;
-  })) === null || _ref5 === void 0 ? void 0 : _ref5.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 || (_defaultLabel$filter = defaultLabel.filter(function (item) {
+  })) === null || _ref7 === void 0 ? void 0 : _ref7.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 || (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
   var findSelectedOptions = function findSelectedOptions(options, value) {
@@ -247,8 +300,8 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = useMemo(function () {
-    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
-  }, [service, serviceData, realDataSource, addressValue]);
+    return findSelectedOptions(useRequest !== null && useRequest !== void 0 && useRequest.service ? serviceData : realDataSource, addressValue);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);
     if (onChange) {
@@ -273,8 +326,9 @@ var ProCascader = function ProCascader(props) {
       className: hasDetail ? '' : 'no-detail',
       placeholder: locale === null || locale === void 0 || (_locale$ProAddressBar = locale.ProAddressBar) === null || _locale$ProAddressBar === void 0 ? void 0 : _locale$ProAddressBar.placeholder,
       value: addressValue,
-      options: service ? serviceData : realDataSource,
+      options: useRequest !== null && useRequest !== void 0 && useRequest.service ? serviceData : realDataSource,
       disabled: lastDisabled[0],
+      loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       displayRender: displayRender,
       showSearch: {
         filter: handlefilter,

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

@@ -1,6 +1,6 @@
 import { ReactNode } from 'react';
 import { DefaultOptionType } from 'rc-select/lib/Select';
-import { Service } from 'ahooks/lib/useRequest/src/types';
+import { Service, Options } from 'ahooks/lib/useRequest/src/types';
 export interface FieldNamesType {
     label: string;
     value: string;
@@ -19,10 +19,18 @@ export interface ProCascaderType {
     fieldNames?: FieldNamesType;
     dataSource?: DefaultOptionType[];
     useRequest?: {
-        loadData?: boolean;
-        service: Service<any, any>;
+        /**
+         * @description 请求服务函数
+         */
+        service?: Service<any, any>;
+        /**
+         * @description 请求选项
+         */
+        options?: Options<any, any>;
+        /**
+         * @deprecated 保留向后兼容性，使用 options.defaultParams 替代
+         */
         defaultParams?: any;
-        parentKey?: string;
     };
     onChange?: (value: string[], selectedOptions?: any[]) => void;
     transformResponse?: (data: any[]) => any[];

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

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-address {
   display: flex;
@@ -9,7 +7,7 @@
     width: 45%;
 
     &.no-detail {
-      width: 100% !important;
+      width: 100%;
     }
   }
 

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

@@ -63,7 +63,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), {}, {
@@ -103,9 +103,7 @@ export function useRequestList(service, options, useRequestOptions) {
 
   // 重置查询条件
   var onReset = useCallback(function () {
-    onSearch({
-      d: Date.now()
-    });
+    onSearch({});
   }, [onSearch]);
   var dataSource = useMemo(function () {
     if (data) {

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

@@ -5,13 +5,13 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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 { SearchOutlined } from '@ant-design/icons';
 import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
 import { Form, message, Input, Tooltip, Space, Button, Spin } from 'antd';
-import { debounce, isArray, isEqual, isFunction } from 'lodash';
+import { debounce, isArray, isBoolean, isEqual, isFunction, isObject } from 'lodash';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
@@ -34,6 +34,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,
@@ -46,11 +48,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】');
@@ -160,8 +170,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformParams: transformParams,
       transformResponse: transformResponse
     }, _objectSpread({
-      manual: true,
-      ready: (initParams || defaultOne) && !readOnly || open
+      ready: (initParams || defaultOne) && nextMode === 'input' || open
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -193,7 +202,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]
@@ -231,7 +240,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];
@@ -254,7 +263,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
       });
@@ -515,7 +524,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                   selectedRows: list,
                   selectedRowKeys: nextSelectRowKeys
                 });
-              } else if (!readOnly) {
+              } else if (nextMode === 'input') {
                 // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
                 setState({
                   _value: value,
@@ -604,13 +613,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],
@@ -633,7 +642,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];
         }
@@ -659,12 +668,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     hideTooltipIfOpen(fieldRef.current, open);
   }, [open]);
   useEffect(function () {
-    if (value && !open && isInit && !readOnly) {
+    if (value && !open && isInit && nextMode === 'input') {
       getInitValues();
     }
   }, [JSON.stringify(value), open, isInit]);
   useDebounceEffect(function () {
-    if (value && !open && readOnly && (!isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !open && 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;
@@ -731,7 +740,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         });
       }
     }
-    if (!readOnly) {
+    if (nextMode === 'input') {
       if (labelInValue && _value && !isEqual(value, _value)) {
         setState({
           _value: value,
@@ -755,7 +764,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? /*#__PURE__*/_jsx(ProSelect, _objectSpread({
+    children: [nextMode === 'select' ? /*#__PURE__*/_jsx(ProSelect, _objectSpread({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -771,16 +780,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: handleSelectFocus,
       onSearch: handleSelectSearch,
+      tooltip: _tooltip,
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : /*#__PURE__*/_jsx(Input, _objectSpread({
-      value: viewText,
-      onChange: handleChangeValue,
-      disabled: disabled,
-      autoComplete: "off",
-      allowClear: true
-    }, restProps)), isView || disabled ? null : /*#__PURE__*/_jsx(Button, {
+    }, restProps)) : /*#__PURE__*/_jsx(Tooltip, {
+      title: _tooltip ? viewText : null,
+      placement: "topLeft",
+      children: /*#__PURE__*/_jsx(Input, _objectSpread({
+        value: viewText,
+        onChange: handleChangeValue,
+        disabled: disabled,
+        autoComplete: "off",
+        allowClear: true
+      }, restProps))
+    }), isView || disabled ? null : /*#__PURE__*/_jsx(Button, {
       onClick: handleClick,
       icon: /*#__PURE__*/_jsx(ReactSVG, {
         className: "viewSvg",
@@ -795,41 +809,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) || []
@@ -868,14 +847,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       className: _className,
       style: style,
       ref: fieldRef,
-      children: isTooltip && viewText ? /*#__PURE__*/_jsx(Tooltip, {
-        placement: "topLeft",
-        open: open,
-        title: viewText,
-        children: initRender
-      }) : initRender
+      children: initRender
     }), /*#__PURE__*/_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

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-modal-select,
 .pro-tree-modal {
@@ -53,7 +51,7 @@
     }
   }
 
-  // 新加适用于 readonly false
+  // 新加适用于 _readOnly false
   .@{ant-prefix}-input-affix-wrapper {
     border-top-right-radius: 0;
     border-bottom-right-radius: 0;
@@ -102,7 +100,6 @@
     }
   }
 
-
   .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
       .@{ant-prefix}-input,

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

@@ -1,7 +1,8 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
-
 .pro-number-range {
+  display: block;
+  .@{ant-prefix}-space-compact {
+    display: block;
+  }
   .range-split {
     min-width: 32px;
     max-width: 32px;

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

@@ -1,5 +1,3 @@
-/* @root-entry-name: 'default'; */
-/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .@{ant-prefix}-form-item-has-error {
   .@{ant-prefix}-picker-status-error

package/es/ProForm/components/render/ChangedWrapper.js

@@ -58,8 +58,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      onDiff: onDiff
-      // name: namesStr || name,
+      onDiff: onDiff,
+      type: props.type
     });
   }, [isWatch, noChange, props[valuePropName], originalValue, _typeof(onDiff)]);
   var isAdd = diffType === 'add';