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

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);
@@ -2157,6 +2167,9 @@
 .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
   background: rgba(0, 106, 255, 0.08);
 }
+.ant-table .original-value-tooltip {
+  position: fixed;
+}
 .pro-tooltip {
   cursor: pointer;
 }
@@ -3087,7 +3100,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 +3120,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 +3161,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 +3176,26 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.original-value-tootip {
-  max-width: 100%;
+.original-value-tooltip {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
-  z-index: 99;
 }
-.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;
@@ -4238,6 +4254,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
   overflow: hidden;
 }
+.pro-drawer .original-value-tooltip {
+  position: fixed;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -4396,6 +4415,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table td[rowspan] {
   vertical-align: middle !important;
 }
+.pro-edit-table .ant-table-content .ant-table-tbody .pro-form-item-add .pro-form-view-container {
+  padding: 0;
+  border-radius: 0;
+}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4600,10 +4623,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-tbody .is-new-row.ant-table-row td {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover td,
+.pro-edit-table .ant-table .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 +5641,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);
@@ -2157,6 +2167,9 @@
 .ant-dropdown-placement-bottomLeft .ant-dropdown-menu-vertical.ant-dropdown-menu-light .ant-dropdown-menu-item-only-child:hover {
   background: rgba(0, 106, 255, 0.08);
 }
+.ant-table .original-value-tooltip {
+  position: fixed;
+}
 .pro-tooltip {
   cursor: pointer;
 }
@@ -3087,7 +3100,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 +3120,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 +3161,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 +3176,26 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   background: var(--zaui-contract-bg-add, #d2fff4);
   border-radius: 4px;
 }
-.original-value-tootip {
-  max-width: 100%;
+.original-value-tooltip {
   width: -webkit-max-content;
   width: -moz-max-content;
   width: max-content;
-  z-index: 99;
 }
-.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;
@@ -4238,6 +4254,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
   overflow: hidden;
 }
+.pro-drawer .original-value-tooltip {
+  position: fixed;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -4396,6 +4415,10 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table td[rowspan] {
   vertical-align: middle !important;
 }
+.pro-edit-table .ant-table-content .ant-table-tbody .pro-form-item-add .pro-form-view-container {
+  padding: 0;
+  border-radius: 0;
+}
 .pro-edit-table .pro-edit-table-tooltip {
   display: -webkit-inline-box;
   display: -webkit-inline-flex;
@@ -4600,10 +4623,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-tbody .is-new-row.ant-table-row td {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-edit-table .ant-table .ant-table-tbody .is-new-row.ant-table-row:hover td,
+.pro-edit-table .ant-table .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/ProDrawerForm/style/index.less

@@ -2,6 +2,9 @@
 @import (reference) '~antd/es/style/themes/index.less';
 
 .pro-drawer {
+  .original-value-tooltip {
+    position: fixed;
+  }
   .pro-drawer-close {
     position: absolute;
     top: 6px;

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/index.js

@@ -2,6 +2,7 @@ import "antd/es/affix/style";
 import _Affix from "antd/es/affix";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/config-provider/style";
 import _ConfigProvider from "antd/es/config-provider";
@@ -9,7 +10,7 @@ import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import "antd/es/form/style";
 import _Form from "antd/es/form";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 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, isBoolean } from 'lodash';
@@ -50,7 +51,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     max = _ref.max,
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
-    originalValues = _ref.originalValues,
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
     rowDraggable = _ref.rowDraggable,
@@ -136,6 +136,25 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
+  var originalValues = useMemo(function () {
+    var _originalArr$every, _originalArr$some;
+    // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
+    var originalArr = get(resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues, name);
+    var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
+      return item.rowKey;
+    }) : true;
+    var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
+      return item.rowKey !== getRowKey(item);
+    });
+    // 初始化默认生成row-key
+    if ((originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
+      var _originalArr$forEach;
+      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
+        item.rowKey = getRowKey(item);
+      });
+    }
+    return (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) ? _defineProperty({}, name, originalArr) : undefined;
+  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
   var config = _objectSpread({
     form: form,
     mode: mode,
@@ -275,33 +294,21 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return transformColumns(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   var initDataSource = function initDataSource() {
-    var _value$every, _originalArr$every, _value$some, _originalArr$some;
+    var _value$every, _value$some;
     var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
       return item.rowKey;
     });
-    // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
-    var originalArr = get(originalValues, name);
-    var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
-      return item.rowKey;
-    }) : true;
     // 检测当前rowkey是否与制定key的值是否一致，不一致，则执行覆盖
     var isNeedCover = value === null || value === void 0 ? void 0 : (_value$some = value.some) === null || _value$some === void 0 ? void 0 : _value$some.call(value, function (item) {
       return item.rowKey !== getRowKey(item);
     });
-    var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
-      return item.rowKey !== getRowKey(item);
-    });
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover) || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
-      var _originalArr$forEach;
+    if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return _objectSpread(_objectSpread({}, item), {}, {
           rowKey: getRowKey(item)
         });
       });
-      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
-        item.rowKey = getRowKey(item);
-      });
       onChange(nextValues);
       if (virtualKey) {
         form.setFieldValue(virtualRowName, nextValues);

package/es/ProEditTable/style/index.less

@@ -5,6 +5,15 @@
   td[rowspan]{
     vertical-align: middle !important;
   }
+  .@{ant-prefix}-table-content{
+    .@{ant-prefix}-table-tbody{
+      .pro-form-item-add .pro-form-view-container{
+        padding: 0;
+        border-radius: 0;
+      }
+    }
+  }
+
 
   .pro-edit-table-tooltip {
     display    : inline-flex;
@@ -281,8 +290,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-tbody .is-new-row.@{ant-prefix}-table-row  td{
+    background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  }
+  .@{ant-prefix}-table .@{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/FormList/index.js

@@ -43,7 +43,7 @@ var FormList = function FormList(props, ref) {
   var _namePath = toArray(name);
   var orgValues = get(diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues, name);
   var _diffConfig = _objectSpread(_objectSpread({}, diffConfig), {}, {
-    originalValues: isDiffAll ? orgValues || [] : orgValues
+    originalValues: (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalValues) && isDiffAll ? orgValues || [] : orgValues
   });
   var processColumns = useCallback(function (fieldName, namePath) {
     return columns.map(function (item) {

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, {