@zat-design/sisyphus-react 3.6.9-beta.4 → 3.6.10

package/es/ProForm/utils/index.js

@@ -1,11 +1,10 @@
-import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
-import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import React, { useState } from 'react';
 import moment from 'moment';
-import _, { isObject, isFunction, cloneDeep, get, set, omit, isNaN } from 'lodash';
+import _, { isObject, isFunction, get, set, omit, isNaN } from 'lodash';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -249,54 +248,6 @@ export function toArray(value) {
   }
   return Array.isArray(value) ? value : [value];
 }
-/**
- * names值合并
- * @param obj AnyObject
- * @returns AnyObject
- */
-export function processHyphenKeys(obj) {
-  var newObj = _objectSpread({}, obj);
-  var keys = Object.keys(obj);
-  for (var _i = 0, _keys = keys; _i < _keys.length; _i++) {
-    var key = _keys[_i];
-    if (key.includes('-')) {
-      var keyParts = key.split('-');
-      var shouldCombine = true;
-      var combinedArray = [];
-      var _iterator = _createForOfIteratorHelper(keyParts),
-        _step;
-      try {
-        for (_iterator.s(); !(_step = _iterator.n()).done;) {
-          var part = _step.value;
-          if (obj.hasOwnProperty(part)) {
-            combinedArray.push(obj[part]);
-          } else {
-            shouldCombine = false;
-            break;
-          }
-        }
-      } catch (err) {
-        _iterator.e(err);
-      } finally {
-        _iterator.f();
-      }
-      if (shouldCombine) {
-        newObj[key] = combinedArray;
-      } else {
-        newObj[key] = undefined;
-      }
-    }
-    // 匹配数组的namePath,只匹配到1层
-    if (key.includes('_')) {
-      var _keyParts = key.split('_')[0];
-      // 校验值是否存在，解决names多传额外空值报错
-      newObj[key] = isObject(newObj[_keyParts]) ? Object.values(newObj[_keyParts]).filter(function (val) {
-        return val !== null && val !== undefined && val !== '';
-      }) : [];
-    }
-  }
-  return cloneDeep(newObj);
-}
 /**
  * 初始化值names值合并
  * @param obj AnyObject
@@ -464,11 +415,11 @@ export var parseNamePath = function parseNamePath(input) {
 };
 /** 解析namePath */
 export function findNamesKeyInArray(arr, key) {
-  var _iterator2 = _createForOfIteratorHelper(arr),
-    _step2;
+  var _iterator = _createForOfIteratorHelper(arr),
+    _step;
   try {
-    for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
-      var item = _step2.value;
+    for (_iterator.s(); !(_step = _iterator.n()).done;) {
+      var item = _step.value;
       if (!item.includes('_')) {
         return null;
       }
@@ -477,9 +428,9 @@ export function findNamesKeyInArray(arr, key) {
       }
     }
   } catch (err) {
-    _iterator2.e(err);
+    _iterator.e(err);
   } finally {
-    _iterator2.f();
+    _iterator.f();
   }
   return null;
 }

package/es/ProForm/utils/useChanged.js

@@ -19,7 +19,8 @@ export var useChanged = function useChanged(_ref) {
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

package/es/ProForm/utils/useListChanged.js

@@ -1,6 +1,6 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
-import { get } from 'lodash';
+import { get, isString } from 'lodash';
 import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -86,8 +86,8 @@ export var useListChanged = function useListChanged(params) {
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
-    // name: isString(namesStr) ? namesStr : originalName || name,
+    equalWith: equalWith,
+    name: isString(namesStr) ? namesStr : originalName || name
   });
   return [changed, originalValue];
 };

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

@@ -191,6 +191,22 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
       var renderValue = getEnumLabel(realCode, value, valueType === 'enumCodeName');
       var originalValue = getOriginalValue(value, record, originalObj, rowKey, dataIndex);
       var originalRenderValue = getEnumLabel(realCode, originalValue, valueType === 'enumCodeName');
+      if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
+        var _column$codeValues$fi;
+        var labelName = column === null || column === void 0 ? void 0 : (_column$codeValues$fi = column.codeValues.find(function (item) {
+          return item.value === value;
+        })) === null || _column$codeValues$fi === void 0 ? void 0 : _column$codeValues$fi.label;
+        if (valueType === 'enumName') {
+          renderValue = _jsx(_Fragment, {
+            children: labelName || '-'
+          });
+        }
+        if (valueType === 'enumCodeName') {
+          renderValue = _jsx(_Fragment, {
+            children: labelName ? "".concat(value, "-").concat(labelName) : labelName
+          });
+        }
+      }
       var node = _jsxs(_Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]

