@zat-design/sisyphus-react 3.7.3-beta.1 → 3.7.3-beta.11

package/lib/ProEditTable/components/RenderField/{ListChanged.js → ListChangedWrapper.js}

@@ -11,8 +11,11 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 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 _ProConfigProvider = require("../../../ProConfigProvider");
+var _utils = require("../../../utils");
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
@@ -66,7 +69,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     return (0, _lodash.get)(originalValues, originalName);
   }) : (0, _lodash.get)(originalValues, originalName);
 };
-var ListChanged = function ListChanged(props) {
+var ListChangedWrapper = function ListChangedWrapper(props) {
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -81,11 +84,13 @@ var ListChanged = function ListChanged(props) {
     children = props.children,
     type = props.type,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEditTable') || {},
+    isDiffAll = _ref2.isDiffAll;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var notWatch = !originalValues || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = !notWatch ? getOriginalValue({
+  var isWatch = originalValues && !['FormList', 'ProEditTable'].includes(type);
+  var originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
@@ -93,9 +98,9 @@ var ListChanged = function ListChanged(props) {
     rowKeyPath: rowKeyPath,
     form: form
   }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var diffType = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return 'same';
     return (0, _diffOriginal.diffOriginal)({
       value: props.value,
       originalValue: originalValue,
@@ -104,11 +109,20 @@ var ListChanged = function ListChanged(props) {
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
   }, [props.value, originalValue]);
-  if (notWatch || noChange) {
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
+  if (!isWatch || noChange) {
     return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
   }
-  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: changed ? undefined : false,
+  var diffClassName = (0, _classnames.default)({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
+  });
+  return (0, _jsxRuntime.jsx)(_antd.Tooltip
+  // 传入undefined 鼠标移入显示移出隐藏
+  , {
+    // 传入undefined 鼠标移入显示移出隐藏
+    open: isChanged ? undefined : false,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
@@ -121,9 +135,9 @@ var ListChanged = function ListChanged(props) {
       })) : undefined]
     }),
     children: (0, _jsxRuntime.jsx)("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: diffClassName,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
     })
   });
 };
-var _default = exports.default = ListChanged;
+var _default = exports.default = ListChangedWrapper;

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

