@zat-design/sisyphus-react 4.1.2-beta.6 → 4.1.2-beta.7

package/es/ProEditTable/components/RenderField/index.js

@@ -699,7 +699,38 @@ var RenderField = _ref => {
 
   // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
   var finalFormItemProps = useMemo(() => {
-    return Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), namesTransform()), isTrim(type, trim, proConfig)));
+    var _namesTransformProps$, _namesTransformProps$2;
+    var defaultTransformProps = defaultTransform();
+    var namesTransformProps = namesTransform();
+    var trimProps = isTrim(type, trim, proConfig); // 使用顶层调用的proConfig
+
+    var transformNormalize = (_namesTransformProps$ = namesTransformProps === null || namesTransformProps === void 0 ? void 0 : namesTransformProps.normalize) !== null && _namesTransformProps$ !== void 0 ? _namesTransformProps$ : defaultTransformProps === null || defaultTransformProps === void 0 ? void 0 : defaultTransformProps.normalize;
+    var userNormalize = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.normalize;
+    var transformGetValueProps = (_namesTransformProps$2 = namesTransformProps === null || namesTransformProps === void 0 ? void 0 : namesTransformProps.getValueProps) !== null && _namesTransformProps$2 !== void 0 ? _namesTransformProps$2 : defaultTransformProps === null || defaultTransformProps === void 0 ? void 0 : defaultTransformProps.getValueProps;
+    var userGetValueProps = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.getValueProps;
+    var finalNormalize = transformNormalize && userNormalize ? (value, prevValue, allValues, isDiffMode) => {
+      // 用户 normalize 需要拿到组件原始值（如 DatePicker 的 dayjs）
+      var userValue = userNormalize(value, prevValue, allValues, isDiffMode);
+      // 保持用户优先：用户有明确返回值时直接使用，不再强制走内置转换
+      if (userValue !== undefined) {
+        return userValue;
+      }
+      // 仅在用户未返回时，回退到内置 transform 逻辑
+      return transformNormalize(value, prevValue, allValues, isDiffMode);
+    } : userNormalize || transformNormalize;
+    var finalGetValueProps = transformGetValueProps && userGetValueProps ? function (value) {
+      for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+        args[_key3 - 1] = arguments[_key3];
+      }
+      var transformValueProps = transformGetValueProps(value, ...args) || {};
+      var nextValue = Object.prototype.hasOwnProperty.call(transformValueProps, 'value') ? transformValueProps.value : value;
+      var userValueProps = userGetValueProps(nextValue, ...args) || {};
+      return _objectSpread(_objectSpread({}, transformValueProps), userValueProps);
+    } : userGetValueProps || transformGetValueProps;
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _formItemProps), defaultTransformProps), namesTransformProps), trimProps), {}, {
+      normalize: finalNormalize,
+      getValueProps: finalGetValueProps
+    });
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
@@ -950,6 +981,13 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
     }
     // reactiveParams 中的 form、index、namePath 已经在外层比较过了，无需重复比较
   }