package/es/ProTable/propsType.d.ts

@@ -26,6 +26,10 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     format?: string;
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
+    codeValues?: {
+        label: string;
+        value: string | number;
+    }[];
     copyable?: boolean;
     originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);

package/es/ProThemeTools/component/{ProTools → PrdTools}/index.d.ts

@@ -1,3 +1,3 @@
 import type { DevToolsPropsType } from '../../propsType';
-declare const ProTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
-export default ProTools;
+declare const PrdTools: ({ onReset, onClose, setState, open, state, tableBorder, tableStripe, }: DevToolsPropsType) => import("react/jsx-runtime").JSX.Element;
+export default PrdTools;

package/es/ProThemeTools/component/{ProTools → PrdTools}/index.js

@@ -21,7 +21,7 @@ var connect = function connect(Component) {
   return ComponentWrapper;
 };
 var NewDrawer = connect(_Drawer);
-var ProTools = function ProTools(_ref) {
+var PrdTools = function PrdTools(_ref) {
   var onReset = _ref.onReset,
     onClose = _ref.onClose,
     setState = _ref.setState,
@@ -266,4 +266,4 @@ var ProTools = function ProTools(_ref) {
     })]
   });
 };
-export default ProTools;
+export default PrdTools;

package/es/ProThemeTools/component/index.d.ts

@@ -1 +1,2 @@
-export { default as ProTools } from './ProTools';
+/// <reference types="typings" />
+export { default as PrdTools } from './PrdTools';

package/es/ProThemeTools/component/index.js

@@ -1 +1,2 @@
-export { default as ProTools } from './ProTools';
+/// <reference path="../../../typings.d.ts" />;
+export { default as PrdTools } from './PrdTools';

package/es/ProThemeTools/index.js

@@ -17,7 +17,7 @@ import { isEqual } from 'lodash';
 import classnames from 'classnames';
 import { getKebabCase, setThemes, setTableBorder, getMapKebabCase, getMapHumpCase } from './utils/index';
 import settingSvg from '../assets/setting.svg';
-import { ProTools } from './component';
+import { PrdTools } from './component';
 import locale from '../locale';
 var defaultCacheTime = 1; // 配置保存时间为一天
 var defaultThemeConfig = {
@@ -183,7 +183,7 @@ var ProThemeTools = function ProThemeTools(_ref) {
         className: "setting-icon",
         src: settingSvg
       })
