@zat-design/sisyphus-react 3.8.2 → 3.8.3-beta.10

package/es/ProForm/components/combination/FormList/components/BlockFields.js

@@ -31,7 +31,8 @@ var BlockFields = function BlockFields(props) {
     _props$level = props.level,
     level = _props$level === void 0 ? '2' : _props$level,
     towCollapse = props.towCollapse,
-    id = props.id;
+    id = props.id,
+    diffConfig = props.diffConfig;
   var _title = useMemo(function () {
     if (isFunction(title)) {
       var record = form.getFieldValue(namePath);
@@ -73,7 +74,8 @@ var BlockFields = function BlockFields(props) {
           form: form,
           colProps: colProps,
           disabled: disabled,
-          isView: isView
+          isView: isView,
+          diffConfig: diffConfig
         })
       }, field.key)
     })

package/es/ProForm/components/combination/FormList/components/LineFields.d.ts

@@ -2,6 +2,7 @@ import { ColProps, FormListFieldData } from 'antd';
 import React from 'react';
 import { InternalNamePath } from 'antd/es/form/interface';
 import { FormListProps } from '../propsType';
+import { DiffConfigProps } from '../../../../propsType';
 interface Props extends Omit<FormListProps, 'toolbarProps'> {
     className?: string;
     index: number;
@@ -12,6 +13,7 @@ interface Props extends Omit<FormListProps, 'toolbarProps'> {
     field: Omit<FormListFieldData, 'key'> & {
         key: string;
     };
+    diffConfig?: DiffConfigProps;
 }
 declare const LineFields: React.FC<Props>;
 export default LineFields;

package/es/ProForm/components/combination/FormList/components/LineFields.js

@@ -29,7 +29,8 @@ var LineFields = function LineFields(props) {
     isView = props.isView,
     draggable = props.draggable,
     className = props.className,
-    id = props.id;
+    id = props.id,
+    diffConfig = props.diffConfig;
   var isLess = mode === 'less';
   var _useSortable = useSortable({
       id: field.key,
@@ -70,7 +71,8 @@ var LineFields = function LineFields(props) {
         form: form,
         colProps: colProps,
         disabled: disabled,
-        isView: isView
+        isView: isView,
+        diffConfig: diffConfig
       })
     }), actionProps !== false && _jsx(ActionButton, {
       min: min,

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

@@ -5,6 +5,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { forwardRef, useCallback, useImperativeHandle } from 'react';
 import { DndContext } from '@dnd-kit/core';
+import { get } from 'lodash';
 import { SortableContext, verticalListSortingStrategy } from '@dnd-kit/sortable';
 import { toArray } from '../../../utils';
 import { namesPathTransform } from './utils';
@@ -12,6 +13,7 @@ import ToolbarButton from './components/ToolbarButton';
 import BlockFields from './components/BlockFields';
 import LineFields from './components/LineFields';
 import ProForm from '../../../../ProForm';
+import { useProConfig } from '../../../../ProConfigProvider';
 var FormList = function FormList(props, ref) {
   var columns = props.columns,
     min = props.min,
@@ -33,9 +35,16 @@ var FormList = function FormList(props, ref) {
   var _ref = ProForm.useFieldProps() || {},
     form = _ref.form,
     name = _ref.name,
-    isView = _ref.isView;
+    isView = _ref.isView,
+    diffConfig = _ref.diffConfig;
+  var _useProConfig = useProConfig('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
   var errors = meta.errors;
   var _namePath = toArray(name);
+  var orgValues = get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
+  var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
+    originalValues: isDiffAll ? orgValues || [] : orgValues
+  });
   var processColumns = useCallback(function (fieldName, namePath) {
     return columns.map(function (item) {
       // names的name处理
@@ -98,7 +107,8 @@ var FormList = function FormList(props, ref) {
           colProps: {
             span: span
           },
-          form: form
+          form: form,
+          diffConfig: _diffConfig
         }), field.key) : _jsx(LineFields, _objectSpread(_objectSpread({
           className: _fields.length === index + 1 ? 'pro-form-list-last' : ''
         }, props), {}, {
@@ -112,7 +122,8 @@ var FormList = function FormList(props, ref) {
           colProps: {
             span: mode === 'less' ? 24 : span
           },
-          form: form
+          form: form,
+          diffConfig: _diffConfig
         }), field.key);
       }), _jsx(_Form.ErrorList, {
         errors: errors

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -14,6 +14,7 @@ interface Props {
     name?: NamePath;
     valueType: string;
     valuePropName?: string;
+    isView?: boolean;
     getValueProps?: (value: any) => Record<string, unknown>;
 }
 /** 渲染组件 */

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

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
@@ -41,6 +41,7 @@ var ComRender = function ComRender(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     valueType = props.valueType,
+    isView = props.isView,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -53,7 +54,8 @@ var ComRender = function ComRender(props) {
   return _jsx(FieldProvider, {
     value: _objectSpread(_objectSpread({}, contextProps), {}, {
       valueType: valueType,
-      type: type
+      type: type,
+      isView: isView
     }),
     children: Com
   });

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

@@ -27,7 +27,8 @@ var Group = function Group(props) {
     onChange = props.onChange,
     otherProps = props.otherProps,
     disabled = props.disabled,
-    id = props.id;
+    id = props.id,
+    isView = props.isView;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -70,7 +71,8 @@ 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) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
-          contextProps: contextProps
+          contextProps: contextProps,
+          isView: isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -80,7 +82,8 @@ var Group = function Group(props) {
     }, omit(space, ['separator', 'compact'])), {}, {
       children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
-          contextProps: contextProps
+          contextProps: contextProps,
+          isView: isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);

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

@@ -50,7 +50,7 @@ var getViewLabel = function getViewLabel(_ref) {
   return viewLabel;
 };
 var ProCascader = function ProCascader(props) {
-  var _props$otherProps, _value$slice, _ref7, _ref7$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
+  var _props$otherProps, _value$slice, _ref5, _ref5$filter, _defaultLabel$filter, _locale$ProAddressBar, _locale$ProAddressBar2;
   var _ref2 = useProConfig('ProAddressBar') || {},
     configDetailMaxLength = _ref2.detailMaxLength,
     configEnumCode = _ref2.enumCode,
@@ -90,16 +90,18 @@ var ProCascader = function ProCascader(props) {
   var realLevel = Math.max(2, level);
   var detail = value === null || value === void 0 ? void 0 : value[realLevel];
   var enumData = useEnum(addressCode);
-  var _ref4 = Array.isArray(enumData) ? enumData : [],
-    _ref5 = _slicedToArray(_ref4, 1),
-    _ref5$ = _ref5[0],
-    enumDataSource = _ref5$ === void 0 ? [] : _ref5$;
+  var _useProConfig = useProConfig('ProEnum'),
+    _useProConfig$dics = _useProConfig.dics,
+    dics = _useProConfig$dics === void 0 ? {} : _useProConfig$dics;
+  var enumDataSource = useMemo(function () {
+    if (!(props === null || props === void 0 ? void 0 : props.mode)) {
+      return (dics === null || dics === void 0 ? void 0 : dics[addressCode]) || [];
+    }
+    return Array.isArray(enumData) ? enumData[0] : [];
+  }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = useMemo(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
     var result = transformDataName(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
-    if (transformResponse) {
-      return transformResponse(result);
-    }
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = _objectSpread({}, useRequest),
@@ -115,7 +117,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -143,9 +145,13 @@ var ProCascader = function ProCascader(props) {
       }, _callee);
     }));
     return function getFirstLevelOptions() {
-      return _ref6.apply(this, arguments);
+      return _ref4.apply(this, arguments);
     };
   }();
+  // 提取出来默认每次都执行
+  if (transformResponse) {
+    realDataSource = transformResponse(realDataSource);
+  }
   useEffect(function () {
     if (service) {
       // 传入useRequest时，初次加载级联第一级数据源
@@ -154,13 +160,14 @@ var ProCascader = function ProCascader(props) {
   }, [service]);
   useEffect(function () {
     if (realIsView && value) {
+      var _realDataSource;
       // 传入dataSource + 查看时初始化展示
       if (service) {
         setDefaultLabel(getViewLabel({
           dataSource: serviceData,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
         }));
-      } else if ((realDataSource === null || realDataSource === void 0 ? void 0 : realDataSource.length) > 0) {
+      } else if (((_realDataSource = realDataSource) === null || _realDataSource === void 0 ? void 0 : _realDataSource.length) > 0) {
         setDefaultLabel(getViewLabel({
           dataSource: realDataSource,
           value: isAddressMode && hasDetail ? value === null || value === void 0 ? void 0 : value.slice(0, realLevel) : value
@@ -194,9 +201,9 @@ var ProCascader = function ProCascader(props) {
   var addressValue = isAddressMode ? value && ((_value$slice = value.slice(0, realLevel)) === null || _value$slice === void 0 ? void 0 : _value$slice.some(function (item) {
     return !!item;
   })) ? value.slice(0, realLevel) : undefined : value;
-  var viewValue = isAddressMode ? ((_ref7 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref7 === void 0 ? void 0 : (_ref7$filter = _ref7.filter(function (item) {
+  var viewValue = isAddressMode ? ((_ref5 = [].concat(_toConsumableArray(defaultLabel), [value === null || value === void 0 ? void 0 : value[realLevel]])) === null || _ref5 === void 0 ? void 0 : (_ref5$filter = _ref5.filter(function (item) {
     return !!item;
-  })) === null || _ref7$filter === void 0 ? void 0 : _ref7$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
+  })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
   var _findSelectedOptions = function findSelectedOptions(options, value) {

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

@@ -195,11 +195,25 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         value: item[valueKey],
         label: item[labelKey]
       }));
-    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : undefined;
+    })) === null || _data$map === void 0 ? void 0 : _data$map.join('，') : '';
   };
   var viewText = useMemo(function () {
-    return formatValue(labelInValue ? value : _value);
-  }, [value, _value]);
+    var nextValue = labelInValue ? value : _value;
+    if (labelInValue) {
+      nextValue = value;
+    } else {
+      var _options$find;
+      var optionDTO = options === null || options === void 0 ? void 0 : (_options$find = options.find) === null || _options$find === void 0 ? void 0 : _options$find.call(options, function (item) {
+        return item[valueKey] === value;
+      });
+      if (optionDTO) {
+        nextValue = optionDTO;
+      } else {
+        nextValue = _value;
+      }
+    }
+    return formatValue(nextValue);
+  }, [value, _value, options]);
   /**
    * 获取表格的rowKey，支持函数、字符串
    * @date 2023-02-16

package/es/ProForm/components/render/ChangedWrapper.js

@@ -5,7 +5,7 @@ import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import classNames from 'classnames';
 import { get } from 'lodash';
@@ -26,6 +26,8 @@ var ChangedWrapper = function ChangedWrapper(props) {
     _props$valuePropName = props.valuePropName,
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     normalize = props.normalize,
+    getValueProps = props.getValueProps,
+    viewRender = props.viewRender,
     rest = _objectWithoutProperties(props, _excluded);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
@@ -51,11 +53,23 @@ var ChangedWrapper = function ChangedWrapper(props) {
   }, [isWatch, noChange, props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
   var isChanged = diffType === 'changed';
+  var viewRenderFun = useMemo(function () {
+    var record = form.getFieldsValue();
+    return function (orgValue) {
+      return viewRender(orgValue, record, {
+        form: form
+      });
+    };
+  }, [form]);
   var tipContent = useMemo(function () {
     if (!isWatch || noChange) return undefined;
+    var valueProps = getValueProps && !names ? getValueProps(originalValue) : {
+      value: originalValue
+    };
+    if (viewRender) return viewRenderFun(valueProps === null || valueProps === void 0 ? void 0 : valueProps.value);
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
       isView: true
-    }, valuePropName, originalValue))) : undefined;
+    }, valuePropName, valueProps === null || valueProps === void 0 ? void 0 : valueProps.value))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
     // 嵌套子组件
@@ -87,9 +101,13 @@ var ChangedWrapper = function ChangedWrapper(props) {
     },
     title: _jsxs(_Space, {
       direction: "vertical",
+      className: "changed-tooltip",
       children: [_jsxs(_Space, {
+        align: "start",
+        className: "original-value-container",
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && _jsxs(_Space, {
+        className: "current-value-container",
         children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
           isView: true
         })) : undefined]

package/es/ProForm/components/render/Render.js

@@ -50,7 +50,8 @@ var Render = function Render(props) {
     requiredOnView = props.requiredOnView,
     confirm = props.confirm,
     globalControl = props.globalControl,
-    diffConfig = props.diffConfig;
+    diffConfig = props.diffConfig,
+    viewRender = props.viewRender;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -155,7 +156,7 @@ var Render = function Render(props) {
     };
   }
   /** 移除多余参数，防止透传给formItem报错 */
-  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow']);
+  var _otherFormItemProps = omit(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
   /**
    * globalControl 全局控制优先
    * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
@@ -426,7 +427,7 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (diffConfig) {
+    if (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) {
       child = _jsx(ChangedWrapper, {
         name: formItemProps.name,
         names: otherProps.names,
@@ -438,6 +439,8 @@ var Render = function Render(props) {
         onChange: handleChange,
         valuePropName: _otherFormItemProps.valuePropName,
         normalize: _otherFormItemProps.normalize,
+        getValueProps: _otherFormItemProps.getValueProps,
+        viewRender: viewRender,
         children: child
       });
     }

package/es/ProForm/components/render/RenderFields.js

@@ -186,7 +186,8 @@ var RenderFields = function RenderFields(props) {
       namePath: column.namePath,
       listName: column.listName,
       globalControl: globalControl,
-      formDisabled: formDisabled
+      formDisabled: formDisabled,
+      diffConfig: diffConfig
     };
     return _jsx(FieldProvider, {
       value: otherProps,
@@ -209,7 +210,8 @@ var RenderFields = function RenderFields(props) {
         diffConfig: diffConfig,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        globalControl: globalControl
+        globalControl: globalControl,
+        viewRender: viewRender
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));
   });

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

@@ -182,6 +182,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     }) => React.ReactElement<any, any> | string | undefined | null;
     viewType?: ViewType;
     colProps?: ColProps;
+    /** 依赖刷新字段列表 */
+    dependNames?: NamePath[];
     /**
      * @description       表单item的props属性
      * @deprecated        将于下个版本 4.0.0 被弃用
@@ -190,6 +192,8 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     formItemProps?: FormItemProps<Values> & {
         index?: number;
         namePath?: NamePath;
+        /** 依赖刷新字段列表 */
+        dependNames?: NamePath[];
     };
     /**
      * @description       表单props属性

package/es/ProForm/propsType.d.ts

@@ -45,6 +45,7 @@ export interface ProFormOtherProps {
     globalControl?: boolean;
     formDisabled?: boolean;
     isDiffChange?: boolean;
+    diffConfig?: DiffConfigProps;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */

package/es/ProForm/style/index.less

@@ -329,6 +329,9 @@
     border-radius: 4px;
     background: @zaui-contract-bg !important;
 
+    .@{ant-prefix}-input {
+      background: @zaui-contract-bg !important;
+    }
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
       background: @zaui-contract-bg !important;
     }
@@ -387,7 +390,7 @@
     
     // textArea
     .@{ant-prefix}-input-textarea > textarea  {
-      background: @zaui-contract-bg;
+      background: @zaui-contract-bg !important;
     }
 
     .pro-form-view-container {
@@ -403,6 +406,10 @@
     border-radius: 4px;
     background: @zaui-contract-bg-add !important;
 
+    .@{ant-prefix}-input {
+      background: @zaui-contract-bg !important;
+    }
+    
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
       background: @zaui-contract-bg-add !important;
     }
@@ -461,7 +468,7 @@
     
     // textArea
     .@{ant-prefix}-input-textarea > textarea {
-      background: @zaui-contract-bg-add;
+      background: @zaui-contract-bg-add !important;
     }
 
 
@@ -472,3 +479,16 @@
     }
   }
 }
+
+.changed-tooltip {
+  .original-value-container {
+    .ant-space-item:nth-child(1) {
+      white-space: nowrap;
+    }
+  }
+  .current-value-container {
+    .ant-space-item:nth-child(1) {
+      white-space: nowrap;
+    }
+  }
+}

package/es/ProForm/utils/diffOriginal.js

@@ -1,5 +1,17 @@
-import { isEqual, isFunction } from 'lodash';
+import { isEqual, isFunction, isObject } from 'lodash';
 import { isEmpty } from '../../utils';
+// 过滤对象中undefined字段
+// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
+var filterUndefined = function filterUndefined(data) {
+  if (!isObject(data) || Array.isArray(data) || data === null) return data;
+  var resData = {};
+  Object.keys(data).forEach(function (key) {
+    if (data[key] !== undefined) {
+      resData[key] = data[key];
+    }
+  });
+  return resData;
+};
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 export var diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
@@ -29,7 +41,7 @@ export var diffOriginal = function diffOriginal(params) {
     return isSame ? 'same' : 'changed';
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return isEqual(value, originalValue) ? 'same' : 'changed';
+    return isEqual(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
   }
   return 'same';
 };

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useRef, useState } from 'react';
-import { isFunction, isEqualWith } from 'lodash';
-import { customEqualForFun, equalDependencies } from './index';
+import { isFunction, isEqualWith, get } from 'lodash';
+import { customEqualForFun } from './index';
 // 代理shouldUpdate事件, 执行函数值的[show, disabled], 当[show, disabled]与上一次值不相同时更新状态
 var useShouldUpdate = function useShouldUpdate(props) {
   var show = props.show,
@@ -20,7 +20,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
     index = formItemProps.index,
     namePath = formItemProps.namePath,
     names = formItemProps.names,
-    dependencies = formItemProps.dependencies;
+    dependNames = formItemProps.dependNames;
   var timerRef = useRef();
   var needClear = useRef(); // 是否需要执行清值操作
   var showRef = useRef();
@@ -29,13 +29,14 @@ var useShouldUpdate = function useShouldUpdate(props) {
   var rulesRef = useRef();
   var fieldPropsRef = useRef();
   var originComponentRef = useRef();
+  var dependNamesRef = useRef();
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
     reRender = _useState2[1];
   var values = {};
   // 不是动态函数直接返回
-  if (!isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent)) {
+  if (!(dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent)) {
     return {
       shouldUpdate: _shouldUpdate,
       show: show,
@@ -119,9 +120,22 @@ var useShouldUpdate = function useShouldUpdate(props) {
   } else {
     fieldPropsRef.current = fieldProps;
   }
+  if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+    dependNamesRef.current = dependNames.map(function (name) {
+      return get(values, name);
+    });
+  }
   return {
     shouldUpdate: function shouldUpdate(prevValues, currentValues) {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
+      if (dependNames === null || dependNames === void 0 ? void 0 : dependNames.length) {
+        var curDependNamesValue = dependNames.map(function (name) {
+          return get(currentValues, name);
+        });
+        var dependNamesChanged = !isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFun);
+        dependNamesRef.current = curDependNamesValue;
+        if (!dependNamesChanged) return false;
+      }
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据
@@ -149,9 +163,6 @@ var useShouldUpdate = function useShouldUpdate(props) {
         index: index,
         namePath: namePath
       }) : rules;
-      // const _component = isFunction(originComponent)
-      //   ? originComponent(_currentValues, { form, index, namePath })
-      //   : newComponent;
       var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
         form: form,
         index: index,
@@ -182,16 +193,12 @@ var useShouldUpdate = function useShouldUpdate(props) {
       }
       var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFun);
       var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun);
-      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes ||
-      // 值变更，需要同步更新函数式的fieldProps
-      // (isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun) && !isEqual(prevValues, currentValues)) ||
-      // !isEqualWith(originComponentRef.current, _component, customEqualForFun) ||
-      equalDependencies(dependencies, prevValues, _currentValues)) {
+      if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
+      ) {
         showRef.current = _show;
         disabledRef.current = _disabled;
         requiredRef.current = _required;
         rulesRef.current = _rules;
-        // originComponentRef.current = _component;
         fieldPropsRef.current = _fieldProps;
         reRender({});
         return false;

package/es/ProTable/components/FormatColumn/index.d.ts

@@ -1,12 +1,15 @@
 import React from 'react';
 import { ProTableColumn } from '../../propsType';
-export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, }: {
+export declare const formatColumn: ({ column, originalObj, dataSourceObj, rowKey, diffToolTip, wrapToolTipProps, scroll, onUpdateMinWidth, isInNewRow, }: {
     column: ProTableColumn;
     originalObj: any;
     dataSourceObj: any;
     rowKey: any;
     diffToolTip?: boolean;
     wrapToolTipProps?: any;
+    scroll?: any;
+    onUpdateMinWidth?: any;
+    isInNewRow?: any;
 }) => void;
 /**
  * 查找最近的父级className