@zat-design/sisyphus-react 4.4.1-beta.4 → 4.4.3-beta.2

package/es/FormsProvider/index.d.ts

@@ -1,5 +1,5 @@
 import React from 'react';
-import { ModifiedFormInstanceType } from '../ProForm/utils/useForm';
+import type { ModifiedFormInstanceType } from '../ProForm/propsType';
 type Forms = Record<string, ModifiedFormInstanceType<any>>;
 export declare const FormsContext: React.Context<Forms>;
 /**

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

@@ -18,8 +18,8 @@ import * as componentMap from "../../../ProForm/components";
 import { useProConfig } from "../../../ProConfigProvider";
 import Container from "../../../ProForm/components/Container";
 import transformNames from "../../../ProForm/utils/transformNames";
-import { FieldProvider } from "../../../ProForm/utils/useFieldProps";
-import useRules from "../../../ProForm/utils/useRules";
+import { FieldProvider } from "../../../ProForm/hooks/useFieldProps";
+import useRules from "../../../ProForm/hooks/useRules";
 import { isSelect, isTrim } from "../../../ProForm/utils";
 import locale from "../../../locale";
 import ConfirmWrapper from "../../../ProForm/components/render/ConfirmWrapper";
@@ -51,7 +51,6 @@ const RenderField = ({
     originTitle,
     label,
     dataIndex,
-    formItemProps,
     isEditable = true,
     required = false,
     rules = [],
@@ -81,7 +80,7 @@ const RenderField = ({
     getIsNew,
     shouldUpdateDebounce
   } = config;
-  let _fieldProps = fieldProps || formItemProps || {};
+  let _fieldProps = fieldProps || {};
   let _rules = rules || [];
   let _required = required;
   let _valueType = valueType;
@@ -620,7 +619,7 @@ const RenderField = ({
       const latestRowParams = [latestRowData, latestReactiveParams];
 
       // ⭐ 关键修改：shouldUpdate 模式下，跳过缓存，直接重新计算所有响应式属性
-      let latestFieldProps = fieldProps || formItemProps || {};
+      let latestFieldProps = fieldProps || {};
       if (_isFunction(fieldProps)) {
         latestFieldProps = fieldProps(latestRowData, latestReactiveParams);
       }
@@ -893,9 +892,10 @@ export default /*#__PURE__*/memo(RenderField, (prevProps, nextProps) => {
     config: nextConfig
   } = nextProps;
 
-  // 自定义 component/editRender 且行对象为同引用时，浅比较无法区分原地修改，需强制重渲染
-  const hasFunctionComponent = _isFunction(prevColumn?.component) || _isFunction(prevColumn?.editRender) || _isFunction(nextColumn?.component) || _isFunction(nextColumn?.editRender);
-  if (hasFunctionComponent && prevRecord === nextRecord) {
+  // 函数型动态属性（component/editRender/fieldProps/rules/required/disabled/isEditable/valueType）
+  // 可能依赖行内兄弟字段；行对象为同引用（原地修改）时，浅比较无法区分，需强制重渲染
+  const hasFunctionDependency = _isFunction(prevColumn?.component) || _isFunction(prevColumn?.editRender) || _isFunction(prevColumn?.fieldProps) || _isFunction(prevColumn?.rules) || _isFunction(prevColumn?.required) || _isFunction(prevColumn?.disabled) || _isFunction(prevColumn?.isEditable) || _isFunction(prevColumn?.valueType) || _isFunction(nextColumn?.component) || _isFunction(nextColumn?.editRender) || _isFunction(nextColumn?.fieldProps) || _isFunction(nextColumn?.rules) || _isFunction(nextColumn?.required) || _isFunction(nextColumn?.disabled) || _isFunction(nextColumn?.isEditable) || _isFunction(nextColumn?.valueType);
+  if (hasFunctionDependency && prevRecord === nextRecord) {
     return false;
   }
 

package/es/ProEditTable/utils/config.js

@@ -89,7 +89,9 @@ export const actions = {
       delete record._isEditing;
     }
     // 防止value引用不变, 值不更新 - (自定义组件)
-    const values = form.getFieldsValue();
+    // 必须取全量 store（true）：names 组合列只注册合并字段，拆分子字段（如 address/postcode）
+    // 未注册；getFieldsValue() 会丢掉它们，叠加 setFieldsValue 对数组「整体覆盖」会抹掉其他行的子字段
+    const values = form.getFieldsValue(true);
     _set(values, rowName, record);
     // 同步清理虚拟路径上的 _addFlag，避免再次编辑→取消时把已保存行误删
     _set(values, virtualRowName, record);
@@ -128,8 +130,9 @@ export const actions = {
       });
     } else {
       // 取消时使用主 form 原始行数据重置虚拟 form，避免编辑值残留
+      // 同 save：取全量 store（true），避免抹掉其他行未注册的 names 拆分子字段
       const originalRecord = form.getFieldValue(rowName);
-      const values = form.getFieldsValue();
+      const values = form.getFieldsValue(true);
       _set(values, virtualRowName, originalRecord ?? record);
       form.setFieldsValue(values);
     }

