@bit-sun/business-component 4.2.1-alpha.24-aiwei → 4.2.1-alpha.26-aiwei

package/dist/index.esm.js

@@ -6,7 +6,7 @@ import _, { omit, uniqBy, escapeRegExp, isNil, trim, isBoolean, debounce, cloneD
 import memoizeOne from 'memoize-one';
 import { formatMessage, history, useLocation, Link, useModel, setLocale, useIntl, request as request$3 } from 'umi';
 import isEqual from 'lodash/isEqual';
-import React$1, { useState, useEffect, useRef, forwardRef, useImperativeHandle, useMemo, Component, Fragment, useCallback, useLayoutEffect, createRef } from 'react';
+import React$1, { useState, useEffect, useRef, forwardRef, useMemo, useImperativeHandle, Component, Fragment, useCallback, useLayoutEffect, createRef } from 'react';
 import { renderToString as renderToString$1 } from 'react-dom/server';
 import moment$1 from 'moment';
 import { EyeOutlined, DeleteOutlined, EditOutlined, CopyOutlined, CloseSquareOutlined, WarningOutlined, SendOutlined, ProfileTwoTone, ExclamationCircleOutlined, DownOutlined, UnorderedListOutlined, DashOutlined, CaretUpOutlined, CaretDownOutlined, SearchOutlined, CloseCircleOutlined, DownCircleFilled, ArrowLeftOutlined, FolderOutlined, EllipsisOutlined, HomeOutlined, DoubleLeftOutlined, DoubleRightOutlined, MenuUnfoldOutlined, CaretLeftOutlined, SettingOutlined, BulbOutlined, PlayCircleOutlined, SaveOutlined, FullscreenExitOutlined, MinusCircleOutlined, PlusCircleOutlined } from '@ant-design/icons';
@@ -5388,11 +5388,20 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     },
     pageSize: tableInitPageSize
   };
+  var selectedInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
+    current: 1,
+    pageSize: resolveTablePageSize((modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.selectedTablePageSize) || 20),
+    total: 0
+  });
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
     current: 1,
     pageSizeOptions: TABLE_PAGE_SIZE_OPTIONS.map(String)
   });
+  /**
+   * 左侧弹窗表格大分页时的实际渲染上限；全选仍基于完整当前页 tableData。
+   */
+  var tableRenderPageSize = 200;
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
   var isHaveDValue = function isHaveDValue() {
@@ -5502,34 +5511,48 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     _useState32 = _slicedToArray(_useState31, 2),
     selectedRows = _useState32[0],
     setSelectedRows = _useState32[1];
-  var _useState33 = useState(false),
+  var _useState33 = useState(selectedInitPagination),
     _useState34 = _slicedToArray(_useState33, 2),
-    checkedAll = _useState34[0],
-    setCheckedAll = _useState34[1];
-  var _useState35 = useState(false),
+    selectedTablePagination = _useState34[0],
+    setSelectedTablePagination = _useState34[1];
+  var _useState35 = useState({}),
     _useState36 = _slicedToArray(_useState35, 2),
-    indeterminate = _useState36[0],
-    setIndeterminate = _useState36[1];
-  var _useState37 = useState({}),
+    tableFormParams = _useState36[0],
+    setTableFormParams = _useState36[1];
+  var _useState37 = useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    tableFormParams = _useState38[0],
-    setTableFormParams = _useState38[1];
-  var _useState39 = useState(false),
+    tooltipVisible = _useState38[0],
+    setTooltipVisible = _useState38[1];
+  var _useState39 = useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
     _useState40 = _slicedToArray(_useState39, 2),
-    tooltipVisible = _useState40[0],
-    setTooltipVisible = _useState40[1];
-  var _useState41 = useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
+    tableShowColumns = _useState40[0],
+    setTabletShowColumns = _useState40[1]; // 默认展示表头-modalTableProps?.tableColumns
+  var _useState41 = useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    tableShowColumns = _useState42[0],
-    setTabletShowColumns = _useState42[1]; // 默认展示表头-modalTableProps?.tableColumns
+    confirmLoading = _useState42[0],
+    setConfirmLoading = _useState42[1];
   var _useState43 = useState(false),
     _useState44 = _slicedToArray(_useState43, 2),
-    confirmLoading = _useState44[0],
-    setConfirmLoading = _useState44[1];
-  var _useState45 = useState(false),
-    _useState46 = _slicedToArray(_useState45, 2),
-    modalSearched = _useState46[0],
-    setModalSearched = _useState46[1];
+    modalSearched = _useState44[0],
+    setModalSearched = _useState44[1];
+  var selectAllTableRef = useRef(false);
+  var getRecordKey = function getRecordKey(record) {
+    var _record$mappingValueF;
+    return (_record$mappingValueF = record === null || record === void 0 ? void 0 : record[mappingValueField]) !== null && _record$mappingValueF !== void 0 ? _record$mappingValueF : record === null || record === void 0 ? void 0 : record.value;
+  };
+  /**
+   * 已选表格只向 Table 传入当前页数据，避免全选 1000 条时右侧表格同步处理全部数据。
+   */
+  var selectedTablePageRows = useMemo(function () {
+    var current = Number((selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.current) || 1);
+    var pageSize = Number((selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.pageSize) || selectedInitPagination.pageSize);
+    var start = (current - 1) * pageSize;
+    return (selectedRows || []).slice(start, start + pageSize).map(function (s, index) {
+      return _objectSpread2(_objectSpread2({}, s), {}, {
+        keyIndex: start + index + 1
+      });
+    });
+  }, [selectedRows, selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.current, selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.pageSize, selectedInitPagination.pageSize]);
   var setSelectDataSource = function setSelectDataSource(list, total) {
     setItems(list);
     setItemsTotal(total);
@@ -5537,6 +5560,20 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   var clearSelectDataSource = function clearSelectDataSource() {
     setSelectDataSource([], 0);
   };
+  /**
+   * 清空弹窗已选数据。
+   */
+  var clearSelectedRows = function clearSelectedRows() {
+    setSelectedRows([]);
+    setPopValue([]);
+    setSelectedTablePagination(function (prev) {
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        total: 0,
+        current: 1
+      });
+    });
+    setSelectedRowKeys([]);
+  };
   useImperativeHandle(ref, function () {
     return {
       refreshDataSource: function refreshDataSource() {
@@ -5729,6 +5766,18 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setUniqueValue(makeUniqueValue());
     setTabletShowColumns(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns));
   }, [resultSourceKey]);
+  useEffect(function () {
+    setSelectedTablePagination(function (prev) {
+      var pageSize = (prev === null || prev === void 0 ? void 0 : prev.pageSize) || selectedInitPagination.pageSize;
+      var maxCurrent = Math.ceil(selectedRows.length / pageSize) || 1;
+      var current = selectedRows.length ? Math.min((prev === null || prev === void 0 ? void 0 : prev.current) || 1, maxCurrent) : 1;
+      if ((prev === null || prev === void 0 ? void 0 : prev.total) === selectedRows.length && (prev === null || prev === void 0 ? void 0 : prev.current) === current) return prev;
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        total: selectedRows.length,
+        current: current
+      });
+    });
+  }, [selectedRows.length, selectedInitPagination.pageSize]);
   useEffect(function () {
     if (init) {
       clearSelectDataSource();
@@ -5786,8 +5835,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
             value: i
           };
         }));
