@zat-design/sisyphus-react 4.0.1 → 4.0.2

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

@@ -41,7 +41,7 @@ function _toPrimitive(t, r) { if ("object" != typeof t || !t) return t; var e =
 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 RenderField = _ref => {
-  var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps2;
+  var _type, _type$replace, _fieldProps2, _fieldProps4, _names, _TargetComponent5, _componentProps;
   var value = _ref.text,
     record = _ref.record,
     index = _ref.index,
@@ -101,6 +101,7 @@ var RenderField = _ref => {
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
   var isCell = mode === 'cell';
+  var isSingleMode = mode === 'single';
   if (isCell) {
     record['is-view'] = !(0, _lodash.isEqual)(cellNamePath, cellName);
   }
@@ -234,6 +235,32 @@ var RenderField = _ref => {
   var _formItemProps = (0, _react.useMemo)(() => _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, defaultProps), resetProps), internalRule), {}, {
     validateTrigger
   }), [defaultProps, resetProps, internalRule, validateTrigger]);
+
+  // 只在 single 模式下，当这些函数类型存在时，自动添加 shouldUpdate
+  // 因为这些函数依赖行数据，当行数据变化时需要重新计算
+  var hasFunctionDependency = (0, _lodash.isFunction)(column === null || column === void 0 ? void 0 : column.disabled) ||
+  // disabled 是函数
+  (0, _lodash.isFunction)(fieldProps) ||
+  // fieldProps 是函数
+  (0, _lodash.isFunction)(required) ||
+  // required 是函数
+  (0, _lodash.isFunction)(rules) ||
+  // rules 是函数
+  (0, _lodash.isFunction)(isEditable) ||
+  // isEditable 是函数
+  (0, _lodash.isFunction)(_editRender) ||
+  // component/editRender 是函数
+  (0, _lodash.isFunction)(viewRender); // viewRender 是函数
+
+  if (isSingleMode && hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
+    // 使用 shouldUpdate 监听同一行的数据变化
+    _formItemProps.shouldUpdate = (prevValues, currentValues) => {
+      var prevRow = (0, _lodash.get)(prevValues, [...namePath, index]);
+      var currentRow = (0, _lodash.get)(currentValues, [...namePath, index]);
+      // 如果行数据发生变化，则重新渲染
+      return !(0, _lodash.isEqual)(prevRow, currentRow);
+    };
+  }
   if (['Switch', 'SwitchCheckbox'].includes(type)) {
     _formItemProps.valuePropName = 'checked';
     _valueType = 'switch';
@@ -660,10 +687,47 @@ var RenderField = _ref => {
   }), [className]);
 
   // 使用useCallback优化getFieldItem函数
-  var getFieldItem = (0, _react.useCallback)(() => {
-    var _componentProps;
+  var getFieldItem = function getFieldItem() {
+    var _finalComponentProps;
+    var shouldUpdateMode = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : false;
+    // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
+    var finalComponentProps = componentProps;
+    if (shouldUpdateMode) {
+      // 重新获取最新的行数据
+      var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
+      var latestOptions = {
+        index,
+        form,
+        name: column === null || column === void 0 ? void 0 : column.name,
+        namePath: [...namePath, index]
+      };
+      var latestRowParams = [latestRowData, latestOptions];
+
+      // 重新计算 fieldProps
+      var latestFieldProps = fieldProps || formItemProps || {};
+      if ((0, _lodash.isFunction)(fieldProps)) {
+        latestFieldProps = fieldProps(...latestRowParams);
+      }
+
+      // 重新计算 disabled
+      var latestDisabled = (0, _tools.getDisabled)({
+        globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
+        formDisabled: otherProps === null || otherProps === void 0 ? void 0 : otherProps.formDisabled,
+        column,
+        tabledDisabled: config === null || config === void 0 ? void 0 : config.disabled,
+        columnFieldProps: latestFieldProps,
+        params: latestRowParams
+      });
+
+      // 更新 componentProps 中的 disabled 和 fieldProps
+      finalComponentProps = _objectSpread(_objectSpread({}, componentProps), {}, {
+        disabled: latestDisabled
+      }, latestFieldProps);
+    }
     var FormItem = null;
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread({}, componentProps));
+    // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
+    var propsForTarget = isView && typeof viewRender === 'function' ? (0, _lodash.omit)(finalComponentProps, ['children']) : finalComponentProps;
+    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, propsForTarget)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread({}, propsForTarget));
     if (originalValues && !getIsNew(record)) {
       FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
@@ -687,15 +751,15 @@ var RenderField = _ref => {
         children: FieldComponent
       });
     }
