@zat-design/sisyphus-react 3.7.3-beta.1 → 3.7.3-beta.11

package/dist/index.esm.css

@@ -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;
@@ -5287,6 +5362,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 +5958,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

@@ -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;
@@ -5287,6 +5362,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,
@@ -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/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

@@ -19,7 +19,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 +29,7 @@
     background-color: var(--zaui-brand);
   }
   &-tag-item-disabled {
-    background-color: #f5f5f5;
+    background-color: var(--zaui-disabled-bg);
     pointer-events: none;
   }
 
@@ -90,12 +90,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: #bfbfbf;
+
+    .pro-enum-group-item {
+      background: var(--zaui-disabled-bg);
+      &.pro-enum-group-item-selected {
+        background: #6b95f5;
+        border-color: #6b95f5;
+      }
+    }
   }
 }

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

@@ -5,7 +5,7 @@ interface EnumRes {
     [key: string]: any;
 }
 export declare function getEnumData(storage: StorageType, cacheKey: string, baseEnumStorage?: any): EnumRes;
-export declare function setEnumData(storage: StorageType, cacheKey: string, data: Object): void;
+export declare function setEnumData(storage: StorageType, cacheKey: string, data: any): boolean;
 export declare function hasEnumList(storage: StorageType, cacheKey: any, code: string): DataOption[];
 export declare function isObject(obj: any): boolean;
 export declare function mergeCacheData(storage: string, code: string, cacheKey: string, responseData: any): void;

package/es/ProEnum/utils/index.js

@@ -13,6 +13,10 @@ export function getEnumData(storage, cacheKey, baseEnumStorage) {
   }
 }
 export function setEnumData(storage, cacheKey, data) {
+  var _Object$keys;
+  if (!((_Object$keys = Object.keys(data === null || data === void 0 ? void 0 : data.data)) === null || _Object$keys === void 0 ? void 0 : _Object$keys.length)) {
+    return false;
+  }
   if (storage === 'localStorage') {
     window.localStorage.setItem(cacheKey, JSON.stringify(data));
   } else if (storage === 'sessionStorage') {

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;
 }

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

@@ -91,7 +91,9 @@ var ProNumberRange = function ProNumberRange(props) {
   });
   // 查看模式
   if (isView || props.isView) {
-    if (isEmpty(value)) {
+    if (isEmpty(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
+      return typeof item !== 'number';
+    }))) {
       return viewEmpty;
     }
     switch (valueType) {

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

@@ -0,0 +1,16 @@
+import { FormInstance } from 'antd';
+import { NamePath } from 'antd/lib/form/interface';
+import React from 'react';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
+import { DiffConfigProps } from '../../propsType';
+interface Props {
+    name?: NamePath;
+    names?: NamePath[];
+    namesStr?: string;
+    diffConfig?: DiffConfigProps;
+    form: FormInstance;
+    equalWith?: DiffOriginalParams['equalWith'];
+    [name: string]: any;
+}
+declare const ChangedWrapper: React.FC<Props>;
+export default ChangedWrapper;

package/es/ProForm/components/render/{Changed.js → ChangedWrapper.js}

@@ -4,61 +4,89 @@ import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["name", "names", "namesStr", "originalValues", "form", "equalWith", "children", "type", "originalDiffTip"];
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import classNames from 'classnames';
 import { get } from 'lodash';
 import React, { useMemo } from 'react';
 import { diffOriginal } from '../../utils/diffOriginal';
-var Changed = function Changed(props) {
+import { useProConfig } from '../../../ProConfigProvider';
+import { isEmpty } from '../../../utils';
+var ChangedWrapper = function ChangedWrapper(props) {
+  var _diffConfig$toolTip;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
-    originalValues = props.originalValues,
     form = props.form,
     equalWith = props.equalWith,
     children = props.children,
     type = props.type,
-    originalDiffTip = props.originalDiffTip,
+    diffConfig = props.diffConfig,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     rest = _objectWithoutProperties(props, _excluded);
+  var _useProConfig = useProConfig('ProForm'),
+    isDiffAll = _useProConfig.isDiffAll;
+  var originalValues = diffConfig.originalValues,
+    changeTipColor = diffConfig.changeTipColor,
+    addTipColor = diffConfig.addTipColor;
+  var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
   // 不渲染tooltip
-  var notWatch = !originalDiffTip || ['FormList', 'ProEditTable'].includes(type);
+  var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
   var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
     return get(originalValues, name);
   }) : get(originalValues, name);
-  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({
       originalValue: originalValue,
-      value: props.value,
+      value: props[valuePropName],
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
     });
-  }, [notWatch, noChange, props.value, originalValue]);
+  }, [isWatch, noChange, props[valuePropName], originalValue]);
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {
-    if (notWatch || noChange) return undefined;
+    if (!isWatch || noChange) return undefined;
     return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, {
       isView: true,
       value: originalValue,
       checked: type === 'Switch' ? originalValue : undefined
     })) : undefined;
   }, [originalValue, children]);
-  if (notWatch || noChange) {
+  if (!isWatch || noChange) {
     return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
   }
+  var tipOpenCalc = function tipOpenCalc() {
+    if (!toolTip) return false;
+    // 传入undefined 鼠标移入显示移出隐藏
+    return isChanged ? undefined : false;
+  };
+  var style = {
+    '--zaui-contract-bg': changeTipColor,
+    '--zaui-contract-bg-add': addTipColor
+  };
+  var diffClassName = classNames({
+    'pro-form-item-changed': isChanged,
+    'pro-form-item-add': isAdd
+  });
   return _jsx(_Tooltip, {
-    open: changed ? undefined : false,
+    open: tipOpenCalc(),
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
     title: _jsxs(_Space, {
       children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
     }),
+    placement: "topLeft",
     children: _jsx("div", {
-      className: changed ? 'pro-form-item-changed' : '',
+      className: diffClassName,
+      style: style,
       children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
     })
   });
 };
-export default Changed;
+export default ChangedWrapper;