@zat-design/sisyphus-react 3.9.0-beta.2 → 3.9.0-beta.20

package/dist/index.esm.css

@@ -1908,6 +1908,16 @@
   background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
   border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
 }
+.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+}
+.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+}
 .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
   margin-left: -8px;
   padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
@@ -3087,7 +3097,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg, #fffaa1);
 }
-.pro-form .pro-form-item-changed .ant-checkbox-group {
+.pro-form .pro-form-item-changed .ant-checkbox-group,
+.pro-form .pro-form-item-changed .pro-switch-checkbox {
   padding: 5px 0;
 }
 .pro-form .pro-form-item-changed:has(.ant-switch) {
@@ -3106,7 +3117,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-form .pro-form-item-add .ant-input {
-  background: var(--zaui-contract-bg, #fffaa1) !important;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
@@ -3147,7 +3158,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
 }
-.pro-form .pro-form-item-add .ant-checkbox-group {
+.pro-form .pro-form-item-add .ant-checkbox-group,
+.pro-form .pro-form-item-add .pro-switch-checkbox {
   padding: 5px 0;
 }
 .pro-form .pro-form-item-add:has(.ant-switch) {
@@ -3161,25 +3173,27 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.original-value-tootip {
+.original-value-tooltip {
   max-width: 100%;
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
-  position: fixed;
 }
-.original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+.original-value-tooltip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
-.original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
+.original-value-tooltip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
   display: block;
 }
-.original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
+.original-value-tooltip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
   word-break: keep-all;
 }
-.original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+.original-value-tooltip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
+.original-value-tooltip-fixed {
+  position: fixed;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;
@@ -4600,10 +4614,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
   width: auto;
 }
-.pro-edit-table .is-new-row td,
-.pro-edit-table .is-new-row.ant-table-row:hover td,
-.pro-edit-table .is-new-row .ant-table-cell-row-hover,
-.pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
+.pro-edit-table .ant-table .ant-table-body .ant-table-tbody .is-new-row.ant-table-row td {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-edit-table .ant-table .ant-table-body .ant-table-tbody .is-new-row.ant-table-row:hover td,
+.pro-edit-table .ant-table .ant-table-body .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-edit-table-footer {
@@ -5617,8 +5632,10 @@ input[type='button'] {
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody tr td {
   border-bottom: none;
 }
-.ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td {
-  background-color: var(--zaui-table-hover-bg, #fafafa);
+.ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td,
+.ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td.ant-table-cell-fix-right,
+.ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even):hover td.ant-table-cell-fix-left {
+  background-color: var(--zaui-table-hover-bg, #fafafa) !important;
 }
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td,
 .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .ant-table-row:nth-child(even) td.ant-table-cell-fix-right,

package/dist/less.esm.css

@@ -1908,6 +1908,16 @@
   background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
   border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
 }
+.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-right {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+}
+.pro-table tbody.ant-table-tbody tr.ant-table-row.new-cell td.ant-table-cell.ant-table-cell-fix-left {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+  border-bottom: 1px solid var(--zaui-form-control-line, #dcdcdc);
+}
 .pro-table tbody.ant-table-tbody .ant-table-cell .varied-cell {
   margin-left: -8px;
   padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
@@ -3087,7 +3097,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg, #fffaa1);
 }
-.pro-form .pro-form-item-changed .ant-checkbox-group {
+.pro-form .pro-form-item-changed .ant-checkbox-group,
+.pro-form .pro-form-item-changed .pro-switch-checkbox {
   padding: 5px 0;
 }
 .pro-form .pro-form-item-changed:has(.ant-switch) {
@@ -3106,7 +3117,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-form .pro-form-item-add .ant-input {
-  background: var(--zaui-contract-bg, #fffaa1) !important;
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
@@ -3147,7 +3158,8 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-add .ant-form-item-control-input-content > .ant-input-group .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
 }
-.pro-form .pro-form-item-add .ant-checkbox-group {
+.pro-form .pro-form-item-add .ant-checkbox-group,
+.pro-form .pro-form-item-add .pro-switch-checkbox {
   padding: 5px 0;
 }
 .pro-form .pro-form-item-add:has(.ant-switch) {
@@ -3161,25 +3173,27 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.original-value-tootip {
+.original-value-tooltip {
   max-width: 100%;
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
-  position: fixed;
 }
-.original-value-tootip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
+.original-value-tooltip .changed-tooltip .original-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
-.original-value-tootip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
+.original-value-tooltip .changed-tooltip .original-value-container .pro-group .ant-space-compact {
   display: block;
 }
-.original-value-tootip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
+.original-value-tooltip .changed-tooltip .original-value-container .pro-group .pro-form-view-container {
   word-break: keep-all;
 }
-.original-value-tootip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
+.original-value-tooltip .changed-tooltip .current-value-container .ant-space-item:nth-child(1) {
   white-space: nowrap;
 }
+.original-value-tooltip-fixed {
+  position: fixed;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;
@@ -4600,10 +4614,11 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table-pagination .ant-pagination-options .ant-select.ant-select-in-form-item {
   width: auto;
 }
-.pro-edit-table .is-new-row td,
-.pro-edit-table .is-new-row.ant-table-row:hover td,
-.pro-edit-table .is-new-row .ant-table-cell-row-hover,
-.pro-edit-table .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
+.pro-edit-table .ant-table .ant-table-body .ant-table-tbody .is-new-row.ant-table-row td {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-edit-table .ant-table .ant-table-body .ant-table-tbody .is-new-row.ant-table-row:hover td,
+.pro-edit-table .ant-table .ant-table-body .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
 .pro-edit-table-footer {

package/es/ProDrawerForm/components/ProDrawer/index.js

@@ -36,6 +36,7 @@ var ProDrawer = function ProDrawer(_ref) {
     onCancel = _ref.onCancel,
     children = _ref.children,
     className = _ref.className,
+    zIndex = _ref.zIndex,
     drawerProps = _ref.drawerProps;
   var ref = useRef(null);
   var modalRef = useRef(null);
@@ -192,7 +193,8 @@ var ProDrawer = function ProDrawer(_ref) {
     placement: "right",
     className: "pro-drawer ".concat(className !== null && className !== void 0 ? className : ''),
     closable: false,
-    onClose: onCancel
+    onClose: onCancel,
+    zIndex: zIndex
   }, drawerProps), {}, {
     children: [_jsx("div", {
       className: "pro-drawer-close",

package/es/ProDrawerForm/components/ProModal/index.js

@@ -35,8 +35,9 @@ var ProModal = function ProModal(_ref) {
     onCancel = _ref.onCancel,
     children = _ref.children,
     className = _ref.className,
-    modalProps = _ref.modalProps,
-    extraLeft = _ref.extraLeft;
+    extraLeft = _ref.extraLeft,
+    zIndex = _ref.zIndex,
+    modalProps = _ref.modalProps;
   var ref = useRef(null);
   var _ref2 = useScroll((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentNode) || {},
     top = _ref2.top;
@@ -178,7 +179,8 @@ var ProModal = function ProModal(_ref) {
     closeIcon: _jsx(ReactSVG, {
       className: "close-icon",
       src: closeSvg
-    })
+    }),
+    zIndex: zIndex
   }, modalProps), {}, {
     children: _jsx("div", {
       ref: ref,

package/es/ProDrawerForm/propsType.d.ts

@@ -98,4 +98,5 @@ export interface ProDrawerFormPropsType {
      */
     onCloseClean?: boolean;
     children?: React.ReactNode;
+    zIndex?: number;
 }

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

@@ -8,7 +8,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type", "normalize", "getValueProps", "valuePropName", "viewRender", "diffConfig", "index"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo, useRef } from 'react';
-import classNames from 'classnames';
+import classnames from 'classnames';
 import { get } from 'lodash';
 import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
 import { useProConfig } from '../../../ProConfigProvider';
@@ -162,7 +162,11 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   };
   // @ts-ignore
   var _showEllipse = ((_children$props = children.props) === null || _children$props === void 0 ? void 0 : _children$props.showEllipse) || ((_children$props2 = children.props) === null || _children$props2 === void 0 ? void 0 : _children$props2.tooltip);
-  var diffClassName = classNames({
+  var classNames = classnames({
+    'original-value-tooltip': true,
+    'original-value-tooltip-fixed': true
+  });
+  var diffClassName = classnames({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
@@ -172,7 +176,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: "original-value-tootip",
+    overlayClassName: classNames,
     placement: "topLeft",
     autoAdjustOverflow: false,
     title: _jsxs(_Space, {

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

@@ -6,7 +6,7 @@ import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -53,6 +53,7 @@ var RenderField = function RenderField(_ref) {
     _column$rules = column.rules,
     rules = _column$rules === void 0 ? [] : _column$rules,
     equalWith = column.equalWith,
+    onDiff = column.onDiff,
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
@@ -555,7 +556,7 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: equalWith,
+        equalWith: onDiff || equalWith,
         type: type,
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,

package/es/ProEditTable/style/index.less

@@ -281,8 +281,11 @@
     }
   }
 
-  .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
-    td, .@{ant-prefix}-table-cell-row-hover {
+  .@{ant-prefix}-table .@{ant-prefix}-table-body .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td{
+    background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  }
+  .@{ant-prefix}-table .@{ant-prefix}-table-body .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
+       td, .@{ant-prefix}-table-cell-row-hover {
       background: var(--zaui-contract-bg-add, #d2fff4) !important;
     }
   }

package/es/ProEnum/index.js

@@ -43,7 +43,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
-  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
+  var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -273,16 +274,17 @@ var ProEnum = function ProEnum(props) {
     return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
-    if (Array.isArray(value)) {
+    var __value = value || _defalutValue;
+    if (Array.isArray(__value)) {
       return _jsx(Container, {
         tooltip: true,
         viewEmpty: viewEmpty,
-        children: transToLabel(value)
+        children: transToLabel(__value)
       });
     }
     return _jsx(Container, {
       viewEmpty: viewEmpty,
-      children: value || isNumber(value) ? transToLabel([value]) : null
+      children: __value || isNumber(__value) ? transToLabel([__value]) : null
     });
   }
   return _jsx(_Fragment, {

package/es/ProEnum/propsType.d.ts

@@ -77,6 +77,7 @@ export interface ProEnum {
     otherProps?: ProFormOtherProps;
     allowClear?: boolean;
     id?: string;
+    defaultValue?: any;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

package/es/ProForm/components/base/SwitchCheckbox/index.js

@@ -2,9 +2,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/checkbox/style";
 import _Checkbox from "antd/es/checkbox";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["onChange", "disabled", "value", "otherProps"];
+var _excluded = ["onChange", "disabled", "value", "otherProps", "className"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { isNull, isUndefined } from 'lodash';
+import classnames from 'classnames';
 import { useProConfig } from '../../../../ProConfigProvider';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
@@ -13,6 +14,7 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
     disabled = props.disabled,
     value = props.value,
     otherProps = props.otherProps,
+    className = props.className,
     restProps = _objectWithoutProperties(props, _excluded);
   var _ref = ProForm.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -47,9 +49,14 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
       })]
     });
   }
+  var classNames = classnames({
+    'pro-switch-checkbox': true,
+    className: className
+  });
   return _jsx(_Checkbox, _objectSpread(_objectSpread(_objectSpread({
     disabled: disabled,
-    onChange: changeVal
+    onChange: changeVal,
+    className: classNames
   }, initialConfig), restProps), {}, {
     children: restProps.label
   }));

package/es/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -16,6 +16,7 @@ interface Props {
     valuePropName?: string;
     isView?: boolean;
     getValueProps?: (value: any) => Record<string, unknown>;
+    viewRender?: (props: any) => any;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

package/es/ProForm/components/combination/Group/component/ComRender.js

@@ -1,7 +1,7 @@
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
 import { jsx as _jsx } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
@@ -42,6 +42,7 @@ var ComRender = function ComRender(props) {
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     valueType = props.valueType,
     isView = props.isView,
+    viewRender = props.viewRender,
     rest = _objectWithoutProperties(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -49,6 +50,16 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
+  if (viewRender && isView) {
+    return _jsx(FieldProvider, {
+      value: _objectSpread(_objectSpread({}, contextProps), {}, {
+        valueType: valueType,
+        type: type,
+        isView: isView
+      }),
+      children: viewRender(componentProps)
+    });
+  }
   var Component = component ? (/*#__PURE__*/React.cloneElement(component, _objectSpread({}, componentProps))) : _jsx(TypeComponent, _objectSpread({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return _jsx(FieldProvider, {

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

@@ -26,7 +26,8 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    id = props.id;
+    id = props.id,
+    isParentView = props.isView;
   var contextProps = ProForm.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -71,7 +72,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -82,7 +83,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return _jsx(ComRender, _objectSpread(_objectSpread({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);

package/es/ProForm/components/combination/ProModalSelect/index.js

@@ -845,7 +845,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible
+      visible: visible,
+      zIndex: 1071
     }, restModalProps), {}, {
       children: [_jsx(ProForm, {
         submitOnEnter: true,

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

@@ -29,7 +29,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getValueProps = props.getValueProps,
     viewRender = props.viewRender,
     rest = _objectWithoutProperties(props, _excluded);
-  // const contentRef = useRef(null);
   var _useProConfig = useProConfig('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,
@@ -103,7 +102,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: "original-value-tootip",
+    overlayClassName: "original-value-tooltip",
     placement: "topLeft",
     autoAdjustOverflow: false,
     title: _jsxs(_Space, {

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

@@ -1,6 +1,6 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required", "confirm"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import React from 'react';
 import { isBoolean, isFunction, union, isString } from 'lodash';
@@ -69,6 +69,7 @@ var RenderFields = function RenderFields(props) {
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
       equalWith = column.equalWith,
+      onDiff = column.onDiff,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
       columnRequired = column.required,
@@ -208,7 +209,7 @@ var RenderFields = function RenderFields(props) {
         fieldProps: isFunction(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
         diffConfig: diffConfig,
-        equalWith: equalWith,
+        equalWith: onDiff || equalWith,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender

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

@@ -207,6 +207,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['equalWith'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;

package/es/ProForm/style/index.less

@@ -385,7 +385,7 @@
     }
 
     // checkbox
-    .@{ant-prefix}-checkbox-group {
+    .@{ant-prefix}-checkbox-group,.pro-switch-checkbox {
       padding: 5px 0
     }
     // switch
@@ -412,7 +412,7 @@
     background: @zaui-contract-bg-add !important;
 
     .@{ant-prefix}-input {
-      background: @zaui-contract-bg !important;
+      background: @zaui-contract-bg-add !important;
     }
     
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
@@ -463,7 +463,7 @@
     }
 
     // checkbox
-    .@{ant-prefix}-checkbox-group {
+    .@{ant-prefix}-checkbox-group,.pro-switch-checkbox {
       padding: 5px 0
     }
     // switch
@@ -485,10 +485,9 @@
   }
 }
 
-.original-value-tootip{
+.original-value-tooltip{
   max-width: 100%;
   width: max-content;
-  position: fixed;
   .changed-tooltip {
     .original-value-container {
       .ant-space-item:nth-child(1) {
@@ -511,3 +510,7 @@
   }
 }
 
+.original-value-tooltip-fixed {
+  position: fixed;
+}
+

package/es/ProForm/utils/diffOriginal.js

@@ -1,15 +1,17 @@
 import { isEqual, isFunction, isObject } from 'lodash';
 import { isEmpty } from '../../utils';
 // 过滤对象中undefined字段
-// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
-var filterUndefined = function filterUndefined(data) {
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = function filterObject(data) {
   if (!isObject(data) || Array.isArray(data) || data === null) return data;
   var resData = {};
   Object.keys(data).forEach(function (key) {
-    if (data[key] !== undefined) {
+    if (!isEmpty(data[key])) {
       resData[key] = data[key];
     }
   });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
   return resData;
 };
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
@@ -20,18 +22,22 @@ export var diffOriginal = function diffOriginal(params) {
   // 支持传入自定义比较事件
   if (isFunction(equalWith)) {
     var diffRes = equalWith(originalValue, value);
-    if (diffRes === undefined) return 'same';
-    if (typeof diffRes === 'boolean') {
-      return diffRes ? 'same' : 'changed';
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
     }
-    return diffRes;
   }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
   // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if (isEmpty(originalValue) && !isEmpty(value)) {
+  if (isEmpty(_originalValue) && !isEmpty(_value)) {
     return 'add';
   }
-  if (Array.isArray(originalValue)) {
-    var isSame = originalValue.every(function (valueItem, index) {
+  if (Array.isArray(_originalValue)) {
+    var isSame = _originalValue.every(function (valueItem, index) {
       // 如果两个值有一个不是空值, 则进行深比较
       if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
         return isEqual(value === null || value === void 0 ? void 0 : value[index], valueItem);
@@ -40,8 +46,8 @@ export var diffOriginal = function diffOriginal(params) {
     });
     return isSame ? 'same' : 'changed';
   }
-  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return isEqual(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
+  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
+    return isEqual(_value, _originalValue) ? 'same' : 'changed';
   }
   return 'same';
 };