-    }), _jsx(ProTools, {
+    }), _jsx(PrdTools, {
       prefixCls: prefixCls,
       onReset: onReset,
       onClose: toggle,

package/es/ProThemeTools/style/index.less

@@ -1,7 +1,7 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
-@import '../component/ProTools/style/index.less';
+@import '../component/PrdTools/style/index.less';
 
 .pro-theme-tools {
   display: flex;

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

@@ -7,6 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -25,10 +26,10 @@ var _ProConfigProvider = require("../../../ProConfigProvider");
 var _Container = _interopRequireDefault(require("../../../ProForm/components/Container"));
 var _transformNames = _interopRequireDefault(require("../../../ProForm/utils/transformNames"));
 var _useFieldProps = require("../../../ProForm/utils/useFieldProps");
+var _useListChanged3 = require("../../../ProForm/utils/useListChanged");
 var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"));
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
-var _ListChanged = _interopRequireDefault(require("./ListChanged"));
 var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -491,6 +492,21 @@ var RenderField = function RenderField(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
+  // 判断当前字段是否变更
+  var _useListChanged = (0, _useListChanged3.useListChanged)({
+      name: cellName,
+      names: names,
+      namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
+      rowKeyPath: [].concat((0, _toConsumableArray2.default)(baseName), [index, 'rowKey']),
+      originalName: originalName,
+      originalNames: originalNames,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useListChanged2 = (0, _slicedToArray2.default)(_useListChanged, 2),
+    changed = _useListChanged2[0],
+    originalValue = _useListChanged2[1];
   var componentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     form: form,
     name: cellName
@@ -536,35 +552,16 @@ var RenderField = function RenderField(_ref) {
   if (isView) {
     delete _formItemProps.rules;
   }
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)({}, className, className));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
   var FormItem = null;
-  var FieldComponent = /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps));
-  if (originalValues) {
-    FieldComponent = (0, _jsxRuntime.jsx)(_ListChanged.default, {
-      name: cellName,
-      names: names,
-      namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),
-      rowKeyPath: [].concat((0, _toConsumableArray2.default)(baseName), [index, 'rowKey']),
-      originalName: originalName,
-      originalNames: originalNames,
-      originalValues: originalValues,
-      form: form,
-      equalWith: equalWith,
-      type: type,
-      children: FieldComponent
-    });
-  }
-  if ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) {
-    FieldComponent = (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
-      children: FieldComponent
-    }));
-  }
   FormItem = TargetComponent ? (0, _jsxRuntime.jsx)(_antd.Form.Item, (0, _objectSpread2.default)((0, _objectSpread2.default)({
     validateFirst: true
   }, (0, _lodash.omit)(_formItemProps, ['render', 'cache', 'key', 'width', 'hiddenNames', 'name', 'onCell'])), {}, {
     className: _className,
     name: formNamePath ? cellName.slice((formNamePath === null || formNamePath === void 0 ? void 0 : formNamePath.length) - 1) : cellName,
-    children: FieldComponent
+    children: ((_componentProps = componentProps) === null || _componentProps === void 0 ? void 0 : _componentProps.confirm) ? (0, _jsxRuntime.jsx)(_ConfirmWrapper.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+      children: /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
+    })) : /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, componentProps)) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)({}, componentProps))
   })) : (0, _jsxRuntime.jsx)(_Container.default, {
     viewEmpty: viewEmpty
   });
@@ -582,9 +579,28 @@ var RenderField = function RenderField(_ref) {
       }
     }));
   }
+  var originalTitle = originalDiffTip && originalValues ? (0, _jsxRuntime.jsxs)(_antd.Space, {
+    children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(TargetComponent) ? ( /*#__PURE__*/_react.default.cloneElement(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    }))) : (0, _jsxRuntime.jsx)(TargetComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), {}, {
+      isView: true,
+      value: originalValue,
+      checked: type === 'Switch' ? originalValue : undefined
+    }))]
+  }) : null;
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: (_componentProps2 = componentProps) === null || _componentProps2 === void 0 ? void 0 : _componentProps2.otherProps,
-    children: FormItem
+    children: !originalTitle || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: originalTitle,
+      placement: "topLeft",
+      open: changed ? undefined : false,
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
+      children: FormItem
+    })
   });
 };
 var _default = exports.default = RenderField;

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

@@ -21,7 +21,6 @@ var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
-var _Container = _interopRequireDefault(require("../../Container"));
 var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
 var Text = _antd.Typography.Text;
 var defaultFieldNames = {
@@ -83,8 +82,7 @@ var ProCascader = function ProCascader(props) {
     detailPlaceholder = props.detailPlaceholder,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
-    isViewCon = _ref3.isView,
-    viewEmpty = _ref3.viewEmpty;
+    isViewCon = _ref3.isView;
   var addressCode = code || enumCode;
   var realIsView = typeof isView === 'boolean' ? isView : isViewCon;
   var realLevel = Math.max(2, level);
@@ -240,9 +238,17 @@ var ProCascader = function ProCascader(props) {
       }
     }
   };