-    if ((_componentProps = componentProps) !== null && _componentProps !== void 0 && _componentProps.confirm) {
-      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, _objectSpread(_objectSpread({}, componentProps), {}, {
+    if ((_finalComponentProps = finalComponentProps) !== null && _finalComponentProps !== void 0 && _finalComponentProps.confirm) {
+      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ConfirmWrapper.default, _objectSpread(_objectSpread({}, finalComponentProps), {}, {
         children: FieldComponent
       }));
     }
     FormItem = TargetComponent ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _fieldProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
-      // 移除非必要字段
+    }, (0, _lodash.omit)(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+      // 移除非必要字段，但保留 dependencies
       className: _className,
       name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
       children: FieldComponent
@@ -706,7 +770,7 @@ var RenderField = _ref => {
       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'])), {}, {
-        children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread(_objectSpread({}, componentProps), {}, {
+        children: (fields, operation, meta) => /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread(_objectSpread({}, finalComponentProps), {}, {
           otherProps: otherProps,
           fields: fields,
           operation: operation,
@@ -715,13 +779,13 @@ var RenderField = _ref => {
       }));
     }
     return FormItem;
-  }, [TargetComponent, componentProps, originalValues, record, cellName, names, baseName, index, dataIndex, originalName, originalNames, type, finalFormItemProps, viewRender, diffConfig, _className, formNamePath, viewEmpty, otherProps, getIsNew]);
+  };
   return /*#__PURE__*/(0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
-    value: ((_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps) || {},
+    value: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.otherProps) || {},
     children: finalFormItemProps.shouldUpdate ? /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Form.Item, {
       noStyle: true,
       shouldUpdate: finalFormItemProps.shouldUpdate,
-      children: () => getFieldItem()
+      children: () => getFieldItem(true)
     }) : getFieldItem()
   });
 };

package/lib/ProEditTable/style/index.less

@@ -174,11 +174,11 @@
           padding: 8px 16px;
           &:first-child{
             // 左下角圆角8px
-            border-bottom-left-radius: 8px;
+            border-bottom-left-radius: 6px;
            }
            &:last-child{
             // 右下角圆角8px
-            border-bottom-right-radius: 8px;
+            border-bottom-right-radius: 6px;
            }
         }
         .@{ant-prefix}-table-cell-fix-left,

package/lib/ProEditTable/utils/index.js

@@ -12,6 +12,7 @@ var _utils = require("@zat-design/utils");
 var _icons = require("@ant-design/icons");
 var _config = require("./config");
 var _tools = require("./tools");
+var _utils2 = require("../../ProForm/utils");
 var _ProTooltip = _interopRequireDefault(require("../../ProTooltip"));
 var _components = require("../components");
 var _locale = _interopRequireDefault(require("../../locale"));