@@ -29,7 +29,7 @@ var _useRules = _interopRequireDefault(require("../../../ProForm/utils/useRules"
 var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
-var _ListChanged = _interopRequireDefault(require("./ListChanged"));
+var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
 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 */
@@ -554,7 +554,7 @@ var RenderField = function RenderField(_ref) {
     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, {
+      FieldComponent = (0, _jsxRuntime.jsx)(_ListChangedWrapper.default, {
         name: cellName,
         names: names,
         namesStr: [].concat((0, _toConsumableArray2.default)(baseName), [index, dataIndex]),

package/lib/ProEnum/index.js

@@ -26,7 +26,7 @@ var _getEnumLabel = _interopRequireDefault(require("./utils/getEnumLabel"));
 var _useEnum = _interopRequireDefault(require("./hooks/useEnum"));
 var _locale = _interopRequireDefault(require("../locale"));
 require("./style/index.less");
-var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
+var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
   _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 var ProEnum = function ProEnum(props) {
   var _enumProps$showCodeNa;
@@ -40,10 +40,11 @@ var ProEnum = function ProEnum(props) {
     onChange = props.onChange,
     transformResponse = props.transformResponse,
     otherProps = props.otherProps,
+    isView = props.isView,
     enumProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = otherProps || {},
-    isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -227,7 +228,7 @@ var ProEnum = function ProEnum(props) {
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
     _antd.message.error(_locale.default === null || _locale.default === void 0 ? void 0 : (_locale$ProEnum4 = _locale.default.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
-    return;
+    // return;
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -272,7 +273,7 @@ var ProEnum = function ProEnum(props) {
     };
     return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
-  if (isView) {
+  if (_isView) {
     if (Array.isArray(value)) {
       return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,

package/lib/ProEnum/style/index.less

@@ -19,7 +19,7 @@
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
     padding: var(--zaui-space-size-xs) 10px;
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     border-radius: var(--zaui-space-size-xs);
     cursor: pointer;
   }
@@ -29,7 +29,7 @@
     background-color: var(--zaui-brand);
   }
   &-tag-item-disabled {
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     pointer-events: none;
   }
 
@@ -90,12 +90,20 @@
 
     .pro-enum-group-item-disabled {
       color: rgba(0, 0, 0, 0.25);
-      background: #f5f5f5;
+      background: var(--zaui-disabled-bg);
       cursor: not-allowed;
     }
   }
 
   &-group-root-disabled {
-    opacity: 0.7;
+    color: #bfbfbf;
+
+    .pro-enum-group-item {
+      background: var(--zaui-disabled-bg);
+      &.pro-enum-group-item-selected {
+        background: #6b95f5;
+        border-color: #6b95f5;
+      }
+    }
   }
 }

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

@@ -5,7 +5,7 @@ interface EnumRes {
     [key: string]: any;
 }
 export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
-export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
+export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
 export declare function isObject(obj: any): boolean;
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;

package/lib/ProEnum/utils/index.js

@@ -26,6 +26,10 @@ function getEnumData(storage, cacheKey, baseEnumStorage) {
   }
 }
 function setEnumData(storage, cacheKey, data) {
+  var _Object$keys;
+  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+    return false;
+  }
   if (storage === 'localStorage') {
     window.localStorage.setItem(cacheKey, JSON.stringify(data));
   } else if (storage === 'sessionStorage') {

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

@@ -16,11 +16,12 @@ var _ProCollapse = _interopRequireDefault(require("../../../../ProLayout/compone
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
 var Container = function Container(props) {
   var children = props.children,
-    otherProps = props.otherProps,
     className = props.className,
     container = props.container,
     show = props.show,
-    clearNotShow = props.clearNotShow;
+    clearNotShow = props.clearNotShow,
+    diffConfig = props.diffConfig,
+    otherProps = props.otherProps;
   var _ref = _ProForm.default.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
@@ -45,7 +46,8 @@ var Container = function Container(props) {
   var childRender = function childRender() {
     var child = (0, _jsxRuntime.jsx)(_RenderFields.default, (0, _objectSpread2.default)({
       columns: _children,
-      form: form
+      form: form,
+      diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
       return (0, _jsxRuntime.jsx)(_ProCollapse.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {

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

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RowProps } from 'antd';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ProColumnProps, ProFormOtherProps, DiffConfigProps } from '../../../propsType';
 export interface ContainerProps {
     children?: ProColumnProps[];
     otherProps?: ProFormOtherProps;
@@ -8,5 +8,6 @@ export interface ContainerProps {
     className?: string;
     container?: string | React.ReactNode;
     show?: boolean | (() => boolean);
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
 }

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

@@ -95,7 +95,9 @@ var ProNumberRange = function ProNumberRange(props) {
   });
   // 查看模式
   if (isView || props.isView) {
-    if ((0, _lodash.isEmpty)(value)) {
+    if ((0, _lodash.isEmpty)(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
+      return typeof item !== 'number';
+    }))) {
       return viewEmpty;
     }
     switch (valueType) {

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

@@ -0,0 +1,16 @@
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+import React from 'react';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
+import { DiffConfigProps } from '../../propsType';
+interface Props {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: string;
+    diffConfig?: DiffConfigProps;
+    form: FormInstance;
+    equalWith?: DiffOriginalParams['equalWith'];
+    [name: string]: any;
+}
+declare const ChangedWrapper: React.FC<Props>;
+export default ChangedWrapper;

package/lib/ProForm/components/render/{Changed.js → ChangedWrapper.js}

@@ -10,60 +10,88 @@ var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/obje
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _lodash = require("lodash");
 var _react = _interopRequireWildcard(require("react"));
 var _diffOriginal = require("../../utils/diffOriginal");
-var _excluded = ["name", "names", "namesStr", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
-var Changed = function Changed(props) {
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var _utils = require("../../../utils");
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
+var ChangedWrapper = function ChangedWrapper(props) {
+  var _diffConfig$toolTip;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
-    originalValues = props.originalValues,
     form = props.form,
     equalWith = props.equalWith,
     children = props.children,
     type = props.type,
-    originalDiffTip = props.originalDiffTip,
+    diffConfig = props.diffConfig,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
+  var originalValues = diffConfig.originalValues,
+    changeTipColor = diffConfig.changeTipColor,
+    addTipColor = diffConfig.addTipColor;
+  var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   // 不渲染tooltip
-  var notWatch = !originalDiffTip || ['FormList', 'ProEditTable'].includes(type);
+  var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return (0, _lodash.get)(originalValues, name);
   }) : (0, _lodash.get)(originalValues, name);
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var diffType = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return 'same';
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
-      value: props.value,
+      value: props[valuePropName],
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
     });
-  }, [notWatch, noChange, props.value, originalValue]);
+  }, [isWatch, noChange, props[valuePropName], originalValue]);
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
   var tipContent = (0, _react.useMemo)(function () {
-    if (notWatch || noChange) return undefined;
+    if (!isWatch || noChange) return undefined;
     return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     })) : undefined;
   }, [originalValue, children]);
-  if (notWatch || noChange) {
+  if (!isWatch || noChange) {
     return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest));
   }
+  var tipOpenCalc = function tipOpenCalc() {
+    if (!toolTip) return false;
+    // 传入undefined 鼠标移入显示移出隐藏
+    return isChanged ? undefined : false;
+  };
+  var style = {
+    '--zaui-contract-bg': changeTipColor,
+    '--zaui-contract-bg-add': addTipColor
+  };
+  var diffClassName = (0, _classnames.default)({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
+  });
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: changed ? undefined : false,
+    open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {
       children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
     }),
+    placement: "topLeft",
     children: (0, _jsxRuntime.jsx)("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: diffClassName,
+      style: style,
       children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, children.props), rest)) : undefined
     })
   });
 };
-var _default = exports.default = Changed;
+var _default = exports.default = ChangedWrapper;

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

@@ -26,7 +26,7 @@ var _valueType = _interopRequireDefault(require("../../utils/valueType"));
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
-var _Changed = _interopRequireDefault(require("./Changed"));
+var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -46,12 +46,11 @@ var Render = function Render(props) {
     formDisabled = props.formDisabled,
     type = props.type,
     isSelect = props.isSelect,
-    originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalDiffTip = props.originalDiffTip,
     confirm = props.confirm,
-    globalControl = props.globalControl;
+    globalControl = props.globalControl,
+    diffConfig = props.diffConfig;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -427,17 +426,17 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (originalValues) {
-      child = (0, _jsxRuntime.jsx)(_Changed.default, {
+    if (diffConfig) {
+      child = (0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
         name: formItemProps.name,
         names: otherProps.names,
         namesStr: namesStr,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         form: form,
         equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
         type: type,
         onChange: handleChange,
+        valuePropName: _otherFormItemProps.valuePropName,
         children: child
       });
     }

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

@@ -2,7 +2,7 @@ import { ColProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import React from 'react';
 import { ProColumnProps } from './propsType';
-import { ProFormProps } from '../../propsType';
+import { DiffConfigProps } from '../../propsType';
 interface Props<T = any> {
     isView?: boolean;
     columns: ProColumnProps[];
@@ -13,11 +13,10 @@ interface Props<T = any> {
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;
-    originalValues?: ProFormProps<T>['originalValues'];
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | boolean[] | (() => boolean | boolean[]);
-    originalDiffTip?: boolean;
     globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;

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

@@ -30,11 +30,10 @@ var RenderFields = function RenderFields(props) {
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
     openState = props.openState,
     labelWidth = props.labelWidth,
-    originalValues = props.originalValues,
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalDiffTip = props.originalDiffTip,
+    diffConfig = props.diffConfig,
     globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
@@ -162,6 +161,7 @@ var RenderFields = function RenderFields(props) {
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
+      componentProps.diffConfig = diffConfig;
     }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
@@ -214,10 +214,9 @@ var RenderFields = function RenderFields(props) {
         otherProps: otherProps,
         fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));

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

@@ -30,7 +30,8 @@ import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
 import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
-import { DistributiveOmit } from '../../propsType';
+import { DistributiveOmit, DiffConfigProps } from '../../propsType';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
@@ -201,7 +202,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     upperCase?: boolean;
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
-    equalWith?: (originValue: any, currentValue: any) => boolean;
+    equalWith?: DiffOriginalParams['equalWith'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
@@ -267,7 +268,7 @@ export interface RenderProps<Values = any> {
     form: FormInstance<Values>;
     fieldProps?: ReactiveFunction<Values, React.ReactNode>;
     isSelect: boolean;
-    originalValues?: Values;
+    diffConfig: DiffConfigProps;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
     globalControl?: boolean;

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
-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", "scrollToError", "optimize"];
+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"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
@@ -54,7 +54,7 @@ var ProForm = function ProForm(props, ref) {
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
-    originalValues = props.originalValues,
+    diffConfig = props.diffConfig,
     submitOnEnter = props.submitOnEnter,
     _props$clearNotShow = props.clearNotShow,
     clearNotShow = _props$clearNotShow === void 0 ? true : _props$clearNotShow,
@@ -63,8 +63,6 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalDiffTi = props.originalDiffTip,
-    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
     _props$scrollToError = props.scrollToError,
@@ -262,11 +260,10 @@ var ProForm = function ProForm(props, ref) {
         colProps: colProps,
         viewEmpty: viewEmpty,
         labelWidth: labelWidth,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       }), footerRender()]
     })), children]

package/lib/ProForm/propsType.d.ts

@@ -45,6 +45,16 @@ export interface ProFormOtherProps {
     globalControl?: boolean;
     formDisabled?: boolean;
 }
+export interface DiffConfigProps<Values = any> {
+    /** 比对原始数据源 */
+    originalValues: Values;
+    /** 是否显示对比值气泡 */
+    toolTip?: boolean;
+    /** 变更提示颜色 */
+    changeTipColor?: string;
+    /** 新增提示颜色 */
+    addTipColor?: string;
+}
 export interface ProFormProps<Values = any> extends FormProps<Values> {
     disabled?: boolean;
     /** 全局控制优先 */
@@ -67,14 +77,14 @@ export interface ProFormProps<Values = any> extends FormProps<Values> {
     viewEmpty?: React.ReactNode | string;
     confirmLoading?: boolean;
     labelWidth?: string | number;
-    originalValues?: Values;
     /** 是否回车提交 */
     submitOnEnter?: boolean;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     formId?: string;
     required?: boolean | boolean[];
-    originalDiffTip?: boolean;
+    /** 表单比对配置 */
+    diffConfig?: DiffConfigProps;
     scrollToError?: boolean;
     /** 性能模式，谨慎使用，默认不开启
      * 1. 开启不过滤names的中间态值