-  return realIsView ? (0, _jsxRuntime.jsx)(_Container.default, {
-    tooltip: !!tooltip,
-    viewEmpty: viewEmpty,
+  return realIsView ? tooltip ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    className: className,
+    title: tooltip === true ? viewValue : tooltip,
+    children: (0, _jsxRuntime.jsx)(Text, {
+      ellipsis: {
+        tooltip: false
+      },
+      children: viewValue
+    })
+  }) : (0, _jsxRuntime.jsx)("span", {
+    className: className,
     children: viewValue
   }) : (0, _jsxRuntime.jsxs)("div", {
     className: "pro-address ".concat(className),

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

@@ -11,6 +11,7 @@ var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 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 _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
@@ -23,10 +24,10 @@ var _index = require("../../utils/index");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _transformNames = _interopRequireDefault(require("../../utils/transformNames"));
 var _valueType = _interopRequireDefault(require("../../utils/valueType"));
+var _useChanged3 = require("../../utils/useChanged");
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
-var _Changed = _interopRequireDefault(require("./Changed"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -98,6 +99,18 @@ var Render = function Render(props) {
       return Array.isArray(name) ? name.join('_') : name;
     }).join('-');
   }, [otherProps === null || otherProps === void 0 ? void 0 : otherProps.names]);
+  // 判断当前字段是否变更
+  var _useChanged = (0, _useChanged3.useChanged)({
+      name: formItemProps.name,
+      names: otherProps.names,
+      namesStr: namesStr,
+      originalValues: originalValues,
+      form: form,
+      equalWith: equalWith
+    }),
+    _useChanged2 = (0, _slicedToArray2.default)(_useChanged, 2),
+    changed = _useChanged2[0],
+    originalValue = _useChanged2[1];
   var internalRule = (0, _useRules.default)({
     names: otherProps.names,
     label: otherFormItemProps.label,
@@ -169,7 +182,7 @@ var Render = function Render(props) {
   var lastComponentProps = (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, componentProps), _fieldProps), {}, {
     disabled: lastDisabled
   });
-  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-width-auto', ['Switch'].includes(type)));
+  var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed), 'pro-form-item-width-auto', ['Switch'].includes(type)));
   if (formItemProps.hidden === true || _show === false) {
     // 为了监听shouldUpdate  必须存在一个FormItem, 空Input解决 【[antd: Form.Item] `name` is only used for validate React element】
     return (0, _jsxRuntime.jsx)(_antd.Form.Item, {
@@ -431,17 +444,7 @@ var Render = function Render(props) {
       // @ts-ignore
       _internalItemRender: internalItemRender,
       className: _className,
-      children: (0, _jsxRuntime.jsx)(_Changed.default, {
-        name: formItemProps.name,
-        names: otherProps.names,
-        namesStr: namesStr,
-        originalValues: originalValues,
-        form: form,
-        equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
-        type: type,
-        children: child
-      })
+      children: child
     }));
     var formItem = orgFormItem;
     // 当存在shouldUpdate时捕获所有form变更（防止表单onchange设置form值时无法更新的问题）
@@ -457,23 +460,32 @@ var Render = function Render(props) {
               // @ts-ignore
               _internalItemRender: internalItemRender,
               className: _className,
-              children: (0, _jsxRuntime.jsx)(_Changed.default, {
-                name: formItemProps.name,
-                names: otherProps.names,
-                namesStr: namesStr,
-                originalValues: originalValues,
-                form: form,
-                equalWith: equalWith,
-                originalDiffTip: originalDiffTip,
-                type: type,
-                children: child
-              })
+              children: child
             }));
           }
         })
       });
     }
-    return formItem;
+    // 不渲染tooltip
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
+      return formItem;
+    }
+    var title = (0, _jsxRuntime.jsxs)(_antd.Space, {
+      children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/_react.default.cloneElement(child, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, child), {}, {
+        isView: true,
+        value: originalValue,
+        checked: type === 'Switch' ? originalValue : undefined
+      }))]
+    });
+    return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      title: title,
+      open: changed ? undefined : false,
+      // open={true}
+      getPopupContainer: function getPopupContainer(target) {
+        return target.parentElement;
+      },
+      children: formItem
+    });
   };
   var FormItem = (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
     children: [renderItem(), (otherProps === null || otherProps === void 0 ? void 0 : (_otherProps$names2 = otherProps.names) === null || _otherProps$names2 === void 0 ? void 0 : _otherProps$names2.length) ? otherProps.names.map(function (name) {

package/lib/ProForm/style/index.less

@@ -116,6 +116,58 @@
       }
     }
 
+    // 比较原始值场景下  不同时的样式
+    &.pro-form-item-changed {
+      span.@{ant-prefix}-input-affix-wrapper,
+      .@{ant-prefix}-select .@{ant-prefix}-select-selector,
+      .@{ant-prefix}-picker,
+      .@{ant-prefix}-input-number {
+        background: @zaui-contract-bg !important;
+
+        input {
+          background: transparent;
+        }
+        .@{ant-prefix}-select-selection-placeholder {
+          z-index: 9;
+        }
+      }
+
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
+      .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
+        background: @zaui-contract-bg;
+        border-radius: 4px;
+      }
+
+      // 地址组件
+      .@{ant-prefix}-form-item-control-input-content {
+        // 查看模式
+        & > span {
+          border-radius: 4px;
+          padding: 5px 8px;
+          background: @zaui-contract-bg;
+        }
+
+        & > .pro-address {
+          .@{ant-prefix}-select-selector,
+          .@{ant-prefix}-input-affix-wrapper,
+          .@{ant-prefix}-input-disabled {
+            background: @zaui-contract-bg;
+          }
+        }
+        & > .@{ant-prefix}-input-group {
+          .forever-checkbox {
+            background: @zaui-contract-bg;
+          }
+        }
+      }
+
+      .pro-form-view-container {
+        padding: 4px 8px;
+        background: @zaui-contract-bg;
+        border-radius: 4px;
+      }
+    }
+
     .@{ant-prefix}-row {
       width: 100%;
     }
@@ -321,56 +373,4 @@
       }
     }
   }
