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

package/es/ProTable/style/index.less

@@ -261,11 +261,20 @@
     tr.@{ant-prefix}-table-row.new-cell {
       background: var(--zaui-contract-bg-add; #d2fff4) !important;
       background-color: var(--zaui-contract-bg-add; #d2fff4) !important;
-
       td.@{ant-prefix}-table-cell {
         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);
+        &.@{ant-prefix}-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);
+        }
+        &.@{ant-prefix}-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);
+        }
       }
     }
 

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

@@ -11,9 +11,12 @@ export declare const getDecimalDigits: (num?: number) => number;
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
-export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => any;
+export declare const getOriginalValue: (value: any, record: any, originalObj: any, rowKey: any, dataIndex: any) => {
+    originalValue: any;
+    isChanged: boolean;
+};
 export declare const getColumnDataIndex: (dataIndex: string | string[]) => string;
 /**
  * 判断数据是否为Response<List<any>>结构

package/es/ProTable/utils/index.js

@@ -16,18 +16,27 @@ export var getDecimalDigits = function getDecimalDigits() {
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
 export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
-    return undefined;
+    return {
+      originalValue: null,
+      isChanged: null
+    };
   }
   var originalRecord = get(originalObj, get(record, rowKey));
   var originalValue = get(originalRecord, dataIndex);
   if (!isEqual(originalValue, value)) {
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      isChanged: true
+    };
   }
-  return undefined;
+  return {
+    originalValue: null,
+    isChanged: false
+  };
 };
 export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
   return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');

package/es/ProTree/components/ProTreeSelect/index.js

@@ -1,6 +1,8 @@
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
+import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
+import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
 import "antd/es/input/style";
 import _Input from "antd/es/input";
 import "antd/es/message/style";
@@ -18,7 +20,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { useImperativeHandle, forwardRef } from 'react';
-import { cloneDeep } from 'lodash';
+import { cloneDeep, debounce } from 'lodash';
 import { useProConfig } from '../../../ProConfigProvider';
 import Container from '../../../ProForm/components/Container';
 import AdaptiveTooltip from '../AdaptiveTooltip';
@@ -398,18 +400,35 @@ export var ProTreeSelect = function ProTreeSelect(props, ref) {
     sourceList = _filterData(sourceList);
     return sourceList;
   }
-  var searchTreeEvent = function searchTreeEvent(searchVal) {
-    if (!searchVal) {
-      setState({
-        selectList: cloneDeep(origDataSource || [])
-      });
-      return null;
-    }
-    var result = filterTree(cloneDeep(origDataSource || []), searchVal);
-    setState({
-      selectList: result || []
-    });
-  };
+  var searchTreeEvent = debounce(/*#__PURE__*/function () {
+    var _ref5 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(searchVal) {
+      var result;
+      return _regeneratorRuntime().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (searchVal) {
+              _context.next = 3;
+              break;
+            }
+            setState({
+              selectList: cloneDeep(origDataSource || [])
+            });
+            return _context.abrupt("return", null);
+          case 3:
+            result = filterTree(cloneDeep(origDataSource || []), searchVal);
+            setState({
+              selectList: result || []
+            });
+          case 5:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function (_x) {
+      return _ref5.apply(this, arguments);
+    };
+  }(), 500);
   function findTreeNode(treeList, nodeValue) {
     var result = {};
     var _filterData2 = function filterData(data) {

package/es/style/theme/antd.less

@@ -280,8 +280,10 @@
     table {
       .@{ant-prefix}-table-tbody {
         .@{ant-prefix}-table-row:nth-child(even) {
-          &:hover td {
-            background-color: @zaui-table-hover-bg;
+          &:hover td,
+          &:hover td.@{ant-prefix}-table-cell-fix-right,
+          &:hover td.@{ant-prefix}-table-cell-fix-left {
+            background-color: @zaui-table-hover-bg !important;
           }
 
           & td,

package/es/utils/index.d.ts

@@ -1,3 +1,3 @@
 /** 判断一个值是否是空值 */
-export declare const isEmpty: (value: any) => boolean;
+export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/es/utils/index.js

@@ -2,7 +2,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useEffect, useState } from 'react';
 var EMPTY_VALUE = [undefined, null, ''];
 /** 判断一个值是否是空值 */
-export var isEmpty = function isEmpty(value) {
+export var isEmpty = function isEmpty(value, emptyValue) {
+  if (emptyValue) {
+    EMPTY_VALUE.push(emptyValue);
+  }
   if (EMPTY_VALUE.includes(value)) {
     return true;
   }

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

@@ -39,6 +39,7 @@ var ProDrawer = function ProDrawer(_ref) {
     onCancel = _ref.onCancel,
     children = _ref.children,
     className = _ref.className,
+    zIndex = _ref.zIndex,
     drawerProps = _ref.drawerProps;
   var ref = (0, _react.useRef)(null);
   var modalRef = (0, _react.useRef)(null);
@@ -195,7 +196,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: [(0, _jsxRuntime.jsx)("div", {
       className: "pro-drawer-close",

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

@@ -38,8 +38,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 = (0, _react.useRef)(null);
   var _ref2 = (0, _ahooks.useScroll)((_ref$current = ref.current) === null || _ref$current === void 0 ? void 0 : _ref$current.parentNode) || {},
     top = _ref2.top;
@@ -181,7 +182,8 @@ var ProModal = function ProModal(_ref) {
     closeIcon: (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, {
       className: "close-icon",
       src: _close.default
-    })
+    }),
+    zIndex: zIndex
   }, modalProps), {}, {
     children: (0, _jsxRuntime.jsx)("div", {
       ref: ref,

package/lib/ProDrawerForm/propsType.d.ts

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

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

@@ -167,6 +167,10 @@ 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 classNames = (0, _classnames.default)({
+    'original-value-tooltip': true,
+    'original-value-tooltip-fixed': true
+  });
   var diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
@@ -177,7 +181,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: (0, _jsxRuntime.jsxs)(_antd.Space, {

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

@@ -30,7 +30,7 @@ var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -60,6 +60,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,
@@ -562,7 +563,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/lib/ProEditTable/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -24,7 +25,7 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
 var _RcTable = require("./components/RcTable");
-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"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
   var value = _ref.value,
@@ -53,7 +54,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,
@@ -139,6 +139,25 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
+  var originalValues = (0, _react.useMemo)(function () {
+    var _originalArr$every, _originalArr$some;
+    // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
+    var originalArr = (0, _lodash.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) ? (0, _defineProperty2.default)({}, name, originalArr) : undefined;
+  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
   var config = (0, _objectSpread2.default)({
     form: form,
     mode: mode,
@@ -278,33 +297,21 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return (0, _utils.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 = (0, _lodash.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 (0, _objectSpread2.default)((0, _objectSpread2.default)({}, 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/lib/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/lib/ProEnum/index.js

@@ -44,7 +44,8 @@ var ProEnum = function ProEnum(props) {
     enumProps = (0, _objectWithoutProperties2.default)(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 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -274,16 +275,17 @@ var ProEnum = function ProEnum(props) {
     return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
-    if (Array.isArray(value)) {
+    var __value = value || _defalutValue;
+    if (Array.isArray(__value)) {
       return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,
         viewEmpty: viewEmpty,
-        children: transToLabel(value)
+        children: transToLabel(__value)
       });
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
-      children: value || (0, _lodash.isNumber)(value) ? transToLabel([value]) : null
+      children: __value || (0, _lodash.isNumber)(__value) ? transToLabel([__value]) : null
     });
   }
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/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/lib/ProForm/components/base/SwitchCheckbox/index.js

@@ -10,15 +10,17 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var _excluded = ["onChange", "disabled", "value", "otherProps"];
+var _excluded = ["onChange", "disabled", "value", "otherProps", "className"];
 var SwitchCheckbox = function SwitchCheckbox(props) {
   var onChange = props.onChange,
     disabled = props.disabled,
     value = props.value,
     otherProps = props.otherProps,
+    className = props.className,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -53,9 +55,14 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
       })]
     });
   }
+  var classNames = (0, _classnames.default)({
+    'pro-switch-checkbox': true,
+    className: className
+  });
   return (0, _jsxRuntime.jsx)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
-    onChange: changeVal
+    onChange: changeVal,
+    className: classNames
   }, initialConfig), restProps), {}, {
     children: restProps.label
   }));

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

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

package/lib/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/lib/ProForm/components/combination/Group/component/ComRender.js

@@ -15,7 +15,7 @@ var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/ren
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
-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"];
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: _ConfirmWrapper.default,
@@ -50,6 +50,7 @@ var ComRender = function ComRender(props) {
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     valueType = props.valueType,
     isView = props.isView,
+    viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -57,6 +58,16 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
+  if (viewRender && isView) {
+    return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
+      value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
+        valueType: valueType,
+        type: type,
+        isView: isView
+      }),
+      children: viewRender(componentProps)
+    });
+  }
   var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {

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

@@ -32,7 +32,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.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -77,7 +78,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -88,7 +89,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);