@zat-design/sisyphus-react 3.13.14-deta.2 → 4.0.0-beta.3

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

@@ -1,45 +1,31 @@
-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/spin/style";
-import _Spin from "antd/es/spin";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
-import "antd/es/message/style";
-import _message from "antd/es/message";
 import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 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 "antd/es/form/style";
-import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-import _isFunction from "lodash/isFunction";
-import _isEqual from "lodash/isEqual";
-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"],
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 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 classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
-import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
-import Container from '../../Container';
-import viewSvg from '../../../../assets/view.svg';
-import useRequestList from './hooks/useRequestList';
-import locale from '../../../../locale';
-import { hideTooltipIfOpen } from './utils';
+import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from "../../../../index";
+import Container from "../../Container";
+import viewSvg from "../../../../assets/view.svg";
+import useRequestList from "./hooks/useRequestList";
+import locale from "../../../../locale";
+import { hideTooltipIfOpen } from "./utils";
+import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _useRequest$options, _useRequest$options2, _useRequest$options2$, _useRequest$options3, _formColumns$;
+  var _useRequest$options, _useRequest$options2, _useRequest$options3, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -65,7 +51,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     defaultOne = props.defaultOne,
     otherProps = props.otherProps,
     restProps = _objectWithoutProperties(props, _excluded);
-  var contentForm = _Form.useFormInstance();
+  var contentForm = Form.useFormInstance();
   if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
     throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
   }
@@ -86,10 +72,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+
   // 是否多选
   var isMultiple = type === 'checkbox';
+
   // 生成一个唯一id，用于满足tooltip功能
   var uuid = Math.random().toString(36).slice(-6);
+
   // 全局配置fieldNames指定 value与label的key
   var _ref3 = useProConfig('ProModalSelect') || {},
     _ref3$fieldNames = _ref3.fieldNames,
@@ -100,6 +89,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     labelKey = proModalSelectFieldNames.label;
     valueKey = proModalSelectFieldNames.value;
   }
