@zat-design/sisyphus-react 3.9.4 → 3.9.5

package/dist/index.esm.css

@@ -3110,6 +3110,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
+.pro-form .pro-form-item-changed .ant-picker-clear {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
@@ -3165,6 +3168,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
+.pro-form .pro-form-item-add .ant-picker-clear {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
 .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
 .pro-form .pro-form-item-add .ant-select .ant-select-selector,
 .pro-form .pro-form-item-add .ant-picker,
@@ -4672,6 +4678,38 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
   background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
+.pro-edit-table * {
+  scrollbar-face-color: #d2d3d7;
+  scrollbar-highlight-color: #979797;
+  scrollbar-3dlight-color: #979797;
+}
+.pro-edit-table * ::-webkit-scrollbar-thumb {
+  background-color: #979797;
+  background-clip: padding-box;
+  border-color: transparent;
+  border-style: dashed;
+  border-width: 4px;
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+}
+.pro-edit-table * ::-webkit-scrollbar-track {
+  background: transparent;
+}
+.pro-edit-table * ::-webkit-scrollbar-thumb {
+  background-color: #d2d3d7;
+  background-clip: padding-box;
+  border-color: transparent;
+  border-style: dashed;
+  border-width: 4px;
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+}
+.pro-edit-table * ::-webkit-scrollbar-thumb {
+  background-color: #979797;
+}
+.pro-edit-table * ::-webkit-scrollbar-track {
+  background: transparent;
+}
 .pro-edit-table-footer {
   margin-top: 12px;
 }
@@ -6043,5 +6081,8 @@ input[type='button'] {
   --antd-arrow-background-color: linear-gradient(to right bottom, rgba(255, 255, 255, 0.95), #ffffff);
 }
 .ant-picker.ant-picker-disabled {
-  background: var(--zaui-disabled-bg);
+  background: var(--zaui-disabled-bg) !important;
+}
+.ant-input-affix-wrapper-disabled {
+  background: var(--zaui-disabled-bg) !important;
 }

package/dist/less.esm.css

@@ -3110,6 +3110,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-changed .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg, #fffaa1) !important;
 }
+.pro-form .pro-form-item-changed .ant-picker-clear {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .pro-form-item-changed span.ant-input-affix-wrapper,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
@@ -3165,6 +3168,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-item-add .ant-select.ant-select-disabled .ant-select-selector {
   background: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
+.pro-form .pro-form-item-add .ant-picker-clear {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
 .pro-form .pro-form-item-add span.ant-input-affix-wrapper,
 .pro-form .pro-form-item-add .ant-select .ant-select-selector,
 .pro-form .pro-form-item-add .ant-picker,
@@ -4672,6 +4678,38 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-edit-table .ant-table.ant-table-scroll-horizontal table .ant-table-tbody .is-new-row.ant-table-row:hover .ant-table-cell-row-hover {
   background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
 }
+.pro-edit-table * {
+  scrollbar-face-color: #d2d3d7;
+  scrollbar-highlight-color: #979797;
+  scrollbar-3dlight-color: #979797;
+}
+.pro-edit-table * ::-webkit-scrollbar-thumb {
+  background-color: #979797;
+  background-clip: padding-box;
+  border-color: transparent;
+  border-style: dashed;
+  border-width: 4px;
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+}
+.pro-edit-table * ::-webkit-scrollbar-track {
+  background: transparent;
+}
+.pro-edit-table * ::-webkit-scrollbar-thumb {
+  background-color: #d2d3d7;
+  background-clip: padding-box;
+  border-color: transparent;
+  border-style: dashed;
+  border-width: 4px;
+  border-radius: 10px;
+  -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+}
+.pro-edit-table * ::-webkit-scrollbar-thumb {
+  background-color: #979797;
+}
+.pro-edit-table * ::-webkit-scrollbar-track {
+  background: transparent;
+}
 .pro-edit-table-footer {
   margin-top: 12px;
 }

package/es/ProEditTable/components/RenderField/ListChangedWrapper.d.ts

@@ -1,7 +1,7 @@
 import React from 'react';
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
-import { DiffOriginalParams } from '../../../ProForm/utils/diffOriginal';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 interface Props {
     name?: NamePath;
     names?: NamePath[];

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

@@ -10,7 +10,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo, useRef } from 'react';
 import classnames from 'classnames';
 import { get } from 'lodash';
-import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
+import { diffOriginal } from '../../utils/diffOriginal';
 import { useProConfig } from '../../../ProConfigProvider';
 import { isEmpty } from '../../../utils';
 var toNamePath = function toNamePath(name) {
@@ -34,7 +34,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
   if (!originalValues) {
     return undefined;
   }
-  var originalValueRow;
+  var originRecord;
   if (rowKeyPath) {
     var rowValueNamePath = namePath.slice(0, rowKeyPath.length - 1); // 表单中变动值所在行
     var rowKeyName = rowKeyPath[rowKeyPath.length - 1]; // rowKey在行内的name
@@ -43,13 +43,13 @@ var getOriginalValue = function getOriginalValue(_ref) {
     var keyValue = rowValue[rowKeyName]; // 获取表单中rowKey值
     if (!keyValue) return undefined;
     var originalValueList = get(originalValues, originalName.slice(0, rowKeyPath.length - 2));
-    originalValueRow = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
+    originRecord = originalValueList === null || originalValueList === void 0 ? void 0 : originalValueList.find(function (item) {
       return item[rowKeyPath[rowKeyPath.length - 1]] === keyValue;
     });
     var originalValue;
     if (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) {
       var originalNamesValue = originalNames.map(function (originalName) {
-        return get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+        return get(originRecord, originalName.slice(rowKeyPath.length - 1));
       });
       // 有可能出现数组中全是undefined的情况  视为没有值
       var fillUndefined = originalNamesValue.every(function (valItem) {
@@ -57,11 +57,12 @@ var getOriginalValue = function getOriginalValue(_ref) {
       });
       originalValue = fillUndefined ? undefined : originalNamesValue;
     } else {
-      originalValue = get(originalValueRow, originalName.slice(rowKeyPath.length - 1));
+      originalValue = get(originRecord, originalName.slice(rowKeyPath.length - 1));
     }
     return {
       originalValue: originalValue,
-      originalValueRow: originalValueRow
+      originRecord: originRecord,
+      record: rowValue
     };
   }
   // 这个方法是给editTable专用的  暂时不存在不传rowKey的情况
@@ -69,7 +70,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     originalValue: (originalNames === null || originalNames === void 0 ? void 0 : originalNames.length) ? originalNames.map(function (originalName) {
       return get(originalValues, originalName);
     }) : get(originalValues, originalName),
-    originalValueRow: originalValueRow
+    originRecord: originRecord
   };
 };
 var ListChangedWrapper = function ListChangedWrapper(props) {
@@ -130,8 +131,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
       value: _value,
       originalValue: _originalValue,
       form: form,
-      equalWith: equalWith
-      // name: isString(namesStr) ? namesStr : originalName || name,
+      equalWith: equalWith,
+      originRecord: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord,
+      record: originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.record,
+      index: index
     });
   }, [props[valuePropName], originalValue]);
   var isAdd = diffType === 'add';
@@ -144,7 +147,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     var _children = children;
     if (viewRender) {
       if (! /*#__PURE__*/React.isValidElement(viewRender)) {
-        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originalValueRow) || {}, {
+        return viewRender(orgValue, (originalDTO === null || originalDTO === void 0 ? void 0 : originalDTO.originRecord) || {}, {
           form: form,
           name: name,
           index: index

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", "onDiff", "className", "trim", "confirm"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "onDiff", "className", "trim", "confirm", "dependencies"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
@@ -52,11 +52,11 @@ var RenderField = function RenderField(_ref) {
     required = _column$required === void 0 ? false : _column$required,
     _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,
+    dependencies = column.dependencies,
     resetProps = _objectWithoutProperties(column, _excluded);
   // editRender弃用使用component同ProForm
   var _editRender = component || editRender;
@@ -312,6 +312,8 @@ var RenderField = function RenderField(_ref) {
       _key2,
       _args,
       rowPath,
+      _dependencies$map,
+      validateFieldKeys,
       row,
       orgRow,
       _TargetComponent,
@@ -323,77 +325,85 @@ var RenderField = function RenderField(_ref) {
       _Object$keys,
       _Object$keys$map,
       diff,
-      validateFieldKeys,
+      _validateFieldKeys,
       _args2 = arguments;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
-          if (!(!onFieldChange && !onChange)) {
-            _context.next = 2;
-            break;
-          }
-          return _context.abrupt("return", null);
-        case 2:
           for (_len2 = _args2.length, args = new Array(_len2), _key2 = 0; _key2 < _len2; _key2++) {
             args[_key2] = _args2[_key2];
           }
           _args = [].concat(args);
           rowPath = [].concat(_toConsumableArray(namePath), [index]);
-          row = form.getFieldValue(rowPath, true); // if (type === 'InputNumber' && column.name) row[column.name] = args[0];
+          if (!(!onFieldChange && !onChange)) {
+            _context.next = 6;
+            break;
+          }
+          if (dependencies === null || dependencies === void 0 ? void 0 : dependencies.length) {
+            validateFieldKeys = dependencies === null || dependencies === void 0 ? void 0 : (_dependencies$map = dependencies.map) === null || _dependencies$map === void 0 ? void 0 : _dependencies$map.call(dependencies, function (key) {
+              return [].concat(_toConsumableArray(rowPath), [key]);
+            });
+            setTimeout(function () {
+              form.validateFields(validateFieldKeys);
+            }, 100);
+          }
+          return _context.abrupt("return", null);
+        case 6:
+          row = form.getFieldValue(rowPath, true);
           orgRow = cloneDeep(row);
           if (!onFieldChange) {
-            _context.next = 20;
+            _context.next = 21;
             break;
           }
           _args = formatArgs(args);
           _args[1] = row;
           _context.t0 = (_TargetComponent = TargetComponent) === null || _TargetComponent === void 0 ? void 0 : (_TargetComponent$prop = _TargetComponent.props) === null || _TargetComponent$prop === void 0 ? void 0 : _TargetComponent$prop.onFieldChange;
           if (!_context.t0) {
-            _context.next = 14;
+            _context.next = 15;
             break;
           }
-          _context.next = 14;
+          _context.next = 15;
           return (_TargetComponent$prop2 = TargetComponent.props).onFieldChange.apply(_TargetComponent$prop2, _toConsumableArray(_args));
-        case 14:
+        case 15:
           _context.t1 = onFieldChange;
           if (!_context.t1) {
-            _context.next = 18;
+            _context.next = 19;
             break;
           }
-          _context.next = 18;
+          _context.next = 19;
           return onFieldChange.apply(void 0, _toConsumableArray(_args));
-        case 18:
-          _context.next = 29;
+        case 19:
+          _context.next = 30;
           break;
-        case 20:
+        case 21:
           _args = _args.concat([row, index, form]);
           _context.t2 = (_TargetComponent2 = TargetComponent) === null || _TargetComponent2 === void 0 ? void 0 : (_TargetComponent2$pro = _TargetComponent2.props) === null || _TargetComponent2$pro === void 0 ? void 0 : _TargetComponent2$pro.onChange;
           if (!_context.t2) {
-            _context.next = 25;
+            _context.next = 26;
             break;
           }
-          _context.next = 25;
+          _context.next = 26;
           return (_TargetComponent$prop3 = TargetComponent.props).onChange.apply(_TargetComponent$prop3, _toConsumableArray(_args));
-        case 25:
+        case 26:
           _context.t3 = onChange;
           if (!_context.t3) {
-            _context.next = 29;
+            _context.next = 30;
             break;
           }
-          _context.next = 29;
+          _context.next = 30;
           return onChange.apply(void 0, _toConsumableArray(_args));
-        case 29:
+        case 30:
           // 判断属性是否变动
           form.setFieldValue(rowPath, row);
           if (validateTrigger && validateTrigger.includes('onChange')) {
             if (!isEqual(orgRow, row)) {
               diff = difference(row, orgRow) || {};
-              validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
+              _validateFieldKeys = (_Object$keys = Object.keys(diff)) === null || _Object$keys === void 0 ? void 0 : (_Object$keys$map = _Object$keys.map) === null || _Object$keys$map === void 0 ? void 0 : _Object$keys$map.call(_Object$keys, function (key) {
                 return [].concat(_toConsumableArray(rowPath), [key]);
-              });
-              if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
+              }).concat(dependencies || []);
+              if (_validateFieldKeys === null || _validateFieldKeys === void 0 ? void 0 : _validateFieldKeys.length) {
                 setTimeout(function () {
-                  form.validateFields(validateFieldKeys);
+                  form.validateFields(_validateFieldKeys);
                 }, 100);
               }
             }
@@ -403,7 +413,7 @@ var RenderField = function RenderField(_ref) {
               d: Date.now()
             }
           });
-        case 32:
+        case 33:
         case "end":
           return _context.stop();
       }
@@ -464,7 +474,7 @@ var RenderField = function RenderField(_ref) {
                 diff = difference(row, orgRow) || {};
                 validateFieldKeys = (_Object$keys2 = Object.keys(diff)) === null || _Object$keys2 === void 0 ? void 0 : (_Object$keys2$map = _Object$keys2.map) === null || _Object$keys2$map === void 0 ? void 0 : _Object$keys2$map.call(_Object$keys2, function (key) {
                   return [].concat(_toConsumableArray(rowPath), [key]);
-                });
+                }).concat(dependencies || []);
                 if (validateFieldKeys === null || validateFieldKeys === void 0 ? void 0 : validateFieldKeys.length) {
                   debounceValidate(validateFieldKeys);
                 }
@@ -557,7 +567,7 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: onDiff || equalWith,
+        equalWith: onDiff,
         type: type,
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,

package/es/ProEditTable/propsType.d.ts

@@ -106,6 +106,7 @@ export interface ProColumnsProps<Values = any, T = any> extends Omit<FormItemPro
     hiddenNames?: NamePath[] | NamePath[][];
     rules?: ProRule[] | RulesFn<T>;
     confirm?: boolean | ModalFuncProps | FunctionArgs<Values, boolean | ModalFuncProps | void>;
+    dependencies?: NamePath[];
     onDiff?: DiffOriginalParams['equalWith'];
     [key: string]: any;
 }

package/es/ProEditTable/style/index.less

@@ -305,6 +305,47 @@
       background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
     }
   }
+
+  * {
+    // ie浏览器
+    scrollbar-face-color: #d2d3d7;
+    scrollbar-highlight-color: #979797;
+    scrollbar-3dlight-color: #979797;
+  
+    // 悬浮轨道
+    ::-webkit-scrollbar-thumb {
+      background-color: #979797;
+      background-clip: padding-box;
+      border-color: transparent;
+      border-style: dashed;
+      border-width: 4px;
+      border-radius: 10px;
+      -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+    }
+  
+    ::-webkit-scrollbar-track {
+      background: transparent;
+    }
+  
+    ::-webkit-scrollbar-thumb {
+      background-color: #d2d3d7;
+      background-clip: padding-box;
+      border-color: transparent;
+      border-style: dashed;
+      border-width: 4px;
+      border-radius: 10px;
+      -webkit-box-shadow: inset 0 0 5px rgba(0, 0, 0, 0);
+    }
+  
+    ::-webkit-scrollbar-thumb {
+      background-color: #979797;
+    }
+  
+    ::-webkit-scrollbar-track {
+      background: transparent;
+    }
+  }
+  
 }
 
 .pro-edit-table-footer{

package/es/ProEditTable/utils/diffOriginal.d.ts

@@ -0,0 +1,21 @@
+import { FormInstance } from 'antd';
+export type DiffType = 'same' | 'add' | 'changed';
+export interface DiffOriginalParams {
+    originalValue: any;
+    value: any;
+    form: FormInstance;
+    equalWith?: ({ originValue, originRecord, value, record, index }: {
+        originValue: any;
+        originRecord: any;
+        value: any;
+        record: any;
+        index: number;
+    }) => DiffType | undefined;
+    /** 原始行数据 */
+    originRecord: any;
+    /** 当前行数据 */
+    record: any;
+    /** 当前行索引 */
+    index: number;
+}
+export declare const diffOriginal: (params: DiffOriginalParams) => DiffType;

package/es/ProEditTable/utils/diffOriginal.js

@@ -0,0 +1,62 @@
+import { isEqual, isFunction, isObject } from 'lodash';
+import { validate } from '@zat-design/utils';
+var isEmpty = validate.isEmpty;
+// 过滤对象中undefined字段
+// 防止{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 (!isEmpty(data[key])) {
+      resData[key] = data[key];
+    }
+  });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
+  return resData;
+};
+export var diffOriginal = function diffOriginal(params) {
+  var originalValue = params.originalValue,
+    value = params.value,
+    equalWith = params.equalWith,
+    originRecord = params.originRecord,
+    record = params.record,
+    index = params.index;
+  // 支持传入自定义比较事件
+  if (isFunction(equalWith)) {
+    var diffRes = equalWith({
+      originValue: originalValue,
+      originRecord: originRecord,
+      value: value,
+      record: record,
+      index: index
+    });
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
+    }
+  }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
+  // 如果原始值为空 且当前有值的话 认为变更类型是新增
+  if (isEmpty(_originalValue) && !isEmpty(_value)) {
+    return 'add';
+  }
+  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);
+      }
+      return true;
+    });
+    return isSame ? 'same' : 'changed';
+  }
+  if (!isEmpty(_originalValue) || !isEmpty(_value)) {
+    return isEqual(_value, _originalValue) ? 'same' : 'changed';
+  }
+  return 'same';
+};

