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

package/dist/index.esm.css

@@ -1909,7 +1909,7 @@
 .pro-table .ant-table-body .ant-table-cell .varied-cell {
   margin-left: -8px;
   padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--zaui-contract-bg, #fffaa1) !important;
   border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-table .ant-table-body .varied-cell.empty-cell {
@@ -2890,12 +2890,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1)) !important;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input {
+  width: 100%;
   -webkit-box-flex: inherit;
   -webkit-flex-grow: inherit;
       -ms-flex-positive: inherit;
           flex-grow: inherit;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input-content {
+  width: 100%;
   -webkit-box-flex: initial;
   -webkit-flex: initial;
       -ms-flex: initial;
@@ -3059,6 +3061,13 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
   width: auto;
 }
+.pro-form .pro-form-item-changed {
+  border-radius: 4px;
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
+.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 span.ant-input-affix-wrapper,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
@@ -3095,11 +3104,77 @@ 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 {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
+.pro-form .pro-form-item-add {
+  border-radius: 4px;
+  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;
+}
+.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,
+.pro-form .pro-form-item-add .ant-input-number {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-form .pro-form-item-add span.ant-input-affix-wrapper input,
+.pro-form .pro-form-item-add .ant-select .ant-select-selector input,
+.pro-form .pro-form-item-add .ant-picker input,
+.pro-form .pro-form-item-add .ant-input-number input {
+  background: transparent !important;
+}
+.pro-form .pro-form-item-add span.ant-input-affix-wrapper .ant-select-selection-placeholder,
+.pro-form .pro-form-item-add .ant-select .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .pro-form-item-add .ant-picker .ant-select-selection-placeholder,
+.pro-form .pro-form-item-add .ant-input-number .ant-select-selection-placeholder {
+  z-index: 9;
+}
+.pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+  border-radius: 4px;
+}
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > span {
+  border-radius: 4px;
+  padding: 5px 8px;
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-select-selector,
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
+.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 {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
+.pro-form .pro-form-item-add .pro-form-view-container {
+  padding: 4px 8px;
+  background: var(--zaui-contract-bg-add, #d2fff4);
+  border-radius: 4px;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;
@@ -3781,6 +3856,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-transfer-right .checked-item.disabled .anticon {
   pointer-events: none;
 }
+.pro-tree-wrap-ellipse {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: keep-all;
+}
 .pro-tree {
   height: 100%;
 }
@@ -4147,6 +4230,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
   display: none;
 }
+.ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
+  overflow: hidden;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -5240,7 +5326,7 @@ input[type='button'] {
   --zaui-brand: #006aff;
   --zaui-brand-hover: #3387ff;
   --zaui-brand-active: #005ad9;
-  --zaui-brand-disabled: #99c3ff;
+  --zaui-brand-disabled: color-mix(in srgb, var(--zaui-brand) 70%, white);
   --zaui-text: #343434;
   --zaui-text-weak: #616161;
   --zaui-aide-text: #909090;
@@ -5287,6 +5373,7 @@ input[type='button'] {
   --zaui-table-selected-hover-bg: var(--zaui-table-hover-bg);
   --zaui-table-nested-bg: #fafcfe;
   --zaui-contract-bg: #fffaa1;
+  --zaui-contract-bg-add: #d2fff4;
   --zaui-form-label-width: 130px;
   --zaui-border-radius: 8px;
   --zaui-border-radius-card: 4px;
@@ -5882,3 +5969,6 @@ input[type='button'] {
 .ant-tooltip > .ant-tooltip-content > .ant-tooltip-arrow > .ant-tooltip-arrow-content {
   --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);
+}

package/dist/less.esm.css

@@ -1909,7 +1909,7 @@
 .pro-table .ant-table-body .ant-table-cell .varied-cell {
   margin-left: -8px;
   padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
-  background: var(--zaui-contract-bg, #fffaa1);
+  background: var(--zaui-contract-bg, #fffaa1) !important;
   border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-table .ant-table-body .varied-cell.empty-cell {
@@ -2890,12 +2890,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
   margin-bottom: calc(var(--zaui-space-size-md, 16px) * var(--zaui-size, 1)) !important;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input {
+  width: 100%;
   -webkit-box-flex: inherit;
   -webkit-flex-grow: inherit;
       -ms-flex-positive: inherit;
           flex-grow: inherit;
 }
 .pro-form .ant-form-item.pro-form-item-width-auto .ant-form-item-control-input-content {
+  width: 100%;
   -webkit-box-flex: initial;
   -webkit-flex: initial;
       -ms-flex: initial;
@@ -3059,6 +3061,13 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-form .pro-form-list-mode-block .pro-collapse-content .ant-row {
   width: auto;
 }
+.pro-form .pro-form-item-changed {
+  border-radius: 4px;
+  background: var(--zaui-contract-bg, #fffaa1) !important;
+}
+.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 span.ant-input-affix-wrapper,
 .pro-form .pro-form-item-changed .ant-select .ant-select-selector,
 .pro-form .pro-form-item-changed .ant-picker,
@@ -3095,11 +3104,77 @@ 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 {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-changed .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg, #fffaa1);
+}
 .pro-form .pro-form-item-changed .pro-form-view-container {
   padding: 4px 8px;
   background: var(--zaui-contract-bg, #fffaa1);
   border-radius: 4px;
 }
+.pro-form .pro-form-item-add {
+  border-radius: 4px;
+  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;
+}
+.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,
+.pro-form .pro-form-item-add .ant-input-number {
+  background: var(--zaui-contract-bg-add, #d2fff4) !important;
+}
+.pro-form .pro-form-item-add span.ant-input-affix-wrapper input,
+.pro-form .pro-form-item-add .ant-select .ant-select-selector input,
+.pro-form .pro-form-item-add .ant-picker input,
+.pro-form .pro-form-item-add .ant-input-number input {
+  background: transparent !important;
+}
+.pro-form .pro-form-item-add span.ant-input-affix-wrapper .ant-select-selection-placeholder,
+.pro-form .pro-form-item-add .ant-select .ant-select-selector .ant-select-selection-placeholder,
+.pro-form .pro-form-item-add .ant-picker .ant-select-selection-placeholder,
+.pro-form .pro-form-item-add .ant-input-number .ant-select-selection-placeholder {
+  z-index: 9;
+}
+.pro-form .pro-form-item-add .ant-form-item-control:has(.ant-switch-handle),
+.pro-form .pro-form-item-add .ant-form-item-control:has(.ant-checkbox-wrapper-in-form-item) {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+  border-radius: 4px;
+}
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > span {
+  border-radius: 4px;
+  padding: 5px 8px;
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-select-selector,
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-affix-wrapper,
+.pro-form .pro-form-item-add .ant-form-item-control-input-content > .pro-address .ant-input-disabled {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
+.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 {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add:has(.ant-switch) {
+  padding: 5px 0;
+}
+.pro-form .pro-form-item-add .ant-input-textarea > textarea {
+  background: var(--zaui-contract-bg-add, #d2fff4);
+}
+.pro-form .pro-form-item-add .pro-form-view-container {
+  padding: 4px 8px;
+  background: var(--zaui-contract-bg-add, #d2fff4);
+  border-radius: 4px;
+}
 .pro-upload .pro-upload-dragger .pro-upload-handle-box {
   padding: var(--zaui-space-size-sm, 8px);
   background: #f8f9fa;
@@ -3781,6 +3856,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-transfer-right .checked-item.disabled .anticon {
   pointer-events: none;
 }
+.pro-tree-wrap-ellipse {
+  display: block;
+  width: 100%;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+  word-break: keep-all;
+}
 .pro-tree {
   height: 100%;
 }
@@ -4147,6 +4230,9 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 .pro-tree-select-drop-down-container.ant-select-dropdown .ant-select-tree-node-content-wrapper .check-mark-icon {
   display: none;
 }
+.ant-select-tree-node-content-wrapper:has(.pro-tree-wrap-ellipse) {
+  overflow: hidden;
+}
 .pro-drawer .pro-drawer-close {
   position: absolute;
   top: 6px;
@@ -5240,7 +5326,7 @@ input[type='button'] {
   --zaui-brand: #006aff;
   --zaui-brand-hover: #3387ff;
   --zaui-brand-active: #005ad9;
-  --zaui-brand-disabled: #99c3ff;
+  --zaui-brand-disabled: color-mix(in srgb, var(--zaui-brand) 70%, white);
   --zaui-text: #343434;
   --zaui-text-weak: #616161;
   --zaui-aide-text: #909090;
@@ -5287,6 +5373,7 @@ input[type='button'] {
   --zaui-table-selected-hover-bg: var(--zaui-table-hover-bg);
   --zaui-table-nested-bg: #fafcfe;
   --zaui-contract-bg: #fffaa1;
+  --zaui-contract-bg-add: #d2fff4;
   --zaui-form-label-width: 130px;
   --zaui-border-radius: 8px;
   --zaui-border-radius-card: 4px;

package/es/ProEditTable/components/RenderField/{ListChanged.d.ts → ListChangedWrapper.d.ts}

@@ -1,6 +1,7 @@
 import React from 'react';
 import { FormInstance } from 'antd';
 import { NamePath } from 'antd/lib/form/interface';
+import { DiffOriginalParams } from '../../../ProForm/utils/diffOriginal';
 interface Props {
     name?: NamePath;
     names?: NamePath[];
@@ -9,8 +10,8 @@ interface Props {
     namesStr?: NamePath;
     originalValues?: any;
     form: FormInstance;
-    equalWith?: (preValue: any, curValue: any) => boolean | undefined;
+    equalWith?: DiffOriginalParams['equalWith'];
     [name: string]: any;
 }
-declare const ListChanged: React.FC<Props>;
-export default ListChanged;
+declare const ListChangedWrapper: React.FC<Props>;
+export default ListChangedWrapper;

package/es/ProEditTable/components/RenderField/{ListChanged.js → ListChangedWrapper.js}

@@ -7,8 +7,11 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["name", "names", "namesStr", "originalName", "originalNames", "originalValues", "form", "equalWith", "rowKeyPath", "children", "type"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { useMemo } from 'react';
+import classNames from 'classnames';
 import { get } from 'lodash';
 import { diffOriginal } from '../../../ProForm/utils/diffOriginal';
+import { useProConfig } from '../../../ProConfigProvider';
+import { isEmpty } from '../../../utils';
 var toNamePath = function toNamePath(name) {
   if (Array.isArray(name)) {
     return name;
@@ -61,7 +64,7 @@ var getOriginalValue = function getOriginalValue(_ref) {
     return get(originalValues, originalName);
   }) : get(originalValues, originalName);
 };
-var ListChanged = function ListChanged(props) {
+var ListChangedWrapper = function ListChangedWrapper(props) {
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -76,11 +79,13 @@ var ListChanged = function ListChanged(props) {
     children = props.children,
     type = props.type,
     rest = _objectWithoutProperties(props, _excluded);
+  var _ref2 = useProConfig('ProEditTable') || {},
+    isDiffAll = _ref2.isDiffAll;
   var namePath = toNamePath(namesStr || name);
   var originalNamePath = toNamePath(originalName);
   var originalNamePaths = originalNames && toNamePaths(originalNames);
-  var notWatch = !originalValues || ['FormList', 'ProEditTable'].includes(type);
-  var originalValue = !notWatch ? getOriginalValue({
+  var isWatch = originalValues && !['FormList', 'ProEditTable'].includes(type);
+  var originalValue = isWatch ? getOriginalValue({
     namePath: namePath,
     originalName: originalNamePath,
     originalNames: originalNamePaths,
@@ -88,9 +93,9 @@ var ListChanged = function ListChanged(props) {
     rowKeyPath: rowKeyPath,
     form: form
   }) : undefined;
-  var noChange = !equalWith && (!originalValues || originalValue === undefined);
-  var changed = useMemo(function () {
-    if (notWatch || noChange) return false;
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : isEmpty(originalValue));
+  var diffType = useMemo(function () {
+    if (!isWatch || noChange) return 'same';
     return diffOriginal({
       value: props.value,
       originalValue: originalValue,
@@ -99,11 +104,18 @@ var ListChanged = function ListChanged(props) {
       // name: isString(namesStr) ? namesStr : originalName || name,
     });
   }, [props.value, originalValue]);
-  if (notWatch || noChange) {
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
+  if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
+  var diffClassName = classNames({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
+  });
   return _jsx(_Tooltip, {
-    open: changed ? undefined : false,
+    // 传入undefined 鼠标移入显示移出隐藏
+    open: isChanged ? undefined : false,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
@@ -116,9 +128,9 @@ var ListChanged = function ListChanged(props) {
       })) : undefined]
     }),
     children: _jsx("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: diffClassName,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
     })
   });
 };
-export default ListChanged;
+export default ListChangedWrapper;

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

@@ -25,7 +25,7 @@ import useRules from '../../../ProForm/utils/useRules';
 import { isSelect, isTrim } from '../../../ProForm/utils';
 import ConfirmWrapper from '../../../ProForm/components/render/ConfirmWrapper';
 import { getDefaultProps } from '../../utils/getDefaultProps';
-import ListChanged from './ListChanged';
+import ListChangedWrapper from './ListChangedWrapper';
 var RenderField = function RenderField(_ref) {
   var _type, _type$replace, _fieldProps2, _names, _TargetComponent4, _componentProps2;
   var value = _ref.text,
@@ -510,7 +510,7 @@ var RenderField = function RenderField(_ref) {
       form: form,
       names: names,
       namePath: [].concat(_toConsumableArray(namePath), [index]),
-      name: cellName,
+      name: originalName,
       listName: cellName,
       viewEmpty: viewEmpty,
       valueType: _valueType,
@@ -547,7 +547,7 @@ var RenderField = function RenderField(_ref) {
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? ( /*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
     if (originalValues) {
-      FieldComponent = _jsx(ListChanged, {
+      FieldComponent = _jsx(ListChangedWrapper, {
         name: cellName,
         names: names,
         namesStr: [].concat(_toConsumableArray(baseName), [index, dataIndex]),

package/es/ProEnum/components/Group.js

@@ -43,7 +43,10 @@ var Group = function Group(props) {
   }
   return _jsx("div", {
     id: id,
-    className: classNames('pro-enum-group-root', disabled ? 'pro-enum-group-root-disabled' : ''),
+    className: classNames({
+      'pro-enum-group-root': true,
+      'pro-enum-group-root-disabled': disabled
+    }),
     children: dataSource.map(function (item, index) {
       return _jsx("div", {
         onClick: function onClick() {
@@ -51,7 +54,12 @@ var Group = function Group(props) {
             handleClick(item[fieldValue], index);
           }
         },
-        className: classNames('pro-enum-group-item', value === item[fieldValue] ? 'pro-enum-group-item-selected' : '', index === idx.current || index + 1 === idx.current ? 'pro-enum-group-item-disabled-after' : '', item.disabled ? 'pro-enum-group-item-disabled' : ''),
+        className: classNames({
+          'pro-enum-group-item': true,
+          'pro-enum-group-item-selected': value === item[fieldValue],
+          'pro-enum-group-item-disabled-after': index === idx.current || index + 1 === idx.current,
+          'pro-enum-group-item-disabled': item.disabled
+        }),
         children: item[fieldLabel]
       }, item[fieldValue]);
     })

package/es/ProEnum/index.js

@@ -11,7 +11,7 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps"],
+var _excluded = ["code", "type", "dataSource", "useRequest", "value", "component", "onChange", "transformResponse", "otherProps", "isView"],
   _excluded2 = ["fieldNames", "clear", "cacheKey", "showCodeName"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
 import { useDeepCompareEffect, useRequest as useRequestFunc } from 'ahooks';
@@ -39,10 +39,11 @@ var ProEnum = function ProEnum(props) {
     onChange = props.onChange,
     transformResponse = props.transformResponse,
     otherProps = props.otherProps,
+    isView = props.isView,
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
-    isView = _ref.isView,
     viewEmpty = _ref.viewEmpty;
+  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -226,7 +227,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);
-    return;
+    // return;
   }
   var transToLabel = function transToLabel(value) {
     var list = dataList && dataList.length ? dataList : enumLists;
@@ -271,7 +272,7 @@ var ProEnum = function ProEnum(props) {
     };
     return isFunction(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
-  if (isView) {
+  if (_isView) {
     if (Array.isArray(value)) {
       return _jsx(Container, {
         tooltip: true,

package/es/ProEnum/style/index.less

@@ -1,6 +1,8 @@
 @root-entry-name: 'default';
 @import (reference) '~antd/es/style/themes/index.less';
 
+@zaui-disabled-bg: var(--zaui-disabled-bg);
+
 .pro-enum {
   &-tag-root {
     display: flex;
@@ -19,7 +21,7 @@
     justify-content: center;
     margin-right: var(--zaui-space-size-sm);
     padding: var(--zaui-space-size-xs) 10px;
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     border-radius: var(--zaui-space-size-xs);
     cursor: pointer;
   }
@@ -29,7 +31,7 @@
     background-color: var(--zaui-brand);
   }
   &-tag-item-disabled {
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     pointer-events: none;
   }
 
@@ -90,12 +92,20 @@
 
     .pro-enum-group-item-disabled {
       color: rgba(0, 0, 0, 0.25);
-      background: #f5f5f5;
+      background: var(--zaui-disabled-bg);
       cursor: not-allowed;
     }
   }
 
   &-group-root-disabled {
-    opacity: 0.7;
+    color: var(--zaui-aide-text);
+
+    .pro-enum-group-item {
+      background: var(--zaui-disabled-bg);
+      &.pro-enum-group-item-selected {
+        background: var(--zaui-brand-disabled);
+        border-color: var(--zaui-brand-disabled);
+      }
+    }
   }
 }

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

@@ -9,11 +9,12 @@ import ProCollapse from '../../../../ProLayout/components/ProCollapse';
 import ProForm from '../../../../ProForm';
 var Container = function Container(props) {
   var children = props.children,
-    otherProps = props.otherProps,
     className = props.className,
     container = props.container,
     show = props.show,
-    clearNotShow = props.clearNotShow;
+    clearNotShow = props.clearNotShow,
+    diffConfig = props.diffConfig,
+    otherProps = props.otherProps;
   var _ref = ProForm.useFieldProps() || {},
     type = _ref.type,
     form = _ref.form,
@@ -38,7 +39,8 @@ var Container = function Container(props) {
   var childRender = function childRender() {
     var child = _jsx(RenderFields, _objectSpread({
       columns: _children,
-      form: form
+      form: form,
+      diffConfig: diffConfig
     }, otherProps));
     if (type === 'ProCollapse') {
       return _jsx(ProCollapse, _objectSpread(_objectSpread({}, omit(props, ['otherProps', 'children', 'onBlur', 'onChange', 'placeholder', 'className'])), {}, {

package/es/ProForm/components/combination/Container/propsType.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { RowProps } from 'antd';
-import { ProColumnProps, ProFormOtherProps } from '../../../propsType';
+import { ProColumnProps, ProFormOtherProps, DiffConfigProps } from '../../../propsType';
 export interface ContainerProps {
     children?: ProColumnProps[];
     otherProps?: ProFormOtherProps;
@@ -8,5 +8,6 @@ export interface ContainerProps {
     className?: string;
     container?: string | React.ReactNode;
     show?: boolean | (() => boolean);
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
 }