package/es/ProEditTable/utils/index.js

@@ -344,6 +344,9 @@ export const transformColumns = (columns = [], config, caches) => {
     // 精准控制单元格更新，减少不必要的渲染
     if (!item.shouldCellUpdate) {
       const hasComponent = _isFunction(item.component);
+      // 函数型动态属性会依赖整行数据（可能是当前列之外的兄弟字段），
+      // 这类列在行内任意字段变化时都需重渲染，不能只比对本列 dataIndex
+      const hasFunctionDependency = hasComponent || _isFunction(item.editRender) || _isFunction(item.fieldProps) || _isFunction(item.rules) || _isFunction(item.required) || _isFunction(item.disabled) || _isFunction(item.isEditable) || _isFunction(item.valueType);
       const columnCacheKey = `${Array.isArray(name) ? name.join('.') : String(name)}::${String(columnName)}`;
 
       // Fix 问题1：用原始列引用（克隆前）比对 dataSource
@@ -387,22 +390,24 @@ export const transformColumns = (columns = [], config, caches) => {
         if (virtualKey && record?._isEditing !== prevRecord?._isEditing) {
           return true;
         }
-        // 动态 component 可能依赖行内其他字段，需比较整行
+        // 动态 component 函数引用变化说明外部依赖（如异步 list）已更新，必须重渲染
+        // 即使行数据未变，旧闭包仍持有过时的外部状态
         if (hasComponent) {
-          // component 函数引用变化说明外部依赖（如异步 list）已更新，必须重渲染
-          // 即使行数据未变，旧闭包仍持有过时的外部状态
           const prevComponentRef = cellCaches.componentRef.get(columnCacheKey);
           const currentComponentRef = item.component;
           if (prevComponentRef !== currentComponentRef) {
             cellCaches.componentRef.set(columnCacheKey, currentComponentRef);
             return true;
           }
-          // 同引用时 isEqual 恒为 true，无法感知原地修改，必须重渲染
+        }
+        // 函数型动态属性（component/fieldProps/rules/required/disabled/isEditable/valueType）
+        // 可能依赖行内其他字段（兄弟字段），需比较整行；
+        // 同引用原地修改时 isEqual 恒为 true，无法感知，必须强制重渲染
+        if (hasFunctionDependency) {
           if (record === prevRecord) {
             return true;
           }
-          const rowChanged = !_isEqual(record, prevRecord);
-          return rowChanged;
+          return !_isEqual(record, prevRecord);
         }
         const key = item.dataIndex || item.key;
         if (!key) return true;

package/es/ProEditTable/utils/tools.js

@@ -114,15 +114,16 @@ export const onDelete = ({
   selectedRowKeys
 }) => {
   // 正常的form数据流处理
+  // 行可能为 undefined/null（单行编辑下虚拟数组多轮增删改后残留的空位），过滤时需先做空值守卫
   let dataSource = form.getFieldValue(name);
-  dataSource = dataSource.filter(row => !selectedRowKeys.includes(row.rowKey));
+  dataSource = dataSource.filter(row => row && !selectedRowKeys.includes(row.rowKey));
   form.setFieldValue(name, dataSource);
   // 单行模式数据流处理 重置中间正在编辑状态单行数据
   if (virtualKey) {
     const namePath = getNamePath(name, virtualKey);
     let virtualList = form.getFieldValue(namePath);
     if (virtualList?.length) {
-      virtualList = virtualList.filter(row => !selectedRowKeys.includes(row.rowKey));
+      virtualList = virtualList.filter(row => row && !selectedRowKeys.includes(row.rowKey));
       form.setFieldValue(namePath, virtualList);
     }
   }

package/es/ProEnum/index.js

@@ -16,7 +16,7 @@ import getEnumLabel from "./utils/getEnumLabel";
 import useEnum from "./hooks/useEnum";
 import getEnum from "./utils/getEnum";
 import locale from "../locale";
-import { useFieldProps } from "../ProForm/utils/useFieldProps";
+import { useFieldProps } from "../ProForm/hooks/useFieldProps";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 const ProEnum = props => {
   const {

package/es/ProForm/components/FormFooter/propsType.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="react" />
 import { ButtonProps, ColProps, FormInstance } from 'antd';
-import { ModifiedFormInstanceType } from '../../utils/useForm';
+import type { ModifiedFormInstanceType } from '../../propsType';
 export interface ButtonItem extends ButtonProps {
     children?: any;
 }

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

@@ -62,10 +62,11 @@ const DatePicker = props => {
     let viewChildren = null;
     if (!value) {
       viewChildren = null;
-    } else if (typeof format === 'string' && _isObject(value)) {
-      viewChildren = value.format?.(format) || value;
     } else if (_isFunction(format)) {
       viewChildren = format(value);
+    } else if (_isObject(value) && _isFunction(value.format)) {
+      // dayjs / dayjs-like 对象：format 字符串优先，否则用 viewFormat（valueType > picker default）
+      viewChildren = value.format(typeof format === 'string' ? format : viewFormat);
     } else if (_isString(value)) {
       viewChildren = dayjs(value).format(viewFormat);
     }

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -2,7 +2,7 @@ import _omit from "lodash/omit";
 import React from 'react';
 import { Form } from 'antd';
 import ConfirmWrapper from "../../../../components/render/ConfirmWrapper";
-import { FieldProvider } from "../../../../utils/useFieldProps";
+import { FieldProvider } from "../../../../hooks/useFieldProps";
 import * as componentMap from "../../../../../index";
 import AddonWrapper from "./AddonWrapper";
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";

package/es/ProForm/components/combination/Group/component/FlexibleGroup.js

@@ -3,7 +3,7 @@ import _isEmpty from "lodash/isEmpty";
 import React from 'react';
 import { Space, Form } from 'antd';
 import classnames from 'classnames';
-import { FieldProvider } from "../../../../utils/useFieldProps";
+import { FieldProvider } from "../../../../hooks/useFieldProps";
 import ProForm from "../../../../../ProForm";
 import Render from "../../../render/Render";
 import * as componentMap from "../../../../../index";
@@ -189,6 +189,8 @@ const FlexibleGroupRender = props => {
       namePath: childNamePath || contextProps.namePath,
       formDisabled: otherProps?.formDisabled,
       globalControl: otherProps?.globalControl,
+      diffConfig: otherProps?.diffConfig,
+      shouldUpdateDebounce: otherProps?.shouldUpdateDebounce,
       // 灵活模式样式属性
       flexibleGroupProps: {
         className: formItemClassName,
@@ -204,27 +206,18 @@ const FlexibleGroupRender = props => {
       value: renderOtherProps,
       children: /*#__PURE__*/_jsx(Render, {
         show: child.show,
-        form: form,
         disabled: child.disabled,
-        formDisabled: otherProps?.formDisabled,
-        type: type,
         originComponent: child.component,
         component: TargetComponent,
         formItemProps: formItemProps,
         confirm: child.confirm,
-        colProps: {
-          span: 24
-        },
         componentProps: adjustedFieldProps || {},
         otherProps: renderOtherProps,
         fieldProps: child.fieldProps,
         isSelect: false // 由 Render 内部计算
         ,
-        diffConfig: otherProps?.diffConfig,
         requiredOnView: otherProps?.requiredOnView,
-        globalControl: otherProps?.globalControl,
-        viewRender: child.viewRender,
-        shouldUpdateDebounce: otherProps?.shouldUpdateDebounce
+        viewRender: child.viewRender
       })
     }, child.name || `item-${index}`);
   };

package/es/ProForm/components/combination/Group/hooks/index.js

@@ -3,7 +3,7 @@ import _isEqual from "lodash/isEqual";
 import _cloneDeep from "lodash/cloneDeep";
 /* eslint-disable no-lonely-if */
 import { useRef, useEffect } from 'react';
-import { useDeepCompareMemo } from "../../../../utils/useDeepCompareMemo";
+import { useDeepCompareMemo } from "../../../../hooks/useDeepCompareMemo";
 import { difference } from "../../../../../ProEditTable/utils/tools";
 import { getReactiveProps, getValueTypeTrans, valueFromEventWrapper } from "../utils";
 /** 转换columns */
@@ -65,7 +65,6 @@ export const useTransformColumns = params => {
     };
 
     // 响应式字段
-    // eslint-disable-next-line react-hooks/rules-of-hooks
     const reactiveProps = useDeepCompareMemo(() => {
       return getReactiveProps({
         form,

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>;
-    prefixCls?: string;
-    htmlFor?: string;
-    className?: string;
-    hidden?: boolean;
-    id?: string;
-    style?: React.CSSProperties;
-    children?: React.ReactNode | ((form: FormInstance<any>) => React.ReactNode);
-    onReset?: () => void;
-    trim?: boolean;
-    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
-    vertical?: boolean;
-    isView?: boolean;
-    trigger?: string;
     toISOString?: boolean;
     toCSTString?: boolean;
     switchValue?: [any, any];
     clearNotShow?: boolean;
-    validateTrigger?: string | false | string[];
-    rootClassName?: string;
-    status?: "" | "warning" | "error" | "success" | "validating";
-    valueType?: import("../../../render/propsType").ProFormValueType;
+    trim?: boolean;
+    upperCase?: boolean;
+    normalize?: (value: any, prevValue: any, allValues: import("@rc-component/form/lib/interface").Store) => any;
     getValueProps?: ((value: any) => Record<string, unknown>) & ((value: any) => Record<string, unknown>);
     shouldUpdate?: import("@rc-component/form/lib/Field").ShouldUpdate<any>;
     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;
+    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?: "" | "warning" | "error" | "success" | "validating";
+    validateStatus?: "" | "success" | "warning" | "error" | "validating";
+    hidden?: boolean;
     layout?: import("antd/es/form/Form").FormItemLayout;
     wrapperCol?: import("antd").ColProps;
+    status?: "" | "success" | "warning" | "error" | "validating";
     help?: React.ReactNode;
     fieldId?: string;
-    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
+    valueType?: import("../../../render/propsType").ProFormValueType;
+    isView?: boolean;
     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;
+    desensitization?: [number, number] | ReactiveFunction<any, [number, number]>;
     name: any;
     dependencies: any[];
     tooltip: string | {