+  // fieldProps 为对象时，必须比较配置变化（如 dataSource 异步更新）
+  if (!isFunction(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && !isFunction(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
+    var isFieldPropsEqual = isEqualWith(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps, nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps, customEqualForFunction);
+    if (!isFieldPropsEqual) {
+      return false;
+    }
+  }
 
   // 通用函数比较方法
   // 优化：不直接调用函数，而是比较输入参数

package/es/ProEditTable/utils/index.js

@@ -22,10 +22,11 @@ import { filterInternalFields } from "../../ProForm/utils";
 import ProTooltip from "../../ProTooltip";
 import { RenderField, ActionButton } from "../components";
 import locale from "../../locale";
-
-// 渲染操作栏
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var columnDataSourceRefCache = new Map();
+
+// 渲染操作栏
 var getActionColumn = config => {
   var _cloneDeepWith = cloneDeepWith(config, value => {
       if ( /*#__PURE__*/React.isValidElement(value)) {
@@ -375,15 +376,33 @@ export var transformColumns = function transformColumns() {
     // 精准控制单元格更新，减少不必要的渲染
     if (!item.shouldCellUpdate) {
       var hasComponent = isFunction(item.component);
+      var columnCacheKey = `${Array.isArray(name) ? name.join('.') : String(name)}::${String(columnName)}`;
       item.shouldCellUpdate = (record, prevRecord) => {
-        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) return true;
+        var _item$fieldProps;
+        var currentDataSourceRef = !isFunction(item === null || item === void 0 ? void 0 : item.fieldProps) ? item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.dataSource : undefined;
+        if (currentDataSourceRef !== undefined) {
+          var prevDataSourceRef = columnDataSourceRefCache.get(columnCacheKey);
+          if (prevDataSourceRef !== currentDataSourceRef) {
+            columnDataSourceRefCache.set(columnCacheKey, currentDataSourceRef);
+            return true;
+          }
+        }
+        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) {
+          return true;
+        }
         // 单行编辑模式下，需要检测编辑状态变化
-        if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) return true;
+        if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) {
+          return true;
+        }
         // 动态 component 可能依赖行内其他字段，需比较整行
-        if (hasComponent) return !isEqual(record, prevRecord);
+        if (hasComponent) {
+          var rowChanged = !isEqual(record, prevRecord);
+          return rowChanged;
+        }
         var key = item.dataIndex || item.key;
         if (!key) return true;
-        return (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+        var keyChanged = (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+        return keyChanged;
       };
     }
   });

package/es/ProSelect/index.js

@@ -14,7 +14,7 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
 import { message, Select, Space, Tooltip } from 'antd';
-import React, { useImperativeHandle, useState, forwardRef, isValidElement, useCallback, useEffect } from 'react';
+import React, { useImperativeHandle, useState, forwardRef, isValidElement, useCallback, useEffect, useMemo, useRef } from 'react';
 import { isFunction, isObject, isString, omit, isNumber } from 'lodash';
 import { useProConfig } from "../ProConfigProvider";
 import Container from "../ProForm/components/Container";
@@ -22,13 +22,11 @@ import AdaptiveTooltip from "./components/AdaptiveTooltip";
 import { ProForm } from '..';
 import locale from "../locale";
 import { getSelectList } from "./utils";
+
+/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 import { Fragment as _Fragment } from "react/jsx-runtime";
-var Option = Select.Option,
-  OptGroup = Select.OptGroup;
-
-/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
 function flattenOptions(list) {
   if (!Array.isArray(list) || !list.length) return [];
   var out = [];
@@ -42,7 +40,7 @@ function flattenOptions(list) {
   return out;
 }
 export var ProSelect = (props, ref) => {
-  var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
+  var _selectProps$showCode, _ProForm$useFieldProp, _useRequest$options3, _locale$ProSelect;
   var _ref = useProConfig('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -77,7 +75,7 @@ export var ProSelect = (props, ref) => {
     selectProps = _objectWithoutProperties(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
-  var _ref2 = ProForm.useFieldProps() || {},
+  var _ref2 = (ProForm === null || ProForm === void 0 || (_ProForm$useFieldProp = ProForm.useFieldProps) === null || _ProForm$useFieldProp === void 0 ? void 0 : _ProForm$useFieldProp.call(ProForm)) || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
@@ -139,6 +137,10 @@ export var ProSelect = (props, ref) => {
       useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 || (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 || _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
     }
   }));
+  var fetchFunctionRef = useRef(fetchFunction);
+  useEffect(() => {
+    fetchFunctionRef.current = fetchFunction;
+  }, [fetchFunction]);
   var cacheList = useRequest !== null && useRequest !== void 0 && (_useRequest$options3 = useRequest.options) !== null && _useRequest$options3 !== void 0 && _useRequest$options3.cacheKey ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   var flatOptions = flattenOptions(selectList);
   var getValueObject = input => {
@@ -316,16 +318,99 @@ export var ProSelect = (props, ref) => {
     return props.children;
   };
   var isReactElement = element => /*#__PURE__*/isValidElement(element);
+  var getInnerRecord = option => {
+    var _option$data;
+    if (!option) return undefined;
+    if (option.record) return option.record;
+    if ((_option$data = option.data) !== null && _option$data !== void 0 && _option$data.record) return option.data.record;
+    return undefined;
+  };
+  var getOptionText = item => {
+    if (OptionRender) {
+      var _item$label;
+      var rendered = OptionRender(item);
+      return isString(rendered) ? rendered : String((_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : '');
+    }
+    var text = selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label];
+    return isString(text) ? text : String(text !== null && text !== void 0 ? text : '');
+  };
+  var buildOptionItem = (item, index) => {
+    var text = getOptionText(item);
+    return {
+      key: item[code] != null ? `${item[code]}-${index}` : `option-${index}`,
+      label: text,
+      value: item[code] != null ? item[code] : undefined,
+      disabled: !!item.disabled,
+      title: text,
+      searchText: text,
+      record: item
+    };
+  };
+  var selectOptionRender = option => {
+    var _option$data2, _ref5, _ref6, _option$data$searchTe, _option$data3, _option$data4;
+    var currentRecord = (option === null || option === void 0 || (_option$data2 = option.data) === null || _option$data2 === void 0 ? void 0 : _option$data2.record) || (option === null || option === void 0 ? void 0 : option.record);
+    var text = (_ref5 = (_ref6 = (_option$data$searchTe = option === null || option === void 0 || (_option$data3 = option.data) === null || _option$data3 === void 0 ? void 0 : _option$data3.searchText) !== null && _option$data$searchTe !== void 0 ? _option$data$searchTe : option === null || option === void 0 || (_option$data4 = option.data) === null || _option$data4 === void 0 ? void 0 : _option$data4.title) !== null && _ref6 !== void 0 ? _ref6 : option === null || option === void 0 ? void 0 : option.label) !== null && _ref5 !== void 0 ? _ref5 : '';
+    if (!currentRecord) {
+      return /*#__PURE__*/_jsx(TooltipOption, {
+        title: String(text),
+        children: String(text)
+      });
+    }
+    return /*#__PURE__*/_jsx(TooltipOption, {
+      title: String(text),
+      children: OptionRender ? /*#__PURE__*/_jsx("span", {
+        children: OptionRender(currentRecord)
+      }) : /*#__PURE__*/_jsx("span", {
+        children: String(text)
+      })
+    });
+  };
+  var defaultFilterOption = useCallback((input, option) => {
+    var _ref7, _option$searchText;
+    if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
+    var optionLabel = (_ref7 = (_option$searchText = option === null || option === void 0 ? void 0 : option.searchText) !== null && _option$searchText !== void 0 ? _option$searchText : option === null || option === void 0 ? void 0 : option.title) !== null && _ref7 !== void 0 ? _ref7 : option === null || option === void 0 ? void 0 : option.label;
+    return String(optionLabel !== null && optionLabel !== void 0 ? optionLabel : '').toLowerCase().includes(input.toLowerCase());
+  }, []);
+  var mergedShowSearch = useMemo(() => {
+    var defaultConfig = {
+      enabled: true,
+      filterOption: isFunction(_onSearch) ? false : defaultFilterOption,
+      onSearch: searchValue => {
+        _onSearch === null || _onSearch === void 0 || _onSearch(searchValue, _objectSpread({}, fetchFunctionRef.current));
+      }
+    };
+    var customShowSearch = selectProps.showSearch;
+    if (customShowSearch === false) {
+      return _objectSpread(_objectSpread({}, defaultConfig), {}, {
+        enabled: false
+      });
+    }
+    if (customShowSearch === true || customShowSearch == null) {
+      return defaultConfig;
+    }
+    if (isObject(customShowSearch)) {
+      var _customShowSearch$fil, _customShowSearch$onS;
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultConfig), customShowSearch), {}, {
+        enabled: true,
+        filterOption: (_customShowSearch$fil = customShowSearch.filterOption) !== null && _customShowSearch$fil !== void 0 ? _customShowSearch$fil : defaultConfig.filterOption,
+        onSearch: (_customShowSearch$onS = customShowSearch.onSearch) !== null && _customShowSearch$onS !== void 0 ? _customShowSearch$onS : defaultConfig.onSearch
+      });
+    }
+    return defaultConfig;
+  }, [_onSearch, defaultFilterOption, selectProps.showSearch]);
   var handleChange = (value, _option) => {
     // option/其第一层子节点是react节点且是labelInValue就拿record
     var option = _option;
     if (labelInValue && (isReactElement(_option) || isReactElement(_option === null || _option === void 0 ? void 0 : _option.children))) {
-      option = _option === null || _option === void 0 ? void 0 : _option.record;
+      option = getInnerRecord(_option);
     }
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(item => {
-          Object.assign(item, item.record);
+          var currentRecord = getInnerRecord(item);
+          if (currentRecord) {
+            Object.assign(item, currentRecord);
+          }
           delete item.record;
           delete item.children;
         });
@@ -338,7 +423,7 @@ export var ProSelect = (props, ref) => {
     } else if (!selectProps.mode && labelInValue) {
       onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 || onChange(getChangeValue ? getChangeValue(value) : value, _option === null || _option === void 0 ? void 0 : _option.record);
+      onChange === null || onChange === void 0 || onChange(getChangeValue ? getChangeValue(value) : value, getInnerRecord(_option));
     }
   };
 
@@ -389,71 +474,41 @@ export var ProSelect = (props, ref) => {
       mode: selectProps.mode
     });
   }
+  var selectOptions = Array.isArray(newSelectList) ? newSelectList.map((item, index) => {
+    var groupOptions = item.options;
+    if (Array.isArray(groupOptions)) {
+      var _item$label2;
+      return {
+        key: (_item$label2 = item[label]) !== null && _item$label2 !== void 0 ? _item$label2 : `group-${index}`,
+        label: item[label],
+        options: groupOptions.map((opt, optIndex) => buildOptionItem(opt, optIndex))
+      };
+    }
+    return buildOptionItem(item, index);
+  }) : [];
+  var selectSearchProps = {
+    filterOption: mergedShowSearch.filterOption,
+    onSearch: mergedShowSearch.onSearch
+  };
   return /*#__PURE__*/_jsx("div", {
     style: props.style,
     className: "pro-select",
-    children: /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/_jsx(Select, _objectSpread(_objectSpread(_objectSpread({
       placeholder: locale === null || locale === void 0 || (_locale$ProSelect = locale.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      showSearch: true,
-      filterOption: isFunction(_onSearch) ? false : (input, option) => {
-        var _option$children;
-        if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
-        var value = isString(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 || (_option$children = option.children) === null || _option$children === void 0 || (_option$children = _option$children.props) === null || _option$children === void 0 ? void 0 : _option$children.title;
-        return value.toLowerCase().includes(input.toLowerCase());
-      },
-      onSearch: value => {
-        _onSearch && _onSearch(value, _objectSpread({}, fetchFunction));
-      },
+      showSearch: mergedShowSearch.enabled
+    }, selectSearchProps), {}, {
       getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, omit(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady'])), {}, {
+    }, omit(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady', 'showSearch'])), {}, {
       // 如果是多选模式且用户没有自定义maxTagPlaceholder，使用我们的hover版本
       maxTagPlaceholder: selectProps.mode === 'multiple' && !selectProps.maxTagPlaceholder ? maxTagPlaceholder : selectProps.maxTagPlaceholder,
+      optionRender: selectOptionRender,
       value: transformValue(),
-      children: Array.isArray(newSelectList) && newSelectList.map((item, index) => {
-        var itemValue = item[code];
-        var itemKey = itemValue != null ? `${itemValue}-${index}` : `option-${index}`;
-        var optionValue = itemValue != null ? itemValue : undefined;
-        var groupOpts = item.options;
-        if (Array.isArray(groupOpts)) {
-          var _item$label;
-          return /*#__PURE__*/_jsx(OptGroup, {
-            label: item[label],
-            children: groupOpts.map(opt => /*#__PURE__*/_jsx(Option, {
-              label: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
-              value: opt[code],
-              record: opt,
-              disabled: !!opt.disabled,
-              children: /*#__PURE__*/_jsx(TooltipOption, {
-                title: OptionRender ? OptionRender(opt) : selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
-                children: OptionRender ? /*#__PURE__*/_jsx("span", {
-                  children: OptionRender(opt)
-                }) : /*#__PURE__*/_jsx("span", {
-                  children: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label]
-                })
-              })
-            }, opt[code]))
-          }, (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : `group-${index}`);
-        }
-        return /*#__PURE__*/_jsx(Option, {
-          label: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
-          value: optionValue,
-          record: item,
-          disabled: !!item.disabled,
-          children: /*#__PURE__*/_jsx(TooltipOption, {
-            title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
-            children: OptionRender ? /*#__PURE__*/_jsx("span", {
-              children: OptionRender(item)
-            }) : /*#__PURE__*/_jsx("span", {
-              children: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label]
-            })
-          })
-        }, itemKey);
-      })
+      options: selectOptions
     }))
   });
 };

package/lib/ProEditTable/components/RenderField/index.js

@@ -706,7 +706,38 @@ var RenderField = _ref => {
 
   // 使用useMemo优化最终的formItemProps - 修复Hooks使用规则
   var finalFormItemProps = (0, _react.useMemo)(() => {
-    return Object.assign(_formItemProps, _objectSpread(_objectSpread(_objectSpread({}, defaultTransform()), namesTransform()), (0, _utils2.isTrim)(type, trim, proConfig)));
+    var _namesTransformProps$, _namesTransformProps$2;
+    var defaultTransformProps = defaultTransform();
+    var namesTransformProps = namesTransform();
+    var trimProps = (0, _utils2.isTrim)(type, trim, proConfig); // 使用顶层调用的proConfig
+
+    var transformNormalize = (_namesTransformProps$ = namesTransformProps === null || namesTransformProps === void 0 ? void 0 : namesTransformProps.normalize) !== null && _namesTransformProps$ !== void 0 ? _namesTransformProps$ : defaultTransformProps === null || defaultTransformProps === void 0 ? void 0 : defaultTransformProps.normalize;
+    var userNormalize = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.normalize;
+    var transformGetValueProps = (_namesTransformProps$2 = namesTransformProps === null || namesTransformProps === void 0 ? void 0 : namesTransformProps.getValueProps) !== null && _namesTransformProps$2 !== void 0 ? _namesTransformProps$2 : defaultTransformProps === null || defaultTransformProps === void 0 ? void 0 : defaultTransformProps.getValueProps;
+    var userGetValueProps = _formItemProps === null || _formItemProps === void 0 ? void 0 : _formItemProps.getValueProps;
+    var finalNormalize = transformNormalize && userNormalize ? (value, prevValue, allValues, isDiffMode) => {
+      // 用户 normalize 需要拿到组件原始值（如 DatePicker 的 dayjs）
+      var userValue = userNormalize(value, prevValue, allValues, isDiffMode);
+      // 保持用户优先：用户有明确返回值时直接使用，不再强制走内置转换
+      if (userValue !== undefined) {
+        return userValue;
+      }
+      // 仅在用户未返回时，回退到内置 transform 逻辑
+      return transformNormalize(value, prevValue, allValues, isDiffMode);
+    } : userNormalize || transformNormalize;
+    var finalGetValueProps = transformGetValueProps && userGetValueProps ? function (value) {
+      for (var _len3 = arguments.length, args = new Array(_len3 > 1 ? _len3 - 1 : 0), _key3 = 1; _key3 < _len3; _key3++) {
+        args[_key3 - 1] = arguments[_key3];
+      }
+      var transformValueProps = transformGetValueProps(value, ...args) || {};
+      var nextValue = Object.prototype.hasOwnProperty.call(transformValueProps, 'value') ? transformValueProps.value : value;
+      var userValueProps = userGetValueProps(nextValue, ...args) || {};
+      return _objectSpread(_objectSpread({}, transformValueProps), userValueProps);
+    } : userGetValueProps || transformGetValueProps;
+    return _objectSpread(_objectSpread(_objectSpread(_objectSpread(_objectSpread({}, _formItemProps), defaultTransformProps), namesTransformProps), trimProps), {}, {
+      normalize: finalNormalize,
+      getValueProps: finalGetValueProps
+    });
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
   // 编辑&保存模式，在查看状态下移除表单的rules不做校验
@@ -957,6 +988,13 @@ var _default = exports.default = /*#__PURE__*/(0, _react.memo)(RenderField, (pre
     }
     // reactiveParams 中的 form、index、namePath 已经在外层比较过了，无需重复比较
   }
+  // fieldProps 为对象时，必须比较配置变化（如 dataSource 异步更新）
+  if (!(0, _lodash.isFunction)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps) && !(0, _lodash.isFunction)(nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps)) {
+    var isFieldPropsEqual = (0, _lodash.isEqualWith)(prevColumn === null || prevColumn === void 0 ? void 0 : prevColumn.fieldProps, nextColumn === null || nextColumn === void 0 ? void 0 : nextColumn.fieldProps, _utils.customEqualForFunction);
+    if (!isFieldPropsEqual) {
+      return false;
+    }
+  }
 
   // 通用函数比较方法
   // 优化：不直接调用函数，而是比较输入参数

package/lib/ProEditTable/utils/index.js

@@ -18,7 +18,7 @@ var _components = require("../components");
 var _locale = _interopRequireDefault(require("../../locale"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["type", "label", "show", "needConfirm", "onHandle", "onClick", "isSelectModal"],
-  _excluded2 = ["title", "icon"]; // 渲染操作栏
+  _excluded2 = ["title", "icon"];
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == typeof h && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw new Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator.return && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(typeof e + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw new Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, catch: function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw new Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
@@ -30,6 +30,9 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+var columnDataSourceRefCache = new Map();
+
+// 渲染操作栏
 var getActionColumn = config => {
   var _cloneDeepWith = (0, _lodash.cloneDeepWith)(config, value => {
       if ( /*#__PURE__*/_react.default.isValidElement(value)) {
@@ -379,15 +382,33 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     // 精准控制单元格更新，减少不必要的渲染
     if (!item.shouldCellUpdate) {
       var hasComponent = (0, _lodash.isFunction)(item.component);
+      var columnCacheKey = `${Array.isArray(name) ? name.join('.') : String(name)}::${String(columnName)}`;
       item.shouldCellUpdate = (record, prevRecord) => {
-        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) return true;
+        var _item$fieldProps;
+        var currentDataSourceRef = !(0, _lodash.isFunction)(item === null || item === void 0 ? void 0 : item.fieldProps) ? item === null || item === void 0 || (_item$fieldProps = item.fieldProps) === null || _item$fieldProps === void 0 ? void 0 : _item$fieldProps.dataSource : undefined;
+        if (currentDataSourceRef !== undefined) {
+          var prevDataSourceRef = columnDataSourceRefCache.get(columnCacheKey);
+          if (prevDataSourceRef !== currentDataSourceRef) {
+            columnDataSourceRefCache.set(columnCacheKey, currentDataSourceRef);
+            return true;
+          }
+        }
+        if ((record === null || record === void 0 ? void 0 : record.rowKey) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord.rowKey)) {
+          return true;
+        }
         // 单行编辑模式下，需要检测编辑状态变化
-        if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) return true;
+        if (virtualKey && (record === null || record === void 0 ? void 0 : record._isEditing) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord._isEditing)) {
+          return true;
+        }
         // 动态 component 可能依赖行内其他字段，需比较整行
-        if (hasComponent) return !(0, _lodash.isEqual)(record, prevRecord);
+        if (hasComponent) {
+          var rowChanged = !(0, _lodash.isEqual)(record, prevRecord);
+          return rowChanged;
+        }
         var key = item.dataIndex || item.key;
         if (!key) return true;
-        return (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+        var keyChanged = (record === null || record === void 0 ? void 0 : record[key]) !== (prevRecord === null || prevRecord === void 0 ? void 0 : prevRecord[key]);
+        return keyChanged;
       };
     }
   });

package/lib/ProForm/components/combination/Group/utils/index.d.ts

@@ -75,40 +75,29 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     confirm?: boolean | import("antd").ModalFuncProps | import("../../../render/propsType").FunctionArgs<any, boolean | import("antd").ModalFuncProps>;
     show?: boolean | ReactiveFunction<any, boolean>;
     component?: React.ReactNode | ReactiveFunction<any, React.ReactNode>;
-    toISOString?: boolean;
-    toCSTString?: boolean;
-    switchValue?: [any, any];
-    clearNotShow?: boolean;
-    style?: React.CSSProperties;
-    valueType?: import("../../../render/propsType").ProFormValueType;
-    viewRender?: (value: any, record: any, { form, index, namePath, }: {
-        [key: string]: any;
-        form: FormInstance<any>;
-        index?: number;
-    }) => string | React.ReactElement<any, any>;
-    className?: string;
-    trim?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    validateTrigger?: string | false | string[];
     id?: string;
+    className?: string;
     hidden?: boolean;
+    style?: React.CSSProperties;
     children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     onReset?: () => void;
     prefixCls?: string;
-    rootClassName?: string;
     status?: "" | "warning" | "error" | "success" | "validating";
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
-    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
-    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
+    rootClassName?: string;
+    isView?: boolean;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     vertical?: boolean;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     trigger?: string;
+    validateTrigger?: string | false | string[];
     validateDebounce?: number;
     valuePropName?: string;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
@@ -124,9 +113,20 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     wrapperCol?: import("antd").ColProps;
     help?: React.ReactNode;
     fieldId?: string;
-    isView?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
+    switchValue?: [any, any];
+    viewRender?: (value: any, record: any, { form, index, namePath, }: {
+        [key: string]: any;
+        form: FormInstance<any>;
+        index?: number;
+    }) => string | React.ReactElement<any, any>;
     viewType?: import("../../../render/propsType").ViewType;
+    trim?: boolean;
     upperCase?: boolean;
+    toISOString?: boolean;
+    toCSTString?: boolean;
+    clearNotShow?: boolean;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {
@@ -141,7 +141,7 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
  * 创建组件属性
  */
 export declare const createComponentProps: (column: FlexibleGroupColumnType, formItemProps: any) => {
-    componentProps: import("lodash").Omit<any, "format" | "toISOString" | "toCSTString" | "switchValue" | "precision" | "clearNotShow" | "dependNames" | "valueType">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/lib/ProSelect/index.js

@@ -16,6 +16,7 @@ var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
 var _jsxRuntime = require("react/jsx-runtime");
 var _excluded = ["dataSource", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "transformResponse", "getValueProps", "getChangeValue", "viewportReady", "isView"];
+/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
 function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != typeof e && "function" != typeof e) return { default: e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && Object.prototype.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n.default = e, t && t.set(e, n), n; }
@@ -32,10 +33,6 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
 function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
-var Option = _antd.Select.Option,
-  OptGroup = _antd.Select.OptGroup;
-
-/** 将 selectList（扁平或分组）转为扁平选项列表，用于查找、回显、defaultOne */
 function flattenOptions(list) {
   if (!Array.isArray(list) || !list.length) return [];
   var out = [];
@@ -49,7 +46,7 @@ function flattenOptions(list) {
   return out;
 }
 var ProSelect = (props, ref) => {
-  var _selectProps$showCode, _useRequest$options3, _locale$ProSelect;
+  var _selectProps$showCode, _ProForm$useFieldProp, _useRequest$options3, _locale$ProSelect;
   var _ref = (0, _ProConfigProvider.useProConfig)('ProSelect') || {},
     _ref$fieldNames = _ref.fieldNames,
     proSelectFieldNames = _ref$fieldNames === void 0 ? {} : _ref$fieldNames,
@@ -84,7 +81,7 @@ var ProSelect = (props, ref) => {
     selectProps = _objectWithoutProperties(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
   var value = getValueProps && props.value ? getValueProps(props.value) : props.value;
-  var _ref2 = _.ProForm.useFieldProps() || {},
+  var _ref2 = (_.ProForm === null || _.ProForm === void 0 || (_ProForm$useFieldProp = _.ProForm.useFieldProps) === null || _ProForm$useFieldProp === void 0 ? void 0 : _ProForm$useFieldProp.call(_.ProForm)) || {},
     isViewCon = _ref2.isView,
     viewEmpty = _ref2.viewEmpty;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
@@ -146,6 +143,10 @@ var ProSelect = (props, ref) => {
       useRequest === null || useRequest === void 0 || (_useRequest$options = useRequest.options) === null || _useRequest$options === void 0 || (_useRequest$options$o = _useRequest$options.onSuccess) === null || _useRequest$options$o === void 0 || _useRequest$options$o.call(_useRequest$options, data, useRequest === null || useRequest === void 0 || (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams);
     }
   }));
+  var fetchFunctionRef = (0, _react.useRef)(fetchFunction);
+  (0, _react.useEffect)(() => {
+    fetchFunctionRef.current = fetchFunction;
+  }, [fetchFunction]);
   var cacheList = useRequest !== null && useRequest !== void 0 && (_useRequest$options3 = useRequest.options) !== null && _useRequest$options3 !== void 0 && _useRequest$options3.cacheKey ? successTransformDataHandle(fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data) : [];
   var flatOptions = flattenOptions(selectList);
   var getValueObject = input => {
@@ -323,16 +324,99 @@ var ProSelect = (props, ref) => {
     return props.children;
   };
   var isReactElement = element => /*#__PURE__*/(0, _react.isValidElement)(element);
+  var getInnerRecord = option => {
+    var _option$data;
+    if (!option) return undefined;
+    if (option.record) return option.record;
+    if ((_option$data = option.data) !== null && _option$data !== void 0 && _option$data.record) return option.data.record;
+    return undefined;
+  };
+  var getOptionText = item => {
+    if (OptionRender) {
+      var _item$label;
+      var rendered = OptionRender(item);
+      return (0, _lodash.isString)(rendered) ? rendered : String((_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : '');
+    }
+    var text = selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label];
+    return (0, _lodash.isString)(text) ? text : String(text !== null && text !== void 0 ? text : '');
+  };
+  var buildOptionItem = (item, index) => {
+    var text = getOptionText(item);
+    return {
+      key: item[code] != null ? `${item[code]}-${index}` : `option-${index}`,
+      label: text,
+      value: item[code] != null ? item[code] : undefined,
+      disabled: !!item.disabled,
+      title: text,
+      searchText: text,
+      record: item
+    };
+  };
+  var selectOptionRender = option => {
+    var _option$data2, _ref5, _ref6, _option$data$searchTe, _option$data3, _option$data4;
+    var currentRecord = (option === null || option === void 0 || (_option$data2 = option.data) === null || _option$data2 === void 0 ? void 0 : _option$data2.record) || (option === null || option === void 0 ? void 0 : option.record);
+    var text = (_ref5 = (_ref6 = (_option$data$searchTe = option === null || option === void 0 || (_option$data3 = option.data) === null || _option$data3 === void 0 ? void 0 : _option$data3.searchText) !== null && _option$data$searchTe !== void 0 ? _option$data$searchTe : option === null || option === void 0 || (_option$data4 = option.data) === null || _option$data4 === void 0 ? void 0 : _option$data4.title) !== null && _ref6 !== void 0 ? _ref6 : option === null || option === void 0 ? void 0 : option.label) !== null && _ref5 !== void 0 ? _ref5 : '';
+    if (!currentRecord) {
+      return /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
+        title: String(text),
+        children: String(text)
+      });
+    }
+    return /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
+      title: String(text),
+      children: OptionRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: OptionRender(currentRecord)
+      }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
+        children: String(text)
+      })
+    });
+  };
+  var defaultFilterOption = (0, _react.useCallback)((input, option) => {
+    var _ref7, _option$searchText;
+    if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
+    var optionLabel = (_ref7 = (_option$searchText = option === null || option === void 0 ? void 0 : option.searchText) !== null && _option$searchText !== void 0 ? _option$searchText : option === null || option === void 0 ? void 0 : option.title) !== null && _ref7 !== void 0 ? _ref7 : option === null || option === void 0 ? void 0 : option.label;
+    return String(optionLabel !== null && optionLabel !== void 0 ? optionLabel : '').toLowerCase().includes(input.toLowerCase());
+  }, []);
+  var mergedShowSearch = (0, _react.useMemo)(() => {
+    var defaultConfig = {
+      enabled: true,
+      filterOption: (0, _lodash.isFunction)(_onSearch) ? false : defaultFilterOption,
+      onSearch: searchValue => {
+        _onSearch === null || _onSearch === void 0 || _onSearch(searchValue, _objectSpread({}, fetchFunctionRef.current));
+      }
+    };
+    var customShowSearch = selectProps.showSearch;
+    if (customShowSearch === false) {
+      return _objectSpread(_objectSpread({}, defaultConfig), {}, {
+        enabled: false
+      });
+    }
+    if (customShowSearch === true || customShowSearch == null) {
+      return defaultConfig;
+    }
+    if ((0, _lodash.isObject)(customShowSearch)) {
+      var _customShowSearch$fil, _customShowSearch$onS;
+      return _objectSpread(_objectSpread(_objectSpread({}, defaultConfig), customShowSearch), {}, {
+        enabled: true,
+        filterOption: (_customShowSearch$fil = customShowSearch.filterOption) !== null && _customShowSearch$fil !== void 0 ? _customShowSearch$fil : defaultConfig.filterOption,
+        onSearch: (_customShowSearch$onS = customShowSearch.onSearch) !== null && _customShowSearch$onS !== void 0 ? _customShowSearch$onS : defaultConfig.onSearch
+      });
+    }
+    return defaultConfig;
+  }, [_onSearch, defaultFilterOption, selectProps.showSearch]);
   var handleChange = (value, _option) => {
     // option/其第一层子节点是react节点且是labelInValue就拿record
     var option = _option;
     if (labelInValue && (isReactElement(_option) || isReactElement(_option === null || _option === void 0 ? void 0 : _option.children))) {
-      option = _option === null || _option === void 0 ? void 0 : _option.record;
+      option = getInnerRecord(_option);
     }
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(item => {
-          Object.assign(item, item.record);
+          var currentRecord = getInnerRecord(item);
+          if (currentRecord) {
+            Object.assign(item, currentRecord);
+          }
           delete item.record;
           delete item.children;
         });
@@ -345,7 +429,7 @@ var ProSelect = (props, ref) => {
     } else if (!selectProps.mode && labelInValue) {
       onChange(getChangeValue ? getChangeValue(getValueObject(value)) : getValueObject(value), option);
     } else {
-      onChange === null || onChange === void 0 || onChange(getChangeValue ? getChangeValue(value) : value, _option === null || _option === void 0 ? void 0 : _option.record);
+      onChange === null || onChange === void 0 || onChange(getChangeValue ? getChangeValue(value) : value, getInnerRecord(_option));
     }
   };
 
@@ -396,71 +480,41 @@ var ProSelect = (props, ref) => {
       mode: selectProps.mode
     });
   }
+  var selectOptions = Array.isArray(newSelectList) ? newSelectList.map((item, index) => {
+    var groupOptions = item.options;
+    if (Array.isArray(groupOptions)) {
+      var _item$label2;
+      return {
+        key: (_item$label2 = item[label]) !== null && _item$label2 !== void 0 ? _item$label2 : `group-${index}`,
+        label: item[label],
+        options: groupOptions.map((opt, optIndex) => buildOptionItem(opt, optIndex))
+      };
+    }
+    return buildOptionItem(item, index);
+  }) : [];
+  var selectSearchProps = {
+    filterOption: mergedShowSearch.filterOption,
+    onSearch: mergedShowSearch.onSearch
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)("div", {
     style: props.style,
     className: "pro-select",
-    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, _objectSpread(_objectSpread({
+    children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Select, _objectSpread(_objectSpread(_objectSpread({
       placeholder: _locale.default === null || _locale.default === void 0 || (_locale$ProSelect = _locale.default.ProSelect) === null || _locale$ProSelect === void 0 ? void 0 : _locale$ProSelect.select,
       allowClear: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      showSearch: true,
-      filterOption: (0, _lodash.isFunction)(_onSearch) ? false : (input, option) => {
-        var _option$children;
-        if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
-        var value = (0, _lodash.isString)(option === null || option === void 0 ? void 0 : option.children) ? option === null || option === void 0 ? void 0 : option.children : option === null || option === void 0 || (_option$children = option.children) === null || _option$children === void 0 || (_option$children = _option$children.props) === null || _option$children === void 0 ? void 0 : _option$children.title;
-        return value.toLowerCase().includes(input.toLowerCase());
-      },
-      onSearch: value => {
-        _onSearch && _onSearch(value, _objectSpread({}, fetchFunction));
-      },
+      showSearch: mergedShowSearch.enabled
+    }, selectSearchProps), {}, {
       getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady'])), {}, {
+    }, (0, _lodash.omit)(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady', 'showSearch'])), {}, {
       // 如果是多选模式且用户没有自定义maxTagPlaceholder，使用我们的hover版本
       maxTagPlaceholder: selectProps.mode === 'multiple' && !selectProps.maxTagPlaceholder ? maxTagPlaceholder : selectProps.maxTagPlaceholder,
+      optionRender: selectOptionRender,
       value: transformValue(),
-      children: Array.isArray(newSelectList) && newSelectList.map((item, index) => {
-        var itemValue = item[code];
-        var itemKey = itemValue != null ? `${itemValue}-${index}` : `option-${index}`;
-        var optionValue = itemValue != null ? itemValue : undefined;
-        var groupOpts = item.options;
-        if (Array.isArray(groupOpts)) {
-          var _item$label;
-          return /*#__PURE__*/(0, _jsxRuntime.jsx)(OptGroup, {
-            label: item[label],
-            children: groupOpts.map(opt => /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-              label: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
-              value: opt[code],
-              record: opt,
-              disabled: !!opt.disabled,
-              children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
-                title: OptionRender ? OptionRender(opt) : selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label],
-                children: OptionRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  children: OptionRender(opt)
-                }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-                  children: selectProps.showCodeName ? `${opt[code]}-${opt[label]}` : opt[label]
-                })
-              })
-            }, opt[code]))
-          }, (_item$label = item[label]) !== null && _item$label !== void 0 ? _item$label : `group-${index}`);
-        }
-        return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
-          label: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
-          value: optionValue,
-          record: item,
-          disabled: !!item.disabled,
-          children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
-            title: OptionRender ? OptionRender(item) : selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label],
-            children: OptionRender ? /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-              children: OptionRender(item)
-            }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-              children: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label]
-            })
-          })
-        }, itemKey);
-      })
+      options: selectOptions
     }))
   });
 };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.2-beta.6",
+  "version": "4.1.2-beta.7",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",