-        setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(itemsTotal && value.length === itemsTotal);
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
         setSelectedRows(labelInValue ? [_defineProperty(_defineProperty(_defineProperty({}, mappingValueField, value.key), "value", value.key), "text", value.label)] : [_defineProperty(_defineProperty({}, mappingValueField, value), "value", value)]);
@@ -5875,8 +5922,6 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setTablePagination(tableInitPagination);
     setSelectedRowKeys([]);
     setSelectedRows([]);
-    setCheckedAll(false);
-    setIndeterminate(false);
   };
   var handleCancel = function handleCancel() {
     clearModalTable();
@@ -5935,9 +5980,17 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       currentPage: pagination.current
     }), 2);
   };
+  var handleSelectedTableChange = function handleSelectedTableChange(pagination) {
+    setSelectedTablePagination(function (prev) {
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        current: pagination.current,
+        pageSize: pagination.pageSize
+      });
+    });
+  };
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
-    var sksResult = (selectRows === null || selectRows === void 0 ? void 0 : selectRows.map(function (i) {
-      return i.value;
+    var sksResult = (selectKeys === null || selectKeys === void 0 ? void 0 : selectKeys.length) ? selectKeys : (selectRows === null || selectRows === void 0 ? void 0 : selectRows.map(function (i) {
+      return getRecordKey(i);
     })) || [];
     // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
     if (!selectMode && !(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter)) {
@@ -5947,33 +6000,96 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     setSelectedRowKeys(sksResult);
     setSelectedRows(selectRows);
     setPopValue(selectRows);
-    setIndeterminate(!!selectRows.length && selectRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
-    setCheckedAll(selectRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
   };
-  var rowSelection = {
-    type: selectMode ? 'checkbox' : 'radio',
-    selectedRowKeys: selectedRowKeys,
-    preserveSelectedRowKeys: true,
-    onChange: function onChange(sks, srs) {
-      // 处理翻页后，之前存储的selectedRows变为undefined
-      // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
-      var tmpSelectedRows = selectedRows.concat(srs).filter(function (item) {
-        return item != undefined;
-      });
-      var totalSelectedRows = sks.map(function (key) {
-        return tmpSelectedRows.filter(function (item) {
-          return item[mappingValueField] == key;
-        })[0];
-      }).filter(function (item) {
-        return item != undefined;
-      });
-      onChangeSelectedKeys(sks, totalSelectedRows);
-    },
-    getCheckboxProps: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps) ? selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps : function () {
-      return {
-        disabled: disabled || !items.length && !tableData.length
-      };
-    }
+  var getRowSelection = function getRowSelection() {
+    var visibleRows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var type = arguments.length > 1 ? arguments[1] : undefined;
+    return {
+      type: selectMode ? 'checkbox' : 'radio',
+      selectedRowKeys: selectedRowKeys,
+      preserveSelectedRowKeys: true,
+      onSelectAll: function onSelectAll(selected) {
+        selectAllTableRef.current = true;
+        setTimeout(function () {
+          selectAllTableRef.current = false;
+        }, 0);
+        var targetRows = type === 'noPage' ? visibleRows : tableData;
+        var targetKeys = (targetRows || []).map(function (item) {
+          return getRecordKey(item);
+        });
+        if (!selected) {
+          var selectedKeySet = new Set((selectedRows || []).map(function (item) {
+            return getRecordKey(item);
+          }));
+          if ((selectedRows || []).length === (targetRows || []).length && targetKeys.every(function (key) {
+            return selectedKeySet.has(key);
+          })) {
+            clearSelectedRows();
+            return;
+          }
+          var targetKeySet = new Set(targetKeys);
+          var _nextSelectedRows = (selectedRows || []).filter(function (item) {
+            return !targetKeySet.has(getRecordKey(item));
+          });
+          var _nextSelectedKeys = _nextSelectedRows.map(function (item) {
+            return getRecordKey(item);
+          });
+          onChangeSelectedKeys(_nextSelectedKeys, _nextSelectedRows);
+          return;
+        }
+        if (!(selectedRows || []).length) {
+          onChangeSelectedKeys(targetKeys, targetRows || []);
+          return;
+        }
+        var selectedRowMap = new Map();
+        (selectedRows || []).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        (targetRows || []).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        var nextSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+        var nextSelectedKeys = nextSelectedRows.map(function (item) {
+          return getRecordKey(item);
+        });
+        onChangeSelectedKeys(nextSelectedKeys, nextSelectedRows);
+      },
+      onChange: function onChange(sks, srs) {
+        if (selectAllTableRef.current) {
+          selectAllTableRef.current = false;
+          return;
+        }
+        if (!(sks === null || sks === void 0 ? void 0 : sks.length)) {
+          clearSelectedRows();
+          return;
+        }
+        // 处理翻页后，之前存储的selectedRows变为undefined
+        // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
+        var visibleKeySet = new Set((visibleRows || []).map(function (item) {
+          return getRecordKey(item);
+        }));
+        var selectedRowMap = new Map();
+        (selectedRows || []).forEach(function (item) {
+          var key = getRecordKey(item);
+          if (!visibleKeySet.has(key)) {
+            selectedRowMap.set(key, item);
+          }
+        });
+        (srs || []).filter(Boolean).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        var totalSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+        var totalSelectedKeys = totalSelectedRows.map(function (item) {
+          return getRecordKey(item);
+        });
+        onChangeSelectedKeys(totalSelectedKeys, totalSelectedRows);
+      },
+      getCheckboxProps: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps) ? selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps : function () {
+        return {
+          disabled: disabled || !items.length && !tableData.length
+        };
+      }
+    };
   };
   var onRowClickSelect = function onRowClickSelect(e, record, type) {
     if (selectMode && !(disabled || !items.length && !tableData.length)) {
@@ -5981,7 +6097,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
       var newSelect = [JSON.parse(JSON.stringify(record))];
       var srs = getRealStr(oldSelect, newSelect, record);
       var sks = srs.map(function (i) {
-        return i.value;
+        return getRecordKey(i);
       });
       onChangeSelectedKeys(sks, srs);
     }
@@ -5990,7 +6106,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     if (!selectMode && !(disabled || !items.length && !tableData.length)) {
       var srs = [JSON.parse(JSON.stringify(record))];
       var sks = srs.map(function (i) {
-        return i.value;
+        return getRecordKey(i);
       });
       onChangeSelectedKeys(sks, srs);
     }
@@ -6262,6 +6378,10 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   };
   var renderShowTable = function renderShowTable(tableList, type) {
     var _modalTableProps$tabl;
+    var currentPageSize = Number((tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) || tableInitPageSize);
+    var needLimitRenderRows = type !== 'noPage' && currentPageSize >= tableRenderPageSize && (tableList === null || tableList === void 0 ? void 0 : tableList.length) > tableRenderPageSize;
+    var currentTableList = needLimitRenderRows ? tableList.slice(0, tableRenderPageSize) : tableList;
+    var currentDataSource = type == 'noPage' ? selectedTablePageRows : currentTableList;
     var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
     var canExpand = hasMoreQueryFields(modalTableProps);
     var collapsedList = modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableSearchForm) === null || _modalTableProps$tabl === void 0 ? void 0 : _modalTableProps$tabl.slice(0, viCount);
@@ -6291,13 +6411,14 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     }, /*#__PURE__*/React$1.createElement(Table, _objectSpread2(_objectSpread2({
       bordered: true,
       size: "middle",
-      rowSelection: rowSelection,
+      rowSelection: getRowSelection(currentDataSource, type),
       columns: tableShowColumns,
-      dataSource: tableList
+      dataSource: currentDataSource
     }, type == 'noPage' ? {
-      pagination: _objectSpread2(_objectSpread2({}, initPagination), {}, {
+      pagination: _objectSpread2(_objectSpread2({}, selectedTablePagination), {}, {
         showSizeChanger: false
       }),
+      onChange: handleSelectedTableChange,
       locale: {
         emptyText: renderEmptyText('暂无已选结果', mTB)
       }
@@ -6333,13 +6454,9 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   } // 务必填写 key
   ];
   var tabsItems2 = [{
-    label: "\u5DF2\u9009\uFF08".concat((selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0, "\uFF09"),
+    label: "\u5DF2\u9009\uFF08".concat((selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) || 0, "\uFF09"),
     key: 'selected',
-    children: renderShowTable((selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (s, index) {
-      return _objectSpread2(_objectSpread2({}, s), {}, {
-        keyIndex: index + 1
-      });
-    })) || [], 'noPage')
+    children: renderShowTable(selectedRows, 'noPage')
   }];
   var resetSelectDataSource = function resetSelectDataSource() {
     var isClear = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -6355,7 +6472,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
     props === null || props === void 0 ? void 0 : (_props$onClear = props.onClear) === null || _props$onClear === void 0 ? void 0 : _props$onClear.call(props);
     // 清空下拉框 / 弹窗 选中数据
     formaData([], items);
-    onChangeSelectedKeys([], []);
+    clearSelectedRows();
     // 重置下拉框数据源
     resetSelectDataSource(true);
   };
@@ -6612,9 +6729,7 @@ var SearchSelect = /*#__PURE__*/forwardRef(function (props, ref) {
   }, /*#__PURE__*/React$1.createElement(Tabs, {
     items: tabsItems2,
     tabBarExtraContent: /*#__PURE__*/React$1.createElement("span", {
-      onClick: function onClick() {
-        return onChangeSelectedKeys([], []);
-      }
+      onClick: clearSelectedRows
     }, "\u6E05\u7A7A\u5DF2\u9009")
   })) : null)))));
 });