+
   // 表单上配置的权重大于全局配置
   if (fieldNames && Object.keys(fieldNames).length) {
     labelKey = fieldNames.label;
@@ -114,13 +104,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   var preValue = useRef(value);
   // 表单项的ref
   var fieldRef = useRef(null);
-  var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : (_useRequest$options2$ = _useRequest$options2.defaultParams) === null || _useRequest$options2$ === void 0 ? void 0 : _useRequest$options2$[0] : (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
+  var defaultParams = Array.isArray(useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 ? void 0 : _useRequest$options.defaultParams) ? useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 || (_useRequest$options2 = _useRequest$options2.defaultParams) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2[0] : (useRequest === null || useRequest === void 0 || (_useRequest$options3 = useRequest.options) === null || _useRequest$options3 === void 0 ? void 0 : _useRequest$options3.defaultParams) || {};
   var defaultParamsRef = useRef(defaultParams); // 缓存 defaultParams 的引用
+
   var _useSetState = useSetState({
       _value: value,
       isInit: true,
       onOff: false,
-      visible: false,
       open: false,
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || [],
       selectedRows: [],
@@ -131,13 +121,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     _value = _useSetState2$._value,
     isInit = _useSetState2$.isInit,
     onOff = _useSetState2$.onOff,
-    visible = _useSetState2$.visible,
     open = _useSetState2$.open,
     options = _useSetState2$.options,
     _selectedRows = _useSetState2$.selectedRows,
     _selectedRowKeys = _useSetState2$.selectedRowKeys,
     setState = _useSetState2[1];
-  var _Form$useForm = _Form.useForm(searchForm),
+  var _Form$useForm = Form.useForm(searchForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   var selectedRows = (rowSelection === null || rowSelection === void 0 ? void 0 : rowSelection.selectedRows) || _selectedRows;
@@ -150,7 +139,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       manual: true,
       onSuccess: function onSuccess(res) {
         var _res$data, _ref5;
-        var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
+        var list = withPagination ? res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
           options: (_ref5 = transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list) !== null && _ref5 !== void 0 ? _ref5 : []
         });
@@ -162,7 +151,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     var nextInitParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
     if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
       var _contentForm$getField;
-      nextInitParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
+      nextInitParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 || (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
     }
     return nextInitParams;
   }, [value]);
@@ -172,7 +161,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       transformResponse: transformResponse
     }, _objectSpread({
       manual: true,
-      ready: (initParams || defaultOne) && !readOnly || visible
+      ready: (initParams || defaultOne) && !readOnly || open
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -192,6 +181,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return "".concat(value, "-").concat(label);
     };
   }
+
   /**
    * 格式化数据方法，展示在输入框中
    * @date 2023-02-16
@@ -209,7 +199,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         label: data[labelKey]
       }));
     }
-    return _isArray(data) ? data === null || data === void 0 ? void 0 : (_data$map = data.map(function (item) {
+    return isArray(data) ? data === null || data === void 0 || (_data$map = data.map(function (item) {
       return handleFormat(_objectSpread(_objectSpread({}, item), {}, {
         value: item[valueKey],
         label: item[labelKey]
@@ -222,7 +212,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       nextValue = value;
     } else {
       var _options$find;
-      var optionDTO = options === null || options === void 0 ? void 0 : (_options$find = options.find) === null || _options$find === void 0 ? void 0 : _options$find.call(options, function (item) {
+      var optionDTO = options === null || options === void 0 || (_options$find = options.find) === null || _options$find === void 0 ? void 0 : _options$find.call(options, function (item) {
         return item[valueKey] === value;
       });
       if (optionDTO) {
@@ -233,6 +223,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     return formatValue(nextValue);
   }, [value, _value, options]);
+
   /**
    * 获取表格的rowKey，支持函数、字符串
    * @date 2023-02-16
@@ -245,6 +236,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
     return record[rowKey];
   };
+
   /**
    * 执行onChange暴露出来的第一个参数取数方法
    * @date 2023-02-16
@@ -273,7 +265,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     preValue.current = val;
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$beforeOpen, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -309,7 +301,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 onOff: true
               });
               setTimeout(function () {
-                afterOpen === null || afterOpen === void 0 ? void 0 : afterOpen({
+                afterOpen === null || afterOpen === void 0 || afterOpen({
                   setInnerState: setState
                 });
               }, 100);
@@ -329,32 +321,33 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     form.resetFields();
     setState({
       onOff: false,
-      visible: false,
+      open: false,
       isInit: false
     });
+
     // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options4 = useRequest.options) === null || _useRequest$options4 === void 0 ? void 0 : _useRequest$options4.manual) {
+    if (useRequest !== null && useRequest !== void 0 && (_useRequest$options4 = useRequest.options) !== null && _useRequest$options4 !== void 0 && _useRequest$options4.manual) {
       mutate(function () {
         return [];
       });
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             _context2.prev = 0;
-            if (!(!(selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || !(selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length))) {
+            if (!(!(selectedRowKeys !== null && selectedRowKeys !== void 0 && selectedRowKeys.length) || !(selectedRows !== null && selectedRows !== void 0 && selectedRows.length))) {
               _context2.next = 4;
               break;
             }
-            _message.error(locale.ProModalSelect.checkMsg);
+            message.error(locale.ProModalSelect.checkMsg);
             return _context2.abrupt("return", false);
           case 4:
             nextSelectedRows = selectedRows;
-            if (!((_nextSelectedRows = nextSelectedRows) === null || _nextSelectedRows === void 0 ? void 0 : _nextSelectedRows[0])) {
+            if (!((_nextSelectedRows = nextSelectedRows) !== null && _nextSelectedRows !== void 0 && _nextSelectedRows[0])) {
               nextSelectedRows = data.filter(function (item) {
                 return selectedRowKeys.includes(item[valueKey]);
               });
@@ -381,12 +374,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             }
           case 14:
             if (flag) {
-              onChange === null || onChange === void 0 ? void 0 : onChange(labelInValue ? record : getNextValues(record), record);
+              onChange === null || onChange === void 0 || onChange(labelInValue ? record : getNextValues(record), record);
               preValue.current = labelInValue ? record : getNextValues(record);
               // 更新内部展示值
               setState({
                 _value: record,
-                options: _isArray(record) ? record : [record]
+                options: isArray(record) ? record : [record]
               });
               handleClose();
             }
@@ -406,7 +399,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -444,13 +437,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     selectedRowKeys: selectedRowKeys,
     selectedRows: selectedRows
   }, rowSelection);
+
   // 点击行进行勾选
   var handleClickRow = function handleClickRow(record) {
-    var _rowSelection$getChec, _rowSelection$getChec2;
-    if (_rowSelection === null || _rowSelection === void 0 ? void 0 : (_rowSelection$getChec = _rowSelection.getCheckboxProps) === null || _rowSelection$getChec === void 0 ? void 0 : (_rowSelection$getChec2 = _rowSelection$getChec.call(_rowSelection, record)) === null || _rowSelection$getChec2 === void 0 ? void 0 : _rowSelection$getChec2.disabled) {
+    var _rowSelection$getChec;
+    if (_rowSelection !== null && _rowSelection !== void 0 && (_rowSelection$getChec = _rowSelection.getCheckboxProps) !== null && _rowSelection$getChec !== void 0 && (_rowSelection$getChec = _rowSelection$getChec.call(_rowSelection, record)) !== null && _rowSelection$getChec !== void 0 && _rowSelection$getChec.disabled) {
       return;
     }
-    if (record === null || record === void 0 ? void 0 : record.disabled) return;
+    if (record !== null && record !== void 0 && record.disabled) return;
     var selectedValue = getRowKey(record);
     var tempSelectedRows = _toConsumableArray(selectedRows);
     var tempSelectedRowKeys = _toConsumableArray(selectedRowKeys);
@@ -477,9 +471,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       selectedRowKeys: tempSelectedRowKeys
     });
   };
+
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _useRequest$options5, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -492,7 +487,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
+            }, useRequest === null || useRequest === void 0 || (_useRequest$options5 = useRequest.options) === null || _useRequest$options5 === void 0 ? void 0 : _useRequest$options5.page);
             params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -501,8 +496,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             return runAsync(params);
           case 7:
             res = _context4.sent;
-            if (res === null || res === void 0 ? void 0 : res.data) {
-              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
+            if (res !== null && res !== void 0 && res.data) {
+              list = withPagination ? res === null || res === void 0 || (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
               }
@@ -538,9 +533,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       return _ref10.apply(this, arguments);
     };
   }();
+
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options6;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -550,7 +546,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             page = _objectSpread({
               pageNum: 1,
               pageSize: 10
-            }, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
+            }, useRequest === null || useRequest === void 0 || (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.page);
             params = withPagination ? _objectSpread(_objectSpread({}, page), {}, {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
@@ -559,8 +555,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
             return runAsync(params);
           case 6:
             res = _context5.sent;
-            if (res === null || res === void 0 ? void 0 : res.data) {
-              list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
+            if (res !== null && res !== void 0 && res.data) {
+              list = withPagination ? res === null || res === void 0 || (_res$data3 = res.data) === null || _res$data3 === void 0 ? void 0 : _res$data3.list : res === null || res === void 0 ? void 0 : res.data;
               if (transformResponse) {
                 list = transformResponse(res === null || res === void 0 ? void 0 : res.data);
               }
@@ -624,13 +620,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   });
   useEffect(function () {
-    if (onOff && !visible) {
+    if (onOff && !open) {
       var _useRequest$options7;
-      if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
+      if ((useRequest === null || useRequest === void 0 || (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.manual) !== true) {
         onReset();
       }
       var nextState = {
-        visible: true
+        open: true
       };
       if (labelInValue) {
         if (!value) {
@@ -641,7 +637,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
           nextState.selectedRowKeys = [getRowKey(value)];
           nextState.selectedRows = [value];
         }
-        if (_isArray(value)) {
+        if (isArray(value)) {
           nextState.selectedRowKeys = value.map(function (item) {
             return getRowKey(item);
           });
@@ -652,27 +648,27 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         var nextSelectedRowKeys = isMultiple ? value : [value];
         nextState.selectedRowKeys = nextSelectedRowKeys;
         var list = options !== null && options !== void 0 ? options : data;
-        nextState.selectedRows = list === null || list === void 0 ? void 0 : (_list$filter = list.filter) === null || _list$filter === void 0 ? void 0 : _list$filter.call(list, function (item) {
+        nextState.selectedRows = list === null || list === void 0 || (_list$filter = list.filter) === null || _list$filter === void 0 ? void 0 : _list$filter.call(list, function (item) {
           return nextSelectedRowKeys.includes(item[valueKey]);
         });
       }
       setState(nextState);
     }
-  }, [onOff, visible, JSON.stringify(value)]);
+  }, [onOff, open, JSON.stringify(value)]);
   useEffect(function () {
-    hideTooltipIfOpen(fieldRef.current, visible);
-  }, [visible]);
+    hideTooltipIfOpen(fieldRef.current, open);
+  }, [open]);
   useEffect(function () {
-    if (value && !visible && isInit && !readOnly) {
+    if (value && !open && isInit && !readOnly) {
       getInitValues();
     }
-  }, [JSON.stringify(value), visible, isInit]);
+  }, [JSON.stringify(value), open, isInit]);
   useDebounceEffect(function () {
-    if (value && !visible && readOnly && (!_isEqual(value, preValue.current) || (options === null || options === void 0 ? void 0 : options.length) === 0)) {
+    if (value && !open && readOnly && (!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;
-      var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
+      var isHasValue = options === null || options === void 0 || (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
         return item[valueKey] === _data3;
       });
       if (isHasValue) {
@@ -691,7 +687,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         }, 300);
       }
     }
-  }, [JSON.stringify(value), visible, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
+  }, [JSON.stringify(value), open, JSON.stringify(defaultParams), JSON.stringify(initParams), options === null || options === void 0 ? void 0 : options.length]);
   var handleSelectFocus = function handleSelectFocus() {
     if (useRequest) {
       var queryBean = defaultParams || {};
@@ -702,7 +698,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       } : queryBean;
       var nextParams = transformParams ? transformParams(params) : params;
       // 减少请求条件一致时，且请求过时，focus的重复请求
-      if (!_isEqual(queryBean, defaultParamsRef.current) || !(options === null || options === void 0 ? void 0 : options.length)) {
+      if (!isEqual(queryBean, defaultParamsRef.current) || !(options !== null && options !== void 0 && options.length)) {
         run(nextParams); // 触发 run 请求
         defaultParamsRef.current = queryBean; // 更新缓存
       }
@@ -711,7 +707,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   };
-  var handleSelectSearch = _debounce(function (val) {
+  var handleSelectSearch = debounce(function (val) {
     if (useRequest) {
       var queryBean = _objectSpread(_objectSpread({}, defaultParams), {}, _defineProperty({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
       var params = withPagination ? {
@@ -736,14 +732,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }
     }
     if (!readOnly) {
-      if (labelInValue && _value && !_isEqual(value, _value)) {
+      if (labelInValue && _value && !isEqual(value, _value)) {
         setState({
           _value: value,
           selectedRowKeys: [],
           selectedRows: []
         });
       }
-      if (!labelInValue && !_isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
+      if (!labelInValue && !isEqual(value, _value === null || _value === void 0 ? void 0 : _value[valueKey])) {
         setState({
           _value: value,
           selectedRowKeys: [],
@@ -752,13 +748,14 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }
     }
   }, [value, _value]);
+
   // 加个中间状态Input
-  var initRender = _jsxs(_Space.Compact, {
+  var initRender = /*#__PURE__*/_jsxs(Space.Compact, {
     style: {
       width: '100%'
     },
     block: true,
-    children: [readOnly ? _jsx(ProSelect, _objectSpread({
+    children: [readOnly ? /*#__PURE__*/_jsx(ProSelect, _objectSpread({
       value: value,
       onChange: handleSelectValue,
       disabled: disabled,
@@ -769,7 +766,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       optionRender: optionRender,
       scrollFollowParent: false,
       mode: isMultiple ? 'multiple' : undefined,
-      notFoundContent: selectLoading ? _jsx(_Spin, {
+      notFoundContent: selectLoading ? /*#__PURE__*/_jsx(Spin, {
         size: "small"
       }) : null,
       onFocus: handleSelectFocus,
@@ -777,22 +774,22 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       style: {
         width: isView || disabled ? '100%' : 'calc(100% - 30px)'
       }
-    }, restProps)) : _jsx(_Input, _objectSpread({
+    }, restProps)) : /*#__PURE__*/_jsx(Input, _objectSpread({
       value: viewText,
       onChange: handleChangeValue,
       disabled: disabled,
       autoComplete: "off",
       allowClear: true
-    }, restProps)), isView || disabled ? null : _jsx(_Button, {
-      icon: _jsx(ReactSVG, {
+    }, restProps)), isView || disabled ? null : /*#__PURE__*/_jsx(Button, {
+      onClick: handleClick,
+      icon: /*#__PURE__*/_jsx(ReactSVG, {
         className: "viewSvg",
-        src: viewSvg,
-        onClick: handleClick
+        src: viewSvg
       })
     })]
   });
   if (customRender && /*#__PURE__*/React.isValidElement(customRender)) {
-    initRender = _jsx("div", {
+    initRender = /*#__PURE__*/_jsx("div", {
       className: "pro-modal-select-init",
       onClick: handleClick,
       children: customRender
@@ -838,60 +835,62 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
     });
   }, [tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource]);
+
   // 当搜索条件只有一个时，且为输入框，默认设置suffix
-  if ((formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) === 1 && (formColumns === null || formColumns === void 0 ? void 0 : (_formColumns$ = formColumns[0]) === null || _formColumns$ === void 0 ? void 0 : _formColumns$.type) === 'Input') {
-    var _formColumns$2, _formColumns$3, _formColumns$3$fieldP;
-    if (!((_formColumns$2 = formColumns[0]) === null || _formColumns$2 === void 0 ? void 0 : _formColumns$2.fieldProps)) {
+  if ((formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) === 1 && (formColumns === null || formColumns === void 0 || (_formColumns$ = formColumns[0]) === null || _formColumns$ === void 0 ? void 0 : _formColumns$.type) === 'Input') {
+    var _formColumns$2, _formColumns$3;
+    if (!((_formColumns$2 = formColumns[0]) !== null && _formColumns$2 !== void 0 && _formColumns$2.fieldProps)) {
       formColumns[0].fieldProps = {};
     }
-    if (!_isFunction(formColumns[0].fieldProps) && !(formColumns === null || formColumns === void 0 ? void 0 : (_formColumns$3 = formColumns[0]) === null || _formColumns$3 === void 0 ? void 0 : (_formColumns$3$fieldP = _formColumns$3.fieldProps) === null || _formColumns$3$fieldP === void 0 ? void 0 : _formColumns$3$fieldP.suffix)) {
-      formColumns[0].fieldProps.suffix = _jsx(SearchOutlined, {
+    if (!isFunction(formColumns[0].fieldProps) && !(formColumns !== null && formColumns !== void 0 && (_formColumns$3 = formColumns[0]) !== null && _formColumns$3 !== void 0 && (_formColumns$3 = _formColumns$3.fieldProps) !== null && _formColumns$3 !== void 0 && _formColumns$3.suffix)) {
+      formColumns[0].fieldProps.suffix = /*#__PURE__*/_jsx(SearchOutlined, {
         onClick: handleSearch
       });
     }
   }
   if (isView) {
     if (!value) {
-      return _jsx(_Fragment, {
+      return /*#__PURE__*/_jsx(_Fragment, {
         children: viewEmpty
       });
     }
-    return _jsx(Container, {
+    return /*#__PURE__*/_jsx(Container, {
       viewEmpty: viewEmpty,
       children: "".concat(viewText)
     });
   }
   var _className = classNames(_defineProperty(_defineProperty({
     'pro-modal-select': true
-  }, props.className, props.className), 'pro-modal-select-open', visible));
-  return _jsxs(_Fragment, {
-    children: [_jsx("div", {
+  }, props.className, props.className), 'pro-modal-select-open', open));
+  return /*#__PURE__*/_jsxs(_Fragment, {
+    children: [/*#__PURE__*/_jsx("div", {
       id: uuid,
       className: _className,
       style: style,
       ref: fieldRef,
-      children: isTooltip && viewText ? _jsx(_Tooltip, {
+      children: isTooltip && viewText ? /*#__PURE__*/_jsx(Tooltip, {
         placement: "topLeft",
         open: open,
         title: viewText,
         children: initRender
       }) : initRender
-    }), _jsxs(ProDrawerForm, _objectSpread(_objectSpread({
+    }), /*#__PURE__*/_jsxs(ProDrawerForm, _objectSpread(_objectSpread({
       showType: "Modal",
       title: title,
-      onOk: handleFinish,
+      onOk: handleFinish
       // @ts-ignore
+      ,
       onCancel: handleClose,
-      open: visible
+      open: open
     }, restModalProps), {}, {
-      children: [_jsx(ProForm, {
+      children: [/*#__PURE__*/_jsx(ProForm, {
         submitOnEnter: true,
         form: form,
         columns: formColumns,
         onFinish: handleSearch,
         confirmLoading: loading,
         footer: (formColumns === null || formColumns === void 0 ? void 0 : formColumns.length) > 1
-      }), _jsx(ProTable, _objectSpread({
+      }), /*#__PURE__*/_jsx(ProTable, _objectSpread({
         onRow: function onRow(record) {
           return {
             onClick: function onClick() {

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

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-modal-select,
 .pro-tree-modal {
@@ -59,9 +59,9 @@
     border-bottom-right-radius: 0;
     &.@{ant-prefix}-input-affix-wrapper-status-error{
        & + .@{ant-prefix}-btn{
-        border: 1px solid var(--ant-error-color);
+        border: 1px solid #ff4d4f;
         >.viewSvg{
-          color: var(--ant-error-color);
+          color: #ff4d4f;
         }
       }
     }
@@ -81,7 +81,9 @@
   .@{ant-prefix}-btn-compact-item.@{ant-prefix}-btn.@{ant-prefix}-btn-compact-last-item:not(.@{ant-prefix}-btn-compact-first-item):not(.@{ant-prefix}-btn-compact-item-rtl){
     &:hover{
       position: relative;
+      z-index: 1;
       transition: none;
+      border-color: var(--ant-primary-color-hover, #1677ff) !important;
       &::before{
         opacity: 1;
       }
@@ -93,16 +95,13 @@
       left: -1px;
       width: 1px;
       height: calc(100% + 2px);
-      background:var(--ant-primary-color-hover);
+      background: var(--ant-primary-color-hover, #1677ff);
       opacity: 0;
       display: block;
+      z-index: 2;
     }
   }
 
-  .@{ant-prefix}-input-affix-wrapper-status-error{
-    
-  }
-
 
   .@{ant-prefix}-input-group-wrapper-status-error {
     &:hover {
@@ -132,7 +131,7 @@
   }
 
   .viewSvg {
-    height: 20px;
+    height: 16px;
     cursor: pointer;
     fill: #c5c7cd;
   }
@@ -140,11 +139,11 @@
   .@{ant-prefix}-space-compact {
     .@{ant-prefix}-select-compact-item-div:has(.@{ant-prefix}-select-status-error) {
       & + .@{ant-prefix}-btn-compact-last-item {
-        border-top: 1px solid var(--ant-error-color);
-        border-right: 1px solid var(--ant-error-color);
-        border-bottom: 1px solid var(--ant-error-color);
+        border-top: 1px solid #ff4d4f;
+        border-right: 1px solid #ff4d4f;
+        border-bottom: 1px solid #ff4d4f;
         >.viewSvg{
-          color: var(--ant-error-color);
+          color: #ff4d4f;
         }
       }
     }