package/es/ProEnum/index.js

@@ -230,7 +230,7 @@ var ProEnum = function ProEnum(props) {
   };
   if (!code && !dataSource && !useRequest) {
     var _locale$ProEnum4;
-    _message.error(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType);
+    _message.error("".concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.label, "-").concat(otherProps === null || otherProps === void 0 ? void 0 : otherProps.name, "-").concat(locale === null || locale === void 0 ? void 0 : (_locale$ProEnum4 = locale.ProEnum) === null || _locale$ProEnum4 === void 0 ? void 0 : _locale$ProEnum4.errorNoEnumType));
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;

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

@@ -2,7 +2,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 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", "viewRender"];
-import { jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React from 'react';
 import ConfirmWrapper from '../../../../components/render/ConfirmWrapper';
 import { FieldProvider } from '../../../../utils/useFieldProps';
@@ -30,6 +30,7 @@ var getComRender = function getComRender(component, props, componentProps) {
 };
 /** 渲染组件 */
 var ComRender = function ComRender(props) {
+  var _props$component, _props$component$prop;
   var type = props.type,
     confirm = props.confirm,
     component = props.component,
@@ -50,6 +51,13 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = _objectSpread(_objectSpread(_objectSpread({}, fieldProps), rest), _props);
+  var isSeparator = (props === null || props === void 0 ? void 0 : (_props$component = props.component) === null || _props$component === void 0 ? void 0 : (_props$component$prop = _props$component.props) === null || _props$component$prop === void 0 ? void 0 : _props$component$prop.className) === 'group-separator';
+  if (isSeparator && isView) {
+    var _props$component2, _props$component2$pro;
+    return _jsxs(_Fragment, {
+      children: [" ", props === null || props === void 0 ? void 0 : (_props$component2 = props.component) === null || _props$component2 === void 0 ? void 0 : (_props$component2$pro = _props$component2.props) === null || _props$component2$pro === void 0 ? void 0 : _props$component2$pro.children, " "]
+    });
+  }
   if (viewRender && isView) {
     return _jsx(FieldProvider, {
       value: _objectSpread(_objectSpread({}, contextProps), {}, {

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

@@ -71,7 +71,7 @@ var Group = function Group(props) {
     children: space.compact || (space === null || space === void 0 ? void 0 : space.separator) ? _jsx(_Space.Compact, {
       children: columns.map(function (column, index) {
         column.otherProps = otherProps;
-        // 自定义间隔移除对于参数
+        // 自定义间隔移除对应参数
         if (column === null || column === void 0 ? void 0 : column.separator) {
           delete column.separator;
           delete column.otherProps;

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

@@ -329,7 +329,7 @@ export var useTransformColumns = function useTransformColumns(params) {
     }, reactiveProps), {}, {
       disabled: getLastDisabled(),
       getValueProps: transform === null || transform === void 0 ? void 0 : transform.getValueProps,
-      fieldProps: _objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), {}, {
+      fieldProps: _objectSpread(_objectSpread(_objectSpread({}, column === null || column === void 0 ? void 0 : column.fieldProps), reactiveProps === null || reactiveProps === void 0 ? void 0 : reactiveProps.fieldProps), {}, {
         onChange: handleChange,
         onBlur: handleBlur,
         value: value === null || value === void 0 ? void 0 : value[index]

package/es/ProForm/style/index.less

@@ -341,6 +341,10 @@
       background: @zaui-contract-bg !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,
@@ -419,6 +423,10 @@
       background: @zaui-contract-bg-add !important;
     }
 
+    .ant-picker-clear {
+      background: @zaui-contract-bg-add;
+    }
+
     span.@{ant-prefix}-input-affix-wrapper,
     .@{ant-prefix}-select .@{ant-prefix}-select-selector,
     .@{ant-prefix}-picker,

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

@@ -139,7 +139,7 @@ export var formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if (isBoolean(diffResult)) {
+        if (isBoolean(diffResult) && !diffResult) {
           otherProps.isChanged = false;
         }
         originalValue = diffResult;