@@ -39330,12 +39445,24 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           padding: '10px',
           borderRadius: '4px'
         }
-      }, /*#__PURE__*/React$1.createElement("span", {
+      }, /*#__PURE__*/React$1.createElement(Select, {
+        disabled: disabled,
         style: {
-          marginRight: 8,
-          flexShrink: 0
-        }
-      }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0:"), /*#__PURE__*/React$1.createElement(Input, {
+          width: 150,
+          marginRight: 10
+        },
+        placeholder: "\u8BF7\u9009\u62E9",
+        value: String(itemDetail.reqConditionData.reqParamType || '10'),
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'reqParamType', val);
+        }
+      }, /*#__PURE__*/React$1.createElement(Select.Option, {
+        value: "10"
+      }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0"), /*#__PURE__*/React$1.createElement(Select.Option, {
+        value: "20"
+      }, "\u8BF7\u6C42\u5934\u53C2\u6570\u540D\u79F0"), /*#__PURE__*/React$1.createElement(Select.Option, {
+        value: "40"
+      }, "\u6E90\u8BF7\u6C42\u5730\u5740")), String(itemDetail.reqConditionData.reqParamType || '10') !== '40' && /*#__PURE__*/React$1.createElement(Input, {
         disabled: disabled,
         style: {
           width: 150,
@@ -39891,6 +40018,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         if (valueNames) {
           itemDetail.reqConditionData.paramNames = valueNames;
         }
+      } else if (field === 'reqParamType') {
+        itemDetail.reqConditionData.reqParamType = value;
       }
       _this.setState({
         ruleClassData: ruleClassData

package/dist/index.js

@@ -5411,11 +5411,20 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     },
     pageSize: tableInitPageSize
   };
+  var selectedInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
+    current: 1,
+    pageSize: resolveTablePageSize((modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.selectedTablePageSize) || 20),
+    total: 0
+  });
   var tableInitPagination = _objectSpread2(_objectSpread2({}, initPagination), {}, {
     total: 0,
     current: 1,
     pageSizeOptions: TABLE_PAGE_SIZE_OPTIONS.map(String)
   });
+  /**
+   * 左侧弹窗表格大分页时的实际渲染上限；全选仍基于完整当前页 tableData。
+   */
+  var tableRenderPageSize = 200;
   var disabled = !!noOperate || (selectProps === null || selectProps === void 0 ? void 0 : selectProps.disabled) || (props === null || props === void 0 ? void 0 : props.disabled);
   var isHaveDependency = fixedparameter && fieldValToParam && ctx;
   var isHaveDValue = function isHaveDValue() {
@@ -5525,34 +5534,48 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     _useState32 = _slicedToArray(_useState31, 2),
     selectedRows = _useState32[0],
     setSelectedRows = _useState32[1];
-  var _useState33 = React$1.useState(false),
+  var _useState33 = React$1.useState(selectedInitPagination),
     _useState34 = _slicedToArray(_useState33, 2),
-    checkedAll = _useState34[0],
-    setCheckedAll = _useState34[1];
-  var _useState35 = React$1.useState(false),
+    selectedTablePagination = _useState34[0],
+    setSelectedTablePagination = _useState34[1];
+  var _useState35 = React$1.useState({}),
     _useState36 = _slicedToArray(_useState35, 2),
-    indeterminate = _useState36[0],
-    setIndeterminate = _useState36[1];
-  var _useState37 = React$1.useState({}),
+    tableFormParams = _useState36[0],
+    setTableFormParams = _useState36[1];
+  var _useState37 = React$1.useState(false),
     _useState38 = _slicedToArray(_useState37, 2),
-    tableFormParams = _useState38[0],
-    setTableFormParams = _useState38[1];
-  var _useState39 = React$1.useState(false),
+    tooltipVisible = _useState38[0],
+    setTooltipVisible = _useState38[1];
+  var _useState39 = React$1.useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
     _useState40 = _slicedToArray(_useState39, 2),
-    tooltipVisible = _useState40[0],
-    setTooltipVisible = _useState40[1];
-  var _useState41 = React$1.useState(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns)),
+    tableShowColumns = _useState40[0],
+    setTabletShowColumns = _useState40[1]; // 默认展示表头-modalTableProps?.tableColumns
+  var _useState41 = React$1.useState(false),
     _useState42 = _slicedToArray(_useState41, 2),
