@zat-design/sisyphus-react 3.4.2-beta.3 → 3.4.2-beta.5

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

@@ -72,7 +72,7 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalTip = config.originalTip;
+    originalDiffTip = config.originalDiffTip;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -505,7 +505,7 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = classNames(_defineProperty(_defineProperty({}, className, className), 'pro-form-item-changed', changed));
-  var originalTitle = originalTip ? _jsxs(_Space, {
+  var originalTitle = originalDiffTip ? _jsxs(_Space, {
     children: ["\u521D\u59CB\u503C\uFF1A", /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, _objectSpread(_objectSpread({}, omit(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
@@ -527,7 +527,7 @@ var RenderField = function RenderField(_ref) {
   });
   return _jsx(FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
-    children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
+    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : _jsx(_Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,
       children: FormItem

package/es/ProEditTable/index.js

@@ -10,7 +10,7 @@ import _ConfigProvider from "antd/es/config-provider";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
 import { get, isArray } from 'lodash';
@@ -49,7 +49,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
-    originalTip = _ref.originalTip,
+    originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     resetProps = _objectWithoutProperties(_ref, _excluded);
   // 上下文form
@@ -151,7 +151,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableLength: value === null || value === void 0 ? void 0 : value.length,
     page: page,
     originalValues: originalValues,
-    originalTip: originalTip,
+    originalDiffTip: originalDiffTip,
     prefixCls: prefixCls
   };
   // 编辑行设置下样式

package/es/ProEditTable/propsType.d.ts

@@ -130,7 +130,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @description       原始数据源，是否tooltip显示
      * @default           -
      */
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
      * @default           false

package/es/ProEnum/style/index.less

@@ -73,6 +73,7 @@
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
       border: 1px solid var(--zaui-brand);
+      background: #fff;
       &::after {
         background: transparent;
       }

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

@@ -52,7 +52,7 @@ var Render = function Render(props) {
     originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalTip = props.originalTip,
+    originalDiffTip = props.originalDiffTip,
     confirm = props.confirm,
     globalControl = props.globalControl;
   var colProps = props.colProps;
@@ -434,7 +434,7 @@ var Render = function Render(props) {
       });
     }
     // 不渲染tooltip
-    if (!originalTip || ['FormList', 'ProEditTable'].includes(type)) {
+    if (!originalDiffTip || ['FormList', 'ProEditTable'].includes(type)) {
       return formItem;
     }
     var title = _jsxs(_Space, {

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

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

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

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

package/es/ProForm/index.js

@@ -12,7 +12,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", "originalTip", "formKey", "globalControl"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
@@ -63,8 +63,8 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalTip = props.originalTip,
-    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    _props$originalDiffTi = props.originalDiffTip,
+    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
     otherProps = _objectWithoutProperties(props, _excluded);
@@ -254,7 +254,7 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip,
+        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       }), children, footerRender()]
     }))

package/es/ProForm/propsType.d.ts

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

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

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

package/es/ProForm/utils/diffOriginal.js

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

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

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

package/es/ProForm/utils/index.js

@@ -108,7 +108,7 @@ export var weedOutProps = function weedOutProps(data, keys) {
   return [obj, weedOut];
 };
 // 对比字段变化
-export var contrast = function contrast(prevValues, curValues, names) {
+export var diffField = function diffField(prevValues, curValues, names) {
   return names.some(function (name) {
     return _.get(prevValues, name) !== _.get(curValues, name);
   });

package/es/ProForm/utils/transformValue.js

@@ -2,7 +2,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["value"];
 import { set } from 'lodash';
-import { contrast } from '../utils';
+import { diffField } from '../utils';
 export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
@@ -41,7 +41,7 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       }, cusRest);
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
-      return contrast(prevValues, curValues, names);
+      return diffField(prevValues, curValues, names);
     }
   };
 };

package/es/ProForm/utils/useChanged.js

@@ -1,7 +1,7 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
-import { contrastOriginal } from './contrastOriginal';
+import { diffOriginal } from './diffOriginal';
 export var useChanged = function useChanged(_ref) {
   var name = _ref.name,
     names = _ref.names,
@@ -16,11 +16,12 @@ export var useChanged = function useChanged(_ref) {
   if (notWatch) form = [];
   var value = _Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
-  var changed = contrastOriginal({
+  var changed = diffOriginal({
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

package/es/ProForm/utils/useListChanged.d.ts

@@ -1,7 +1,7 @@
 import { FormInstance } from 'antd';
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 interface Params {
-    name?: NamePath;
+    name?: any;
     names?: NamePath[];
     namesStr?: NamePath;
     originalName?: NamePath;

package/es/ProForm/utils/useListChanged.js

@@ -1,7 +1,7 @@
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import { get } from 'lodash';
-import { contrastOriginal } from './contrastOriginal';
+import { diffOriginal } from './diffOriginal';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -83,11 +83,12 @@ export var useListChanged = function useListChanged(params) {
   if (notWatch) _form = [];
   var value = _Form.useWatch(namePath, _form);
   if (notWatch || noChange) return [false];
-  var changed = contrastOriginal({
+  var changed = diffOriginal({
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

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

@@ -5,7 +5,7 @@ interface Props {
     value?: any;
     currentValue?: any;
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;

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

@@ -18,10 +18,10 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalTip = props.originalTip;
+    originalDiffTip = props.originalDiffTip;
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalTip) {
+    if (ellipsis || originalDiffTip) {
       if (ellipsis) {
         renderNode = _jsx(Text, {
           style: {
@@ -38,7 +38,7 @@ var RenderColumn = function RenderColumn(props) {
         style: {
           width: width
         },
-        title: originalTip ? _jsxs(_Fragment, {
+        title: originalDiffTip ? _jsxs(_Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, _jsx("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
         }) : node,
         children: renderNode

package/es/ProTable/propsType.d.ts

@@ -26,7 +26,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {

package/es/ProTable/utils.js

@@ -57,8 +57,8 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    _column$originalTip = column.originalTip,
-    originalTip = _column$originalTip === void 0 ? true : _column$originalTip;
+    _column$originalDiffT = column.originalDiffTip,
+    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -122,7 +122,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: renderValue,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -151,7 +151,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -203,7 +203,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -224,7 +224,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (precision || prefix || suffix) {
@@ -250,7 +250,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (valueType === 'address') {
@@ -322,7 +322,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
           node: value,
           value: value,
           currentValue: value || '-',
-          originalTip: originalTip
+          originalDiffTip: originalDiffTip
         }), suffixNode(value, record, index)]
       });
     };
@@ -344,7 +344,7 @@ export var formatColumn = function formatColumn(column, originalObj, dataSourceO
         node: node,
         value: value,
         currentValue: value || '-',
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   }

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

@@ -75,7 +75,7 @@ var RenderField = function RenderField(_ref) {
     virtualKey = config.virtualKey,
     viewEmpty = config.viewEmpty,
     originalValues = config.originalValues,
-    originalTip = config.originalTip;
+    originalDiffTip = config.originalDiffTip;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -508,7 +508,7 @@ var RenderField = function RenderField(_ref) {
     delete _formItemProps.rules;
   }
   var _className = (0, _classnames.default)((0, _defineProperty2.default)((0, _defineProperty2.default)({}, className, className), 'pro-form-item-changed', changed));
-  var originalTitle = originalTip ? (0, _jsxRuntime.jsxs)(_antd.Space, {
+  var originalTitle = originalDiffTip ? (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)({}, (0, _lodash.omit)(componentProps, ['onFieldChange'])), {}, {
       isView: true,
       value: originalValue,
@@ -530,7 +530,7 @@ var RenderField = function RenderField(_ref) {
   });
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
     value: componentProps === null || componentProps === void 0 ? void 0 : componentProps.otherProps,
-    children: !originalTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    children: !originalDiffTip || ['FormList', 'ProEditTable'].includes(type) ? FormItem : (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: originalTitle,
       open: changed ? undefined : false,
       children: FormItem

package/lib/ProEditTable/index.js

@@ -23,7 +23,7 @@ var _tools = require("./utils/tools");
 var _components = require("./components");
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
-var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalTip", "rowKey"];
+var _excluded = ["value", "onChange", "className", "columns", "type", "mode", "stripe", "draggable", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "otherProps", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "originalDiffTip", "rowKey"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _value$2;
   var value = _ref.value,
@@ -52,7 +52,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
     originalValues = _ref.originalValues,
-    originalTip = _ref.originalTip,
+    originalDiffTip = _ref.originalDiffTip,
     rowKey = _ref.rowKey,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
   // 上下文form
@@ -154,7 +154,7 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     tableLength: value === null || value === void 0 ? void 0 : value.length,
     page: page,
     originalValues: originalValues,
-    originalTip: originalTip,
+    originalDiffTip: originalDiffTip,
     prefixCls: prefixCls
   };
   // 编辑行设置下样式

package/lib/ProEditTable/propsType.d.ts

@@ -130,7 +130,7 @@ export interface ProEditTableProps<T = any> extends Omit<TableProps<T>, 'onChang
      * @description       原始数据源，是否tooltip显示
      * @default           -
      */
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     /**
      * @description       可编辑表格的类型，单行、多行、单元格编辑
      * @default           false

package/lib/ProEnum/style/index.less

@@ -73,6 +73,7 @@
     .pro-enum-group-item-selected {
       color: var(--zaui-brand);
       border: 1px solid var(--zaui-brand);
+      background: #fff;
       &::after {
         background: transparent;
       }

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

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

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

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

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

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

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _index = require("./utils/index");
 var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalTip", "formKey", "globalControl"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage;
   var _props$mode = props.mode,
@@ -64,8 +64,8 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalTip = props.originalTip,
-    originalTip = _props$originalTip === void 0 ? true : _props$originalTip,
+    _props$originalDiffTi = props.originalDiffTip,
+    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
@@ -255,7 +255,7 @@ var ProForm = function ProForm(props, ref) {
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalTip: originalTip,
+        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       }), children, footerRender()]
     }))

package/lib/ProForm/propsType.d.ts

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

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

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

package/lib/ProForm/utils/diffOriginal.js

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

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

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

package/lib/ProForm/utils/index.js

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

package/lib/ProForm/utils/transformValue.js

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

package/lib/ProForm/utils/useChanged.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _contrastOriginal = require("./contrastOriginal");
+var _diffOriginal = require("./diffOriginal");
 var useChanged = exports.useChanged = function useChanged(_ref) {
   var name = _ref.name,
     names = _ref.names,
@@ -21,11 +21,12 @@ var useChanged = exports.useChanged = function useChanged(_ref) {
   if (notWatch) form = [];
   var value = _antd.Form.useWatch(namesStr || name, form);
   if (notWatch) return [false];
-  var changed = (0, _contrastOriginal.contrastOriginal)({
+  var changed = (0, _diffOriginal.diffOriginal)({
     originalValue: originalValue,
     value: value,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

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

@@ -1,7 +1,7 @@
 import { FormInstance } from 'antd';
 import { InternalNamePath, NamePath } from 'antd/lib/form/interface';
 interface Params {
-    name?: NamePath;
+    name?: any;
     names?: NamePath[];
     namesStr?: NamePath;
     originalName?: NamePath;

package/lib/ProForm/utils/useListChanged.js

@@ -6,7 +6,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.useListChanged = void 0;
 var _antd = require("antd");
 var _lodash = require("lodash");
-var _contrastOriginal = require("./contrastOriginal");
+var _diffOriginal = require("./diffOriginal");
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -88,11 +88,12 @@ var useListChanged = exports.useListChanged = function useListChanged(params) {
   if (notWatch) _form = [];
   var value = _antd.Form.useWatch(namePath, _form);
   if (notWatch || noChange) return [false];
-  var changed = (0, _contrastOriginal.contrastOriginal)({
+  var changed = (0, _diffOriginal.diffOriginal)({
     value: value,
     originalValue: originalValue,
     form: form,
-    equalWith: equalWith
+    equalWith: equalWith,
+    name: namesStr || name
   });
   return [changed, originalValue];
 };

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -5,7 +5,7 @@ interface Props {
     value?: any;
     currentValue?: any;
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     ellipsis?: any;
     width?: number | string;
     originalValue?: any;

package/lib/ProTable/components/RenderColumn/index.js

@@ -22,10 +22,10 @@ var RenderColumn = function RenderColumn(props) {
     ellipsis = props.ellipsis,
     width = props.width,
     originalValue = props.originalValue,
-    originalTip = props.originalTip;
+    originalDiffTip = props.originalDiffTip;
   if (originalValue !== undefined) {
     var renderNode = value ? node : '-';
-    if (ellipsis || originalTip) {
+    if (ellipsis || originalDiffTip) {
       if (ellipsis) {
         renderNode = (0, _jsxRuntime.jsx)(Text, {
           style: {
@@ -42,7 +42,7 @@ var RenderColumn = function RenderColumn(props) {
         style: {
           width: width
         },
-        title: originalTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
+        title: originalDiffTip ? (0, _jsxRuntime.jsxs)(_jsxRuntime.Fragment, {
           children: ["\u521D\u59CB\u503C\uFF1A", originalValue, (0, _jsxRuntime.jsx)("br", {}), ellipsis ? "\u5F53\u524D\u503C\uFF1A".concat(currentValue) : undefined]
         }) : node,
         children: renderNode

package/lib/ProTable/propsType.d.ts

@@ -26,7 +26,7 @@ export interface ProTableColumn extends Omit<ColumnType<any>, 'dataIndex'> {
     precision?: number;
     code?: string | string[] | ((text: any, record: any) => string);
     copyable?: boolean;
-    originalTip?: boolean;
+    originalDiffTip?: boolean;
     prefix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     suffix?: string | ReactNode | ((value: any, record?: any, index?: number) => any);
     tooltip?: ReactNode | {

package/lib/ProTable/utils.js

@@ -64,8 +64,8 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
     prefix = column.prefix,
     suffix = column.suffix,
     dataIndex = column.dataIndex,
-    _column$originalTip = column.originalTip,
-    originalTip = _column$originalTip === void 0 ? true : _column$originalTip;
+    _column$originalDiffT = column.originalDiffTip,
+    originalDiffTip = _column$originalDiffT === void 0 ? true : _column$originalDiffT;
   // 前缀处理
   var prefixNode = function prefixNode(value, record, index) {
     if (!prefix) {
@@ -129,7 +129,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: renderValue,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
     // 千分位, 千分位带CNY前缀
@@ -158,7 +158,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -210,7 +210,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -231,7 +231,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (precision || prefix || suffix) {
@@ -257,7 +257,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: renderValue,
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   } else if (valueType === 'address') {
@@ -329,7 +329,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
           node: value,
           value: value,
           currentValue: value || '-',
-          originalTip: originalTip
+          originalDiffTip: originalDiffTip
         }), suffixNode(value, record, index)]
       });
     };
@@ -351,7 +351,7 @@ var formatColumn = exports.formatColumn = function formatColumn(column, original
         node: node,
         value: value,
         currentValue: value || '-',
-        originalTip: originalTip
+        originalDiffTip: originalDiffTip
       });
     };
   }

package/package.json

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

package/es/ProForm/utils/contrastOriginal.js

@@ -1,24 +0,0 @@
-import { isEqual, isFunction } from 'lodash';
-var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-export var contrastOriginal = function contrastOriginal(params) {
-  var originalValue = params.originalValue,
-    value = params.value,
-    equalWith = params.equalWith;
-  // 支持传入自定义比较事件
-  if (isFunction(equalWith)) {
-    return !equalWith(originalValue, value);
-  }
-  if (Array.isArray(originalValue)) {
-    return originalValue.some(function (valueItem, index) {
-      // 如果两个值有一个不是空值, 则进行深比较
-      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
-        return !isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
-      }
-      return false;
-    });
-  }
-  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !isEqual(value, originalValue);
-  }
-  return false;
-};

package/lib/ProForm/utils/contrastOriginal.js

@@ -1,30 +0,0 @@
-"use strict";
-
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.contrastOriginal = void 0;
-var _lodash = require("lodash");
-var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
-var contrastOriginal = exports.contrastOriginal = function contrastOriginal(params) {
-  var originalValue = params.originalValue,
-    value = params.value,
-    equalWith = params.equalWith;
-  // 支持传入自定义比较事件
-  if ((0, _lodash.isFunction)(equalWith)) {
-    return !equalWith(originalValue, value);
-  }
-  if (Array.isArray(originalValue)) {
-    return originalValue.some(function (valueItem, index) {
-      // 如果两个值有一个不是空值, 则进行深比较
-      if (!nullValue.includes(value === null || value === void 0 ? void 0 : value[index]) || !nullValue.includes(valueItem)) {
-        return !(0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
-      }
-      return false;
-    });
-  }
-  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return !(0, _lodash.isEqual)(value, originalValue);
-  }
-  return false;
-};