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

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

@@ -93,9 +93,7 @@ var RenderField = _ref => {
   var _valueType = valueType;
   var _disabled = false;
   var _desensitization = desensitization || [];
-
-  // editRender弃用使用component同ProForm
-  var _editRender = component || editRender;
+  var _component = component || editRender;
   var isCell = mode === 'cell';
   var isSingleMode = mode === 'single';
   if (isCell) {
@@ -184,6 +182,15 @@ var RenderField = _ref => {
     isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(rowData, reactiveParams);
   }
 
+  // component 处理 - 优先使用 hook 返回的值
+  if (isFunction(_component)) {
+    var _dynamicProps$compone;
+    _component = (_dynamicProps$compone = dynamicProps.component) !== null && _dynamicProps$compone !== void 0 ? _dynamicProps$compone : _component(rowData, reactiveParams);
+  }
+
+  // 更新 _editRender 为处理后的 _component
+  var _editRender = _component;
+
   // 是否只读文本
   var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || getDisabled({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -232,8 +239,10 @@ var RenderField = _ref => {
     validateTrigger
   }), [defaultProps, resetProps, internalRule, validateTrigger]);
 
-  // 只在 single 模式下，当这些函数类型存在时，自动添加 shouldUpdate
+  // 当这些函数类型存在时，自动添加 shouldUpdate
   // 因为这些函数依赖行数据，当行数据变化时需要重新计算
+  // 扩展到所有模式（single/multiple/cell），统一行为
+  // 注意：需要检查原始的 component/editRender，而不是处理后的 _component
   var hasFunctionDependency = isFunction(column === null || column === void 0 ? void 0 : column.disabled) ||
   // disabled 是函数
   isFunction(fieldProps) ||
@@ -244,11 +253,15 @@ var RenderField = _ref => {
   // rules 是函数
   isFunction(isEditable) ||
   // isEditable 是函数
-  isFunction(_editRender) ||
-  // component/editRender 是函数
+  isFunction(component) ||
+  // component 是函数
+  isFunction(editRender) ||
+  // editRender 是函数
   isFunction(viewRender); // viewRender 是函数
 
-  if (isSingleMode && hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
+  // 移除 isSingleMode 限制，让所有模式都支持响应式更新
+  // 性能优化已通过 useShouldUpdateForTable hook 的缓存和防抖机制实现
+  if (hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
     // 使用 shouldUpdate 监听同一行的数据变化
     _formItemProps.shouldUpdate = (prevValues, currentValues) => {
       var prevRow = get(prevValues, [...namePath, index]);
@@ -327,11 +340,14 @@ var RenderField = _ref => {
     TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : /*#__PURE__*/_jsx(_Fragment, {});
   }
   if (isEditable && _isEditing) {
-    if (typeof _editRender === 'function') {
-      TargetComponent = _editRender(...rowParams);
-    }
+    // _editRender 已经是处理后的值（通过 dynamicProps.component 或直接计算）
+    // 如果原本是函数，此时 _editRender 已经是执行后的 ReactNode
+    // 如果原本是 ReactElement，_editRender 就是 ReactElement
     if ( /*#__PURE__*/React.isValidElement(_editRender)) {
       TargetComponent = _editRender;
+    } else if (_editRender) {
+      // 其他情况（可能是字符串或其他类型的 ReactNode）
+      TargetComponent = _editRender;
     }
   }
 
@@ -707,6 +723,7 @@ var RenderField = _ref => {
     // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
     var finalComponentProps = componentProps;
     if (shouldUpdateMode) {
+      var _column$isEditable2;
       // 重新获取最新的行数据
       var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
       var latestReactiveParams = {
@@ -740,6 +757,18 @@ var RenderField = _ref => {
         latestDesensitization = desensitization(latestRowData, latestReactiveParams);
       }
 
+      // 重新计算 component
+      var latestComponent = component || editRender;
+      if (isFunction(latestComponent)) {
+        latestComponent = latestComponent(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 isEditable（使用原始的 column.isEditable，而不是处理后的 isEditable）
+      var latestIsEditable = (_column$isEditable2 = column.isEditable) !== null && _column$isEditable2 !== void 0 ? _column$isEditable2 : true;
+      if (isFunction(column.isEditable)) {
+        latestIsEditable = column.isEditable(latestRowData, latestReactiveParams);
+      }
+
       // 重新计算 disabled
       var latestDisabled = getDisabled({
         globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -756,6 +785,52 @@ var RenderField = _ref => {
       }, latestFieldProps), {}, {
         desensitization: latestDesensitization
       });
+
+      // ⭐ 关键修改：在 shouldUpdate 模式下，需要重新设置 TargetComponent
+      // 因为 component 函数可能返回不同的结果
+      var latestTargetComponent = TargetComponent;
+
+      // 首先检查是否有内置type
+      if (!latestComponent && typeof type === 'string') {
+        var _componentMap$type2;
+        latestTargetComponent = (_componentMap$type2 = componentMap[type]) !== null && _componentMap$type2 !== void 0 ? _componentMap$type2 : /*#__PURE__*/_jsx(_Fragment, {});
+      }
+
+      // 然后处理自定义 component
+      var latestIsView = !latestIsEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || 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,
+        rowDisabled: rowDisabled || 'empty'
+      });
+      if (latestIsEditable && _isEditing) {
+        if ( /*#__PURE__*/React.isValidElement(latestComponent)) {
+          latestTargetComponent = latestComponent;
+        } else if (latestComponent) {
+          latestTargetComponent = latestComponent;
+        }
+      }
+
+      // 查看模式
+      if (latestIsView) {
+        if (typeof viewRender === 'function') {
+          var latestCurrentValue = dataIndex ? latestRowData === null || latestRowData === void 0 ? void 0 : latestRowData[dataIndex] : null;
+          var _View = viewRender(latestCurrentValue, latestRowData || {}, options);
+          latestTargetComponent = /*#__PURE__*/_jsx(Container, {
+            viewEmpty: viewEmpty,
+            children: _View
+          });
+        }
+        if ( /*#__PURE__*/React.isValidElement(viewRender)) {
+          latestTargetComponent = viewRender;
+        }
+      }
+
+      // 使用重新计算的 TargetComponent
+      TargetComponent = latestTargetComponent;
     }
     var FormItem = null;
     // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
@@ -765,7 +840,15 @@ var RenderField = _ref => {
     if (isTargetDomElement) {
       propsForTarget = omit(propsForTarget, ['disabled', ...OMIT_FORM_ITEM_AND_DOM_KEYS]);
     }
-    var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, propsForTarget)) : /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, propsForTarget));
+    // 当 TargetComponent 未定义时，使用空的占位组件避免渲染错误
+    var FieldComponent = null;
+    if ( /*#__PURE__*/React.isValidElement(TargetComponent)) {
+      FieldComponent = /*#__PURE__*/React.cloneElement(TargetComponent, propsForTarget);
+    } else if (TargetComponent) {
+      FieldComponent = /*#__PURE__*/_jsx(TargetComponent, _objectSpread({}, propsForTarget));
+    } else {
+      FieldComponent = /*#__PURE__*/_jsx(_Fragment, {});
+    }
     if (originalValues && !getIsNew(record)) {
       FieldComponent = /*#__PURE__*/_jsx(ListChangedWrapper, {
         name: cellName,
@@ -796,7 +879,7 @@ var RenderField = _ref => {
     }
     FormItem = TargetComponent ? /*#__PURE__*/_jsx(Form.Item, _objectSpread(_objectSpread({
       validateFirst: true
-    }, omit(finalFormItemProps, ['render', 'key', 'width', 'hiddenNames', 'name', 'onCell', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, omit(finalFormItemProps, ['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,

package/es/ProEditTable/propsType.d.ts

@@ -130,6 +130,11 @@ export type RequiredFn<T = any> = ReactiveFunction<T, boolean | boolean[]>;
  * @template T 记录类型
  */
 export type viewRenderFn<T = any> = (text?: any, record?: T, options?: OptionsProps) => string | number | ReactNode | void;
+/**
+ * 组件渲染函数类型（与 ReactiveFunction 保持一致）
+ * @template T 记录类型
+ */
+export type ComponentRenderFn<T = any> = ReactiveFunction<T, string | number | ReactNode | void>;
 /**
  * 表格列属性接口
  * @template Values 值类型
@@ -153,7 +158,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
         icon?: string | ReactNode;
     } & TooltipProps);
     /** 组件 */
-    component?: string | number | ReactNode | viewRenderFn<T>;
+    component?: string | number | ReactNode | ComponentRenderFn<T>;
     /** 视图渲染 */
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     /** 隐藏的字段名 */

package/es/ProEditTable/utils/useShouldUpdateForTable.d.ts

@@ -10,6 +10,7 @@ interface Result {
     fieldProps: any;
     desensitization: any;
     valueType: any;
+    component: any;
 }
 declare const useShouldUpdateForTable: (props: UseShouldUpdateForTableProps) => Result;
 export default useShouldUpdateForTable;

package/es/ProEditTable/utils/useShouldUpdateForTable.js

@@ -8,7 +8,7 @@ import { useRef, useState, useEffect } from 'react';
 import { isFunction, isEqualWith, debounce } from 'lodash';
 import { customEqualForFunction } from "../../utils";
 var useShouldUpdateForTable = props => {
-  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current;
+  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current, _componentRef$current;
   var rowParams = props.rowParams,
     column = props.column,
     shouldUpdateDebounce = props.shouldUpdateDebounce;
@@ -20,6 +20,7 @@ var useShouldUpdateForTable = props => {
   var fieldPropsRef = useRef();
   var desensitizationRef = useRef();
   var valueTypeRef = useRef();
+  var componentRef = useRef();
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
@@ -100,6 +101,19 @@ var useShouldUpdateForTable = props => {
     } else {
       valueTypeRef.current = column.valueType;
     }
+
+    // component 处理（注意：component 是 editRender 的别名）
+    var componentOrEditRender = column.component || column.editRender;
+    if (isFunction(componentOrEditRender)) {
+      var newComponent = componentOrEditRender(values, reactiveParams);
+      // 对于 ReactNode 类型的返回值，使用深度比较
+      if (!isEqualWith(componentRef.current, newComponent, customEqualForFunction)) {
+        componentRef.current = newComponent;
+        hasChange = true;
+      }
+    } else {
+      componentRef.current = componentOrEditRender;
+    }
     if (hasChange) {
       reRender({});
     }
@@ -107,7 +121,8 @@ var useShouldUpdateForTable = props => {
 
   // 创建防抖函数（统一处理所有动态属性）
   useEffect(() => {
-    if (shouldUpdateDebounce > 0 && (isFunction(column.isEditable) || isFunction(column.required) || isFunction(column.rules) || isFunction(column.fieldProps) || isFunction(column.desensitization) || isFunction(column.valueType))) {
+    var componentOrEditRender = column.component || column.editRender;
+    if (shouldUpdateDebounce > 0 && (isFunction(column.isEditable) || isFunction(column.required) || isFunction(column.rules) || isFunction(column.fieldProps) || isFunction(column.desensitization) || isFunction(column.valueType) || isFunction(componentOrEditRender))) {
       debouncedUpdateRef.current = debounce(() => {
         if (pendingParamsRef.current) {
           processUpdate(pendingParamsRef.current);
@@ -146,7 +161,8 @@ var useShouldUpdateForTable = props => {
     rules: (_rulesRef$current = rulesRef.current) !== null && _rulesRef$current !== void 0 ? _rulesRef$current : column.rules,
     fieldProps: (_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 ? _fieldPropsRef$curren : column.fieldProps,
     desensitization: (_desensitizationRef$c = desensitizationRef.current) !== null && _desensitizationRef$c !== void 0 ? _desensitizationRef$c : column.desensitization,
-    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType
+    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType,
+    component: (_componentRef$current = componentRef.current) !== null && _componentRef$current !== void 0 ? _componentRef$current : column.component || column.editRender
   };
 };
 export default useShouldUpdateForTable;

package/es/ProForm/components/base/DatePicker/index.js

@@ -87,13 +87,7 @@ var DatePicker = props => {
     restProps.showTime = true;
   }
 
-  // onChange 输出格式化字符串，表单直接存储
-  var handleChange = (date, dateString) => {
-    var _rest$onChange;
-    var valueToStore = date && typeof nextFormat === 'string' ? date.format(nextFormat) : date;
-    (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 || _rest$onChange.call(rest, valueToStore, dateString);
-  };
-  restProps.onChange = handleChange;
+  // 直接透传 onChange，保持 dayjs 对象类型（与 RangePicker 一致）
 
   // 字符串时间格式兼容，使用 nextFormat 解析 quarter/week 等格式
   if (isString(restProps.value)) {

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

@@ -75,58 +75,58 @@ 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>;
+    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";
+    vertical?: boolean;
+    isView?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    validateTrigger?: string | false | string[];
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
-    vertical?: boolean;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     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;
     messageVariables?: Record<string, string>;
     initialValue?: any;
-    onReset?: () => void;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
     preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
-    prefixCls?: string;
     noStyle?: boolean;
-    style?: React.CSSProperties;
-    className?: string;
-    rootClassName?: string;
-    id?: string;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "warning" | "error" | "validating";
-    hidden?: boolean;
+    validateStatus?: "" | "warning" | "error" | "success" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
-    status?: "" | "success" | "warning" | "error" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
-    toISOString?: boolean;
-    toCSTString?: boolean;
     switchValue?: [any, any];
-    clearNotShow?: boolean;
-    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>;
-    trim?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    isView?: boolean;
-    upperCase?: boolean;
     viewType?: import("../../../render/propsType").ViewType;
+    upperCase?: boolean;
+    toISOString?: boolean;
+    toCSTString?: boolean;
+    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, "format" | "toISOString" | "toCSTString" | "switchValue" | "precision" | "clearNotShow" | "dependNames" | "valueType">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "precision" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

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

@@ -100,9 +100,7 @@ var RenderField = _ref => {
   var _valueType = valueType;
   var _disabled = false;
   var _desensitization = desensitization || [];
-
-  // editRender弃用使用component同ProForm
-  var _editRender = component || editRender;
+  var _component = component || editRender;
   var isCell = mode === 'cell';
   var isSingleMode = mode === 'single';
   if (isCell) {
@@ -191,6 +189,15 @@ var RenderField = _ref => {
     isEditable = (_dynamicProps$isEdita = dynamicProps.isEditable) !== null && _dynamicProps$isEdita !== void 0 ? _dynamicProps$isEdita : isEditable(rowData, reactiveParams);
   }
 
+  // component 处理 - 优先使用 hook 返回的值
+  if ((0, _lodash.isFunction)(_component)) {
+    var _dynamicProps$compone;
+    _component = (_dynamicProps$compone = dynamicProps.component) !== null && _dynamicProps$compone !== void 0 ? _dynamicProps$compone : _component(rowData, reactiveParams);
+  }
+
+  // 更新 _editRender 为处理后的 _component
+  var _editRender = _component;
+
   // 是否只读文本
   var isView = !isEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || (0, _tools.getDisabled)({
     globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -239,8 +246,10 @@ var RenderField = _ref => {
     validateTrigger
   }), [defaultProps, resetProps, internalRule, validateTrigger]);
 
-  // 只在 single 模式下，当这些函数类型存在时，自动添加 shouldUpdate
+  // 当这些函数类型存在时，自动添加 shouldUpdate
   // 因为这些函数依赖行数据，当行数据变化时需要重新计算
+  // 扩展到所有模式（single/multiple/cell），统一行为
+  // 注意：需要检查原始的 component/editRender，而不是处理后的 _component
   var hasFunctionDependency = (0, _lodash.isFunction)(column === null || column === void 0 ? void 0 : column.disabled) ||
   // disabled 是函数
   (0, _lodash.isFunction)(fieldProps) ||
@@ -251,11 +260,15 @@ var RenderField = _ref => {
   // rules 是函数
   (0, _lodash.isFunction)(isEditable) ||
   // isEditable 是函数
-  (0, _lodash.isFunction)(_editRender) ||
-  // component/editRender 是函数
+  (0, _lodash.isFunction)(component) ||
+  // component 是函数
+  (0, _lodash.isFunction)(editRender) ||
+  // editRender 是函数
   (0, _lodash.isFunction)(viewRender); // viewRender 是函数
 
-  if (isSingleMode && hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
+  // 移除 isSingleMode 限制，让所有模式都支持响应式更新
+  // 性能优化已通过 useShouldUpdateForTable hook 的缓存和防抖机制实现
+  if (hasFunctionDependency && !(column !== null && column !== void 0 && column.dependencies)) {
     // 使用 shouldUpdate 监听同一行的数据变化
     _formItemProps.shouldUpdate = (prevValues, currentValues) => {
       var prevRow = (0, _lodash.get)(prevValues, [...namePath, index]);
@@ -334,11 +347,14 @@ var RenderField = _ref => {
     TargetComponent = (_componentMap$type = componentMap[type]) !== null && _componentMap$type !== void 0 ? _componentMap$type : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
   }
   if (isEditable && _isEditing) {
-    if (typeof _editRender === 'function') {
-      TargetComponent = _editRender(...rowParams);
-    }
+    // _editRender 已经是处理后的值（通过 dynamicProps.component 或直接计算）
+    // 如果原本是函数，此时 _editRender 已经是执行后的 ReactNode
+    // 如果原本是 ReactElement，_editRender 就是 ReactElement
     if ( /*#__PURE__*/_react.default.isValidElement(_editRender)) {
       TargetComponent = _editRender;
+    } else if (_editRender) {
+      // 其他情况（可能是字符串或其他类型的 ReactNode）
+      TargetComponent = _editRender;
     }
   }
 
@@ -714,6 +730,7 @@ var RenderField = _ref => {
     // 如果处于 shouldUpdate 模式，需要重新获取最新的行数据并重新计算依赖值
     var finalComponentProps = componentProps;
     if (shouldUpdateMode) {
+      var _column$isEditable2;
       // 重新获取最新的行数据
       var latestRowData = form.getFieldValue([...namePath, index]) || record || {};
       var latestReactiveParams = {
@@ -747,6 +764,18 @@ var RenderField = _ref => {
         latestDesensitization = desensitization(latestRowData, latestReactiveParams);
       }
 
+      // 重新计算 component
+      var latestComponent = component || editRender;
+      if ((0, _lodash.isFunction)(latestComponent)) {
+        latestComponent = latestComponent(latestRowData, latestReactiveParams);
+      }
+
+      // 重新计算 isEditable（使用原始的 column.isEditable，而不是处理后的 isEditable）
+      var latestIsEditable = (_column$isEditable2 = column.isEditable) !== null && _column$isEditable2 !== void 0 ? _column$isEditable2 : true;
+      if ((0, _lodash.isFunction)(column.isEditable)) {
+        latestIsEditable = column.isEditable(latestRowData, latestReactiveParams);
+      }
+
       // 重新计算 disabled
       var latestDisabled = (0, _tools.getDisabled)({
         globalControl: otherProps === null || otherProps === void 0 ? void 0 : otherProps.globalControl,
@@ -763,6 +792,52 @@ var RenderField = _ref => {
       }, latestFieldProps), {}, {
         desensitization: latestDesensitization
       });
+
+      // ⭐ 关键修改：在 shouldUpdate 模式下，需要重新设置 TargetComponent
+      // 因为 component 函数可能返回不同的结果
+      var latestTargetComponent = TargetComponent;
+
+      // 首先检查是否有内置type
+      if (!latestComponent && typeof type === 'string') {
+        var _componentMap$type2;
+        latestTargetComponent = (_componentMap$type2 = componentMap[type]) !== null && _componentMap$type2 !== void 0 ? _componentMap$type2 : /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+      }
+
+      // 然后处理自定义 component
+      var latestIsView = !latestIsEditable || (record === null || record === void 0 ? void 0 : record['is-view']) || config.isView || virtualKey && !_isEditing || (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,
+        rowDisabled: rowDisabled || 'empty'
+      });
+      if (latestIsEditable && _isEditing) {
+        if ( /*#__PURE__*/_react.default.isValidElement(latestComponent)) {
+          latestTargetComponent = latestComponent;
+        } else if (latestComponent) {
+          latestTargetComponent = latestComponent;
+        }
+      }
+
+      // 查看模式
+      if (latestIsView) {
+        if (typeof viewRender === 'function') {
+          var latestCurrentValue = dataIndex ? latestRowData === null || latestRowData === void 0 ? void 0 : latestRowData[dataIndex] : null;
+          var _View = viewRender(latestCurrentValue, latestRowData || {}, options);
+          latestTargetComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_Container.default, {
+            viewEmpty: viewEmpty,
+            children: _View
+          });
+        }
+        if ( /*#__PURE__*/_react.default.isValidElement(viewRender)) {
+          latestTargetComponent = viewRender;
+        }
+      }
+
+      // 使用重新计算的 TargetComponent
+      TargetComponent = latestTargetComponent;
     }
     var FormItem = null;
     // 当 viewRender 存在时，需要排除 finalComponentProps 中的 children，避免覆盖 Container 的 children
@@ -772,7 +847,15 @@ var RenderField = _ref => {
     if (isTargetDomElement) {
       propsForTarget = (0, _lodash.omit)(propsForTarget, ['disabled', ...OMIT_FORM_ITEM_AND_DOM_KEYS]);
     }
-    var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, propsForTarget)) : /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread({}, propsForTarget));
+    // 当 TargetComponent 未定义时，使用空的占位组件避免渲染错误
+    var FieldComponent = null;
+    if ( /*#__PURE__*/_react.default.isValidElement(TargetComponent)) {
+      FieldComponent = /*#__PURE__*/_react.default.cloneElement(TargetComponent, propsForTarget);
+    } else if (TargetComponent) {
+      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(TargetComponent, _objectSpread({}, propsForTarget));
+    } else {
+      FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {});
+    }
     if (originalValues && !getIsNew(record)) {
       FieldComponent = /*#__PURE__*/(0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
@@ -803,7 +886,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', _formItemProps.shouldUpdate ? 'shouldUpdate' : null])), {}, {
+    }, (0, _lodash.omit)(finalFormItemProps, ['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,

package/lib/ProEditTable/propsType.d.ts

@@ -130,6 +130,11 @@ export type RequiredFn<T = any> = ReactiveFunction<T, boolean | boolean[]>;
  * @template T 记录类型
  */
 export type viewRenderFn<T = any> = (text?: any, record?: T, options?: OptionsProps) => string | number | ReactNode | void;
+/**
+ * 组件渲染函数类型（与 ReactiveFunction 保持一致）
+ * @template T 记录类型
+ */
+export type ComponentRenderFn<T = any> = ReactiveFunction<T, string | number | ReactNode | void>;
 /**
  * 表格列属性接口
  * @template Values 值类型
@@ -153,7 +158,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
         icon?: string | ReactNode;
     } & TooltipProps);
     /** 组件 */
-    component?: string | number | ReactNode | viewRenderFn<T>;
+    component?: string | number | ReactNode | ComponentRenderFn<T>;
     /** 视图渲染 */
     viewRender?: string | number | ReactNode | viewRenderFn<T>;
     /** 隐藏的字段名 */

package/lib/ProEditTable/utils/useShouldUpdateForTable.d.ts

@@ -10,6 +10,7 @@ interface Result {
     fieldProps: any;
     desensitization: any;
     valueType: any;
+    component: any;
 }
 declare const useShouldUpdateForTable: (props: UseShouldUpdateForTableProps) => Result;
 export default useShouldUpdateForTable;

package/lib/ProEditTable/utils/useShouldUpdateForTable.js

@@ -14,7 +14,7 @@ function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t.return && (u = t.return(), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 var useShouldUpdateForTable = props => {
-  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current;
+  var _isEditableRef$curren, _requiredRef$current, _rulesRef$current, _fieldPropsRef$curren, _desensitizationRef$c, _valueTypeRef$current, _componentRef$current;
   var rowParams = props.rowParams,
     column = props.column,
     shouldUpdateDebounce = props.shouldUpdateDebounce;
@@ -26,6 +26,7 @@ var useShouldUpdateForTable = props => {
   var fieldPropsRef = (0, _react.useRef)();
   var desensitizationRef = (0, _react.useRef)();
   var valueTypeRef = (0, _react.useRef)();
+  var componentRef = (0, _react.useRef)();
   var _useState = (0, _react.useState)({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
@@ -106,6 +107,19 @@ var useShouldUpdateForTable = props => {
     } else {
       valueTypeRef.current = column.valueType;
     }
+
+    // component 处理（注意：component 是 editRender 的别名）
+    var componentOrEditRender = column.component || column.editRender;
+    if ((0, _lodash.isFunction)(componentOrEditRender)) {
+      var newComponent = componentOrEditRender(values, reactiveParams);
+      // 对于 ReactNode 类型的返回值，使用深度比较
+      if (!(0, _lodash.isEqualWith)(componentRef.current, newComponent, _utils.customEqualForFunction)) {
+        componentRef.current = newComponent;
+        hasChange = true;
+      }
+    } else {
+      componentRef.current = componentOrEditRender;
+    }
     if (hasChange) {
       reRender({});
     }
@@ -113,7 +127,8 @@ var useShouldUpdateForTable = props => {
 
   // 创建防抖函数（统一处理所有动态属性）
   (0, _react.useEffect)(() => {
-    if (shouldUpdateDebounce > 0 && ((0, _lodash.isFunction)(column.isEditable) || (0, _lodash.isFunction)(column.required) || (0, _lodash.isFunction)(column.rules) || (0, _lodash.isFunction)(column.fieldProps) || (0, _lodash.isFunction)(column.desensitization) || (0, _lodash.isFunction)(column.valueType))) {
+    var componentOrEditRender = column.component || column.editRender;
+    if (shouldUpdateDebounce > 0 && ((0, _lodash.isFunction)(column.isEditable) || (0, _lodash.isFunction)(column.required) || (0, _lodash.isFunction)(column.rules) || (0, _lodash.isFunction)(column.fieldProps) || (0, _lodash.isFunction)(column.desensitization) || (0, _lodash.isFunction)(column.valueType) || (0, _lodash.isFunction)(componentOrEditRender))) {
       debouncedUpdateRef.current = (0, _lodash.debounce)(() => {
         if (pendingParamsRef.current) {
           processUpdate(pendingParamsRef.current);
@@ -152,7 +167,8 @@ var useShouldUpdateForTable = props => {
     rules: (_rulesRef$current = rulesRef.current) !== null && _rulesRef$current !== void 0 ? _rulesRef$current : column.rules,
     fieldProps: (_fieldPropsRef$curren = fieldPropsRef.current) !== null && _fieldPropsRef$curren !== void 0 ? _fieldPropsRef$curren : column.fieldProps,
     desensitization: (_desensitizationRef$c = desensitizationRef.current) !== null && _desensitizationRef$c !== void 0 ? _desensitizationRef$c : column.desensitization,
-    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType
+    valueType: (_valueTypeRef$current = valueTypeRef.current) !== null && _valueTypeRef$current !== void 0 ? _valueTypeRef$current : column.valueType,
+    component: (_componentRef$current = componentRef.current) !== null && _componentRef$current !== void 0 ? _componentRef$current : column.component || column.editRender
   };
 };
 var _default = exports.default = useShouldUpdateForTable;

package/lib/ProForm/components/base/DatePicker/index.js

@@ -94,13 +94,7 @@ var DatePicker = props => {
     restProps.showTime = true;
   }
 
-  // onChange 输出格式化字符串，表单直接存储
-  var handleChange = (date, dateString) => {
-    var _rest$onChange;
-    var valueToStore = date && typeof nextFormat === 'string' ? date.format(nextFormat) : date;
-    (_rest$onChange = rest.onChange) === null || _rest$onChange === void 0 || _rest$onChange.call(rest, valueToStore, dateString);
-  };
-  restProps.onChange = handleChange;
+  // 直接透传 onChange，保持 dayjs 对象类型（与 RangePicker 一致）
 
   // 字符串时间格式兼容，使用 nextFormat 解析 quarter/week 等格式
   if ((0, _lodash.isString)(restProps.value)) {

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

@@ -75,58 +75,58 @@ 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>;
+    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";
+    vertical?: boolean;
+    isView?: boolean;
+    valueType?: import("../../../render/propsType").ProFormValueType;
+    trim?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
+    validateTrigger?: string | false | string[];
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     colon?: boolean;
     htmlFor?: string;
     labelAlign?: import("antd/es/form/interface").FormLabelAlign;
     labelCol?: import("antd").ColProps;
-    vertical?: boolean;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
     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;
     messageVariables?: Record<string, string>;
     initialValue?: any;
-    onReset?: () => void;
     onMetaChange?: (meta: import("@rc-component/form/lib/Field").MetaEvent) => void;
     preserve?: boolean;
     isListField?: boolean;
     isList?: boolean;
-    prefixCls?: string;
     noStyle?: boolean;
-    style?: React.CSSProperties;
-    className?: string;
-    rootClassName?: string;
-    id?: string;
     hasFeedback?: boolean | {
         icons: import("antd/es/form/FormItem").FeedbackIcons;
     };
-    validateStatus?: "" | "success" | "warning" | "error" | "validating";
-    hidden?: boolean;
+    validateStatus?: "" | "warning" | "error" | "success" | "validating";
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
-    status?: "" | "success" | "warning" | "error" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
-    toISOString?: boolean;
-    toCSTString?: boolean;
     switchValue?: [any, any];
-    clearNotShow?: boolean;
-    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>;
-    trim?: boolean;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
-    isView?: boolean;
-    upperCase?: boolean;
     viewType?: import("../../../render/propsType").ViewType;
+    upperCase?: boolean;
+    toISOString?: boolean;
+    toCSTString?: boolean;
+    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, "format" | "toISOString" | "toCSTString" | "switchValue" | "precision" | "clearNotShow" | "dependNames" | "valueType">;
+    componentProps: import("lodash").Omit<any, "format" | "valueType" | "precision" | "switchValue" | "dependNames" | "toISOString" | "toCSTString" | "clearNotShow">;
     formItemTransform: {
         getValueProps: any;
         normalize: any;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "4.1.2-beta.3",
+  "version": "4.1.2-beta.5",
   "license": "MIT",
   "main": "lib/index.js",
   "module": "es/index.js",
@@ -44,6 +44,8 @@
     "lint": "npm run lint:js && npm run lint:style && npm run lint:prettier",
     "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",
+    "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",
     "lint:prettier": "prettier --check \"**/*\" --end-of-line auto",
@@ -62,7 +64,7 @@
   "husky": {
     "hooks": {
       "commit-msg": "commitlint -E HUSKY_GIT_PARAMS",
-      "pre-commit": "npm run lint-staged"
+      "pre-commit": "npm run lint-staged && npm run code-standards:check"
     }
   },
   "lint-staged": {