@zat-design/sisyphus-react 4.5.9 → 4.5.10-beta.2

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

@@ -1,15 +1,22 @@
-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";
-import { SearchOutlined } from '@ant-design/icons';
-import { useDebounceEffect, useDeepCompareEffect, useMount, useSetState } from 'ahooks';
-import { Form, message, Input, Tooltip, Space, Button, Spin } from 'antd';
-import classNames from 'classnames';
-import { ReactSVG } from 'react-svg';
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
+import { Fragment, jsx, jsxs } 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 from "lodash/debounce";
+import isArray from "lodash/isArray";
+import isBoolean from "lodash/isBoolean";
+import isEqual from "lodash/isEqual";
+import isFunction from "lodash/isFunction";
+import isObject from "lodash/isObject";
+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";
@@ -17,8 +24,8 @@ import useRequestList from "./hooks/useRequestList";
 import locale from "../../../../locale";
 import { hideTooltipIfOpen, mergeSelectedRows } from "./utils";
 import { generateId } from "../../../../utils";
-import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 const ProModalSelect = (props, ref) => {
+  var _a, _b, _c, _d, _e, _f, _g, _h, _i, _j, _k, _l;
   const {
     value,
     onChange,
@@ -26,7 +33,7 @@ const ProModalSelect = (props, ref) => {
     labelInValue = false,
     fieldNames,
     readOnly = true,
-    mode = 'select',
+    mode = "select",
     addonAfter,
     configOption,
     title,
@@ -48,17 +55,17 @@ const ProModalSelect = (props, ref) => {
   } = props;
   const _tooltip = tooltip ?? isTooltip;
   const nextMode = useMemo(() => {
-    if (_isBoolean(readOnly) && readOnly === false) {
-      return 'input';
+    if (isBoolean(readOnly) && readOnly === false) {
+      return "input";
     }
     return mode;
   }, [mode, readOnly]);
   const contentForm = Form.useFormInstance();
-  if (!configOption || Object.prototype.toString.call(configOption) !== '[object Object]') {
-    throw new Error('error: 请检查枚举选择弹框的配置项【configOption】');
+  if (!configOption || Object.prototype.toString.call(configOption) !== "[object Object]") {
+    throw new Error("error: 请检查枚举选择弹框的配置项【configOption】");
   }
   const {
-    type = 'radio',
+    type = "radio",
     useRequest,
     transformParams,
     transformResponse,
@@ -67,150 +74,124 @@ const ProModalSelect = (props, ref) => {
     modalProps,
     tableProps
   } = configOption;
-  const {
-    onOk,
-    ...restModalProps
-  } = modalProps || {};
-  const {
-    isView: isViewCon,
-    viewEmpty
-  } = ProForm.useFieldProps() || {};
-  const isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
-
-  // 是否多选
-  const isMultiple = type === 'checkbox';
-
-  // 生成一个唯一id，用于满足tooltip功能
+  const { onOk, ...restModalProps } = modalProps || {};
+  const { isView: isViewCon, viewEmpty } = ProForm.useFieldProps() || {};
+  const isView = typeof props.isView === "boolean" ? props.isView : isViewCon;
+  const isMultiple = type === "checkbox";
   const uuid = generateId();
-
-  // 全局配置fieldNames指定 value与label的key
-  const {
-    fieldNames: proModalSelectFieldNames = {}
-  } = useProConfig('ProModalSelect') || {};
-  let labelKey = 'label';
-  let valueKey = 'value';
+  const { fieldNames: proModalSelectFieldNames = {} } = useProConfig("ProModalSelect") || {};
+  let labelKey = "label";
+  let valueKey = "value";
   if (proModalSelectFieldNames && Object.keys(proModalSelectFieldNames).length) {
     labelKey = proModalSelectFieldNames.label;
     valueKey = proModalSelectFieldNames.value;
   }
-
-  // 表单上配置的权重大于全局配置
   if (fieldNames && Object.keys(fieldNames).length) {
     labelKey = fieldNames.label;
     valueKey = fieldNames.value;
   }
-  const {
-    rowKey = valueKey,
-    columns,
-    rowSelection,
-    ...restTableProps
-  } = tableProps || {};
+  const { rowKey = valueKey, columns, rowSelection, ...restTableProps } = tableProps || {};
   const preValue = useRef(value);
-  // 表单项的ref
   const fieldRef = useRef(null);
-  const defaultParams = Array.isArray(useRequest?.options?.defaultParams) ? useRequest?.options?.defaultParams?.[0] : useRequest?.options?.defaultParams || {};
-  const defaultParamsRef = useRef(defaultParams); // 缓存 defaultParams 的引用
-
-  const [{
-    _value,
-    isInit,
-    onOff,
-    open,
-    options,
-    selectedRows: _selectedRows,
-    selectedRowKeys: _selectedRowKeys
-  }, setState] = useSetState({
+  const defaultParams = Array.isArray((_a = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a.defaultParams) ? (_c = (_b = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _b.defaultParams) == null ? void 0 : _c[0] : ((_d = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _d.defaultParams) || {};
+  const defaultParamsRef = useRef(defaultParams);
+  const [
+    {
+      _value,
+      isInit,
+      onOff,
+      open,
+      options,
+      selectedRows: _selectedRows,
+      selectedRowKeys: _selectedRowKeys
+    },
+    setState
+  ] = useSetState({
     _value: value,
     isInit: true,
     onOff: false,
     open: false,
-    options: tableProps?.dataSource || [],
+    options: (tableProps == null ? void 0 : tableProps.dataSource) || [],
     selectedRows: [],
     selectedRowKeys: []
   });
   const [form] = Form.useForm(searchForm);
-  const selectedRows = rowSelection?.selectedRows || _selectedRows;
-  const selectedRowKeys = rowSelection?.selectedRowKeys || _selectedRowKeys;
-  const {
-    run,
-    loading: selectLoading
-  } = useRequestList(useRequest?.service, {
-    withPagination,
-    transformParams,
-    transformResponse
-  }, {
-    ...useRequest?.options,
-    manual: true,
-    onSuccess(res) {
-      const list = withPagination ? res?.data?.list : res?.data;
-      setState({
-        options: (transformResponse ? transformResponse(res?.data) : list) ?? []
-      });
+  const selectedRows = (rowSelection == null ? void 0 : rowSelection.selectedRows) || _selectedRows;
+  const selectedRowKeys = (rowSelection == null ? void 0 : rowSelection.selectedRowKeys) || _selectedRowKeys;
+  const { run, loading: selectLoading } = useRequestList(
+    useRequest == null ? void 0 : useRequest.service,
+    {
+      withPagination,
+      transformParams,
+      transformResponse
+    },
+    {
+      ...useRequest == null ? void 0 : useRequest.options,
+      manual: true,
+      onSuccess(res) {
+        var _a2;
+        const list = withPagination ? (_a2 = res == null ? void 0 : res.data) == null ? void 0 : _a2.list : res == null ? void 0 : res.data;
+        setState({
+          options: (transformResponse ? transformResponse(res == null ? void 0 : res.data) : list) ?? []
+        });
+      }
     }
-  });
+  );
   const initParams = useMemo(() => {
-    let nextInitParams = useRequest?.initParams;
-    if (typeof useRequest?.initParams === 'function') {
-      nextInitParams = useRequest?.initParams(value, contentForm?.getFieldsValue?.());
+    var _a2;
+    let nextInitParams = useRequest == null ? void 0 : useRequest.initParams;
+    if (typeof (useRequest == null ? void 0 : useRequest.initParams) === "function") {
+      nextInitParams = useRequest == null ? void 0 : useRequest.initParams(value, (_a2 = contentForm == null ? void 0 : contentForm.getFieldsValue) == null ? void 0 : _a2.call(contentForm));
     }
     return nextInitParams;
   }, [value]);
-  const {
-    data,
-    loading,
-    pagination,
-    onSearch,
-    onReset,
-    runAsync,
-    mutate
-  } = useRequestList(useRequest?.service, {
-    withPagination,
-    transformParams,
-    transformResponse
-  }, {
-    ready: (initParams || defaultOne) && nextMode === 'input' || open,
-    ...useRequest?.options
-  });
-  const defaultOptionRender = rowData => rowData?.[labelKey];
+  const { data, loading, pagination, onSearch, onReset, runAsync, mutate } = useRequestList(
+    useRequest == null ? void 0 : useRequest.service,
+    {
+      withPagination,
+      transformParams,
+      transformResponse
+    },
+    {
+      ...useRequest == null ? void 0 : useRequest.options,
+      ready: ((_e = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _e.ready) ?? ((initParams || defaultOne) && nextMode === "input" ? true : void 0),
+      manual: ((_f = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _f.manual) ?? ((initParams || defaultOne) && nextMode === "input" ? void 0 : true)
+    }
+  );
+  const defaultOptionRender = (rowData) => rowData == null ? void 0 : rowData[labelKey];
   let handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
-    handleFormat = ({
-      value,
-      label
-    }) => `${value}-${label}`;
+    handleFormat = ({ value: value2, label }) => `${value2}-${label}`;
   }
-
-  /**
-   * 格式化数据方法，展示在输入框中
-   * @date 2023-02-16
-   * @param {any} data 当前选中的值 labelInValue模式下为选中行对象，单值模式为value值
-   * @returns {any}
-   */
-  const formatValue = data => {
-    if (typeof data === 'string' || typeof data === 'number') {
-      return data;
+  const formatValue = (data2) => {
+    if (typeof data2 === "string" || typeof data2 === "number") {
+      return data2;
     }
-    if (_isObject(data)) {
-      return handleFormat({
-        ...data,
-        value: data[valueKey],
-        label: data[labelKey]
-      });
+    if (isArray(data2)) {
+      return data2.map((item) => {
+        return handleFormat({
+          ...item,
+          value: item[valueKey],
+          label: item[labelKey]
+        });
+      }).join("、");
     }
-    return _isArray(data) ? data?.map(item => {
+    if (isObject(data2)) {
       return handleFormat({
-        ...item,
-        value: item[valueKey],
-        label: item[labelKey]
+        ...data2,
+        value: data2[valueKey],
+        label: data2[labelKey]
       });
-    })?.join('、') : '';
+    }
+    return "";
   };
   const viewText = useMemo(() => {
+    var _a2;
     let nextValue = labelInValue ? value : _value;
     if (labelInValue) {
       nextValue = value;
     } else {
-      const optionDTO = options?.find?.(item => item[valueKey] === value);
+      const optionDTO = (_a2 = options == null ? void 0 : options.find) == null ? void 0 : _a2.call(options, (item) => item[valueKey] === value);
       if (optionDTO) {
         nextValue = optionDTO;
       } else {
@@ -219,36 +200,22 @@ const ProModalSelect = (props, ref) => {
     }
     return formatValue(nextValue);
   }, [value, _value, options]);
-
-  /**
-   * 获取表格的rowKey，支持函数、字符串
-   * @date 2023-02-16
-   * @param {any} record 表格行数据
-   * @returns {any}
-   */
-  const getRowKey = record => {
-    if (_isFunction(rowKey)) {
+  const getRowKey = (record) => {
+    if (isFunction(rowKey)) {
       return rowKey(record);
     }
     return record[rowKey];
   };
-
-  /**
-   * 执行onChange暴露出来的第一个参数取数方法
-   * @date 2023-02-16
-   * @param {any} selectedRows 选中行数据
-   * @returns {any}
-   */
-  const getNextValues = selectedRows => {
+  const getNextValues = (selectedRows2) => {
     if (isMultiple) {
-      return selectedRows.map(item => item?.[valueKey]);
+      return selectedRows2.map((item) => item == null ? void 0 : item[valueKey]);
     }
-    return selectedRows?.[valueKey];
+    return selectedRows2 == null ? void 0 : selectedRows2[valueKey];
   };
-  const handleChangeValue = e => {
+  const handleChangeValue = (e) => {
     onChange(e.target.value);
     preValue.current = e.target.value;
-    if (nextMode === 'input') {
+    if (nextMode === "input") {
       setState({
         _value: e.target.value
       });
@@ -260,13 +227,13 @@ const ProModalSelect = (props, ref) => {
   };
   const handleClick = async () => {
     if (!disabled) {
-      const res = (await beforeOpen?.()) ?? true;
+      const res = await (beforeOpen == null ? void 0 : beforeOpen()) ?? true;
       if (res) {
         setState({
           onOff: true
         });
         setTimeout(() => {
-          afterOpen?.({
+          afterOpen == null ? void 0 : afterOpen({
             setInnerState: setState
           });
         }, 100);
@@ -274,57 +241,51 @@ const ProModalSelect = (props, ref) => {
     }
   };
   const handleClose = () => {
+    var _a2;
     form.resetFields();
     setState({
       onOff: false,
       open: false,
       isInit: false
     });
-
-    // 当设置manual为true时，清空当前弹框内已搜索出来的值
-    if (useRequest?.options?.manual) {
+    if ((_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.manual) {
       mutate(() => []);
     }
   };
   const handleFinish = async () => {
     try {
-      if (!selectedRowKeys?.length || !selectedRows?.length) {
+      if (!(selectedRowKeys == null ? void 0 : selectedRowKeys.length) || !(selectedRows == null ? void 0 : selectedRows.length)) {
         message.error(locale.ProModalSelect.checkMsg);
         return false;
       }
       let nextSelectedRows = selectedRows;
-      if (!nextSelectedRows?.[0]) {
-        nextSelectedRows = data.filter(item => selectedRowKeys.includes(item[valueKey]));
+      if (!(nextSelectedRows == null ? void 0 : nextSelectedRows[0])) {
+        nextSelectedRows = data.filter((item) => selectedRowKeys.includes(item[valueKey]));
       }
-      const record = isMultiple ? nextSelectedRows : nextSelectedRows?.[0];
+      const record = isMultiple ? nextSelectedRows : nextSelectedRows == null ? void 0 : nextSelectedRows[0];
       if (!isMultiple) {
-        // @ts-ignore
         record.value = record[valueKey];
-        // @ts-ignore
         record.label = record[labelKey];
       }
       let flag = true;
       if (onOk) {
-        // @ts-ignore
         const res = await onOk(record);
-        if (res !== null && res !== undefined) {
-          // @ts-ignore
+        if (res !== null && res !== void 0) {
           flag = res;
         }
       }
       if (flag) {
-        onChange?.(labelInValue ? record : getNextValues(record), record);
+        onChange == null ? 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();
       }
       return flag;
     } catch (error) {
-      console.warn('error', error);
+      console.warn("error", error);
     }
   };
   const handleSearch = async () => {
@@ -334,38 +295,49 @@ const ProModalSelect = (props, ref) => {
       d: Date.now()
     });
   };
+  const handleReset = () => {
+    form.resetFields();
+    formColumns == null ? void 0 : formColumns.forEach((column) => {
+      if ((column == null ? void 0 : column.name) !== void 0 && Object.prototype.hasOwnProperty.call(column, "initialValue")) {
+        form.setFieldValue(column.name, column.initialValue);
+      }
+    });
+    onSearch({
+      ...form.getFieldsValue(),
+      d: Date.now()
+    });
+  };
   const _rowSelection = {
     type,
     // 多选时开启，保证翻页/筛选后不丢弃不在当前页的已选 key
     preserveSelectedRowKeys: isMultiple,
     onChange: (rowKeys, rows) => {
-      // 多选时合并跨页已选行：antd 回传的 rows 中不在当前页的为 undefined，用历史 selectedRows 补全
       const nextSelectedRows = isMultiple ? mergeSelectedRows(selectedRows, rowKeys, rows, getRowKey) : rows;
       setState({
         selectedRowKeys: rowKeys,
         selectedRows: nextSelectedRows
       });
     },
-    getCheckboxProps: record => ({
-      disabled: record?.disabled
+    getCheckboxProps: (record) => ({
+      disabled: record == null ? void 0 : record.disabled
     }),
     selectedRowKeys,
     selectedRows,
     ...rowSelection
   };
-
-  // 点击行进行勾选
-  const handleClickRow = record => {
-    if (_rowSelection?.getCheckboxProps?.(record)?.disabled) {
+  const handleClickRow = (record) => {
+    var _a2, _b2;
+    if ((_b2 = (_a2 = _rowSelection == null ? void 0 : _rowSelection.getCheckboxProps) == null ? void 0 : _a2.call(_rowSelection, record)) == null ? void 0 : _b2.disabled) {
       return;
     }
-    if (record?.disabled) return;
+    if (record == null ? void 0 : record.disabled)
+      return;
     const selectedValue = getRowKey(record);
     let tempSelectedRows = [...selectedRows];
     let tempSelectedRowKeys = [...selectedRowKeys];
     if (isMultiple) {
-      const rowIndex = tempSelectedRows.findIndex(item => getRowKey(item) === selectedValue);
-      const rowKeyIndex = tempSelectedRowKeys.findIndex(item => item === selectedValue);
+      const rowIndex = tempSelectedRows.findIndex((item) => getRowKey(item) === selectedValue);
+      const rowKeyIndex = tempSelectedRowKeys.findIndex((item) => item === selectedValue);
       if (rowKeyIndex > -1) {
         tempSelectedRows.splice(rowIndex, 1);
         tempSelectedRowKeys.splice(rowKeyIndex, 1);
@@ -382,18 +354,17 @@ const ProModalSelect = (props, ref) => {
       selectedRowKeys: tempSelectedRowKeys
     });
   };
-
-  // 初始化回显，当传入initParams时，前端用来回险
   const getInitValues = async () => {
+    var _a2, _b2;
     if (initParams || defaultOne) {
       const queryBean = {
         ...defaultParams,
-        ...(initParams || {})
+        ...initParams || {}
       };
       const page = {
         pageNum: 1,
         pageSize: 10,
-        ...useRequest?.options?.page
+        ...(_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.page
       };
       let params = withPagination ? {
         ...page,
@@ -401,27 +372,25 @@ const ProModalSelect = (props, ref) => {
       } : queryBean;
       params = transformParams ? transformParams(params) : params;
       const res = await runAsync(params);
-      if (res?.data) {
-        let list = withPagination ? res?.data?.list : res?.data;
+      if (res == null ? void 0 : res.data) {
+        let list = withPagination ? (_b2 = res == null ? void 0 : res.data) == null ? void 0 : _b2.list : res == null ? void 0 : res.data;
         if (transformResponse) {
-          list = transformResponse(res?.data);
+          list = transformResponse(res == null ? void 0 : res.data);
         }
-        const data = isMultiple ? list : list?.[0];
-        if (data) {
+        const data2 = isMultiple ? list : list == null ? void 0 : list[0];
+        if (data2) {
           const nextSelectRowKeys = isMultiple ? value : [value];
           if (labelInValue) {
-            onChange(data);
-            preValue.current = data;
+            onChange(data2);
+            preValue.current = data2;
           }
-          // 更新内部展示值
           setState({
-            _value: data,
+            _value: data2,
             isInit: false,
             selectedRows: list,
             selectedRowKeys: nextSelectRowKeys
           });
-        } else if (nextMode === 'input') {
-          // 当传入initParams且文本框非只读时，不调用接口获取初始化数据
+        } else if (nextMode === "input") {
           setState({
             _value: value,
             isInit: false
@@ -430,16 +399,15 @@ const ProModalSelect = (props, ref) => {
       }
     }
   };
-
-  // 初始化回显，当传入initParams时，前端用来回险
   const getDefaultOneValues = async () => {
+    var _a2, _b2;
     const queryBean = {
       ...defaultParams
     };
     const page = {
       pageNum: 1,
       pageSize: 10,
-      ...useRequest?.options?.page
+      ...(_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.page
     };
     let params = withPagination ? {
       ...page,
@@ -447,23 +415,22 @@ const ProModalSelect = (props, ref) => {
     } : queryBean;
     params = transformParams ? transformParams(params) : params;
     const res = await runAsync(params);
-    if (res?.data) {
-      let list = withPagination ? res?.data?.list : res?.data;
+    if (res == null ? void 0 : res.data) {
+      let list = withPagination ? (_b2 = res == null ? void 0 : res.data) == null ? void 0 : _b2.list : res == null ? void 0 : res.data;
       if (transformResponse) {
-        list = transformResponse(res?.data);
+        list = transformResponse(res == null ? void 0 : res.data);
       }
-      const data = isMultiple ? list : list?.[0];
+      const data2 = isMultiple ? list : list == null ? void 0 : list[0];
       const nextSelectRowKeys = isMultiple ? value : [value];
       if (labelInValue) {
-        onChange(data);
-        preValue.current = data;
+        onChange(data2);
+        preValue.current = data2;
       } else {
-        onChange(isMultiple ? data.map(item => item[valueKey]) : data[valueKey]);
-        preValue.current = isMultiple ? data.map(item => item[valueKey]) : data[valueKey];
+        onChange(isMultiple ? data2.map((item) => item[valueKey]) : data2[valueKey]);
+        preValue.current = isMultiple ? data2.map((item) => item[valueKey]) : data2[valueKey];
       }
-      // 更新内部展示值
       setState({
-        _value: data,
+        _value: data2,
         isInit: false,
         selectedRows: list,
         selectedRowKeys: nextSelectRowKeys
@@ -477,21 +444,18 @@ const ProModalSelect = (props, ref) => {
   useMount(() => {
     if (!value) {
       setState({
-        selectedRowKeys: rowSelection?.selectedRowKeys || [],
-        selectedRows: rowSelection?.selectedRows || [],
-        _value: undefined
+        selectedRowKeys: (rowSelection == null ? void 0 : rowSelection.selectedRowKeys) || [],
+        selectedRows: (rowSelection == null ? void 0 : rowSelection.selectedRows) || [],
+        _value: void 0
       });
-    } else if (_isArray(value)) {
+    } else if (isArray(value)) {
       setState({
-        selectedRowKeys: rowSelection?.selectedRowKeys || value,
-        selectedRows: rowSelection?.selectedRows || value,
+        selectedRowKeys: (rowSelection == null ? void 0 : rowSelection.selectedRowKeys) || value,
+        selectedRows: (rowSelection == null ? void 0 : rowSelection.selectedRows) || value,
         _value: value
       });
-    } else if (_isObject(value)) {
-      const initialValue = {
-        [valueKey]: value[valueKey],
-        [labelKey]: value[labelKey]
-      };
+    } else if (isObject(value)) {
+      const initialValue = { [valueKey]: value[valueKey], [labelKey]: value[labelKey] };
       setState({
         selectedRowKeys: [value],
         selectedRows: [initialValue],
@@ -500,10 +464,8 @@ const ProModalSelect = (props, ref) => {
     }
   });
   useEffect(() => {
+    var _a2;
     if (onOff && !open) {
-      if (useRequest?.options?.manual !== true) {
-        onReset();
-      }
       const nextState = {
         open: true
       };
@@ -512,43 +474,49 @@ const ProModalSelect = (props, ref) => {
           nextState.selectedRowKeys = [];
           nextState.selectedRows = [];
         }
-        if (_isObject(value)) {
+        if (isObject(value)) {
           nextState.selectedRowKeys = [getRowKey(value)];
           nextState.selectedRows = [value];
         }
-        if (_isArray(value)) {
-          nextState.selectedRowKeys = value.map(item => getRowKey(item));
+        if (isArray(value)) {
+          nextState.selectedRowKeys = value.map((item) => getRowKey(item));
           nextState.selectedRows = value;
         }
       } else if (value) {
         const nextSelectedRowKeys = isMultiple ? value : [value];
         nextState.selectedRowKeys = nextSelectedRowKeys;
         const list = options ?? data;
-        nextState.selectedRows = list?.filter?.(item => {
+        nextState.selectedRows = (_a2 = list == null ? void 0 : list.filter) == null ? void 0 : _a2.call(list, (item) => {
           return nextSelectedRowKeys.includes(item[valueKey]);
         });
       }
       setState(nextState);
     }
   }, [onOff, open, JSON.stringify(value)]);
+  useEffect(() => {
+    var _a2, _b2;
+    if (open && ((_a2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _a2.ready) !== false && ((_b2 = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _b2.manual) === void 0) {
+      onSearch(form.getFieldsValue(), true);
+    }
+  }, [open, (_g = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _g.manual, (_h = useRequest == null ? void 0 : useRequest.options) == null ? void 0 : _h.ready]);
   useEffect(() => {
     hideTooltipIfOpen(fieldRef.current, open);
   }, [open]);
   useEffect(() => {
-    if (value && !open && isInit && nextMode === 'input') {
+    if (value && !open && isInit && nextMode === "input") {
       getInitValues();
     }
   }, [JSON.stringify(value), open, isInit]);
   useDebounceEffect(() => {
-    if (value && !open && nextMode === 'select' && (!_isEqual(value, preValue.current) || options?.length === 0)) {
+    var _a2;
+    if (value && !open && nextMode === "select" && (!isEqual(value, preValue.current) || (options == null ? void 0 : options.length) === 0)) {
       preValue.current = value;
-      const data = labelInValue ? value[valueKey] : value;
-      const isHasValue = options?.some?.(item => item[valueKey] === data);
+      const data2 = labelInValue ? value[valueKey] : value;
+      const isHasValue = (_a2 = options == null ? void 0 : options.some) == null ? void 0 : _a2.call(options, (item) => item[valueKey] === data2);
       if (isHasValue) {
         return;
       }
       if (useRequest) {
-        // 加定时器 修复依赖数据同步更新未取到问题
         setTimeout(() => {
           const params = withPagination ? {
             pageNum: 1,
@@ -556,19 +524,25 @@ const ProModalSelect = (props, ref) => {
             queryBean: {
               ...defaultParams,
               ...initParams,
-              [searchKey ?? valueKey]: data
+              [searchKey ?? valueKey]: data2
             }
           } : {
             ...defaultParams,
             ...initParams,
-            [searchKey ?? valueKey]: data
+            [searchKey ?? valueKey]: data2
           };
           const nextParams = transformParams ? transformParams(params) : params;
           run(nextParams);
         }, 300);
       }
     }
-  }, [JSON.stringify(value), open, JSON.stringify(defaultParams), JSON.stringify(initParams), options?.length]);
+  }, [
+    JSON.stringify(value),
+    open,
+    JSON.stringify(defaultParams),
+    JSON.stringify(initParams),
+    options == null ? void 0 : options.length
+  ]);
   const handleSelectFocus = () => {
     if (useRequest) {
       const queryBean = defaultParams || {};
@@ -578,17 +552,16 @@ const ProModalSelect = (props, ref) => {
         queryBean
       } : queryBean;
       const nextParams = transformParams ? transformParams(params) : params;
-      // 减少请求条件一致时，且请求过时，focus的重复请求
-      if (!_isEqual(queryBean, defaultParamsRef.current) || !options?.length) {
-        run(nextParams); // 触发 run 请求
-        defaultParamsRef.current = queryBean; // 更新缓存
+      if (!isEqual(queryBean, defaultParamsRef.current) || !(options == null ? void 0 : options.length)) {
+        run(nextParams);
+        defaultParamsRef.current = queryBean;
       }
       setState({
         isInit: false
       });
     }
   };
-  const handleSelectSearch = _debounce(val => {
+  const handleSelectSearch = debounce((val) => {
     if (useRequest) {
       const queryBean = {
         ...defaultParams,
@@ -602,28 +575,28 @@ const ProModalSelect = (props, ref) => {
       const nextParams = transformParams ? transformParams(params) : params;
       run(nextParams);
     }
-  }, 1000);
+  }, 1e3);
   useDebounceEffect(() => {
     if (!value) {
       if (defaultOne) {
         getDefaultOneValues();
       } else {
         setState({
-          _value: undefined,
+          _value: void 0,
           selectedRowKeys: [],
           selectedRows: []
         });
       }
     }
-    if (nextMode === 'input') {
-      if (labelInValue && _value && !_isEqual(value, _value)) {
+    if (nextMode === "input") {
+      if (labelInValue && _value && !isEqual(value, _value)) {
         setState({
           _value: value,
           selectedRowKeys: [],
           selectedRows: []
         });
       }
-      if (!labelInValue && !_isEqual(value, _value?.[valueKey])) {
+      if (!labelInValue && !isEqual(value, _value == null ? void 0 : _value[valueKey])) {
         setState({
           _value: value,
           selectedRowKeys: [],
@@ -632,132 +605,121 @@ const ProModalSelect = (props, ref) => {
       }
     }
   }, [value, _value]);
-
-  // 加个中间状态Input
-  let initRender = /*#__PURE__*/_jsxs(Space.Compact, {
-    style: {
-      width: '100%'
-    },
-    block: true,
-    children: [nextMode === 'select' ? /*#__PURE__*/_jsx(ProSelect, {
-      value: value,
-      onChange: handleSelectValue,
-      disabled: disabled,
-      fieldNames: fieldNames,
-      showCodeName: showCodeName,
-      labelInValue: labelInValue,
-      dataSource: options,
-      optionRender: optionRender,
-      scrollFollowParent: false,
-      mode: isMultiple ? 'multiple' : undefined,
-      notFoundContent: selectLoading ? /*#__PURE__*/_jsx(Spin, {
-        size: "small"
-      }) : null,
-      onFocus: handleSelectFocus,
-      onSearch: handleSelectSearch,
-      tooltip: _tooltip,
-      style: {
-        width: isView || disabled ? '100%' : 'calc(100% - 30px)'
-      },
-      ...restProps
-    }) : /*#__PURE__*/_jsx(Tooltip, {
-      title: _tooltip ? viewText : null,
-      placement: "topLeft",
-      children: /*#__PURE__*/_jsx(Input, {
+  let initRender = /* @__PURE__ */ jsxs(Space.Compact, { style: { width: "100%" }, block: true, children: [
+    nextMode === "select" ? /* @__PURE__ */ jsx(
+      ProSelect,
+      {
+        value,
+        onChange: handleSelectValue,
+        disabled,
+        fieldNames,
+        showCodeName,
+        labelInValue,
+        dataSource: options,
+        optionRender,
+        scrollFollowParent: false,
+        mode: isMultiple ? "multiple" : void 0,
+        notFoundContent: selectLoading ? /* @__PURE__ */ jsx(Spin, { size: "small" }) : null,
+        onFocus: handleSelectFocus,
+        onSearch: handleSelectSearch,
+        tooltip: _tooltip,
+        style: { width: isView || disabled ? "100%" : "calc(100% - 30px)" },
+        ...restProps
+      }
+    ) : /* @__PURE__ */ jsx(Tooltip, { title: _tooltip ? viewText : null, placement: "topLeft", children: /* @__PURE__ */ jsx(
+      Input,
+      {
         value: viewText,
         onChange: handleChangeValue,
-        disabled: disabled,
+        disabled,
         autoComplete: "off",
         allowClear: true,
         ...restProps
-      })
-    }), isView || disabled ? null : /*#__PURE__*/_jsx(Button, {
-      onClick: handleClick,
-      className: "pro-modal-select-view-button",
-      icon: /*#__PURE__*/_jsx(ReactSVG, {
-        className: "viewSvg",
-        src: viewSvg
-      })
-    })]
-  });
-  if (customRender && /*#__PURE__*/React.isValidElement(customRender)) {
-    initRender = /*#__PURE__*/_jsx("div", {
-      className: "pro-modal-select-init",
-      onClick: handleClick,
-      children: customRender
-    });
+      }
+    ) }),
+    isView || disabled ? null : /* @__PURE__ */ jsx(
+      Button,
+      {
+        onClick: handleClick,
+        className: "pro-modal-select-view-button",
+        icon: /* @__PURE__ */ jsx(ReactSVG, { className: "viewSvg", src: viewSvg })
+      }
+    )
+  ] });
+  if (customRender && React.isValidElement(customRender)) {
+    initRender = /* @__PURE__ */ jsx("div", { className: "pro-modal-select-init", onClick: handleClick, children: customRender });
   }
   useDeepCompareEffect(() => {
     setState({
-      options: tableProps?.dataSource || []
+      options: (tableProps == null ? void 0 : tableProps.dataSource) || []
     });
-  }, [tableProps?.dataSource]);
-
-  // 当搜索条件只有一个时，且为输入框，默认设置suffix
-  if (formColumns?.length === 1 && formColumns?.[0]?.type === 'Input') {
-    if (!formColumns[0]?.fieldProps) {
+  }, [tableProps == null ? void 0 : tableProps.dataSource]);
+  if ((formColumns == null ? void 0 : formColumns.length) === 1 && ((_i = formColumns == null ? void 0 : formColumns[0]) == null ? void 0 : _i.type) === "Input") {
+    if (!((_j = formColumns[0]) == null ? void 0 : _j.fieldProps)) {
       formColumns[0].fieldProps = {};
     }
-    if (!_isFunction(formColumns[0].fieldProps) && !formColumns?.[0]?.fieldProps?.suffix) {
-      formColumns[0].fieldProps.suffix = /*#__PURE__*/_jsx(SearchOutlined, {
-        onClick: handleSearch
-      });
+    if (!isFunction(formColumns[0].fieldProps) && !((_l = (_k = formColumns == null ? void 0 : formColumns[0]) == null ? void 0 : _k.fieldProps) == null ? void 0 : _l.suffix)) {
+      formColumns[0].fieldProps.suffix = /* @__PURE__ */ jsx(SearchOutlined, { onClick: handleSearch });
     }
   }
   if (isView) {
     if (!value) {
-      return /*#__PURE__*/_jsx(_Fragment, {
-        children: viewEmpty
-      });
+      return /* @__PURE__ */ jsx(Fragment, { children: viewEmpty });
     }
-    return /*#__PURE__*/_jsx(Container, {
-      viewEmpty: viewEmpty,
-      children: `${viewText}`
-    });
+    return /* @__PURE__ */ jsx(Container, { viewEmpty, children: `${viewText}` });
   }
   const _className = classNames({
-    'pro-modal-select': true,
+    "pro-modal-select": true,
     [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: initRender
-    }), /*#__PURE__*/_jsxs(ProDrawerForm, {
-      mode: "Modal",
-      title: title,
-      onOk: handleFinish
-      // @ts-ignore
-      ,
-      onCancel: handleClose,
-      open: open,
-      ...restModalProps,
-      children: [/*#__PURE__*/_jsx(ProForm, {
-        submitOnEnter: true,
-        form: form,
-        columns: formColumns,
-        onFinish: handleSearch,
-        confirmLoading: loading,
-        footer: formColumns?.length > 1
-      }), /*#__PURE__*/_jsx(ProTable, {
-        onRow: record => {
-          return {
-            onClick: () => handleClickRow(record)
-          };
-        },
-        rowKey: rowKey,
-        loading: loading,
-        rowSelection: _rowSelection,
-        columns: columns,
-        dataSource: data,
-        pagination: withPagination ? pagination : false,
-        ...restTableProps
-      })]
-    })]
+    "pro-modal-select-open": open
   });
+  return /* @__PURE__ */ jsxs(Fragment, { children: [
+    /* @__PURE__ */ jsx("div", { id: uuid, className: _className, style, ref: fieldRef, children: initRender }),
+    /* @__PURE__ */ jsxs(
+      ProDrawerForm,
+      {
+        mode: "Modal",
+        title,
+        onOk: handleFinish,
+        onCancel: handleClose,
+        open,
+        ...restModalProps,
+        children: [
+          /* @__PURE__ */ jsx(
+            ProForm,
+            {
+              submitOnEnter: true,
+              form,
+              columns: formColumns,
+              onFinish: handleSearch,
+              onCancel: handleReset,
+              confirmLoading: loading,
+              footer: (formColumns == null ? void 0 : formColumns.length) > 1
+            }
+          ),
+          /* @__PURE__ */ jsx(
+            ProTable,
+            {
+              onRow: (record) => {
+                return {
+                  onClick: () => handleClickRow(record)
+                };
+              },
+              rowKey,
+              loading,
+              rowSelection: _rowSelection,
+              columns,
+              dataSource: data,
+              pagination: withPagination ? pagination : false,
+              ...restTableProps
+            }
+          )
+        ]
+      }
+    )
+  ] });
+};
+var ProModalSelect_default = forwardRef(ProModalSelect);
+export {
+  ProModalSelect_default as default
 };
-export default /*#__PURE__*/forwardRef(ProModalSelect);