@zat-design/sisyphus-react 3.7.3-beta.9 → 3.8.0

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 {
@@ -2365,8 +2365,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-number-range .range-left,
 .pro-number-range .range-right {
-  width: calc(50% - 20px);
+  width: calc(50% - 16px);
   text-align: center;
+  -webkit-transition: none;
+  transition: none;
+}
+.pro-number-range .range-left .range-left,
+.pro-number-range .range-right .range-left {
+  width: calc(100% + 2px) !important;
 }
 .pro-number-range .range-left .ant-input-number {
   border-right: none;
@@ -2978,7 +2984,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .site-input-group-wrapper .site-input-left,
 .pro-form .site-input-group-wrapper .site-input-right {
-  width: calc(50% - 20px);
+  width: calc(50% - 16px);
 }
 .pro-form .site-input-group-wrapper .site-input-left .ant-input-number {
   border-right: none;
@@ -3856,6 +3862,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%;
 }
@@ -4222,6 +4236,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;
@@ -5315,7 +5332,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;

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 {
@@ -2365,8 +2365,14 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-number-range .range-left,
 .pro-number-range .range-right {
-  width: calc(50% - 20px);
+  width: calc(50% - 16px);
   text-align: center;
+  -webkit-transition: none;
+  transition: none;
+}
+.pro-number-range .range-left .range-left,
+.pro-number-range .range-right .range-left {
+  width: calc(100% + 2px) !important;
 }
 .pro-number-range .range-left .ant-input-number {
   border-right: none;
@@ -2978,7 +2984,7 @@ span.ant-input-group-compact.pro-range-limit .forever-checkbox {
 }
 .pro-form .site-input-group-wrapper .site-input-left,
 .pro-form .site-input-group-wrapper .site-input-right {
-  width: calc(50% - 20px);
+  width: calc(50% - 16px);
 }
 .pro-form .site-input-group-wrapper .site-input-left .ant-input-number {
   border-right: none;
@@ -3856,6 +3862,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%;
 }
@@ -4222,6 +4236,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;
@@ -5315,7 +5332,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;

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

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

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

@@ -43,7 +43,7 @@ var ProEnum = function ProEnum(props) {
     enumProps = _objectWithoutProperties(props, _excluded);
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
-  var _isView = isView || otherProps.isView;
+  var _isView = isView || (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView);
   var _ref2 = useProConfig('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,

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;
@@ -96,10 +98,14 @@
   }
 
   &-group-root-disabled {
-    color: #bfbfbf;
+    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/ProModalSelect/index.js

@@ -27,7 +27,7 @@ import { SearchOutlined } from '@ant-design/icons';
 import { useDeepCompareEffect, useMount, useSetState } from 'ahooks';
 import { debounce, isArray, isEqual, isFunction, omit } from 'lodash';
 import { ReactSVG } from 'react-svg';
-import React, { forwardRef, useEffect, useImperativeHandle, useMemo } from 'react';
+import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
 import { ProForm, ProDrawerForm, ProTable, useProConfig, ProSelect } from '../../../../index';
 import Container from '../../Container';
 import viewSvg from '../../../../assets/view.svg';
@@ -137,10 +137,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }, _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options), {}, {
       manual: true,
       onSuccess: function onSuccess(res) {
-        var _res$data;
+        var _res$data, _ref5;
         var list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.list : res === null || res === void 0 ? void 0 : res.data;
         setState({
-          options: transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list
+          options: (_ref5 = transformResponse ? transformResponse(res === null || res === void 0 ? void 0 : res.data) : list) !== null && _ref5 !== void 0 ? _ref5 : []
         });
       }
     })),
@@ -166,9 +166,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   var handleFormat = onFormat || defaultOptionRender;
   if (showCodeName) {
-    handleFormat = function handleFormat(_ref5) {
-      var value = _ref5.value,
-        label = _ref5.label;
+    handleFormat = function handleFormat(_ref6) {
+      var value = _ref6.value,
+        label = _ref6.label;
       return "".concat(value, "-").concat(label);
     };
   }
@@ -237,7 +237,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
+    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
       var _yield$beforeOpen, res;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -280,7 +280,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee);
     }));
     return function handleClick() {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   var handleClose = function handleClose() {
@@ -299,7 +299,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref7 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
+    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -360,11 +360,11 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee2, null, [[0, 18]]);
     }));
     return function handleFinish() {
-      return _ref7.apply(this, arguments);
+      return _ref8.apply(this, arguments);
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref8 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
+    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3() {
       var values;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -383,7 +383,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee3);
     }));
     return function handleSearch() {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var _rowSelection = _objectSpread({
@@ -437,7 +437,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref9 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
+    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
       var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -495,12 +495,12 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee4);
     }));
     return function getInitValues() {
-      return _ref9.apply(this, arguments);
+      return _ref10.apply(this, arguments);
     };
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref10 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
+    var _ref11 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return _regeneratorRuntime().wrap(function _callee5$(_context5) {
@@ -548,7 +548,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee5);
     }));
     return function getDefaultOneValues() {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   useImperativeHandle(ref, function () {
@@ -579,7 +579,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     if (onOff && !visible) {
       var _useRequest$options6;
       if ((useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options6 = useRequest.options) === null || _useRequest$options6 === void 0 ? void 0 : _useRequest$options6.manual) !== true) {
@@ -615,34 +615,39 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, value]);
-  useEffect(function () {
-    if (value && !visible && isInit) {
-      if (readOnly) {
-        // 加定时器 修复依赖数据同步更新未取到问题
-        setTimeout(function () {
-          var _useRequest$options7, _useRequest$options8;
-          var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
-          if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
-            var _contentForm$getField2;
-            initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
-          }
-          var params = withPagination ? {
-            pageNum: 1,
-            pageSize: 50,
-            queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
-          } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
-          var nextParams = transformParams ? transformParams(params) : params;
-          run(nextParams);
-          setState({
-            isInit: false
-          });
-        }, 300);
-      } else {
-        getInitValues();
+  useDeepCompareEffect(function () {
+    if (value && !visible && isInit && !readOnly) {
+      getInitValues();
+    }
+  }, [value, visible, isInit]);
+  useDeepCompareEffect(function () {
+    if (value && !visible && readOnly) {
+      var _options$some;
+      var isHasValue = options === null || options === void 0 ? void 0 : (_options$some = options.some) === null || _options$some === void 0 ? void 0 : _options$some.call(options, function (item) {
+        return item[valueKey] === value;
+      });
+      if (isHasValue) {
+        return;
       }
+      // 加定时器 修复依赖数据同步更新未取到问题
+      setTimeout(function () {
+        var _useRequest$options7, _useRequest$options8;
+        var initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
+        if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
+          var _contentForm$getField2;
+          initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField2 = contentForm.getFieldsValue) === null || _contentForm$getField2 === void 0 ? void 0 : _contentForm$getField2.call(contentForm));
+        }
+        var params = withPagination ? {
+          pageNum: 1,
+          pageSize: 50,
+          queryBean: _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
+        } : _objectSpread(_objectSpread({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options8 = useRequest.options) === null || _useRequest$options8 === void 0 ? void 0 : _useRequest$options8.defaultParams), initParams);
+        var nextParams = transformParams ? transformParams(params) : params;
+        run(nextParams);
+      }, 300);
     }
-  }, [value, visible, isInit, useRequest]);
-  useEffect(function () {
+  }, [value, options, visible, useRequest]);
+  useDeepCompareEffect(function () {
     if (!value) {
       if (defaultOne) {
         getDefaultOneValues();
@@ -742,7 +747,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  useEffect(function () {
+  useDeepCompareEffect(function () {
     if (isTooltip && value) {
       var dom = document.getElementById(uuid);
       dom.addEventListener('mouseover', function (e) {
@@ -779,7 +784,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [value, isTooltip]);
   useDeepCompareEffect(function () {
     setState({
-      options: tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource
+      options: (tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource) || []
     });
   }, [tableProps === null || tableProps === void 0 ? void 0 : tableProps.dataSource]);
   // 当搜索条件只有一个时，且为输入框，默认设置suffix

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

@@ -13,11 +13,9 @@ import { tools } from '@zat-design/utils';
 import Container from '../../Container';
 import locale from '../../../../locale';
 import ProForm from '../../../../ProForm';
-var formatAmount = tools.formatAmount,
-  formatPercent = tools.formatPercent,
-  formatPerMill = tools.formatPerMill;
+var formatAmount = tools.formatAmount;
 var ProNumberRange = function ProNumberRange(props) {
-  var _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
+  var _document$querySelect, _valueProps, _ref2, _ref3, _value$, _valueProps2, _ref4, _ref5, _value$2, _valueProps3, _valueProps4;
   var _props$value = props.value,
     value = _props$value === void 0 ? [] : _props$value,
     _props$onChange = props.onChange,
@@ -42,6 +40,7 @@ var ProNumberRange = function ProNumberRange(props) {
     viewEmpty = _ref.viewEmpty,
     valueType = _ref.valueType;
   var isView = typeof props.isView === 'boolean' ? props.isView : isViewCon; // 组件可直接接收isView参数, 优先级高
+  var addonAfterDomWidth = (_document$querySelect = document.querySelector('.ant-input-number-group-addon')) === null || _document$querySelect === void 0 ? void 0 : _document$querySelect.clientWidth;
   var _useSetState = useSetState({
       range: value || []
     }),
@@ -87,6 +86,8 @@ var ProNumberRange = function ProNumberRange(props) {
   };
   var cls = classnames({
     'pro-number-range': true,
+    'pro-number-range-after': addonAfter,
+    'pro-number-range-before': addonBefore,
     className: className
   });
   // 查看模式
@@ -190,6 +191,9 @@ var ProNumberRange = function ProNumberRange(props) {
       },
       addonBefore: addonBefore
     }, valueProps), {}, {
+      style: addonAfter ? {
+        width: "calc(50% - ".concat(16 + addonAfterDomWidth / 2, "px)")
+      } : null,
       min: min !== null && min !== void 0 ? min : (_valueProps = valueProps) === null || _valueProps === void 0 ? void 0 : _valueProps.min,
       max: (_ref2 = (_ref3 = (_value$ = value === null || value === void 0 ? void 0 : value[1]) !== null && _value$ !== void 0 ? _value$ : range[1]) !== null && _ref3 !== void 0 ? _ref3 : max) !== null && _ref2 !== void 0 ? _ref2 : (_valueProps2 = valueProps) === null || _valueProps2 === void 0 ? void 0 : _valueProps2.max
     }, childProps === null || childProps === void 0 ? void 0 : childProps[0])), _jsx(_Input, {
@@ -210,6 +214,9 @@ var ProNumberRange = function ProNumberRange(props) {
       },
       addonAfter: addonAfter
     }, valueProps), {}, {
+      style: addonAfter ? {
+        width: "calc(50% - ".concat(16 - addonAfterDomWidth / 2, "px)")
+      } : null,
       min: (_ref4 = (_ref5 = (_value$2 = value === null || value === void 0 ? void 0 : value[0]) !== null && _value$2 !== void 0 ? _value$2 : range[0]) !== null && _ref5 !== void 0 ? _ref5 : min) !== null && _ref4 !== void 0 ? _ref4 : (_valueProps3 = valueProps) === null || _valueProps3 === void 0 ? void 0 : _valueProps3.min,
       max: max !== null && max !== void 0 ? max : (_valueProps4 = valueProps) === null || _valueProps4 === void 0 ? void 0 : _valueProps4.max
     }, childProps === null || childProps === void 0 ? void 0 : childProps[1]))]

package/es/ProForm/components/combination/ProNumberRange/style/index.less

@@ -40,8 +40,12 @@
 
   .range-left,
   .range-right {
-    width: calc(50% - 20px);
+    width: calc(50% - 16px);
     text-align: center;
+    transition: none;
+    .range-left {
+      width: calc(100% + 2px) !important;
+    }
   }
 
   .range-left {

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

@@ -10,6 +10,7 @@ interface Props {
     diffConfig?: DiffConfigProps;
     form: FormInstance;
     equalWith?: DiffOriginalParams['equalWith'];
+    valuePropName?: string;
     [name: string]: any;
 }
 declare const ChangedWrapper: React.FC<Props>;

package/es/ProForm/components/render/ChangedWrapper.js

@@ -2,6 +2,7 @@ import "antd/es/space/style";
 import _Space from "antd/es/space";
 import "antd/es/tooltip/style";
 import _Tooltip from "antd/es/tooltip";
+import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
@@ -13,7 +14,7 @@ import { diffOriginal } from '../../utils/diffOriginal';
 import { useProConfig } from '../../../ProConfigProvider';
 import { isEmpty } from '../../../utils';
 var ChangedWrapper = function ChangedWrapper(props) {
-  var _diffConfig$toolTip;
+  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
     names = props.names,
     namesStr = props.namesStr,
@@ -31,7 +32,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     changeTipColor = diffConfig.changeTipColor,
     addTipColor = diffConfig.addTipColor;
   var toolTip = (_diffConfig$toolTip = diffConfig.toolTip) !== null && _diffConfig$toolTip !== void 0 ? _diffConfig$toolTip : true;
-  // 不渲染tooltip
   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);
@@ -51,14 +51,16 @@ var ChangedWrapper = function ChangedWrapper(props) {
   var isChanged = diffType === 'changed';
   var tipContent = useMemo(function () {
     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;
+    return /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), {}, _defineProperty({
+      isView: true
+    }, valuePropName, originalValue))) : undefined;
   }, [originalValue, children]);
   if (!isWatch || noChange) {
-    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest));
+    // 嵌套子组件
+    var isNestedField = ['ProEditTable'].includes(type);
+    return /*#__PURE__*/React.isValidElement(children) && /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({
+      originalValues: isNestedField ? originalValues : undefined
+    }, children.props), rest));
   }
   var tipOpenCalc = function tipOpenCalc() {
     if (!toolTip) return false;
@@ -73,19 +75,33 @@ var ChangedWrapper = function ChangedWrapper(props) {
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
   });
+  // @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);
   return _jsx(_Tooltip, {
     open: tipOpenCalc(),
+    mouseEnterDelay: 1,
     getPopupContainer: function getPopupContainer(target) {
       return target.parentElement;
     },
     title: _jsxs(_Space, {
-      children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      direction: "vertical",
+      children: [_jsxs(_Space, {
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _showEllipse && _jsxs(_Space, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+          isView: true
+        })) : undefined]
+      })]
     }),
     placement: "topLeft",
     children: _jsx("div", {
       className: diffClassName,
       style: style,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread({}, children.props), rest)) : undefined
+      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
+        otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+          isDiffChange: isChanged
+        })
+      })) : undefined
     })
   });
 };

