@zat-design/sisyphus-react 4.1.3-beta.3 → 4.1.3-beta.5

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

@@ -32,6 +32,7 @@ import transformNames from "../../../ProForm/utils/transformNames";
 import { FieldProvider } from "../../../ProForm/utils/useFieldProps";
 import useRules from "../../../ProForm/utils/useRules";
 import { isSelect, isTrim } from "../../../ProForm/utils";
+import locale from "../../../locale";
 import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
 import { getDefaultProps } from "../../utils/getDefaultProps";
 import ListChangedWrapper from "./ListChangedWrapper";
@@ -215,13 +216,13 @@ var RenderField = _ref => {
   // 将Hooks调用移到组件顶层
   var proConfig = useProConfig();
 
-  // 设置校验规则 - 修复Hooks使用规则
+  // 设置校验规则 - 不在此处过滤 isView，由 getFieldItem 内根据 latestIsView 动态决定是否应用规则
   var internalRule = useRules({
     names,
     label: label,
     labelRequired,
-    required: !isView && _required,
-    rules: !isView ? _rules : [],
+    required: _required,
+    rules: _rules,
     isSelect: isSelect({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type
@@ -755,10 +756,8 @@ var RenderField = _ref => {
     });
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
-  // 编辑&保存模式，在查看状态下移除表单的rules不做校验
-  if (isView) {
-    delete finalFormItemProps.rules;
-  }
+  // rules 的 isView 过滤已移至 getFieldItem 内处理（支持 shouldUpdate 模式下的动态 isEditable）
+
   var _className = useMemo(() => classNames({
     [className]: className
   }), [className]);
@@ -771,6 +770,10 @@ var RenderField = _ref => {
     var finalComponentProps = componentProps;
     // shouldUpdate 模式下会被更新为最新值，供外层 FieldProvider 消费
     var latestIsView = isView;
+    // 用于在 shouldUpdate 模式下重建正确的 Form.Item rules（外层 finalFormItemProps 是旧闭包）
+    var effectiveRequired = _required;
+    var effectiveRules = _rules;
+    var effectiveFieldProps = _fieldProps;
     if (shouldUpdateMode) {
       var _column$isEditable2;
       // 重新获取最新的行数据（shouldUpdate 触发时，通过 getFieldValue 拿到最新值）
@@ -800,6 +803,11 @@ var RenderField = _ref => {
         latestRules = rules(latestRowData, latestReactiveParams);
       }
 
+      // 同步到外层变量，用于后续构建 activeFinalFormItemProps
+      effectiveRequired = latestRequired;
+      effectiveRules = latestRules;
+      effectiveFieldProps = latestFieldProps;
+
       // 重新计算 desensitization
       var latestDesensitization = desensitization || [];
       if (isFunction(desensitization)) {
@@ -905,6 +913,34 @@ var RenderField = _ref => {
         }
       }
     }
+
+    // 根据 latestIsView 和最新的 required/rules 构建正确的 Form.Item props
+    // 解决 shouldUpdate 触发时外层 finalFormItemProps 是旧闭包（rules 基于旧 isView 计算）的问题
+    var activeFinalFormItemProps = finalFormItemProps;
+    if (latestIsView) {
+      // 查看模式：移除 rules 不做校验
+      activeFinalFormItemProps = omit(finalFormItemProps, ['rules']);
+    } else if (shouldUpdateMode) {
+      // shouldUpdate 模式下 finalFormItemProps 是旧闭包，需用最新 effectiveRequired/effectiveRules 重建 rules
+      var activeRules = Array.isArray(effectiveRules) ? [...effectiveRules] : [];
+      var hasRequiredRule = activeRules.some(r => (r === null || r === void 0 ? void 0 : r.required) === true);
+      if (effectiveRequired && !hasRequiredRule) {
+        var _effectiveFieldProps;
+        var _isSelectVal = isSelect({
+          dataSource: (_effectiveFieldProps = effectiveFieldProps) === null || _effectiveFieldProps === void 0 ? void 0 : _effectiveFieldProps.dataSource,
+          type
+        });
+        activeRules.push({
+          required: true,
+          message: `${_isSelectVal ? locale.ProForm.selectPlaceHolder : locale.ProForm.inputPlaceholder}${label || ''}`
+        });
+      }
+      activeFinalFormItemProps = _objectSpread(_objectSpread({}, finalFormItemProps), {}, {
+        rules: activeRules.length > 0 ? activeRules : [{
+          required: false
+        }]
+      });
+    }
     var FormItem = null;
     // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
     var propsForTarget = isView && typeof viewRender === 'function' ? omit(finalComponentProps, ['children']) : finalComponentProps;
@@ -952,7 +988,7 @@ var RenderField = _ref => {
     }
     FormItem = TargetComponent ? /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, omit(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       // 移除非必要字段，但保留 dependencies
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
@@ -963,7 +999,7 @@ var RenderField = _ref => {
     if (type === 'FormList') {
       FormItem = /*#__PURE__*/_jsx(Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, omit(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: (fields, operation, meta) => /*#__PURE__*/_jsx(TargetComponent, _objectSpread(_objectSpread({}, finalComponentProps), {}, {
           otherProps: otherProps,
           fields: fields,

package/es/ProEditTable/style/index.less

@@ -433,4 +433,16 @@
       }
     }
   }
+  table .@{ant-prefix}-table-tbody{
+    td.@{ant-prefix}-table-selection-column {
+      padding-left: 38px;
+    }
+  }
+}
+
+.pro-edit-table{
+  .pro-tree-modal .pro-tree-modal-isView .pro-enum-input-addonAfter{
+    border: none;
+    padding-left: 0;
+  }
 }

package/es/ProEditTable/utils/index.js

@@ -284,14 +284,8 @@ export var transformColumns = function transformColumns() {
 
     var required = isBoolean(item.required) ? item.required : false;
     if (isFunction(item.required)) {
-      var namePath = getNamePath(name, virtualKey);
-      var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
-      var rowData = form.getFieldValue([...namePathArray, index]) || {};
-      required = item.required(rowData[columnName], rowData, {
-        form,
-        index,
-        namePath: [...namePathArray, index]
-      });
+      // 列配置预处理阶段没有稳定行上下文，required 函数交给 RenderField 内按行计算
+      required = false;
     }
 
     // 样式处理

package/es/ProForm/style/index.less

@@ -11,6 +11,24 @@
 @import '../components/combination/Container/style/index.less';
 
 .pro-form {
+  .pro-container{
+    .pro-collapse {
+      .pro-collapse-panel{
+        .@{ant-prefix}-collapse-header{
+          border-radius:var(--zaui-border-radius, 8px) !important;
+        }
+        &.@{ant-prefix}-collapse-item-active{
+          .@{ant-prefix}-collapse-header{
+            border-radius:var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+          }
+        }
+      }
+    }
+    .pro-collapse-content{
+      margin: 0;
+      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+    }
+  }
   .@{ant-prefix}-input-disabled {
    border-radius: 6px !important;
   }

package/es/ProLayout/components/TabsManager/style/index.less

@@ -70,9 +70,6 @@
   }
 
   &-content {
-    flex: 1;
-    overflow-y: auto;
-    min-height: 0; // 重要：允许 flex 子元素缩小到内容以下
 
     .tab-pane {
       &.hidden {

package/es/ProSelect/index.js

@@ -263,6 +263,41 @@ export var ProSelect = (props, ref) => {
     };
     return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('、');
   };
+
+  // 必须在早期 return 之前声明，确保每次渲染 hooks 调用数量一致（React Rules of Hooks）
+  var defaultFilterOption = useCallback((input, option) => {
+    var _ref5, _option$searchText;
+    if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
+    var optionLabel = (_ref5 = (_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 && _ref5 !== void 0 ? _ref5 : 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]);
   if (isView || props.isView) {
     if (Array.isArray(value)) {
       // 如果设置了maxTagCount且超出数量，需要截断显示
@@ -347,9 +382,9 @@ export var ProSelect = (props, ref) => {
     };
   };
   var selectOptionRender = option => {
-    var _option$data2, _ref5, _ref6, _option$data$searchTe, _option$data3, _option$data4;
+    var _option$data2, _ref6, _ref7, _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 : '';
+    var text = (_ref6 = (_ref7 = (_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 && _ref7 !== void 0 ? _ref7 : option === null || option === void 0 ? void 0 : option.label) !== null && _ref6 !== void 0 ? _ref6 : '';
     if (!currentRecord) {
       return /*#__PURE__*/_jsx(TooltipOption, {
         title: String(text),
@@ -365,39 +400,6 @@ export var ProSelect = (props, ref) => {
       })
     });
   };
-  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;

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

@@ -19,6 +19,7 @@ var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/tra
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils2 = require("../../../ProForm/utils");
+var _locale = _interopRequireDefault(require("../../../locale"));
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
@@ -222,13 +223,13 @@ var RenderField = _ref => {
   // 将Hooks调用移到组件顶层
   var proConfig = (0, _ProConfigProvider.useProConfig)();
 
-  // 设置校验规则 - 修复Hooks使用规则
+  // 设置校验规则 - 不在此处过滤 isView，由 getFieldItem 内根据 latestIsView 动态决定是否应用规则
   var internalRule = (0, _useRules.default)({
     names,
     label: label,
     labelRequired,
-    required: !isView && _required,
-    rules: !isView ? _rules : [],
+    required: _required,
+    rules: _rules,
     isSelect: (0, _utils2.isSelect)({
       dataSource: (_fieldProps2 = _fieldProps) === null || _fieldProps2 === void 0 ? void 0 : _fieldProps2.dataSource,
       type
@@ -762,10 +763,8 @@ var RenderField = _ref => {
     });
   }, [_formItemProps, defaultTransform, namesTransform, type, trim, proConfig]);
 
-  // 编辑&保存模式，在查看状态下移除表单的rules不做校验
-  if (isView) {
-    delete finalFormItemProps.rules;
-  }
+  // rules 的 isView 过滤已移至 getFieldItem 内处理（支持 shouldUpdate 模式下的动态 isEditable）
+
   var _className = (0, _react.useMemo)(() => (0, _classnames.default)({
     [className]: className
   }), [className]);
@@ -778,6 +777,10 @@ var RenderField = _ref => {
     var finalComponentProps = componentProps;
     // shouldUpdate 模式下会被更新为最新值，供外层 FieldProvider 消费
     var latestIsView = isView;
+    // 用于在 shouldUpdate 模式下重建正确的 Form.Item rules（外层 finalFormItemProps 是旧闭包）
+    var effectiveRequired = _required;
+    var effectiveRules = _rules;
+    var effectiveFieldProps = _fieldProps;
     if (shouldUpdateMode) {
       var _column$isEditable2;
       // 重新获取最新的行数据（shouldUpdate 触发时，通过 getFieldValue 拿到最新值）
@@ -807,6 +810,11 @@ var RenderField = _ref => {
         latestRules = rules(latestRowData, latestReactiveParams);
       }
 
+      // 同步到外层变量，用于后续构建 activeFinalFormItemProps
+      effectiveRequired = latestRequired;
+      effectiveRules = latestRules;
+      effectiveFieldProps = latestFieldProps;
+
       // 重新计算 desensitization
       var latestDesensitization = desensitization || [];
       if ((0, _lodash.isFunction)(desensitization)) {
@@ -912,6 +920,34 @@ var RenderField = _ref => {
         }
       }
     }
+
+    // 根据 latestIsView 和最新的 required/rules 构建正确的 Form.Item props
+    // 解决 shouldUpdate 触发时外层 finalFormItemProps 是旧闭包（rules 基于旧 isView 计算）的问题
+    var activeFinalFormItemProps = finalFormItemProps;
+    if (latestIsView) {
+      // 查看模式：移除 rules 不做校验
+      activeFinalFormItemProps = (0, _lodash.omit)(finalFormItemProps, ['rules']);
+    } else if (shouldUpdateMode) {
+      // shouldUpdate 模式下 finalFormItemProps 是旧闭包，需用最新 effectiveRequired/effectiveRules 重建 rules
+      var activeRules = Array.isArray(effectiveRules) ? [...effectiveRules] : [];
+      var hasRequiredRule = activeRules.some(r => (r === null || r === void 0 ? void 0 : r.required) === true);
+      if (effectiveRequired && !hasRequiredRule) {
+        var _effectiveFieldProps;
+        var _isSelectVal = (0, _utils2.isSelect)({
+          dataSource: (_effectiveFieldProps = effectiveFieldProps) === null || _effectiveFieldProps === void 0 ? void 0 : _effectiveFieldProps.dataSource,
+          type
+        });
+        activeRules.push({
+          required: true,
+          message: `${_isSelectVal ? _locale.default.ProForm.selectPlaceHolder : _locale.default.ProForm.inputPlaceholder}${label || ''}`
+        });
+      }
+      activeFinalFormItemProps = _objectSpread(_objectSpread({}, finalFormItemProps), {}, {
+        rules: activeRules.length > 0 ? activeRules : [{
+          required: false
+        }]
+      });
+    }
     var FormItem = null;
     // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
     var propsForTarget = isView && typeof viewRender === 'function' ? (0, _lodash.omit)(finalComponentProps, ['children']) : finalComponentProps;
@@ -959,7 +995,7 @@ var RenderField = _ref => {
     }
     FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, (0, _lodash.omit)(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', 'disabled', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
       // 移除非必要字段，但保留 dependencies
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
@@ -970,7 +1006,7 @@ var RenderField = _ref => {
     if (type === 'FormList') {
       FormItem = /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.List, _objectSpread(_objectSpread({
         name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName
-      }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
+      }, (0, _lodash.omit)(activeFinalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name'])), {}, {
         children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread(_objectSpread({}, finalComponentProps), {}, {
           otherProps: otherProps,
           fields: fields,

package/lib/ProEditTable/style/index.less

@@ -433,4 +433,16 @@
       }
     }
   }
+  table .@{ant-prefix}-table-tbody{
+    td.@{ant-prefix}-table-selection-column {
+      padding-left: 38px;
+    }
+  }
+}
+
+.pro-edit-table{
+  .pro-tree-modal .pro-tree-modal-isView .pro-enum-input-addonAfter{
+    border: none;
+    padding-left: 0;
+  }
 }

package/lib/ProEditTable/utils/index.js

@@ -290,14 +290,8 @@ var transformColumns = exports.transformColumns = function transformColumns() {
 
     var required = (0, _lodash.isBoolean)(item.required) ? item.required : false;
     if ((0, _lodash.isFunction)(item.required)) {
-      var namePath = (0, _tools.getNamePath)(name, virtualKey);
-      var namePathArray = Array.isArray(namePath) ? namePath : [namePath];
-      var rowData = form.getFieldValue([...namePathArray, index]) || {};
-      required = item.required(rowData[columnName], rowData, {
-        form,
-        index,
-        namePath: [...namePathArray, index]
-      });
+      // 列配置预处理阶段没有稳定行上下文，required 函数交给 RenderField 内按行计算
+      required = false;
     }
 
     // 样式处理

package/lib/ProForm/style/index.less

@@ -11,6 +11,24 @@
 @import '../components/combination/Container/style/index.less';
 
 .pro-form {
+  .pro-container{
+    .pro-collapse {
+      .pro-collapse-panel{
+        .@{ant-prefix}-collapse-header{
+          border-radius:var(--zaui-border-radius, 8px) !important;
+        }
+        &.@{ant-prefix}-collapse-item-active{
+          .@{ant-prefix}-collapse-header{
+            border-radius:var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px) 0 0 !important;
+          }
+        }
+      }
+    }
+    .pro-collapse-content{
+      margin: 0;
+      border-radius: 0 0 var(--zaui-border-radius, 8px) var(--zaui-border-radius, 8px);
+    }
+  }
   .@{ant-prefix}-input-disabled {
    border-radius: 6px !important;
   }

package/lib/ProLayout/components/TabsManager/style/index.less

@@ -70,9 +70,6 @@
   }
 
   &-content {
-    flex: 1;
-    overflow-y: auto;
-    min-height: 0; // 重要：允许 flex 子元素缩小到内容以下
 
     .tab-pane {
       &.hidden {

package/lib/ProSelect/index.js

@@ -269,6 +269,41 @@ var ProSelect = (props, ref) => {
     };
     return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('、');
   };
+
+  // 必须在早期 return 之前声明，确保每次渲染 hooks 调用数量一致（React Rules of Hooks）
+  var defaultFilterOption = (0, _react.useCallback)((input, option) => {
+    var _ref5, _option$searchText;
+    if ((option === null || option === void 0 ? void 0 : option.value) == null) return false;
+    var optionLabel = (_ref5 = (_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 && _ref5 !== void 0 ? _ref5 : 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]);
   if (isView || props.isView) {
     if (Array.isArray(value)) {
       // 如果设置了maxTagCount且超出数量，需要截断显示
@@ -353,9 +388,9 @@ var ProSelect = (props, ref) => {
     };
   };
   var selectOptionRender = option => {
-    var _option$data2, _ref5, _ref6, _option$data$searchTe, _option$data3, _option$data4;
+    var _option$data2, _ref6, _ref7, _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 : '';
+    var text = (_ref6 = (_ref7 = (_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 && _ref7 !== void 0 ? _ref7 : option === null || option === void 0 ? void 0 : option.label) !== null && _ref6 !== void 0 ? _ref6 : '';
     if (!currentRecord) {
       return /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
         title: String(text),
@@ -371,39 +406,6 @@ var ProSelect = (props, ref) => {
       })
     });
   };
-  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;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.3-beta.3",
+  "version": "4.1.3-beta.5",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -45,6 +45,7 @@
     "lint-staged": "lint-staged",
     "lint-staged:js": "eslint --ext .js,.jsx,.ts,.tsx --ignore-pattern '**/__tests__/**' --ignore-pattern '**/*.test.*' --ignore-pattern '**/*.spec.*'",
     "code-standards:check": "node ./scripts/code-standards-check.mjs",
+    "commit-msg:format": "node ./scripts/format-commit-msg.mjs",
     "git:pull:dev_4": "git pull --tags --no-rebase origin dev_4",
     "lint:fix": "eslint --fix --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
     "lint:js": "eslint --cache --ext .js,.jsx,.ts,.tsx --format=pretty ./src",
@@ -63,7 +64,7 @@
   },
   "husky": {
     "hooks": {
-      "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
+      "commit-msg": "npm run commit-msg:format -- \"$HUSKY_GIT_PARAMS\" && commitlint -E HUSKY_GIT_PARAMS",
       "pre-commit": "npm run lint-staged && npm run code-standards:check"
     }
   },