-
-  // 比较原始值场景下  不同时的样式
-  .pro-form-item-changed {
-    span.@{ant-prefix}-input-affix-wrapper,
-    .@{ant-prefix}-select .@{ant-prefix}-select-selector,
-    .@{ant-prefix}-picker,
-    .@{ant-prefix}-input-number {
-      background: @zaui-contract-bg !important;
-
-      input {
-        background: transparent;
-      }
-      .@{ant-prefix}-select-selection-placeholder {
-        z-index: 9;
-      }
-    }
-
-    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-switch-handle),
-    .@{ant-prefix}-form-item-control:has(.@{ant-prefix}-checkbox-wrapper-in-form-item) {
-      background: @zaui-contract-bg;
-      border-radius: 4px;
-    }
-
-    // 地址组件
-    .@{ant-prefix}-form-item-control-input-content {
-      // 查看模式
-      & > span {
-        border-radius: 4px;
-        padding: 5px 8px;
-        background: @zaui-contract-bg;
-      }
-
-      & > .pro-address {
-        .@{ant-prefix}-select-selector,
-        .@{ant-prefix}-input-affix-wrapper,
-        .@{ant-prefix}-input-disabled {
-          background: @zaui-contract-bg;
-        }
-      }
-      & > .@{ant-prefix}-input-group {
-        .forever-checkbox {
-          background: @zaui-contract-bg;
-        }
-      }
-    }
-
-    .pro-form-view-container {
-      padding: 4px 8px;
-      background: @zaui-contract-bg;
-      border-radius: 4px;
-    }
-  }
 }

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

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

package/lib/ProForm/utils/diffOriginal.js

@@ -1,15 +1,38 @@
 "use strict";
 
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.diffOriginal = void 0;
+var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _lodash = require("lodash");
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
+/** 将解构后的name值，反向转回names,例如 formData {a:1, b:2} names ['a', 'b'] 返回 [1,2] */
+var extractValues = function extractValues(form, pathString) {
+  var _pathString;
+  var result = [];
+  var PrefixesName = (0, _lodash.isString)(pathString) ? [] : pathString.slice(0, -1);
+  if ((0, _lodash.isString)(pathString)) {
+    pathString.split('-').forEach(function (item) {
+      result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
+    });
+    return result;
+  }
+  (_pathString = pathString[pathString.length - 1]) === null || _pathString === void 0 ? void 0 : _pathString.split('-').forEach(function (item) {
+    result.push(form.getFieldValue([].concat((0, _toConsumableArray2.default)(PrefixesName), [item])));
+  });
+  return result;
+};
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
+  var _name$join;
   var originalValue = params.originalValue,
-    value = params.value,
-    equalWith = params.equalWith;
+    _value = params.value,
+    equalWith = params.equalWith,
+    form = params.form,
+    name = params.name;
+  var isNames = Array.isArray(name) && ((_name$join = name.join(',')) === null || _name$join === void 0 ? void 0 : _name$join.includes('-')) || (name === null || name === void 0 ? void 0 : name.includes('-'));
+  var value = !isNames ? _value : extractValues(form, name);
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     return !equalWith(originalValue, value);
@@ -24,7 +47,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
   }
   if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(value, originalValue);
+    var res = !(0, _lodash.isEqual)(value, originalValue);
+    return res;
   }
   return false;
 };