@zat-design/sisyphus-react 3.7.3-beta.2 → 3.7.3-beta.3

package/es/ProEditTable/components/RenderField/{ListChanged.d.ts → ListChangedWrapper.d.ts}

@@ -12,5 +12,5 @@ interface Props {
     equalWith?: (preValue: any, curValue: any) => boolean | undefined;
     [name: string]: any;
 }
-declare const ListChanged: React.FC<Props>;
-export default ListChanged;
+declare const ListChangedWrapper: React.FC<Props>;
+export default ListChangedWrapper;

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

@@ -9,6 +9,8 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
 import { get } from 'lodash';
 import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
+import { useProConfig } from '../../../ProConfigProvider';
+import { isEmpty } from '../../../utils';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -61,7 +63,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     return get(originalValues, originalName);
   }) : get(originalValues, originalName);
 };
-var ListChanged = function ListChanged(props) {
+var ListChangedWrapper = function ListChangedWrapper(props) {
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -76,11 +78,13 @@ var ListChanged = function ListChanged(props) {
     children = props.children,
     type = props.type,
     rest = _objectWithoutProperties(props, _excluded);
+  var _useProConfig = useProConfig('ProEditTable'),
+    isDiffAll = _useProConfig.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,
@@ -88,9 +92,9 @@ var ListChanged = function ListChanged(props) {
     rowKeyPath: rowKeyPath,
     form: form
   }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = useMemo(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  var isChanged = useMemo(function () {
+    if (!isWatch || noChange) return false;
     return diffOriginal({
       value: props.value,
       originalValue: originalValue,
@@ -99,11 +103,12 @@ var ListChanged = function ListChanged(props) {
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
   }, [props.value, originalValue]);
-  if (notWatch || noChange) {
+  if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
   return _jsx(_Tooltip, {
-    open: changed ? undefined : false,
+    // 传入undefined 鼠标移入显示移出隐藏
+    open: isChanged ? undefined : false,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
@@ -116,9 +121,9 @@ var ListChanged = function ListChanged(props) {
       })) : undefined]
     }),
     children: _jsx("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: isChanged ? 'pro-form-item-changed' : '',
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
     })
   });
 };
-export default ListChanged;
+export default ListChangedWrapper;

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

@@ -25,7 +25,7 @@ import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
 import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
 import { getDefaultProps } from '../../utils/getDefaultProps';
-import ListChanged from './ListChanged';
+import ListChangedWrapper from './ListChangedWrapper';
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
   var value = _ref.text,
@@ -547,7 +547,7 @@ var RenderField = function RenderField(_ref) {
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues) {
-      FieldComponent = _jsx(ListChanged, {
+      FieldComponent = _jsx(ListChangedWrapper, {
         name: cellName,
         names: names,
         namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),

package/es/ProEnum/index.js

@@ -11,7 +11,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-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"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
@@ -39,10 +39,11 @@ var ProEnum = function ProEnum(props) {
     onChange = props.onChange,
     transformResponse = props.transformResponse,
     otherProps = props.otherProps,
+    isView = props.isView,
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
-    isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var _isView = isView || otherProps.isView;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -226,7 +227,7 @@ var ProEnum = function ProEnum(props) {
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
     _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.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;
@@ -271,7 +272,7 @@ var ProEnum = function ProEnum(props) {
     };
     return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
-  if (isView) {
+  if (_isView) {
     if (Array.isArray(value)) {
       return _jsx(Container, {
         tooltip: true,

package/{lib/ProForm/components/render/Changed.d.ts → es/ProForm/components/render/ChangedWrapper.d.ts}

@@ -1,14 +1,15 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
 import React from 'react';
+import { DiffConfigProps } from '../../propsType';
 interface Props {
     name?: NamePath;
     names?: NamePath[];
     namesStr?: string;
-    originalValues?: any;
+    diffConfig?: DiffConfigProps;
     form: FormInstance;
     equalWith?: (preValue: any, curValue: any) => boolean | undefined;
     [name: string]: any;
 }
-declare const Changed: React.FC<Props>;
-export default Changed;
+declare const ChangedWrapper: React.FC<Props>;
+export default ChangedWrapper;

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

@@ -4,30 +4,36 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { get } from 'lodash';
 import React, { useMemo } from 'react';
 import { diffOriginal } from '../../utils/diffOriginal';
-var Changed = function Changed(props) {
+import { useProConfig } from '../../../ProConfigProvider';
+import { isEmpty } from '../../../utils';
+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,
     rest = _objectWithoutProperties(props, _excluded);
+  var _useProConfig = useProConfig('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
+  var originalValues = diffConfig.originalValues;
+  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 get(originalValues, name);
   }) : get(originalValues, name);
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = useMemo(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  var isChanged = useMemo(function () {
+    if (!isWatch || noChange) return false;
     return diffOriginal({
       originalValue: originalValue,
       value: props.value,
@@ -35,30 +41,38 @@ var Changed = function Changed(props) {
       equalWith: equalWith
       // name: namesStr || name,
     });
-  }, [notWatch, noChange, props.value, originalValue]);
+  }, [isWatch, noChange, props.value, originalValue]);
   var tipContent = useMemo(function () {
-    if (notWatch || noChange) return undefined;
+    if (!isWatch || noChange) return undefined;
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     })) : undefined;
   }, [originalValue, children]);
-  if (notWatch || noChange) {
+  if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
+  var tipOpenCalc = function tipOpenCalc() {
+    if (!toolTip) {
+      return false;
+    }
+    // 传入undefined 鼠标移入显示移出隐藏
+    return isChanged ? undefined : false;
+  };
   return _jsx(_Tooltip, {
-    open: changed ? undefined : false,
+    open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
     title: _jsxs(_Space, {
       children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
     }),
+    placement: "topLeft",
     children: _jsx("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: isChanged ? 'pro-form-item-changed' : '',
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
     })
   });
 };
-export default Changed;
+export default ChangedWrapper;

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

@@ -28,7 +28,7 @@ import valueTypeMap from '../../utils/valueType';
 import tipSvg from '../../../assets/tip.svg';
 import useRules from '../../utils/useRules';
 import ConfirmWrapper from './ConfirmWrapper';
-import Changed from './Changed';
+import ChangedWrapper from './ChangedWrapper';
 // 这个组件只管渲染, 参数的整理在外部处理
 var Render = function Render(props) {
   var _ref2, _ref3, _ref4, _ref5, _otherProps$names2;
@@ -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,15 +426,14 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (originalValues) {
-      child = _jsx(Changed, {
+    if (diffConfig) {
+      child = _jsx(ChangedWrapper, {
         name: formItemProps.name,
         names: otherProps.names,
         namesStr: namesStr,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         form: form,
         equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
         type: type,
         onChange: handleChange,
         children: child

package/es/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/es/ProForm/components/render/RenderFields.js

@@ -22,11 +22,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) {
@@ -206,10 +205,9 @@ var RenderFields = function RenderFields(props) {
         otherProps: otherProps,
         fieldProps: 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/es/ProForm/components/render/propsType.d.ts

@@ -30,7 +30,7 @@ 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';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
@@ -267,7 +267,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/es/ProForm/index.js

@@ -11,7 +11,7 @@ import _Space from "antd/es/space";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "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"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
@@ -53,7 +53,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,
@@ -62,8 +62,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,
@@ -261,11 +259,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/es/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的中间态值

package/es/utils/index.d.ts

@@ -0,0 +1,2 @@
+/** 判断一个值是否是空值 */
+export declare const isEmpty: (value: any) => boolean;

package/es/utils/index.js

@@ -0,0 +1,13 @@
+var EMPTY_VALUE = [undefined, null, ''];
+/** 判断一个值是否是空值 */
+export var isEmpty = function isEmpty(value) {
+  if (EMPTY_VALUE.includes(value)) {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return !(value === null || value === void 0 ? void 0 : value.length) || value.every(function (item) {
+      return EMPTY_VALUE.includes(item);
+    });
+  }
+  return false;
+};

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

@@ -12,5 +12,5 @@ interface Props {
     equalWith?: (preValue: any, curValue: any) => boolean | undefined;
     [name: string]: any;
 }
-declare const ListChanged: React.FC<Props>;
-export default ListChanged;
+declare const ListChangedWrapper: React.FC<Props>;
+export default ListChangedWrapper;

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

@@ -13,6 +13,8 @@ var _react = _interopRequireWildcard(require("react"));
 var _antd = require("antd");
 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 +68,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 +83,13 @@ var ListChanged = function ListChanged(props) {
     children = props.children,
     type = props.type,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProEditTable'),
+    isDiffAll = _useProConfig.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 +97,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 isChanged = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return false;
     return (0, _diffOriginal.diffOriginal)({
       value: props.value,
       originalValue: originalValue,
@@ -104,11 +108,14 @@ var ListChanged = function ListChanged(props) {
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
   }, [props.value, originalValue]);
-  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));
   }
-  return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
-    open: changed ? undefined : false,
+  return (0, _jsxRuntime.jsx)(_antd.Tooltip
+  // 传入undefined 鼠标移入显示移出隐藏
+  , {
+    // 传入undefined 鼠标移入显示移出隐藏
+    open: isChanged ? undefined : false,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
@@ -121,9 +128,9 @@ var ListChanged = function ListChanged(props) {
       })) : undefined]
     }),
     children: (0, _jsxRuntime.jsx)("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: isChanged ? 'pro-form-item-changed' : '',
       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.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/{es/ProForm/components/render/Changed.d.ts → lib/ProForm/components/render/ChangedWrapper.d.ts}

@@ -1,14 +1,15 @@
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
 import React from 'react';
+import { DiffConfigProps } from '../../propsType';
 interface Props {
     name?: NamePath;
     names?: NamePath[];
     namesStr?: string;
-    originalValues?: any;
+    diffConfig?: DiffConfigProps;
     form: FormInstance;
     equalWith?: (preValue: any, curValue: any) => boolean | undefined;
     [name: string]: any;
 }
-declare const Changed: React.FC<Props>;
-export default Changed;
+declare const ChangedWrapper: React.FC<Props>;
+export default ChangedWrapper;

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

@@ -13,26 +13,32 @@ var _antd = require("antd");
 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"];
+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,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
+  var originalValues = diffConfig.originalValues;
+  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 isChanged = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return false;
     return (0, _diffOriginal.diffOriginal)({
       originalValue: originalValue,
       value: props.value,
@@ -40,30 +46,38 @@ var Changed = function Changed(props) {
       equalWith: equalWith
       // name: namesStr || name,
     });
-  }, [notWatch, noChange, props.value, originalValue]);
+  }, [isWatch, noChange, props.value, originalValue]);
   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;
+  };
   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: isChanged ? 'pro-form-item-changed' : '',
       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,15 +426,14 @@ 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,
         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) {
@@ -214,10 +213,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,7 @@ 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';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
@@ -267,7 +267,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的中间态值

package/lib/utils/index.d.ts

@@ -0,0 +1,2 @@
+/** 判断一个值是否是空值 */
+export declare const isEmpty: (value: any) => boolean;

package/lib/utils/index.js

@@ -0,0 +1,19 @@
+"use strict";
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.isEmpty = void 0;
+var EMPTY_VALUE = [undefined, null, ''];
+/** 判断一个值是否是空值 */
+var isEmpty = exports.isEmpty = function isEmpty(value) {
+  if (EMPTY_VALUE.includes(value)) {
+    return true;
+  }
+  if (Array.isArray(value)) {
+    return !(value === null || value === void 0 ? void 0 : value.length) || value.every(function (item) {
+      return EMPTY_VALUE.includes(item);
+    });
+  }
+  return false;
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@zat-design/sisyphus-react",
-  "version": "3.7.3-beta.2",
+  "version": "3.7.3-beta.3",
   "license": "Apache-2.0",
   "main": "lib/index.js",
   "module": "es/index.js",

package/.vscode/extensions.json

@@ -1,5 +0,0 @@
-{
-    "recommendations": [
-        "kisstkondoros.vscode-codemetrics"
-    ]
-}