@zat-design/sisyphus-react 3.4.2-beta.2 → 3.4.2-beta.21

package/lib/ProEditTable/utils/index.js

@@ -89,40 +89,77 @@ var getActionColumn = function getActionColumn(config) {
               index = _utils.tools.calc(firstIndex, '+', index);
               rowName = [].concat((0, _toConsumableArray2.default)(virtualRowName), [index]);
               if (!(type === 'save')) {
-                _context.next = 5;
+                _context.next = 12;
                 break;
               }
-              _context.next = 5;
+              _context.prev = 3;
+              _context.next = 6;
               return (0, _tools.customValidate)(validateKeys, form, rowName);
-            case 5:
+            case 6:
+              _context.next = 12;
+              break;
+            case 8:
+              _context.prev = 8;
+              _context.t0 = _context["catch"](3);
+              setTimeout(function () {
+                var errorDom = document.querySelector('.ant-form-item-has-error');
+                if (errorDom) {
+                  var tableBody = errorDom.closest('.ant-table-content') || errorDom.closest('.ant-table-body');
+                  var tableCell = errorDom.closest('.ant-table-cell');
+                  if (tableBody && tableCell) {
+                    var previousSibling = tableCell.previousElementSibling;
+                    var childOffsetLeft = 0;
+                    var childFixedLeft = 0;
+                    while (previousSibling) {
+                      if (previousSibling.nodeType === 1) {
+                        var _previousSibling, _previousSibling$clas, _previousSibling$clas2, _previousSibling$clas3;
+                        var _ref2 = previousSibling.getBoundingClientRect() || {},
+                          _ref2$width = _ref2.width,
+                          width = _ref2$width === void 0 ? 0 : _ref2$width;
+                        childOffsetLeft += width;
+                        if ((_previousSibling = previousSibling) === null || _previousSibling === void 0 ? void 0 : (_previousSibling$clas = _previousSibling.classList) === null || _previousSibling$clas === void 0 ? void 0 : (_previousSibling$clas2 = (_previousSibling$clas3 = _previousSibling$clas).contains) === null || _previousSibling$clas2 === void 0 ? void 0 : _previousSibling$clas2.call(_previousSibling$clas3, 'ant-table-cell-fix-left')) {
+                          childFixedLeft += width;
+                        }
+                      }
+                      previousSibling = previousSibling.previousElementSibling;
+                    }
+                    tableBody.scrollTo({
+                      left: childOffsetLeft - childFixedLeft,
+                      behavior: 'smooth'
+                    });
+                  }
+                }
+              }, 0);
+              return _context.abrupt("return", Promise.reject(_context.t0));
+            case 12:
               // 编辑状态使用自定义form值，非编辑状态直接使用行数据
               _record = (_form$getFieldValue = form.getFieldValue(rowName)) !== null && _form$getFieldValue !== void 0 ? _form$getFieldValue : record; // 新增事件可以设置初始默认值，当做函数的出参导出
               onEvent = onClick || onHandle;
-              _context.next = 9;
+              _context.next = 16;
               return onEvent === null || onEvent === void 0 ? void 0 : onEvent(_record, index, {
                 form: form,
                 namePath: virtualRowName
               });
-            case 9:
-              _context.t1 = _yield$onEvent = _context.sent;
-              _context.t0 = _context.t1 !== null;
-              if (!_context.t0) {
-                _context.next = 13;
+            case 16:
+              _context.t2 = _yield$onEvent = _context.sent;
+              _context.t1 = _context.t2 !== null;
+              if (!_context.t1) {
+                _context.next = 20;
                 break;
               }
-              _context.t0 = _yield$onEvent !== void 0;
-            case 13:
-              if (!_context.t0) {
-                _context.next = 17;
+              _context.t1 = _yield$onEvent !== void 0;
+            case 20:
+              if (!_context.t1) {
+                _context.next = 24;
                 break;
               }
-              _context.t2 = _yield$onEvent;
-              _context.next = 18;
+              _context.t3 = _yield$onEvent;
+              _context.next = 25;
               break;
-            case 17:
-              _context.t2 = true;
-            case 18:
-              result = _context.t2;
+            case 24:
+              _context.t3 = true;
+            case 25:
+              result = _context.t3;
               if (result && type !== 'custom') {
                 _config.actions[type]((0, _objectSpread2.default)((0, _objectSpread2.default)({}, config), {}, {
                   rowName: [].concat((0, _toConsumableArray2.default)(name), [index]),
@@ -132,11 +169,11 @@ var getActionColumn = function getActionColumn(config) {
                   validateKeys: validateKeys
                 }));
               }
-            case 20:
+            case 27:
             case "end":
               return _context.stop();
           }
-        }, _callee);
+        }, _callee, null, [[3, 8]]);
       }));
       return function (_x, _x2) {
         return _ref.apply(this, arguments);
@@ -214,10 +251,10 @@ var transformColumns = exports.transformColumns = function transformColumns() {
     if (typeof columnTitle === 'string') {
       item.originTitle = columnTitle;
       if (tooltip) {
-        var _ref2 = tooltip || {},
-          tooltipTitle = _ref2.title,
-          icon = _ref2.icon,
-          resetProps = (0, _objectWithoutProperties2.default)(_ref2, _excluded2);
+        var _ref3 = tooltip || {},
+          tooltipTitle = _ref3.title,
+          icon = _ref3.icon,
+          resetProps = (0, _objectWithoutProperties2.default)(_ref3, _excluded2);
         item.title = (0, _jsxRuntime.jsxs)("span", {
           className: "pro-edit-table-title pro-edit-table-tooltip",
           children: [before, columnTitle, (0, _jsxRuntime.jsx)(_antd.Tooltip, (0, _objectSpread2.default)((0, _objectSpread2.default)({
@@ -284,7 +321,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
       (_item$fieldProps3 = item.fieldProps) === null || _item$fieldProps3 === void 0 ? true : delete _item$fieldProps3.useRequest;
     }
     var _render = function _render(text, record, index) {
-      var isEditing = !virtualKey || editingKeys.includes(record.rowKey);
+      var isEditing = !virtualKey || editingKeys.includes(record.rowKey) || record.addFlag;
       var namePath = (0, _lodash.isArray)(name) ? name : [name];
       if (virtualKey && editingKeys.includes(record.rowKey)) {
         namePath = (0, _tools.getNamePath)(name, virtualKey);
@@ -369,13 +406,13 @@ var transformColumns = exports.transformColumns = function transformColumns() {
   // cacheMap 用来存储缓存值，若有值后不再请求
   if (JSON.stringify(cacheMap.current) === '{}') {
     Promise.all(Object.entries(_cacheMap).map( /*#__PURE__*/function () {
-      var _ref3 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
-        var _item, key, value, _ref4, service, option;
+      var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(item) {
+        var _item, key, value, _ref5, service, option;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _item = (0, _slicedToArray2.default)(item, 2), key = _item[0], value = _item[1];
-              _ref4 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref4.service, option = _ref4.option;
+              _ref5 = (value === null || value === void 0 ? void 0 : value.useRequest) || {}, service = _ref5.service, option = _ref5.option;
               if (!service) {
                 _context2.next = 8;
                 break;
@@ -395,7 +432,7 @@ var transformColumns = exports.transformColumns = function transformColumns() {
         }, _callee2);
       }));
       return function (_x3) {
-        return _ref3.apply(this, arguments);
+        return _ref4.apply(this, arguments);
       };
     }())).then(function (res) {
       res.forEach(function (item) {

package/lib/ProEditTable/utils/tools.js

@@ -12,7 +12,9 @@ var getRandom = exports.getRandom = function getRandom() {
 var difference = exports.difference = function difference(object, base) {
   var changes = function changes(object, base) {
     return (0, _lodash.transform)(object, function (result, value, key) {
-      if (!(0, _lodash.isEqual)(value, base[key])) {
+      if (key.indexOf('-') > -1) {
+        result[key] = true;
+      } else if (!(0, _lodash.isEqual)(value, base[key])) {
         result[key] = (0, _lodash.isObject)(value) && (0, _lodash.isObject)(base[key]) ? changes(value, base[key]) : value;
       }
     });

package/lib/ProEnum/components/Group.d.ts

@@ -2,6 +2,7 @@ import { ProEnum } from '../propsType';
 interface Props extends Pick<ProEnum, 'value' | 'onChange' | 'dataSource'> {
     fieldValue: string;
     fieldLabel: string;
+    disabled?: boolean;
 }
 declare const Group: (props: Props) => JSX.Element;
 export default Group;

package/lib/ProEnum/components/Group.js

@@ -15,7 +15,8 @@ var Group = function Group(props) {
     onChange = props.onChange,
     dataSource = props.dataSource,
     fieldValue = props.fieldValue,
-    fieldLabel = props.fieldLabel;
+    fieldLabel = props.fieldLabel,
+    disabled = props.disabled;
   var idx = (0, _react.useRef)(-1);
   var _useSetState = (0, _ahooks.useSetState)({
       checked: ''
@@ -27,13 +28,25 @@ var Group = function Group(props) {
     setState({
       checked: value
     });
-  }, [value]);
-  var handleClick = function handleClick(val, index) {
-    setState({
-      checked: val
+    var index = dataSource.findIndex(function (item) {
+      return item[fieldValue] === value;
     });
     idx.current = index;
-    onChange === null || onChange === void 0 ? void 0 : onChange(val);
+  }, [value]);
+  var handleClick = function handleClick(val, index) {
+    if (state.checked === val) {
+      setState({
+        checked: ''
+      });
+      onChange === null || onChange === void 0 ? void 0 : onChange('');
+      idx.current = -1;
+    } else {
+      setState({
+        checked: val
+      });
+      idx.current = index;
+      onChange === null || onChange === void 0 ? void 0 : onChange(val);
+    }
   };
   if (dataSource.length === 0) {
     return (0, _jsxRuntime.jsx)("span", {
@@ -41,11 +54,11 @@ var Group = function Group(props) {
     });
   }
   return (0, _jsxRuntime.jsx)("div", {
-    className: "pro-enum-group-root",
+    className: (0, _classnames.default)('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
     children: dataSource.map(function (item, index) {
       return (0, _jsxRuntime.jsx)("div", {
         onClick: function onClick() {
-          if (!item.disabled) {
+          if (!item.disabled && !disabled) {
             handleClick(item[fieldValue], index);
           }
         },

package/lib/ProEnum/index.js

@@ -42,7 +42,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
     isView = _ref.isView,
-    viewEmpty = _ref.viewEmpty;
+    viewEmpty = _ref.viewEmpty,
+    disabled = _ref.disabled;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -213,7 +214,8 @@ var ProEnum = function ProEnum(props) {
           onChange: onChange,
           fieldLabel: label,
           fieldValue: fieldValue,
-          dataSource: list
+          dataSource: list,
+          disabled: disabled
         });
       default:
         return null;

package/lib/ProEnum/style/index.less

@@ -7,12 +7,17 @@
     flex-direction: row;
     flex-wrap: wrap;
   }
+  &-group-root-disabled {
+    color: rgba(0, 0, 0, 0.25);
+    .pro-enum-group-item{
+      cursor: not-allowed !important;
+    }
+  }
   &-tag-item {
     display: flex;
     align-items: center;
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
-    margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
     padding: var(--zaui-space-size-xs) 10px;
     background-color: #f5f5f5;
     border-radius: var(--zaui-space-size-xs);
@@ -38,8 +43,7 @@
       display: flex;
       align-items: center;
       justify-content: center;
-      margin-bottom: calc(var(--zaui-space-size-sm; 8px) * var(--zaui-size; 1));
-      padding: var(--zaui-space-size-sm) var(--zaui-space-border);
+      padding: 6px var(--zaui-space-border);
       line-height: 18px;
       background-color: #f1f3f6ff;
       border: 1px solid transparent;
@@ -72,6 +76,7 @@
 
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
+      background: #fff;
       border: 1px solid var(--zaui-brand);
       &::after {
         background: transparent;
@@ -88,4 +93,8 @@
       cursor: not-allowed;
     }
   }
+
+  &-group-root-disabled {
+    opacity: 0.7;
+  }
 }

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

@@ -7,7 +7,6 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
-var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _react = require("react");
@@ -27,11 +26,8 @@ var Group = function Group(props) {
     } : _props$space,
     id = props.id,
     value = props.value,
+    isView = props.isView,
     onFieldChange = props.onFieldChange;
-  var _useCounter = (0, _ahooks.useCounter)(0),
-    _useCounter2 = (0, _slicedToArray2.default)(_useCounter, 2),
-    num = _useCounter2[0],
-    inc = _useCounter2[1].inc;
   var _ref = _ProForm.default.useFieldProps() || {},
     names = _ref.names,
     name = _ref.name,
@@ -45,6 +41,7 @@ var Group = function Group(props) {
       return (0, _objectSpread2.default)((0, _objectSpread2.default)({
         disabled: Boolean(props === null || props === void 0 ? void 0 : props.disabled)
       }, item), {}, {
+        isView: isView !== null && isView !== void 0 ? isView : item.isView,
         noStyle: (space === null || space === void 0 ? void 0 : space.compact) || (space === null || space === void 0 ? void 0 : space.separator),
         parentNames: id
       });
@@ -69,13 +66,15 @@ var Group = function Group(props) {
     })
   }, "".concat(className), className));
   (0, _ahooks.useDeepCompareEffect)(function () {
+    var _document, _document$activeEleme;
+    // 焦点激活的表单
+    var touchName = ((_document = document) === null || _document === void 0 ? void 0 : (_document$activeEleme = _document.activeElement) === null || _document$activeEleme === void 0 ? void 0 : _document$activeEleme.id) || '';
     // 模拟change,初始化不执行onFieldChange
-    if ((0, _lodash.isFunction)(onFieldChange) && num >= 1) {
+    if ((0, _lodash.isFunction)(onFieldChange) && form.isFieldsTouched(names) && (0, _utils.transformNamesString)(names).includes(touchName)) {
       onFieldChange(value, form.getFieldsValue(), {
         form: form
       });
     }
-    inc();
   }, [value]);
   return (0, _jsxRuntime.jsx)("div", {
     className: _className,

package/lib/ProForm/components/combination/Group/propsType.d.ts

@@ -23,6 +23,7 @@ export interface GroupProps {
     value?: any;
     id?: string;
     disabled?: boolean | (() => void);
+    isView?: boolean;
     onFieldChange?: (value: any[] | null, record: any, { form, }: {
         form: FormInstance;
     }) => any;

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

@@ -9,13 +9,13 @@
 }
 
 .start-radius() {
-  border-start-start-radius: var(--zaui-border-radius, 8px);
-  border-end-start-radius: var(--zaui-border-radius, 8px);
+  border-start-start-radius: 4px;
+  border-end-start-radius: 4px;
 }
 
 .end-radius() {
-  border-start-end-radius: var(--zaui-border-radius, 8px);
-  border-end-end-radius: var(--zaui-border-radius, 8px);
+  border-start-end-radius: 4px;
+  border-end-end-radius: 4px;
 }
 
 .pro-group {

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

@@ -6,3 +6,5 @@ import { SpaceType } from './propsType';
 * @returns
 */
 export declare const insertSeparator: (columns: any, space?: SpaceType, separatorNode?: ReactNode, otherProps?: any) => any;
+/** 转换names */
+export declare const transformNamesString: (arr: (string | string[])[]) => (string | string[])[];

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

@@ -4,7 +4,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.insertSeparator = void 0;
+exports.transformNamesString = exports.insertSeparator = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 /**
 * 插入间隔符
@@ -40,4 +40,14 @@ var insertSeparator = exports.insertSeparator = function insertSeparator(columns
     }
     return result;
   }, []);
+};
+/** 转换names */
+var transformNamesString = exports.transformNamesString = function transformNamesString(arr) {
+  var result = arr.map(function (subArr) {
+    if (Array.isArray(subArr)) {
+      return subArr.join('_');
+    }
+    return subArr;
+  });
+  return result;
 };

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

@@ -6,7 +6,7 @@
     ~ .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(
       .@{ant-prefix}-input-borderless
     ).@{ant-prefix}-input {
-    background: @zaui-base-bg;
+    // background: @zaui-base-bg;
     border-color: var(--ant-error-color);
   }
   .forever-checkbox:not(.@{ant-prefix}-input-disabled):not(

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

@@ -50,7 +50,7 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip,
+    originalDiffTip = props.originalDiffTip,
     confirm = props.confirm,
     globalControl = props.globalControl;
   var colProps = props.colProps;
@@ -432,7 +432,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = (0, _jsxRuntime.jsxs)(_antd.Space, {

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -17,7 +17,7 @@ interface Props<T = any> {
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | (() => boolean);
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;

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

@@ -33,7 +33,7 @@ var RenderFields = function RenderFields(props) {
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalTip = props.originalTip,
+    originalDiffTip = props.originalDiffTip,
     globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
@@ -213,7 +213,7 @@ var RenderFields = function RenderFields(props) {
         originalValues: originalValues,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalTip: originalTip,
+        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey", "globalControl"];
+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", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
@@ -64,8 +64,8 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalTip = props.originalTip,
-    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    _props$originalDiffTi = props.originalDiffTip,
+    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -255,7 +255,7 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip,
+        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       }), children, footerRender()]
     }))

package/lib/ProForm/propsType.d.ts

@@ -69,7 +69,7 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
 }
 export interface Transform<T = any> {
     normalize?: (value: StoreValue, prevValue: StoreValue, allValues: Store) => StoreValue;

package/lib/ProForm/style/index.less

@@ -147,8 +147,22 @@
         border-radius: 4px;
       }
 
-      // 查看模式 修改容器样式
-      .@{ant-prefix}-form-item-control-input-content > span, // 地址组件
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        & > .pro-address {
+          .ant-select-selector,
+          .ant-input-affix-wrapper,
+          .ant-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .ant-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
       .pro-form-view-container {
         padding: 4px 8px;
         background: @zaui-contract-bg;

package/lib/ProForm/utils/{contrastOriginal.d.ts → diffOriginal.d.ts}

@@ -3,7 +3,8 @@ interface Params {
     originalValue: any;
     value: any;
     form: FormInstance;
+    name?: string | any[];
     equalWith?: (originalValue: any, currentValue: any) => boolean;
 }
-export declare const contrastOriginal: (params: Params) => boolean;
+export declare const diffOriginal: (params: Params) => boolean;
 export {};

package/lib/ProForm/utils/diffOriginal.js

@@ -0,0 +1,68 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.diffOriginal = void 0;
+var _createForOfIteratorHelper2 = _interopRequireDefault(require("@babel/runtime/helpers/createForOfIteratorHelper"));
+var _lodash = require("lodash");
+var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+var extractValue = function extractValue(obj, path) {
+  var value = obj || {};
+  if (!Object.keys(obj)) {
+    return [];
+  }
+  var _iterator = (0, _createForOfIteratorHelper2.default)(path),
+    _step;
+  try {
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var key = _step.value;
+      if (value && value.hasOwnProperty(key)) {
+        value = value[key];
+      } else {
+        return undefined;
+      }
+    }
+  } catch (err) {
+    _iterator.e(err);
+  } finally {
+    _iterator.f();
+  }
+  return Object.values(value);
+};
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(data, pathString) {
+  if (pathString.includes('_')) {
+    var namePrefixes = pathString.split('-')[0].split('_').slice(0, -1);
+    return extractValue(data, namePrefixes);
+  }
+  return pathString.split('-').map(function (item) {
+    return data[item];
+  });
+};
+var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var value = !(name === null || name === void 0 ? void 0 : name.includes('-')) ? _value : extractValues(form.getFieldsValue(), name);
+  // 支持传入自定义比较事件
+  if ((0, _lodash.isFunction)(equalWith)) {
+    return !equalWith(originalValue, value);
+  }
+  if (Array.isArray(originalValue)) {
+    return originalValue.some(function (valueItem, index) {
+      // 如果两个值有一个不是空值, 则进行深比较
+      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
+        return !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
+      }
+      return false;
+    });
+  }
+  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
+    return !(0, _lodash.isEqual)(value, originalValue);
+  }
+  return false;
+};

package/lib/ProForm/utils/index.d.ts

@@ -26,7 +26,7 @@ export declare const isTrim: (type: string, trim: boolean, configData: any) => a
  */
 export declare const isUpperCase: (type: string, upperCase: boolean) => any;
 export declare const weedOutProps: (data: Record<string, any>, keys: string[]) => {}[];
-export declare const contrast: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
+export declare const diffField: (prevValues: any, curValues: any, names: NamePath[]) => boolean;
 export declare const splitNameStr: (name: string) => NamePath[];
 export declare const filterInternalFields: (values: any) => any;
 export declare const getAllNamePath: (object: Record<string, any>, currentPath?: InternalNamePath) => InternalNamePath[];

package/lib/ProForm/utils/index.js

@@ -5,7 +5,7 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.deleteForPath = exports.customEqualForFun = exports.contrast = void 0;
+exports.getAllNamePath = exports.findOptionByValue = exports.filterInternalFields = exports.equalDependencies = exports.diffField = exports.deleteForPath = exports.customEqualForFun = void 0;
 exports.getArrayBeforeNumber = getArrayBeforeNumber;
 exports.hasRowKey = exports.getLayout = exports.getDecimalDigits = void 0;
 exports.initialValuesToNames = initialValuesToNames;
@@ -124,7 +124,7 @@ var weedOutProps = exports.weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-var contrast = exports.contrast = function contrast(prevValues, curValues, names) {
+var diffField = exports.diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
     return _lodash.default.get(prevValues, name) !== _lodash.default.get(curValues, name);
   });

package/lib/ProForm/utils/transformValue.js

@@ -48,7 +48,7 @@ var transformValue = exports.transformValue = function transformValue(names, for
       }, cusRest);
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
-      return (0, _utils.contrast)(prevValues, curValues, names);
+      return (0, _utils.diffField)(prevValues, curValues, names);
     }
   };
 };