@zat-design/sisyphus-react 3.9.4 → 3.9.5-beta.2

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

@@ -71,7 +71,7 @@ var Group = function Group(props) {
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: columns.map(function (column, index) {
         column.otherProps = otherProps;
-        // 自定义间隔移除对于参数
+        // 自定义间隔移除对应参数
         if (column === null || column === void 0 ? void 0 : column.separator) {
           delete column.separator;
           delete column.otherProps;

package/es/ProForm/components/combination/Group/utils.js

@@ -329,7 +329,7 @@ export var useTransformColumns = function useTransformColumns(params) {
     }, reactiveProps), {}, {
       disabled: getLastDisabled(),
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+      fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
         onChange: handleChange,
         onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]

package/es/ProForm/index.js

@@ -2,13 +2,13 @@ import "antd/es/row/style";
 import _Row from "antd/es/row";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
+import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/col/style";
 import _Col from "antd/es/col";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
@@ -19,14 +19,15 @@ import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { isObject, merge, omit } from 'lodash';
 import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
-import { useProConfig, useContextForms } from '../ProConfigProvider';
+import { useProConfig } from '../ProConfigProvider';
 import { getLayout, splitNameStr, useControlled, initialValuesToNames, filterInternalFields } from './utils/index';
 import { useForm } from './utils/useForm';
 import { useFieldProps } from './utils/useFieldProps';
 import locale from '../locale';
 import useWatch from './utils/useWatch';
+import { useContextForms, useForms } from '../ProConfigProvider/FormsContext';
 var ProForm = function ProForm(props, ref) {
-  var _forms$formKey, _localStorage, _ref;
+  var _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -69,17 +70,15 @@ var ProForm = function ProForm(props, ref) {
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
     otherProps = _objectWithoutProperties(props, _excluded);
-  var _useProConfig = useProConfig(),
-    state = _useProConfig.state,
-    dispatch = _useProConfig.dispatch;
-  var config = state.ProForm,
-    forms = state.forms;
-  var _useForm = useForm((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
+  var config = useProConfig('ProForm');
+  var _useForm = useForm(originForm, {
       scrollToError: scrollToError,
-      optimize: optimize
+      optimize: optimize,
+      formKey: formKey
     }),
     _useForm2 = _slicedToArray(_useForm, 1),
     form = _useForm2[0];
+  // const form = useForms(formKey, originForm, { scrollToError, optimize, formKey });
   var _useControlled = useControlled({
       value: expandOpen,
       onChange: expandOpenChange
@@ -88,32 +87,22 @@ var ProForm = function ProForm(props, ref) {
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
   // 把表单实例存入表单组
-  useMemo(function () {
-    if (formKey && forms[formKey] !== form) {
-      forms[formKey] = form;
-      // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
-      setTimeout(function () {
-        dispatch({
-          type: 'set',
-          payload: {
-            forms: _objectSpread({}, forms)
-          }
-        });
-      }, 300);
-    }
-    // 销毁
-    return function () {
-      if (formKey && forms[formKey]) {
-        delete forms[formKey];
-        dispatch({
-          type: 'set',
-          payload: {
-            forms: _objectSpread({}, forms)
-          }
-        });
-      }
-    };
-  }, [formKey, form]);
+  // useMemo(() => {
+  //   if (formKey && forms[formKey] !== form) {
+  //     forms[formKey] = form;
+  //     // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
+  //     setTimeout(() => {
+  //       dispatch({ type: 'set', payload: { forms: { ...forms } } });
+  //     }, 300);
+  //   }
+  //   // 销毁
+  //   return () => {
+  //     if (formKey && forms[formKey]) {
+  //       delete forms[formKey];
+  //       dispatch({ type: 'set', payload: { forms: { ...forms } } });
+  //     }
+  //   };
+  // }, [formKey, form]);
   var _getLayout = getLayout({
       span: span,
       form: form
@@ -310,6 +299,7 @@ export var ProFormProvider = function ProFormProvider(props) {
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = useFieldProps; // 获取每个字段的其他参数  -otherProps
+ProFormForward.useForms = useForms; // 获取上下文中的指定表单实例 如果不存在则会创建
 ProFormForward.useContextForms = useContextForms; // 获取 ProConfigProvider中的表单实例map
 // 内置组合
 ProFormForward.ProCascader = ProCascader;

package/es/ProForm/style/index.less

@@ -341,6 +341,10 @@
       background: @zaui-contract-bg !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -419,6 +423,10 @@
       background: @zaui-contract-bg-add !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg-add;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,

package/es/ProForm/utils/diffOriginal.js

@@ -36,14 +36,17 @@ export var diffOriginal = function diffOriginal(params) {
     return 'add';
   }
   if (Array.isArray(_originalValue)) {
-    var isSame = _originalValue.every(function (valueItem, index) {
-      // 如果两个值有一个不是空值, 则进行深比较
-      if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
-        return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
-      }
-      return true;
-    });
-    return isSame ? 'same' : 'changed';
+    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
+      var isSame = _originalValue.every(function (valueItem, index) {
+        // 如果两个值有一个不是空值, 则进行深比较
+        if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
+          return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
+        }
+        return true;
+      });
+      return isSame ? 'same' : 'changed';
+    }
+    return 'changed';
   }
   if (!isEmpty(_originalValue) || !isEmpty(_value)) {
     return isEqual(_value, _originalValue) ? 'same' : 'changed';

package/es/ProForm/utils/useForm.d.ts

@@ -1,15 +1,16 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/es/form/interface';
 import { ValuedNotifyInfo } from 'rc-field-form/es/interface';
-type ModifiedFormInstance<T> = FormInstance<T> & {
+export type ModifiedFormInstance<T> = FormInstance<T> & {
     isModified?: boolean;
     /** 默认清空设置值的报错状态 */
     setFieldValue: (name: NamePath, value: any, info?: ValuedNotifyInfo) => void;
+    formKey?: string;
     _init?: boolean;
 };
-interface FormInstanceOption {
+export interface FormInstanceOption {
     scrollToError?: boolean;
     optimize?: boolean;
+    formKey?: string;
 }
 export declare const useForm: <T>(originForm?: FormInstanceOption | ModifiedFormInstance<T>, options?: FormInstanceOption) => [ModifiedFormInstance<T>];
-export {};

package/es/ProForm/utils/useForm.js

@@ -5,8 +5,10 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+import { useContext } from 'react';
 import { filterInternalFields } from './index';
 import { handleScrollToError } from '../../ProEditTable/utils/tools';
+import { FormsContext } from '../../ProConfigProvider/FormsContext';
 export var useForm = function useForm(originForm, options) {
   // 如果没有form实例可以直接把options放在第一个参数位置
   // @ts-ignore
@@ -17,10 +19,17 @@ export var useForm = function useForm(originForm, options) {
   var _ref = _options || {},
     _ref$scrollToError = _ref.scrollToError,
     scrollToError = _ref$scrollToError === void 0 ? true : _ref$scrollToError,
-    optimize = _ref.optimize;
-  var _Form$useForm = _Form.useForm(_originForm),
+    optimize = _ref.optimize,
+    formKey = _ref.formKey;
+  // formKey全局共享逻辑
+  var forms = useContext(FormsContext);
+  var _Form$useForm = _Form.useForm(forms[formKey] || _originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
+  if (formKey && forms[formKey] !== form) {
+    forms[formKey] = form;
+    form.formKey = formKey;
+  }
   var getFieldsValue = form.getFieldsValue,
     validateFields = form.validateFields,
     isModified = form.isModified,

package/es/ProTable/components/FormatColumn/index.js

@@ -139,7 +139,7 @@ export var formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if (isBoolean(diffResult)) {
+        if (isBoolean(diffResult) && !diffResult) {
           otherProps.isChanged = false;
         }
         originalValue = diffResult;

package/es/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -106,7 +106,7 @@ var DndWrapper = function DndWrapper(_ref2) {
   }();
   var onDragEnd = /*#__PURE__*/function () {
     var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2(_ref5) {
-      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
+      var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -114,7 +114,7 @@ var DndWrapper = function DndWrapper(_ref2) {
             // 为数据源划分层级及parentId
             transformedValue = addLevelAndParentId(value, rowKey); // 同一level层级的且parentId相同的，可以互相之间拖拽替换
             if (!(active.id !== (over === null || over === void 0 ? void 0 : over.id))) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeObject = treeNodeFind(transformedValue, function (t) {
@@ -124,47 +124,51 @@ var DndWrapper = function DndWrapper(_ref2) {
               return t.rowKey === (over === null || over === void 0 ? void 0 : over.id);
             });
             if (!(activeObject && overObject)) {
-              _context2.next = 15;
+              _context2.next = 20;
               break;
             }
             activeLevel = activeObject.level, activeParentId = activeObject.parentId;
-            overLevel = overObject.level, overParentId = overObject.parentId; // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
+            overLevel = overObject.level, overParentId = overObject.parentId;
+            nextDataSource = value;
+            if (!(activeLevel === overLevel && activeParentId === overParentId)) {
+              _context2.next = 20;
+              break;
+            }
+            // 将树平铺
+            _flatTree = transformTreeToArray(transformedValue).map(function (item) {
+              return _objectSpread(_objectSpread({}, item), {}, {
+                children: undefined
+              });
+            });
+            activeIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === active.id;
+            });
+            overIndex = _flatTree.findIndex(function (i) {
+              return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
+            });
+            nextValue = arrayMove(_flatTree, activeIndex, overIndex);
+            nextDataSource = createTreeFromArray(nextValue, {
+              itemKey: 'rowKey',
+              parentKey: 'parentId',
+              childrenKey: 'children'
+            });
+            // 如果传了onDragEndGuard 则视为外部业务逻辑自处理
             if (!(onDragEndGuard && isFunction(onDragEndGuard))) {
-              _context2.next = 14;
+              _context2.next = 19;
               break;
             }
-            _context2.next = 11;
+            _context2.next = 18;
             return onDragEndGuard({
               activeObject: activeObject,
               overObject: overObject,
-              currentDataSource: value
+              originDataSource: value,
+              currentDataSource: nextDataSource
             });
-          case 11:
+          case 18:
             nextDataSource = _context2.sent;
-            onChange(nextDataSource !== null && nextDataSource !== void 0 ? nextDataSource : []);
-            return _context2.abrupt("return");
-          case 14:
-            if (activeLevel === overLevel && activeParentId === overParentId) {
-              // 将树平铺
-              _flatTree = transformTreeToArray(transformedValue).map(function (item) {
-                return _objectSpread(_objectSpread({}, item), {}, {
-                  children: undefined
-                });
-              });
-              activeIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === active.id;
-              });
-              overIndex = _flatTree.findIndex(function (i) {
-                return i.rowKey === (over === null || over === void 0 ? void 0 : over.id);
-              });
-              nextValue = arrayMove(_flatTree, activeIndex, overIndex);
-              onChange(createTreeFromArray(nextValue, {
-                itemKey: 'rowKey',
-                parentKey: 'parentId',
-                childrenKey: 'children'
-              }));
-            }
-          case 15:
+          case 19:
+            onChange((_nextDataSource = nextDataSource) !== null && _nextDataSource !== void 0 ? _nextDataSource : []);
+          case 20:
           case "end":
             return _context2.stop();
         }

package/es/ProTable/index.js

@@ -187,6 +187,26 @@ var ProTable = function ProTable(props) {
       return 'new-cell';
     }
   };
+  var _formatColumns = function formatColumns(nextColumns) {
+    nextColumns === null || nextColumns === void 0 ? void 0 : nextColumns.forEach(function (item, index) {
+      formatColumn({
+        column: item,
+        originalObj: originalObj,
+        rowKey: props.rowKey,
+        diffConfig: diffConfig,
+        wrapToolTipProps: wrapToolTipProps,
+        scroll: _scroll,
+        onUpdateMinWidth: function onUpdateMinWidth(w) {
+          curColumns[index].minWidth = w;
+        },
+        isInNewRow: _rowClassName
+      });
+      if (item.children && Array.isArray(item.children)) {
+        _formatColumns(item.children);
+      }
+    });
+    return nextColumns;
+  };
   var columns = useMemo(function () {
     var newColumns = curColumns.map(function (item, index) {
       var _propsColumnObj$getCo2;
@@ -208,21 +228,8 @@ var ProTable = function ProTable(props) {
     }).filter(function (item) {
       return !(item === null || item === void 0 ? void 0 : item.delete);
     });
-    newColumns === null || newColumns === void 0 ? void 0 : newColumns.forEach(function (item, index) {
-      formatColumn({
-        column: item,
-        originalObj: originalObj,
-        rowKey: props.rowKey,
-        diffConfig: diffConfig,
-        wrapToolTipProps: wrapToolTipProps,
-        scroll: _scroll,
-        onUpdateMinWidth: function onUpdateMinWidth(w) {
-          curColumns[index].minWidth = w;
-        },
-        isInNewRow: _rowClassName
-      });
-    });
-    return newColumns;
+    var nextColumns = _formatColumns(newColumns);
+    return nextColumns;
   }, [curColumns, handleResize, _scroll, originalDataSource, originalObj, _rowClassName]);
   var _columns = useMemo(function () {
     return columns === null || columns === void 0 ? void 0 : columns.filter(function (item, index) {

package/es/ProTable/propsType.d.ts

@@ -19,7 +19,7 @@ export interface ProTableSummaryProps {
     fixed?: boolean;
 }
 export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
-    dataIndex: string | string[];
+    dataIndex?: string | string[];
     width?: number | string;
     minWidth?: number;
     valueType?: ProTableValueType;
@@ -43,8 +43,9 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     /** 自定义比对函数, 触发条件必须写render */
     onDiff?: ({ value, record, index, originalValue, originalRecord }: any) => any;
     /** 自定义提示render, 触发条件必须写render */
-    viewRender?: ({ value, record, index, originalValue, originalRecord }: any) => 'same' | 'changed' | 'add' | undefined;
+    viewRender?: ({ value, record, index, originalValue, originalRecord, }: any) => 'same' | 'changed' | 'add' | undefined;
     isChanged?: boolean | null;
+    children?: ProTableColumn[];
 }
 export interface CreateTreeFromArrayOptions {
     itemKey?: string;

package/es/style/theme/antd.less

@@ -753,6 +753,9 @@
 }
 
 .@{ant-prefix}-picker.@{ant-prefix}-picker-disabled  {
-  background: var(--zaui-disabled-bg);
+  background: var(--zaui-disabled-bg) !important;
 }
 
+.@{ant-prefix}-input-affix-wrapper-disabled {
+  background: var(--zaui-disabled-bg) !important;
+}

package/lib/ProConfigProvider/FormsContext.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import { ModifiedFormInstance } from '../ProForm/utils/useForm';
+type Forms = Record<string, ModifiedFormInstance<any>>;
+export declare const FormsContext: React.Context<Forms>;
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+export declare const useForms: () => Forms;
+/** 获取所有表单实例 */
+export declare const useContextForms: () => Forms;
+declare const FormsProvider: React.FC;
+export default FormsProvider;

package/lib/ProConfigProvider/FormsContext.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useForms = exports.useContextForms = exports.default = exports.FormsContext = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = _interopRequireWildcard(require("react"));
+var FormsContext = exports.FormsContext = /*#__PURE__*/_react.default.createContext({});
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+var useForms = exports.useForms = function useForms() {
+  var forms = (0, _react.useContext)(FormsContext);
+  return forms;
+};
+/** 获取所有表单实例 */
+var useContextForms = exports.useContextForms = function useContextForms() {
+  var forms = (0, _react.useContext)(FormsContext);
+  return forms;
+};
+var FormsProvider = function FormsProvider(props) {
+  var formsRef = (0, _react.useRef)({});
+  (0, _react.useEffect)(function () {
+    // 销毁
+    return function () {
+      formsRef.current = {};
+    };
+  }, []);
+  return (0, _jsxRuntime.jsx)(FormsContext.Provider, {
+    value: formsRef.current,
+    children: props.children
+  });
+};
+var _default = exports.default = FormsProvider;

package/lib/ProConfigProvider/index.d.ts

@@ -20,7 +20,6 @@ interface ConfigContext {
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-export declare function useContextForms(): Record<string, FormInstance<any>>;
 type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic' | 'setWithLocal';
 interface Actions {
     type: ActionsType;

package/lib/ProConfigProvider/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
-exports.useContextForms = useContextForms;
 exports.useProConfig = useProConfig;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -18,6 +17,7 @@ var _en_US = _interopRequireDefault(require("antd/es/locale/en_US"));
 var _merge = _interopRequireDefault(require("lodash/merge"));
 var _useEnumRequest = _interopRequireDefault(require("../ProEnum/hooks/useEnumRequest"));
 var _locale = require("../locale");
+var _FormsContext = _interopRequireDefault(require("./FormsContext"));
 var initialState = {
   ProEnum: {
     dics: {}
@@ -44,11 +44,6 @@ function useProConfig(name) {
   var config = (0, _react.useContext)(ProConfigContext);
   return name ? config.state[name] : config;
 }
-function useContextForms() {
-  var _config$state;
-  var config = (0, _react.useContext)(ProConfigContext);
-  return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;
-}
 var antdLangMap = {
   'zh-CN': _zh_CN.default,
   'en-US': _en_US.default // en-US
@@ -114,8 +109,10 @@ var ProConfigProvider = exports.ProConfigProvider = function ProConfigProvider(p
     },
     children: (0, _jsxRuntime.jsx)(_antd.ConfigProvider, {
       locale: antdLangMap[lang],
-      children: (0, _jsxRuntime.jsx)("div", {
-        children: props.children
+      children: (0, _jsxRuntime.jsx)(_FormsContext.default, {
+        children: (0, _jsxRuntime.jsx)("div", {
+          children: props.children
+        })
       })
     })
   });

package/lib/ProEditTable/components/RenderField/ListChangedWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
-import { DiffOriginalParams } from '../../../ProForm/utils/diffOriginal';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 interface Props {
     name?: NamePath;
     names?: NamePath[];

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

@@ -14,7 +14,7 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
-var _diffOriginal = require("../../../ProForm/utils/diffOriginal");
+var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
@@ -39,7 +39,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   if (!originalValues) {
     return undefined;
   }
-  var originalValueRow;
+  var originRecord;
   if (rowKeyPath) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
@@ -48,13 +48,13 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = (0, _lodash.get)(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
+    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
     if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
       var originalNamesValue = originalNames.map(function (originalName) {
-        return (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+        return (0, _lodash.get)(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
       // 有可能出现数组中全是undefined的情况  视为没有值
       var fillUndefined = originalNamesValue.every(function (valItem) {
@@ -62,11 +62,12 @@ var getOriginalValue = function getOriginalValue(_ref) {
       });
       originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
-      originalValue = (0, _lodash.get)(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      originalValue = (0, _lodash.get)(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
       originalValue: originalValue,
-      originalValueRow: originalValueRow
+      originRecord: originRecord,
+      record: rowValue
     };
   }
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
@@ -74,7 +75,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
       return (0, _lodash.get)(originalValues, originalName);
     }) : (0, _lodash.get)(originalValues, originalName),
-    originalValueRow: originalValueRow
+    originRecord: originRecord
   };
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
@@ -135,8 +136,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith
-      // name: isString(namesStr) ? namesStr : originalName || name,
+      equalWith: equalWith,
+      originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
+      record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
+      index: index
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -149,7 +152,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     var _children = children;
     if (viewRender) {
       if (! /*#__PURE__*/_react.default.isValidElement(viewRender)) {
-        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValueRow) || {}, {
+        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord) || {}, {
           form: form,
           name: name,
           index: index