-    tableShowColumns = _useState42[0],
-    setTabletShowColumns = _useState42[1]; // 默认展示表头-modalTableProps?.tableColumns
+    confirmLoading = _useState42[0],
+    setConfirmLoading = _useState42[1];
   var _useState43 = React$1.useState(false),
     _useState44 = _slicedToArray(_useState43, 2),
-    confirmLoading = _useState44[0],
-    setConfirmLoading = _useState44[1];
-  var _useState45 = React$1.useState(false),
-    _useState46 = _slicedToArray(_useState45, 2),
-    modalSearched = _useState46[0],
-    setModalSearched = _useState46[1];
+    modalSearched = _useState44[0],
+    setModalSearched = _useState44[1];
+  var selectAllTableRef = React$1.useRef(false);
+  var getRecordKey = function getRecordKey(record) {
+    var _record$mappingValueF;
+    return (_record$mappingValueF = record === null || record === void 0 ? void 0 : record[mappingValueField]) !== null && _record$mappingValueF !== void 0 ? _record$mappingValueF : record === null || record === void 0 ? void 0 : record.value;
+  };
+  /**
+   * 已选表格只向 Table 传入当前页数据，避免全选 1000 条时右侧表格同步处理全部数据。
+   */
+  var selectedTablePageRows = React$1.useMemo(function () {
+    var current = Number((selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.current) || 1);
+    var pageSize = Number((selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.pageSize) || selectedInitPagination.pageSize);
+    var start = (current - 1) * pageSize;
+    return (selectedRows || []).slice(start, start + pageSize).map(function (s, index) {
+      return _objectSpread2(_objectSpread2({}, s), {}, {
+        keyIndex: start + index + 1
+      });
+    });
+  }, [selectedRows, selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.current, selectedTablePagination === null || selectedTablePagination === void 0 ? void 0 : selectedTablePagination.pageSize, selectedInitPagination.pageSize]);
   var setSelectDataSource = function setSelectDataSource(list, total) {
     setItems(list);
     setItemsTotal(total);
@@ -5560,6 +5583,20 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   var clearSelectDataSource = function clearSelectDataSource() {
     setSelectDataSource([], 0);
   };
+  /**
+   * 清空弹窗已选数据。
+   */
+  var clearSelectedRows = function clearSelectedRows() {
+    setSelectedRows([]);
+    setPopValue([]);
+    setSelectedTablePagination(function (prev) {
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        total: 0,
+        current: 1
+      });
+    });
+    setSelectedRowKeys([]);
+  };
   React$1.useImperativeHandle(ref, function () {
     return {
       refreshDataSource: function refreshDataSource() {
@@ -5752,6 +5789,18 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     setUniqueValue(makeUniqueValue());
     setTabletShowColumns(handleTableColumns(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.tableColumns));
   }, [resultSourceKey]);
+  React$1.useEffect(function () {
+    setSelectedTablePagination(function (prev) {
+      var pageSize = (prev === null || prev === void 0 ? void 0 : prev.pageSize) || selectedInitPagination.pageSize;
+      var maxCurrent = Math.ceil(selectedRows.length / pageSize) || 1;
+      var current = selectedRows.length ? Math.min((prev === null || prev === void 0 ? void 0 : prev.current) || 1, maxCurrent) : 1;
+      if ((prev === null || prev === void 0 ? void 0 : prev.total) === selectedRows.length && (prev === null || prev === void 0 ? void 0 : prev.current) === current) return prev;
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        total: selectedRows.length,
+        current: current
+      });
+    });
+  }, [selectedRows.length, selectedInitPagination.pageSize]);
   React$1.useEffect(function () {
     if (init) {
       clearSelectDataSource();
@@ -5809,8 +5858,6 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
             value: i
           };
         }));
-        setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(itemsTotal && value.length === itemsTotal);
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value]);
         setSelectedRows(labelInValue ? [_defineProperty(_defineProperty(_defineProperty({}, mappingValueField, value.key), "value", value.key), "text", value.label)] : [_defineProperty(_defineProperty({}, mappingValueField, value), "value", value)]);
@@ -5898,8 +5945,6 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     setTablePagination(tableInitPagination);
     setSelectedRowKeys([]);
     setSelectedRows([]);
-    setCheckedAll(false);
-    setIndeterminate(false);
   };
   var handleCancel = function handleCancel() {
     clearModalTable();
@@ -5958,9 +6003,17 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       currentPage: pagination.current
     }), 2);
   };