@@ -91,7 +92,7 @@ var getActionColumn = config => {
     action.onEvent = /*#__PURE__*/function () {
       var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(record, _ref) {
         var _form$getFieldValue;
-        var index, form, name, namePath, tableLength, selectedRows, rowName, _record, onEvent, result, actionHandler;
+        var index, form, name, namePath, tableLength, selectedRows, rowName, lastRecord, onEvent, result, actionHandler;
         return _regeneratorRuntime().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
             case 0:
@@ -115,7 +116,7 @@ var getActionColumn = config => {
               return _context.abrupt("return", Promise.reject(_context.t0));
             case 13:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
-              _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
+              lastRecord = (0, _utils2.filterInternalFields)((_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record); // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
               if (onEvent) {
                 _context.next = 19;
@@ -126,7 +127,7 @@ var getActionColumn = config => {
               break;
             case 19:
               _context.next = 21;
-              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, {
+              return onEvent === null || onEvent === void 0 ? void 0 : onEvent(lastRecord, {
                 form,
                 index,
                 tableLength,
@@ -142,7 +143,7 @@ var getActionColumn = config => {
                 actionHandler(_objectSpread(_objectSpread({}, config), {}, {
                   rowName: [...name, index],
                   virtualRowName: rowName,
-                  record,
+                  record: lastRecord,
                   result,
                   validateKeys
                 }));

package/lib/ProForm/components/combination/Group/style/index.less

@@ -6,6 +6,7 @@
 
   &.pro-group-view {
     .@{ant-prefix}-space {
+      gap: 0 !important;
       .@{ant-prefix}-space-item {
         width: auto;
       }
@@ -121,8 +122,8 @@
           .@{ant-prefix}-select .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input {
-            border-top-left-radius: 8px;
-            border-bottom-left-radius: 8px;
+            border-top-left-radius: 6px;
+            border-bottom-left-radius: 6px;
           }
         }
 
@@ -132,8 +133,8 @@
           .@{ant-prefix}-select .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input {
-            border-top-right-radius: 8px;
-            border-bottom-right-radius: 8px;
+            border-top-right-radius: 6px;
+            border-bottom-right-radius: 6px;
           }
         }
 
@@ -324,8 +325,8 @@
           .@{ant-prefix}-select .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input {
-            border-top-left-radius: 8px;
-            border-bottom-left-radius: 8px;
+            border-top-left-radius: 6px;
+            border-bottom-left-radius: 6px;
           }
         }
 
@@ -335,8 +336,8 @@
           .@{ant-prefix}-select .@{ant-prefix}-select-selector,
           .@{ant-prefix}-input-number,
           .@{ant-prefix}-input-number-input {
-            border-top-right-radius: 8px;
-            border-bottom-right-radius: 8px;
+            border-top-right-radius: 6px;
+            border-bottom-right-radius: 6px;
           }
         }
 
@@ -468,8 +469,8 @@
     .pro-select .@{ant-prefix}-select, 
     .@{ant-prefix}-select, 
     .@{ant-prefix}-input-number  {
-      border-top-left-radius: 8px;
-      border-bottom-left-radius: 8px;
+      border-top-left-radius: 6px;
+      border-bottom-left-radius: 6px;
     }
   }
 
@@ -478,8 +479,8 @@
     .pro-select .@{ant-prefix}-select, 
     .@{ant-prefix}-select, 
     .@{ant-prefix}-input-number  {
-      border-top-right-radius: 8px;
-      border-bottom-right-radius: 8px;
+      border-top-right-radius: 6px;
+      border-bottom-right-radius: 6px;
     }
   }
 }

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

@@ -75,34 +75,31 @@ 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>;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    style?: React.CSSProperties;
-    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>);
-    valuePropName?: string;
-    viewRender?: (value: any, record: any, { form, index, namePath, }: {
-        [key: string]: any;
-        form: FormInstance<any>;
-        index?: number;
-    }) => string | React.ReactElement<any, any>;
-    isView?: boolean;
     trim?: boolean;
-    prefixCls?: string;
-    trigger?: string;
-    id?: string;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     vertical?: boolean;
+    id?: string;
     className?: string;
     hidden?: boolean;
-    htmlFor?: string;
+    style?: React.CSSProperties;
     onReset?: () => void;
+    prefixCls?: string;
     rootClassName?: string;
-    validateTrigger?: string | false | string[];
+    status?: "" | "success" | "error" | "warning" | "validating";
+    trigger?: string;
     colon?: boolean;
+    isView?: boolean;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
     getValueFromEvent?: (...args: import("@rc-component/form/lib/interface").EventArgs) => any;
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
+    validateTrigger?: string | false | string[];
     validateDebounce?: number;
+    valuePropName?: string;
     messageVariables?: Record<string, string>;
     initialValue?: any;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
@@ -113,20 +110,23 @@ export declare const useFormItemProps: (column: FlexibleGroupColumnType, context
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "error" | "warning" | "success" | "validating";
+    validateStatus?: "" | "success" | "error" | "warning" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
-    status?: "" | "error" | "warning" | "success" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
-    clearNotShow?: 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;
     upperCase?: boolean;
     toISOString?: boolean;
     toCSTString?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    clearNotShow?: boolean;
     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, "clearNotShow" | "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "precision">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow" | "precision">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/lib/ProForm/style/index.less

@@ -11,7 +11,7 @@
 
 .pro-form {
   .@{ant-prefix}-input-disabled {
-   border-radius: 8px !important;
+   border-radius: 6px !important;
   }
   &.@{ant-prefix}-form-vertical {
     .@{ant-prefix}-form-item .@{ant-prefix}-form-item-label {
@@ -338,7 +338,7 @@
 
     .@{ant-prefix}-input,  .@{ant-prefix}-select {
       background: @zaui-contract-bg !important;
-      border-radius: 8px;
+      border-radius: 6px;
     }
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
       background: @zaui-contract-bg !important;

package/lib/ProSelect/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import type { PropSelectType, ProSelectActionType } from './propsType';
-import './index.less';
+import './style/index.less';
 export declare const ProSelect: (props: PropSelectType, ref: React.Ref<ProSelectActionType> | undefined) => import("react/jsx-runtime").JSX.Element;
 declare const _default: React.ForwardRefExoticComponent<PropSelectType & React.RefAttributes<ProSelectActionType>>;
 export default _default;

package/lib/ProSelect/index.js

@@ -14,9 +14,9 @@ var _AdaptiveTooltip = _interopRequireDefault(require("./components/AdaptiveTool
 var _ = require("..");
 var _locale = _interopRequireDefault(require("../locale"));
 var _utils = require("./utils");
-require("./index.less");
+require("./style/index.less");
 var _jsxRuntime = require("react/jsx-runtime");
-var _excluded = ["dataSource", "defaultDisableValue", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "updateDataSource", "transformResponse", "getValueProps", "isView"];
+var _excluded = ["dataSource", "useRequest", "fieldNames", "tooltip", "otherProps", "labelInValue", "filterInList", "scrollFollowParent", "defaultOne", "onSearch", "optionRender", "onChange", "transformResponse", "getValueProps", "getChangeValue", "viewportReady", "isView"];
 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; }
@@ -48,7 +48,6 @@ var ProSelect = (props, ref) => {
   }
   var _props$dataSource = props.dataSource,
     dataSource = _props$dataSource === void 0 ? [] : _props$dataSource,
-    defaultDisableValue = props.defaultDisableValue,
     useRequest = props.useRequest,
     fieldNames = props.fieldNames,
     _props$tooltip = props.tooltip,
@@ -63,9 +62,10 @@ var ProSelect = (props, ref) => {
     _onSearch = props.onSearch,
     optionRender = props.optionRender,
     onChange = props.onChange,
-    updateDataSource = props.updateDataSource,
     transformResponse = props.transformResponse,
     getValueProps = props.getValueProps,
+    getChangeValue = props.getChangeValue,
+    viewportReady = props.viewportReady,
     isViewPro = props.isView,
     selectProps = _objectWithoutProperties(props, _excluded);
   selectProps.showCodeName = (_selectProps$showCode = selectProps.showCodeName) !== null && _selectProps$showCode !== void 0 ? _selectProps$showCode : showCodeName;
@@ -126,8 +126,7 @@ var ProSelect = (props, ref) => {
         var responseData = transformResponse(data);
         setSelectList(responseData);
       } else {
-        // 接口写死了，无法复用
-        updateDataSource ? updateDataSource(data, setSelectList) : defaultOnSuccessFun(data);
+        defaultOnSuccessFun(data);
       }
       // 执行传入onSuccess
       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);
@@ -162,8 +161,7 @@ var ProSelect = (props, ref) => {
     }
   }, [fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.data]);
   (0, _ahooks.useDeepCompareEffect)(() => {
-    // 默认disable值时，不查询接口
-    if (defaultDisableValue || !useRequest) {
+    if (!useRequest) {
       return;
     }
     var _ref4 = (useRequest === null || useRequest === void 0 ? void 0 : useRequest.options) || {},
@@ -174,19 +172,21 @@ var ProSelect = (props, ref) => {
     }
     var params = Array.isArray(defaultParams) ? defaultParams === null || defaultParams === void 0 ? void 0 : defaultParams[0] : defaultParams || {};
     fetchFunction.run(params);
-  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options, defaultDisableValue]);
+  }, [useRequest === null || useRequest === void 0 ? void 0 : useRequest.options]);
 
-  // disable默认值
-  if (defaultDisableValue) {
-    return /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
-      title: defaultDisableValue,
-      children: /*#__PURE__*/(0, _jsxRuntime.jsx)(_antd.Input, {
-        disabled: true,
-        defaultValue: defaultDisableValue,
-        style: props === null || props === void 0 ? void 0 : props.style
-      })
-    });
-  }
+  // 处理 defaultOne 逻辑：当 dataSource 只有一个值且没有 value 时，自动设置默认值
+  (0, _react.useEffect)(() => {
+    if (defaultOne && !value && !isDefaultOne && (selectList === null || selectList === void 0 ? void 0 : selectList.length) === 1) {
+      var option = selectList === null || selectList === void 0 ? void 0 : selectList[0];
+      if (option && option[code] !== undefined && option[code] !== null) {
+        setIsDefaultOne(true);
+        // 使用 setTimeout 确保在下一个事件循环中调用，避免在渲染过程中更新状态
+        setTimeout(() => {
+          onChange === null || onChange === void 0 || onChange(option[code], option);
+        }, 0);
+      }
+    }
+  }, [defaultOne, value, isDefaultOne, selectList, code, onChange]);
   var transToLabel = value => {
     if (!Array.isArray(selectList) || !selectList.length) {
       return viewEmpty;
@@ -259,7 +259,6 @@ var ProSelect = (props, ref) => {
     if (labelInValue && (isReactElement(_option) || isReactElement(_option === null || _option === void 0 ? void 0 : _option.children))) {
       option = _option === null || _option === void 0 ? void 0 : _option.record;
     }
-    var getChangeValue = selectProps.getChangeValue;
     if (selectProps.mode && selectProps.mode === 'multiple') {
       if (Array.isArray(option)) {
         option.forEach(item => {
@@ -302,18 +301,17 @@ var ProSelect = (props, ref) => {
     if (selectProps.mode && value === null) {
       return undefined;
     }
-    if (defaultOne && !value && !isDefaultOne) {
+    // 只有当 dataSource 只有一个值时才默认回填（只返回值，不进行状态更新）
+    if (defaultOne && !value && !isDefaultOne && (selectList === null || selectList === void 0 ? void 0 : selectList.length) === 1) {
       var option = selectList === null || selectList === void 0 ? void 0 : selectList[0];
       // selectList 可能是异步回来的值
       if (option) {
-        setIsDefaultOne(true);
-        onChange === null || onChange === void 0 || onChange(option === null || option === void 0 ? void 0 : option[code], option);
         return option === null || option === void 0 ? void 0 : option[code];
       }
     }
     // 修复空字符placeholder不显示
     if (value === '') {
-      return null;
+      return undefined;
     }
     return value;
   };
@@ -348,12 +346,15 @@ var ProSelect = (props, ref) => {
       getPopupContainer: trigger => {
         return scrollFollowParent ? trigger.parentElement : document.body;
       }
-    }, (0, _lodash.omit)(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange'])), {}, {
+    }, (0, _lodash.omit)(_objectSpread({}, selectProps), ['isView', 'showCodeName', 'form', 'name', 'style', 'onFieldChange', 'getChangeValue', 'viewportReady'])), {}, {
       value: transformValue(),
-      children: Array.isArray(newSelectList) && newSelectList.map(item => {
+      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;
         return /*#__PURE__*/(0, _jsxRuntime.jsx)(Option, {
           label: item[label],
-          value: item[code],
+          value: optionValue,
           record: item,
           disabled: !!item.disabled,
           children: /*#__PURE__*/(0, _jsxRuntime.jsx)(TooltipOption, {
@@ -363,8 +364,8 @@ var ProSelect = (props, ref) => {
             }) : /*#__PURE__*/(0, _jsxRuntime.jsx)("span", {
               children: selectProps.showCodeName ? `${item[code]}-${item[label]}` : item[label]
             })
-          }, item[code])
-        }, item[code]);
+          })
+        }, itemKey);
       })
     }))
   });

package/lib/ProSelect/propsType.d.ts

@@ -50,11 +50,6 @@ export interface PropSelectType extends Omit<SelectProps, 'onSearch'> {
      * @default false
      */
     filterInList?: boolean;
-    /**
-     * @deprecated 兼容 2.0 版本、3.0 使用view 模式
-     * @default -
-     */
-    defaultDisableValue?: string;
     /**
      * @description 是否展示 tooltip、当 label 特别长的时候使用
      * @default false
@@ -89,13 +84,6 @@ export interface PropSelectType extends Omit<SelectProps, 'onSearch'> {
          */
         options?: Options<any, any>;
     };
-    /**
-     * @deprecated 兼容 2.0 版本、3.0 使用 transformResponse
-     * @param data 数据
-     * @param setSelectList 设置选择列表的函数
-     * @returns
-     */
-    updateDataSource?: (data: any, setSelectList: any) => void;
     /**
      * @description 格式化数据
      * @param data 后台返回的数据

package/lib/ProTreeModal/style/index.less

@@ -143,7 +143,7 @@
 
     &:first-child {
       color: #616161;
-      border-radius: 8px 0 0 8px;
+      border-radius: 6px 0 0 6px;
     }
 
     .@{ant-prefix}-btn-link {

package/lib/style/theme/antd.less

@@ -609,7 +609,7 @@
 
 // 下拉框三角样式替换
 .@{ant-prefix}-select {
-  .@{ant-prefix}-select-arrow {
+  .@{ant-prefix}-select-arrow, .@{ant-prefix}-select-suffix {
     .anticon-down {
       width: 0;
       height: 0;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.0.1",
+  "version": "4.0.2",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -57,10 +57,7 @@
   "browserslist": [
     "last 2 versions",
     "Firefox ESR",
-    "> 1%",
-    "ie >= 11",
-    "iOS >= 7",
-    "Android >= 4"
+    "> 1%"
   ],
   "overrides": {
     "react-resizable": {
@@ -90,9 +87,9 @@
     "react-svg": "^15.1.7"
   },
   "peerDependencies": {
-    "antd": "^6.0.0",
-    "react": "^18.3.0",
-    "react-dom": "^18.3.0",
+    "antd": "^6.0.0", 
+    "react": "^18.3.0 || ^19.0.0",
+    "react-dom": "^18.3.0 || ^19.0.0",
     "react-router-dom": "^6.0.0"
   },
   "devDependencies": {