package/es/ProForm/propsType.d.ts

@@ -44,6 +44,7 @@ export interface ProFormOtherProps {
     listName?: any[] | string | number;
     globalControl?: boolean;
     formDisabled?: boolean;
+    isDiffChange?: boolean;
 }
 export interface DiffConfigProps<Values = any> {
     /** 比对原始数据源 */

package/es/ProForm/style/index.less

@@ -218,7 +218,7 @@
 
     .site-input-left,
     .site-input-right {
-      width: calc(50% - 20px);
+      width: calc(50% - 16px);
     }
 
     .site-input-left {

package/es/ProForm/utils/transformValue.js

@@ -1,8 +1,7 @@
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
-var _excluded = ["value"];
 import { set } from 'lodash';
 import { diffField } from '../utils';
+import { isEmpty } from '../../utils';
 export var transformValue = function transformValue(names, form, fieldName, _normalize, _getValueProps) {
   return {
     normalize: function normalize(value) {
@@ -22,23 +21,30 @@ export var transformValue = function transformValue(names, form, fieldName, _nor
       return _value;
     },
     getValueProps: function getValueProps(value) {
+      var _curValue;
       var _value = [];
       names.forEach(function (name, index) {
         var value = form.getFieldValue(name);
         _value[index] = value;
       });
       // 支持外部传入转换函数
-      var _ref = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
-          value: _value
-        },
-        cusValue = _ref.value,
-        cusRest = _objectWithoutProperties(_ref, _excluded);
+      var res = (_getValueProps === null || _getValueProps === void 0 ? void 0 : _getValueProps(_value)) || {
+        value: _value
+      };
+      // 如果数组中值都为空, 则值置为空
+      var curValue = res === null || res === void 0 ? void 0 : res.value;
       // @ts-ignore
-      set(form.getFieldsValue(true), fieldName, cusValue);
+      if ((_curValue = curValue) === null || _curValue === void 0 ? void 0 : _curValue.every(function (item) {
+        return isEmpty(item);
+      })) {
+        curValue = undefined;
+      }
+      // @ts-ignore
+      set(form.getFieldsValue(true), fieldName, curValue);
       // 如果表单里的值和组合得到的值不全等  更新表单里的值、
-      return _objectSpread({
-        value: cusValue
-      }, cusRest);
+      return _objectSpread(_objectSpread({}, res), {}, {
+        value: curValue
+      });
     },
     shouldUpdate: function shouldUpdate(prevValues, curValues) {
       return diffField(prevValues, curValues, names);