+  var handleSelectedTableChange = function handleSelectedTableChange(pagination) {
+    setSelectedTablePagination(function (prev) {
+      return _objectSpread2(_objectSpread2({}, prev), {}, {
+        current: pagination.current,
+        pageSize: pagination.pageSize
+      });
+    });
+  };
   var onChangeSelectedKeys = function onChangeSelectedKeys(selectKeys, selectRows) {
-    var sksResult = (selectRows === null || selectRows === void 0 ? void 0 : selectRows.map(function (i) {
-      return i.value;
+    var sksResult = (selectKeys === null || selectKeys === void 0 ? void 0 : selectKeys.length) ? selectKeys : (selectRows === null || selectRows === void 0 ? void 0 : selectRows.map(function (i) {
+      return getRecordKey(i);
     })) || [];
     // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
     if (!selectMode && !(modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.modalRadioNeedFooter)) {
@@ -5970,33 +6023,96 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     setSelectedRowKeys(sksResult);
     setSelectedRows(selectRows);
     setPopValue(selectRows);
-    setIndeterminate(!!selectRows.length && selectRows.length < (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
-    setCheckedAll(selectRows.length === (tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.total));
   };
-  var rowSelection = {
-    type: selectMode ? 'checkbox' : 'radio',
-    selectedRowKeys: selectedRowKeys,
-    preserveSelectedRowKeys: true,
-    onChange: function onChange(sks, srs) {
-      // 处理翻页后，之前存储的selectedRows变为undefined
-      // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
-      var tmpSelectedRows = selectedRows.concat(srs).filter(function (item) {
-        return item != undefined;
-      });
-      var totalSelectedRows = sks.map(function (key) {
-        return tmpSelectedRows.filter(function (item) {
-          return item[mappingValueField] == key;
-        })[0];
-      }).filter(function (item) {
-        return item != undefined;
-      });
-      onChangeSelectedKeys(sks, totalSelectedRows);
-    },
-    getCheckboxProps: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps) ? selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps : function () {
-      return {
-        disabled: disabled || !items.length && !tableData.length
-      };
-    }
+  var getRowSelection = function getRowSelection() {
+    var visibleRows = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
+    var type = arguments.length > 1 ? arguments[1] : undefined;
+    return {
+      type: selectMode ? 'checkbox' : 'radio',
+      selectedRowKeys: selectedRowKeys,
+      preserveSelectedRowKeys: true,
+      onSelectAll: function onSelectAll(selected) {
+        selectAllTableRef.current = true;
+        setTimeout(function () {
+          selectAllTableRef.current = false;
+        }, 0);
+        var targetRows = type === 'noPage' ? visibleRows : tableData;
+        var targetKeys = (targetRows || []).map(function (item) {
+          return getRecordKey(item);
+        });
+        if (!selected) {
+          var selectedKeySet = new Set((selectedRows || []).map(function (item) {
+            return getRecordKey(item);
+          }));
+          if ((selectedRows || []).length === (targetRows || []).length && targetKeys.every(function (key) {
+            return selectedKeySet.has(key);
+          })) {
+            clearSelectedRows();
+            return;
+          }
+          var targetKeySet = new Set(targetKeys);
+          var _nextSelectedRows = (selectedRows || []).filter(function (item) {
+            return !targetKeySet.has(getRecordKey(item));
+          });
+          var _nextSelectedKeys = _nextSelectedRows.map(function (item) {
+            return getRecordKey(item);
+          });
+          onChangeSelectedKeys(_nextSelectedKeys, _nextSelectedRows);
+          return;
+        }
+        if (!(selectedRows || []).length) {
+          onChangeSelectedKeys(targetKeys, targetRows || []);
+          return;
+        }
+        var selectedRowMap = new Map();
+        (selectedRows || []).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        (targetRows || []).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        var nextSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+        var nextSelectedKeys = nextSelectedRows.map(function (item) {
+          return getRecordKey(item);
+        });
+        onChangeSelectedKeys(nextSelectedKeys, nextSelectedRows);
+      },
+      onChange: function onChange(sks, srs) {
+        if (selectAllTableRef.current) {
+          selectAllTableRef.current = false;
+          return;
+        }
+        if (!(sks === null || sks === void 0 ? void 0 : sks.length)) {
+          clearSelectedRows();
+          return;
+        }
+        // 处理翻页后，之前存储的selectedRows变为undefined
+        // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
+        var visibleKeySet = new Set((visibleRows || []).map(function (item) {
+          return getRecordKey(item);
+        }));
+        var selectedRowMap = new Map();
+        (selectedRows || []).forEach(function (item) {
+          var key = getRecordKey(item);
+          if (!visibleKeySet.has(key)) {
+            selectedRowMap.set(key, item);
+          }
+        });
+        (srs || []).filter(Boolean).forEach(function (item) {
+          selectedRowMap.set(getRecordKey(item), item);
+        });
+        var totalSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+        var totalSelectedKeys = totalSelectedRows.map(function (item) {
+          return getRecordKey(item);
+        });
+        onChangeSelectedKeys(totalSelectedKeys, totalSelectedRows);
+      },
+      getCheckboxProps: (selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps) ? selectProps === null || selectProps === void 0 ? void 0 : selectProps.getCheckboxProps : function () {
+        return {
+          disabled: disabled || !items.length && !tableData.length
+        };
+      }
+    };
   };
   var onRowClickSelect = function onRowClickSelect(e, record, type) {
     if (selectMode && !(disabled || !items.length && !tableData.length)) {
@@ -6004,7 +6120,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
       var newSelect = [JSON.parse(JSON.stringify(record))];
       var srs = getRealStr(oldSelect, newSelect, record);
       var sks = srs.map(function (i) {
-        return i.value;
+        return getRecordKey(i);
       });
       onChangeSelectedKeys(sks, srs);
     }
@@ -6013,7 +6129,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     if (!selectMode && !(disabled || !items.length && !tableData.length)) {
       var srs = [JSON.parse(JSON.stringify(record))];
       var sks = srs.map(function (i) {
-        return i.value;
+        return getRecordKey(i);
       });
       onChangeSelectedKeys(sks, srs);
     }
@@ -6285,6 +6401,10 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   };
   var renderShowTable = function renderShowTable(tableList, type) {
     var _modalTableProps$tabl;
+    var currentPageSize = Number((tablePagination === null || tablePagination === void 0 ? void 0 : tablePagination.pageSize) || tableInitPageSize);
+    var needLimitRenderRows = type !== 'noPage' && currentPageSize >= tableRenderPageSize && (tableList === null || tableList === void 0 ? void 0 : tableList.length) > tableRenderPageSize;
+    var currentTableList = needLimitRenderRows ? tableList.slice(0, tableRenderPageSize) : tableList;
+    var currentDataSource = type == 'noPage' ? selectedTablePageRows : currentTableList;
     var viCount = (modalTableProps === null || modalTableProps === void 0 ? void 0 : modalTableProps.visibleFieldsCount) || defaultVisibleFieldsCount;
     var canExpand = hasMoreQueryFields(modalTableProps);
     var collapsedList = modalTableProps === null || modalTableProps === void 0 ? void 0 : (_modalTableProps$tabl = modalTableProps.tableSearchForm) === null || _modalTableProps$tabl === void 0 ? void 0 : _modalTableProps$tabl.slice(0, viCount);
@@ -6314,13 +6434,14 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     }, /*#__PURE__*/React__default['default'].createElement(antd.Table, _objectSpread2(_objectSpread2({
       bordered: true,
       size: "middle",
-      rowSelection: rowSelection,
+      rowSelection: getRowSelection(currentDataSource, type),
       columns: tableShowColumns,
-      dataSource: tableList
+      dataSource: currentDataSource
     }, type == 'noPage' ? {
-      pagination: _objectSpread2(_objectSpread2({}, initPagination), {}, {
+      pagination: _objectSpread2(_objectSpread2({}, selectedTablePagination), {}, {
         showSizeChanger: false
       }),
+      onChange: handleSelectedTableChange,
       locale: {
         emptyText: renderEmptyText('暂无已选结果', mTB)
       }
@@ -6356,13 +6477,9 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   } // 务必填写 key
   ];
   var tabsItems2 = [{
-    label: "\u5DF2\u9009\uFF08".concat((selectedRowKeys === null || selectedRowKeys === void 0 ? void 0 : selectedRowKeys.length) || 0, "\uFF09"),
+    label: "\u5DF2\u9009\uFF08".concat((selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.length) || 0, "\uFF09"),
     key: 'selected',
-    children: renderShowTable((selectedRows === null || selectedRows === void 0 ? void 0 : selectedRows.map(function (s, index) {
-      return _objectSpread2(_objectSpread2({}, s), {}, {
-        keyIndex: index + 1
-      });
-    })) || [], 'noPage')
+    children: renderShowTable(selectedRows, 'noPage')
   }];
   var resetSelectDataSource = function resetSelectDataSource() {
     var isClear = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
@@ -6378,7 +6495,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
     props === null || props === void 0 ? void 0 : (_props$onClear = props.onClear) === null || _props$onClear === void 0 ? void 0 : _props$onClear.call(props);
     // 清空下拉框 / 弹窗 选中数据
     formaData([], items);
-    onChangeSelectedKeys([], []);
+    clearSelectedRows();
     // 重置下拉框数据源
     resetSelectDataSource(true);
   };
@@ -6635,9 +6752,7 @@ var SearchSelect = /*#__PURE__*/React$1.forwardRef(function (props, ref) {
   }, /*#__PURE__*/React__default['default'].createElement(antd.Tabs, {
     items: tabsItems2,
     tabBarExtraContent: /*#__PURE__*/React__default['default'].createElement("span", {
-      onClick: function onClick() {
-        return onChangeSelectedKeys([], []);
-      }
+      onClick: clearSelectedRows
     }, "\u6E05\u7A7A\u5DF2\u9009")
   })) : null)))));
 });
@@ -39353,12 +39468,24 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
           padding: '10px',
           borderRadius: '4px'
         }
-      }, /*#__PURE__*/React__default['default'].createElement("span", {
+      }, /*#__PURE__*/React__default['default'].createElement(antd.Select, {
+        disabled: disabled,
         style: {
-          marginRight: 8,
-          flexShrink: 0
-        }
-      }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0:"), /*#__PURE__*/React__default['default'].createElement(antd.Input, {
+          width: 150,
+          marginRight: 10
+        },
+        placeholder: "\u8BF7\u9009\u62E9",
+        value: String(itemDetail.reqConditionData.reqParamType || '10'),
+        onChange: function onChange(val) {
+          return _this.handleReqDataChange(itemDetail, 'reqParamType', val);
+        }
+      }, /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+        value: "10"
+      }, "\u8BF7\u6C42\u53C2\u6570\u540D\u79F0"), /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+        value: "20"
+      }, "\u8BF7\u6C42\u5934\u53C2\u6570\u540D\u79F0"), /*#__PURE__*/React__default['default'].createElement(antd.Select.Option, {
+        value: "40"
+      }, "\u6E90\u8BF7\u6C42\u5730\u5740")), String(itemDetail.reqConditionData.reqParamType || '10') !== '40' && /*#__PURE__*/React__default['default'].createElement(antd.Input, {
         disabled: disabled,
         style: {
           width: 150,
@@ -39914,6 +40041,8 @@ var RuleObjectComponent = /*#__PURE__*/function (_Component) {
         if (valueNames) {
           itemDetail.reqConditionData.paramNames = valueNames;
         }
+      } else if (field === 'reqParamType') {
+        itemDetail.reqConditionData.reqParamType = value;
       }
       _this.setState({
         ruleClassData: ruleClassData

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@bit-sun/business-component",
-  "version": "4.2.1-alpha.24-aiwei",
+  "version": "4.2.1-alpha.26-aiwei",
   "scripts": {
     "start": "dumi dev",
     "docs:build": "dumi build",

package/src/components/Functional/SearchSelect/index.tsx

@@ -1,5 +1,5 @@
 // @ts-nocheck
-import React, { useState, useEffect, forwardRef, useImperativeHandle } from 'react';
+import React, { useState, useEffect, useMemo, useRef, forwardRef, useImperativeHandle } from 'react';
 import { useDebounceFn } from 'ahooks';
 import { Input, Button, Modal, Select, Divider, message, Spin, Form, Table, Checkbox, TreeSelect, Tooltip, Tag, Row, Col, Space, Tabs, Empty, DatePicker } from 'antd';
 import { SearchOutlined, CopyOutlined, CaretLeftOutlined } from '@ant-design/icons';
@@ -95,7 +95,12 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const isFormPage = pathname.match(pattern)?.length > 0;
 
   const initPagination = { showQuickJumper: true, showSizeChanger: true, showTotal: (total: any) => `共 ${total} 条`, pageSize: tableInitPageSize }
+  const selectedInitPagination = { ...initPagination, current: 1, pageSize: resolveTablePageSize(modalTableProps?.selectedTablePageSize || 20), total: 0 }
   const tableInitPagination = { ...initPagination, total: 0, current: 1, pageSizeOptions:TABLE_PAGE_SIZE_OPTIONS.map(String) }
+  /**
+   * 左侧弹窗表格大分页时的实际渲染上限；全选仍基于完整当前页 tableData。
+   */
+  const tableRenderPageSize = 200;
   const disabled = !!noOperate || selectProps?.disabled || props?.disabled;
   const isHaveDependency = fixedparameter && fieldValToParam && ctx;
   const isHaveDValue = () => {
@@ -153,13 +158,25 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const [tablePagination, setTablePagination] = useState(tableInitPagination)
   const [selectedRowKeys, setSelectedRowKeys] = useState([]);
   const [selectedRows, setSelectedRows] = useState([]);
-  const [checkedAll, setCheckedAll] = useState(false)
-  const [indeterminate, setIndeterminate] = useState(false)
+  const [selectedTablePagination, setSelectedTablePagination] = useState(selectedInitPagination);
   const [tableFormParams, setTableFormParams] = useState({});
   const [tooltipVisible, setTooltipVisible] = useState(false);
   const [tableShowColumns, setTabletShowColumns] = useState(handleTableColumns(modalTableProps?.tableColumns)); // 默认展示表头-modalTableProps?.tableColumns
   const [confirmLoading, setConfirmLoading] = useState(false);
   const [modalSearched, setModalSearched]=useState(false);
+  const selectAllTableRef = useRef(false);
+
+  const getRecordKey = (record: any) => record?.[mappingValueField] ?? record?.value;
+
+  /**
+   * 已选表格只向 Table 传入当前页数据，避免全选 1000 条时右侧表格同步处理全部数据。
+   */
+  const selectedTablePageRows = useMemo(() => {
+    const current = Number(selectedTablePagination?.current || 1);
+    const pageSize = Number(selectedTablePagination?.pageSize || selectedInitPagination.pageSize);
+    const start = (current - 1) * pageSize;
+    return (selectedRows || []).slice(start, start + pageSize).map((s,index)=> ({...s,keyIndex:start + index + 1}));
+  }, [selectedRows, selectedTablePagination?.current, selectedTablePagination?.pageSize, selectedInitPagination.pageSize]);
 
   const setSelectDataSource = (list,total: number) => {
     setItems(list);
@@ -169,6 +186,16 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     setSelectDataSource([],0)
   }
 
+  /**
+   * 清空弹窗已选数据。
+   */
+  const clearSelectedRows = () => {
+    setSelectedRows([]);
+    setPopValue([]);
+    setSelectedTablePagination((prev: any) => ({ ...prev, total: 0, current: 1 }));
+    setSelectedRowKeys([]);
+  }
+
   useImperativeHandle(ref, () => ({
     refreshDataSource: (reset: boolean = false) => {
       if (reset) {
@@ -342,6 +369,16 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     setTabletShowColumns(handleTableColumns(modalTableProps?.tableColumns));
   }, [resultSourceKey])
 
+  useEffect(() => {
+    setSelectedTablePagination((prev: any) => {
+      const pageSize = prev?.pageSize || selectedInitPagination.pageSize;
+      const maxCurrent = Math.ceil(selectedRows.length / pageSize) || 1;
+      const current = selectedRows.length ? Math.min(prev?.current || 1, maxCurrent) : 1;
+      if (prev?.total === selectedRows.length && prev?.current === current) return prev;
+      return { ...prev, total: selectedRows.length, current };
+    });
+  }, [selectedRows.length, selectedInitPagination.pageSize])
+
   useEffect(() => {
     if (init) {
       clearSelectDataSource();
@@ -388,9 +425,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         setSelectedRowKeys(labelInValue ? value.map(i => i.key) : value)
         setSelectedRows(labelInValue ? value.map(i => ({ [mappingValueField]: i.key, value: i.key, text: i.label })) : value.map(i => ({ [mappingValueField]: i, value: i })))
         setPopValue(labelInValue ? value.map(i => ({ value: i.key, text: i.label })) : value.map(i => ({ value: i })));
-        setIndeterminate(!!value.length && value.length < itemsTotal);
-        setCheckedAll(itemsTotal && value.length === itemsTotal);
-
       } else {
         setSelectedRowKeys(labelInValue ? [value.key] : [value])
         setSelectedRows(labelInValue ? [{ [mappingValueField]: value.key, value: value.key, text: value.label }] : [{ [mappingValueField]: value, value: value }])
@@ -461,8 +495,6 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     setTablePagination(tableInitPagination);
     setSelectedRowKeys([]);
     setSelectedRows([]);
-    setCheckedAll(false);
-    setIndeterminate(false);
   };
 
   const handleCancel = () => {
@@ -522,6 +554,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     getData({ ...tableFormParams, pageSize: pagination.pageSize, currentPage: pagination.current }, 2)
   }
 
+  const handleSelectedTableChange = (pagination) => {
+    setSelectedTablePagination((prev: any) => ({ ...prev, current: pagination.current, pageSize: pagination.pageSize }));
+  }
+
   // 扁平化二维数组的方法
   const mapRows = params => {
     var res = [];
@@ -539,7 +575,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   };
 
   const onChangeSelectedKeys = (selectKeys, selectRows) => {
-    let sksResult = selectRows?.map((i) => i.value)||[];
+    let sksResult = selectKeys?.length ? selectKeys : selectRows?.map((i) => getRecordKey(i))||[];
 
     // 单选 默认直接选中 不需要确定  配置了modalRadioNeedFooter就需要确定
     if(!selectMode && !modalTableProps?.modalRadioNeedFooter) {
@@ -550,34 +586,87 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     setSelectedRowKeys(sksResult)
     setSelectedRows(selectRows)
     setPopValue(selectRows);
-    setIndeterminate(!!selectRows.length && selectRows.length < tablePagination?.total);
-    setCheckedAll(selectRows.length === tablePagination?.total);
   }
 
-  const rowSelection = {
+  const getRowSelection = (visibleRows: any[] = [], type?: string) => ({
     type: selectMode ? 'checkbox' : 'radio',
     selectedRowKeys,
     preserveSelectedRowKeys: true,
+    onSelectAll: (selected) => {
+      selectAllTableRef.current = true;
+      setTimeout(() => {
+        selectAllTableRef.current = false;
+      }, 0);
+      const targetRows = type === 'noPage' ? visibleRows : tableData;
+      const targetKeys = (targetRows || []).map((item: any) => getRecordKey(item));
+      if (!selected) {
+        const selectedKeySet = new Set((selectedRows || []).map((item: any) => getRecordKey(item)));
+        if ((selectedRows || []).length === (targetRows || []).length && targetKeys.every((key: any) => selectedKeySet.has(key))) {
+          clearSelectedRows();
+          return;
+        }
+        const targetKeySet = new Set(targetKeys);
+        const nextSelectedRows = (selectedRows || []).filter((item: any) => !targetKeySet.has(getRecordKey(item)));
+        const nextSelectedKeys = nextSelectedRows.map((item: any) => getRecordKey(item));
+        onChangeSelectedKeys(nextSelectedKeys, nextSelectedRows);
+        return;
+      }
+
+      if (!(selectedRows || []).length) {
+        onChangeSelectedKeys(targetKeys, targetRows || []);
+        return;
+      }
+
+      const selectedRowMap = new Map();
+      (selectedRows || []).forEach((item: any) => {
+        selectedRowMap.set(getRecordKey(item), item);
+      });
+      (targetRows || []).forEach((item: any) => {
+        selectedRowMap.set(getRecordKey(item), item);
+      });
+      const nextSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+      const nextSelectedKeys = nextSelectedRows.map((item: any) => getRecordKey(item));
+      onChangeSelectedKeys(nextSelectedKeys, nextSelectedRows);
+    },
     onChange: (sks, srs) => {
+      if (selectAllTableRef.current) {
+        selectAllTableRef.current = false;
+        return;
+      }
+      if (!sks?.length) {
+        clearSelectedRows();
+        return;
+      }
       // 处理翻页后，之前存储的selectedRows变为undefined
       // selectedRows合并新数组，过滤undefined，过滤留下对应selectedRowKeys的集合
-      let tmpSelectedRows = selectedRows.concat(srs).filter(item => item != undefined);
-      let totalSelectedRows = sks.map(key => tmpSelectedRows.filter(item => item[mappingValueField] == key)[0]).filter(item => item != undefined)
-      onChangeSelectedKeys(sks, totalSelectedRows)
+      const visibleKeySet = new Set((visibleRows || []).map((item: any) => getRecordKey(item)));
+      const selectedRowMap = new Map();
+      (selectedRows || []).forEach((item: any) => {
+        const key = getRecordKey(item);
+        if (!visibleKeySet.has(key)) {
+          selectedRowMap.set(key, item);
+        }
+      });
+      (srs || []).filter(Boolean).forEach((item: any) => {
+        selectedRowMap.set(getRecordKey(item), item);
+      });
+      const totalSelectedRows = Array.from(selectedRowMap.values()).filter(Boolean);
+      const totalSelectedKeys = totalSelectedRows.map((item: any) => getRecordKey(item));
+      onChangeSelectedKeys(totalSelectedKeys, totalSelectedRows)
     },
     getCheckboxProps: selectProps?.getCheckboxProps ? selectProps?.getCheckboxProps : () => {
       return ({
         disabled: disabled || (!items.length && !tableData.length),
       })
     },
-  };
+  });
 
   const onRowClickSelect = (e, record,type) => {
     if (selectMode && !(disabled || (!items.length && !tableData.length))) {
       const oldSelect = selectedRows;
       const newSelect = [JSON.parse(JSON.stringify(record))];
       const srs = getRealStr(oldSelect,newSelect,record);
-      const sks = srs.map((i: any) => i.value)
+      const sks = srs.map((i: any) => getRecordKey(i))
 
       onChangeSelectedKeys(sks, srs)
     }
@@ -585,7 +674,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   const onDoubleClickSelect = (e, record,type) => {
     if (!selectMode && !(disabled || (!items.length && !tableData.length))) {
       const srs = [JSON.parse(JSON.stringify(record))]
-      const sks = srs.map((i: any) => i.value)
+      const sks = srs.map((i: any) => getRecordKey(i))
       onChangeSelectedKeys(sks, srs)
     }
   }
@@ -788,6 +877,10 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
   }
 
   const renderShowTable =  (tableList, type) => {
+    const currentPageSize = Number(tablePagination?.pageSize || tableInitPageSize);
+    const needLimitRenderRows = type !== 'noPage' && currentPageSize >= tableRenderPageSize && tableList?.length > tableRenderPageSize;
+    const currentTableList = needLimitRenderRows ? tableList.slice(0, tableRenderPageSize) : tableList;
+    const currentDataSource = type=='noPage' ? selectedTablePageRows : currentTableList;
     const viCount = modalTableProps?.visibleFieldsCount || defaultVisibleFieldsCount;
     const canExpand = hasMoreQueryFields(modalTableProps);
     const collapsedList = modalTableProps?.tableSearchForm?.slice(0, viCount);
@@ -815,11 +908,12 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
         <Table
           bordered
           size="middle"
-          rowSelection={rowSelection}
+          rowSelection={getRowSelection(currentDataSource, type)}
           columns={tableShowColumns}
-          dataSource={tableList}
+          dataSource={currentDataSource}
           {...type=='noPage'?{
-            pagination: { ...initPagination,showSizeChanger: false },
+            pagination: { ...selectedTablePagination,showSizeChanger: false },
+            onChange: handleSelectedTableChange,
             locale: {
               emptyText: renderEmptyText('暂无已选结果',mTB),
             }
@@ -852,7 +946,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     { label: `全部（${tablePagination?.total || 0}）`, key: 'all', children: renderShowTable(tableData) }, // 务必填写 key
   ];
   const tabsItems2 = [
-    { label: `已选（${selectedRowKeys?.length || 0}）`, key: 'selected', children: renderShowTable(selectedRows?.map((s,index)=> ({...s,keyIndex:index+1}))||[],'noPage')  },
+    { label: `已选（${selectedRows?.length || 0}）`, key: 'selected', children: renderShowTable(selectedRows,'noPage')  },
   ];
 
   const resetSelectDataSource = (isClear=false) => {
@@ -868,7 +962,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
     props?.onClear?.();
     // 清空下拉框 / 弹窗 选中数据
     formaData([], items);
-    onChangeSelectedKeys([], [])
+    clearSelectedRows();
     // 重置下拉框数据源
     resetSelectDataSource(true);
   }
@@ -1082,7 +1176,7 @@ const SearchSelect = forwardRef((props: any, ref: any) => {
 
             <div className={'search_select_wrapper_bottomTable'}>
               <div className={selectMode ?'search_select_wrapper_bottomTable_wrapLeft2':'search_select_wrapper_bottomTable_wrapLeft1'}><Tabs items={tabsItems1} /></div>
-              {selectMode ? <div className={'search_select_wrapper_bottomTable_wrapRight'}><Tabs items={tabsItems2} tabBarExtraContent={<span onClick={()=> onChangeSelectedKeys([], [])}>清空已选</span>} /></div> : null}
+              {selectMode ? <div className={'search_select_wrapper_bottomTable_wrapRight'}><Tabs items={tabsItems2} tabBarExtraContent={<span onClick={clearSelectedRows}>清空已选</span>} /></div> : null}
             </div>
           </div>
         </Modal>

package/src/components/Solution/RuleComponent/index.js

@@ -1143,21 +1143,36 @@ class RuleObjectComponent extends Component {
                     borderRadius: '4px',
                   }}
                 >
-                <span style={{ marginRight: 8, flexShrink: 0 }}>
-                  请求参数名称:
-                </span>
-                <Input
+                <Select
                   disabled={disabled}
                   style={{ width: 150, marginRight: 10 }}
-                  value={itemDetail.reqConditionData.reqParamName}
-                  onChange={(e) =>
-                    this.handleReqDataChange(
-                      itemDetail,
-                      'reqParamName',
-                      e.target.value,
-                    )
+                  placeholder="请选择"
+                  value={String(
+                    itemDetail.reqConditionData.reqParamType || '10',
+                  )}
+                  onChange={(val) =>
+                    this.handleReqDataChange(itemDetail, 'reqParamType', val)
                   }
-                />
+                >
+                  <Select.Option value="10">请求参数名称</Select.Option>
+                  <Select.Option value="20">请求头参数名称</Select.Option>
+                  <Select.Option value="40">源请求地址</Select.Option>
+                </Select>
+                {String(itemDetail.reqConditionData.reqParamType || '10') !==
+                  '40' && (
+                  <Input
+                    disabled={disabled}
+                    style={{ width: 150, marginRight: 10 }}
+                    value={itemDetail.reqConditionData.reqParamName}
+                    onChange={(e) =>
+                      this.handleReqDataChange(
+                        itemDetail,
+                        'reqParamName',
+                        e.target.value,
+                      )
+                    }
+                  />
+                )}
 
                 <span style={{ marginRight: 8, flexShrink: 0 }}>类型:</span>
                 <Select
@@ -1843,6 +1858,8 @@ class RuleObjectComponent extends Component {
       if (valueNames) {
         itemDetail.reqConditionData.paramNames = valueNames;
       }
+    } else if (field === 'reqParamType') {
+      itemDetail.reqConditionData.reqParamType = value;
     }
 
     this.setState(