@zat-design/sisyphus-react 3.7.3 → 3.8.0-beat.2

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

@@ -132,10 +132,10 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, 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 : []
         });
       }
     })),
@@ -161,9 +161,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);
     };
   }
@@ -232,7 +232,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$beforeOpen, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -275,7 +275,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() {
@@ -294,7 +294,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
+    var _ref8 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2() {
       var _nextSelectedRows, _nextSelectedRows2, nextSelectedRows, record, flag, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -355,11 +355,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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
+    var _ref9 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
@@ -378,7 +378,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee3);
     }));
     return function handleSearch() {
-      return _ref8.apply(this, arguments);
+      return _ref9.apply(this, arguments);
     };
   }();
   var _rowSelection = (0, _objectSpread3.default)({
@@ -432,7 +432,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
+    var _ref10 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee4() {
       var _contentForm$getField, _useRequest$options2, _useRequest$options3, queryBean, page, params, res, _res$data2, _list, list, _data, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
@@ -490,12 +490,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 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
+    var _ref11 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee5() {
       var _useRequest$options4, _useRequest$options5;
       var queryBean, page, params, res, _res$data3, _list2, list, _data2, nextSelectRowKeys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee5$(_context5) {
@@ -543,7 +543,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }, _callee5);
     }));
     return function getDefaultOneValues() {
-      return _ref10.apply(this, arguments);
+      return _ref11.apply(this, arguments);
     };
   }();
   (0, _react.useImperativeHandle)(ref, function () {
@@ -574,7 +574,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.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) {
@@ -610,34 +610,39 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       setState(nextState);
     }
   }, [onOff, visible, value]);
-  (0, _react.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: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
-          } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, 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();
+  (0, _ahooks.useDeepCompareEffect)(function () {
+    if (value && !visible && isInit && !readOnly) {
+      getInitValues();
+    }
+  }, [value, visible, isInit]);
+  (0, _ahooks.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: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options7 = useRequest.options) === null || _useRequest$options7 === void 0 ? void 0 : _useRequest$options7.defaultParams), initParams)
+        } : (0, _objectSpread3.default)((0, _objectSpread3.default)({}, 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]);
-  (0, _react.useEffect)(function () {
+  }, [value, options, visible, useRequest]);
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (!value) {
       if (defaultOne) {
         getDefaultOneValues();
@@ -737,7 +742,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       children: customRender
     });
   }
-  (0, _react.useEffect)(function () {
+  (0, _ahooks.useDeepCompareEffect)(function () {
     if (isTooltip && value) {
       var dom = document.getElementById(uuid);
       dom.addEventListener('mouseover', function (e) {
@@ -774,7 +779,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }, [value, isTooltip]);
   (0, _ahooks.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/lib/ProForm/components/combination/ProNumberRange/index.js

@@ -17,11 +17,9 @@ var _utils = require("@zat-design/utils");
 var _Container = _interopRequireDefault(require("../../Container"));
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var formatAmount = _utils.tools.formatAmount,
-  formatPercent = _utils.tools.formatPercent,
-  formatPerMill = _utils.tools.formatPerMill;
+var formatAmount = _utils.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,
@@ -46,6 +44,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 = (0, _ahooks.useSetState)({
       range: value || []
     }),
@@ -91,11 +90,15 @@ var ProNumberRange = function ProNumberRange(props) {
   };
   var cls = (0, _classnames.default)({
     'pro-number-range': true,
+    'pro-number-range-after': addonAfter,
+    'pro-number-range-before': addonBefore,
     className: className
   });
   // 查看模式
   if (isView || props.isView) {
-    if ((0, _lodash.isEmpty)(value)) {
+    if ((0, _lodash.isEmpty)(value) || (value === null || value === void 0 ? void 0 : value.every(function (item) {
+      return typeof item !== 'number';
+    }))) {
       return viewEmpty;
     }
     switch (valueType) {
@@ -192,6 +195,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])), (0, _jsxRuntime.jsx)(_antd.Input, {
@@ -212,6 +218,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/lib/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/lib/ProForm/components/old/ProAddress/index.js

@@ -93,7 +93,7 @@ function ProAddress(_ref3) {
     secondCitys = _useState6[0],
     setSecondCitys = _useState6[1];
   var queryCity = /*#__PURE__*/function () {
-    var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
+    var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(code, type) {
       var cityList, _cityList, newList, _secondCitys;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

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

@@ -0,0 +1,17 @@
+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'];
+    valuePropName?: string;
+    [name: string]: any;
+}
+declare const ChangedWrapper: React.FC<Props>;
+export default ChangedWrapper;

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

@@ -0,0 +1,113 @@
+"use strict";
+
+var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefault").default;
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.default = void 0;
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
+var _objectSpread3 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
+var _jsxRuntime = require("react/jsx-runtime");
+var _antd = require("antd");
+var _classnames = _interopRequireDefault(require("classnames"));
+var _lodash = require("lodash");
+var _react = _interopRequireWildcard(require("react"));
+var _diffOriginal = require("../../utils/diffOriginal");
+var _ProConfigProvider = require("../../../ProConfigProvider");
+var _utils = require("../../../utils");
+var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName"];
+var ChangedWrapper = function ChangedWrapper(props) {
+  var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
+  var name = props.name,
+    names = props.names,
+    namesStr = props.namesStr,
+    form = props.form,
+    equalWith = props.equalWith,
+    children = props.children,
+    type = props.type,
+    diffConfig = props.diffConfig,
+    _props$valuePropName = props.valuePropName,
+    valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
+    rest = (0, _objectWithoutProperties2.default)(props, _excluded);
+  var _useProConfig = (0, _ProConfigProvider.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;
+  var isWatch = toolTip && !['FormList', 'ProEditTable'].includes(type);
+  var originalValue = (names === null || names === void 0 ? void 0 : names.length) ? names.map(function (name) {
+    return (0, _lodash.get)(originalValues, name);
+  }) : (0, _lodash.get)(originalValues, name);
+  var noChange = !equalWith && (!originalValues || isDiffAll ? false : (0, _utils.isEmpty)(originalValue));
+  var diffType = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return 'same';
+    return (0, _diffOriginal.diffOriginal)({
+      originalValue: originalValue,
+      value: props[valuePropName],
+      form: form,
+      equalWith: equalWith
+      // name: namesStr || name,
+    });
+  }, [isWatch, noChange, props[valuePropName], originalValue]);
+  var isAdd = diffType === 'add';
+  var isChanged = diffType === 'changed';
+  var tipContent = (0, _react.useMemo)(function () {
+    if (!isWatch || noChange) return undefined;
+    return /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), {}, (0, _defineProperty2.default)({
+      isView: true
+    }, valuePropName, originalValue))) : undefined;
+  }, [originalValue, children]);
+  if (!isWatch || noChange) {
+    // 嵌套子组件
+    var isNestedField = ['ProEditTable'].includes(type);
+    return /*#__PURE__*/_react.default.isValidElement(children) && /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)({
+      originalValues: isNestedField ? originalValues : undefined
+    }, 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 = (0, _classnames.default)({
+    '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 (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+    open: tipOpenCalc(),
+    // mouseEnterDelay={1}
+    getPopupContainer: function getPopupContainer(target) {
+      return target.parentElement;
+    },
+    title: (0, _jsxRuntime.jsxs)(_antd.Space, {
+      direction: "vertical",
+      children: [(0, _jsxRuntime.jsxs)(_antd.Space, {
+        children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
+      }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+          isView: true
+        })) : undefined]
+      })]
+    }),
+    placement: "topLeft",
+    children: (0, _jsxRuntime.jsx)("div", {
+      className: diffClassName,
+      style: style,
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
+        otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
+          isDiffChange: isChanged
+        })
+      })) : undefined
+    })
+  });
+};
+var _default = exports.default = ChangedWrapper;

package/lib/ProForm/components/render/ConfirmWrapper.js

@@ -28,7 +28,7 @@ var ConfirmWrapper = function ConfirmWrapper(props) {
   var _ProForm$useFieldProp = _index.default.useFieldProps(),
     form = _ProForm$useFieldProp.form;
   var handleChange = /*#__PURE__*/function () {
-    var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
+    var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(value) {
       var _len,
         other,
         _key,

package/lib/ProForm/components/render/Render.js

@@ -26,7 +26,7 @@ var _valueType = _interopRequireDefault(require("../../utils/valueType"));
 var _tip = _interopRequireDefault(require("../../../assets/tip.svg"));
 var _useRules = _interopRequireDefault(require("../../utils/useRules"));
 var _ConfirmWrapper = _interopRequireDefault(require("./ConfirmWrapper"));
-var _Changed = _interopRequireDefault(require("./Changed"));
+var _ChangedWrapper = _interopRequireDefault(require("./ChangedWrapper"));
 var _excluded = ["labelWidth", "hiddenNames", "trim", "upperCase", "className", "rules", "required", "labelRequired", "tooltip"];
 /* eslint-disable prefer-destructuring */
 // 这个组件只管渲染, 参数的整理在外部处理
@@ -46,12 +46,11 @@ var Render = function Render(props) {
     formDisabled = props.formDisabled,
     type = props.type,
     isSelect = props.isSelect,
-    originalValues = props.originalValues,
     equalWith = props.equalWith,
     requiredOnView = props.requiredOnView,
-    originalDiffTip = props.originalDiffTip,
     confirm = props.confirm,
-    globalControl = props.globalControl;
+    globalControl = props.globalControl,
+    diffConfig = props.diffConfig;
   var colProps = props.colProps;
   // 剔除一些不是FormItem的属性, 防止控制台报warning
   var labelWidth = formItemProps.labelWidth,
@@ -241,7 +240,7 @@ var Render = function Render(props) {
       _args = functionArgs([].concat(args));
     }
     var inList = _otherFormItemProps === null || _otherFormItemProps === void 0 ? void 0 : (_otherFormItemProps$n3 = _otherFormItemProps.namePath) === null || _otherFormItemProps$n3 === void 0 ? void 0 : _otherFormItemProps$n3.length;
-    if ( /*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
+    if (/*#__PURE__*/_react.default.isValidElement(AutoComponent)) {
       var _AutoComponent$props$, _AutoComponent$props, _lastComponentProps$c;
       ((_AutoComponent$props$ = (_AutoComponent$props = AutoComponent === null || AutoComponent === void 0 ? void 0 : AutoComponent.props)[changeKey]) === null || _AutoComponent$props$ === void 0 ? void 0 : _AutoComponent$props$.call.apply(_AutoComponent$props$, [_AutoComponent$props].concat((0, _toConsumableArray2.default)(_args)))) || ((_lastComponentProps$c = lastComponentProps[changeKey]) === null || _lastComponentProps$c === void 0 ? void 0 : _lastComponentProps$c.call.apply(_lastComponentProps$c, [lastComponentProps].concat((0, _toConsumableArray2.default)(_args))));
       return false;
@@ -291,7 +290,7 @@ var Render = function Render(props) {
    * onBlur参数重置 (value, record, { form, index, namePath, option }) => void
    */
   var handleBlur = /*#__PURE__*/function () {
-    var _ref7 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref7 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _len3,
         args,
         _key3,
@@ -374,7 +373,7 @@ var Render = function Render(props) {
     if (originComponent) {
       delete childProps.otherProps;
     }
-    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? ( /*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
+    var child = /*#__PURE__*/_react.default.isValidElement(AutoComponent) ? (/*#__PURE__*/_react.default.cloneElement(AutoComponent, childProps)) : (0, _jsxRuntime.jsx)(AutoComponent, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(lastComponentProps, [].concat(lastComponentPropsFilter, ['debounceWait']))), {}, {
       otherProps: (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         show: show,
         disabled: lastDisabled,
@@ -427,17 +426,17 @@ var Render = function Render(props) {
         span: 24 // 默认占一行
       });
     }
-    if (originalValues) {
-      child = (0, _jsxRuntime.jsx)(_Changed.default, {
+    if (diffConfig) {
+      child = (0, _jsxRuntime.jsx)(_ChangedWrapper.default, {
         name: formItemProps.name,
         names: otherProps.names,
         namesStr: namesStr,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         form: form,
         equalWith: equalWith,
-        originalDiffTip: originalDiffTip,
         type: type,
         onChange: handleChange,
+        valuePropName: _otherFormItemProps.valuePropName,
         children: child
       });
     }

package/lib/ProForm/components/render/RenderFields.d.ts

@@ -2,7 +2,7 @@ import { ColProps } from 'antd';
 import { FormInstance } from 'antd/es/form/Form';
 import React from 'react';
 import { ProColumnProps } from './propsType';
-import { ProFormProps } from '../../propsType';
+import { DiffConfigProps } from '../../propsType';
 interface Props<T = any> {
     isView?: boolean;
     columns: ProColumnProps[];
@@ -13,11 +13,10 @@ interface Props<T = any> {
     viewEmpty?: React.ReactNode;
     openState?: boolean;
     labelWidth?: string | number;
-    originalValues?: ProFormProps<T>['originalValues'];
+    diffConfig?: DiffConfigProps;
     clearNotShow?: boolean;
     requiredOnView?: boolean;
     required?: boolean | boolean[] | (() => boolean | boolean[]);
-    originalDiffTip?: boolean;
     globalControl?: boolean;
 }
 declare const RenderFields: React.FC<Props>;

package/lib/ProForm/components/render/RenderFields.js

@@ -30,11 +30,10 @@ var RenderFields = function RenderFields(props) {
     viewEmpty = _props$viewEmpty === void 0 ? '-' : _props$viewEmpty,
     openState = props.openState,
     labelWidth = props.labelWidth,
-    originalValues = props.originalValues,
     outerClearNotShow = props.clearNotShow,
     requiredOnView = props.requiredOnView,
     required = props.required,
-    originalDiffTip = props.originalDiffTip,
+    diffConfig = props.diffConfig,
     globalControl = props.globalControl;
   // 是否包含隐藏字段
   var hiddenData = columns.filter(function (item) {
@@ -162,6 +161,7 @@ var RenderFields = function RenderFields(props) {
     if (['ProCollapse', 'Container'].includes(_type)) {
       componentProps.show = show;
       componentProps.clearNotShow = clearNotShow;
+      componentProps.diffConfig = diffConfig;
     }
     // switch与SwitchCheckbox单独添加valuePropName
     if (['Switch', 'SwitchCheckbox'].includes(_type)) {
@@ -214,10 +214,9 @@ var RenderFields = function RenderFields(props) {
         otherProps: otherProps,
         fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         equalWith: equalWith,
         requiredOnView: requiredOnView,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       })
     }, "".concat(_formItemProps.name || _formItemProps.label).concat(index));

package/lib/ProForm/components/render/propsType.d.ts

@@ -30,7 +30,8 @@ import { ProUploadProps } from '../../../ProUpload/propsType';
 import { ProTreeProps } from '../../../ProTree/propsType';
 import { GroupProps as GroupCopyProps } from '../combination/Group/propsType';
 import { ProCollapseProps } from '../../../ProLayout/components/ProCollapse/PropTypes';
-import { DistributiveOmit } from '../../propsType';
+import { DistributiveOmit, DiffConfigProps } from '../../propsType';
+import { DiffOriginalParams } from '../../utils/diffOriginal';
 export type ComponentMap = keyof typeof componentMap;
 type ValidateKey = keyof typeof validate;
 type RegExpKey = keyof typeof regExp;
@@ -196,12 +197,12 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
      * @default           -
      */
     labelWidth?: string | number;
-    disabled?: boolean | ReactiveFunction<Values, boolean>;
+    disabled?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     trim?: boolean;
     upperCase?: boolean;
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
-    equalWith?: (originValue: any, currentValue: any) => boolean;
+    equalWith?: DiffOriginalParams['equalWith'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;
@@ -267,7 +268,7 @@ export interface RenderProps<Values = any> {
     form: FormInstance<Values>;
     fieldProps?: ReactiveFunction<Values, React.ReactNode>;
     isSelect: boolean;
-    originalValues?: Values;
+    diffConfig: DiffConfigProps;
     requiredOnView?: boolean;
     confirm?: ProFormColumnProps['confirm'];
     globalControl?: boolean;

package/lib/ProForm/index.js

@@ -25,7 +25,7 @@ var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
-var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "originalValues", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "originalDiffTip", "formKey", "globalControl", "scrollToError", "optimize"];
+var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
 var ProForm = function ProForm(props, ref) {
   var _forms$formKey, _localStorage, _ref;
   var _props$mode = props.mode,
@@ -54,7 +54,7 @@ var ProForm = function ProForm(props, ref) {
     labelWidth = props.labelWidth,
     onValuesChange = props.onValuesChange,
     onFinish = props.onFinish,
-    originalValues = props.originalValues,
+    diffConfig = props.diffConfig,
     submitOnEnter = props.submitOnEnter,
     _props$clearNotShow = props.clearNotShow,
     clearNotShow = _props$clearNotShow === void 0 ? true : _props$clearNotShow,
@@ -63,8 +63,6 @@ var ProForm = function ProForm(props, ref) {
     requiredOnView = _props$requiredOnView === void 0 ? true : _props$requiredOnView,
     formId = props.formId,
     required = props.required,
-    _props$originalDiffTi = props.originalDiffTip,
-    originalDiffTip = _props$originalDiffTi === void 0 ? true : _props$originalDiffTi,
     formKey = props.formKey,
     globalControl = props.globalControl,
     _props$scrollToError = props.scrollToError,
@@ -203,7 +201,7 @@ var ProForm = function ProForm(props, ref) {
     if (isView || disabled) {
       // 查看或禁用模式
       footerEle = null;
-    } else if ( /*#__PURE__*/_react.default.isValidElement(footer)) {
+    } else if (/*#__PURE__*/_react.default.isValidElement(footer)) {
       // 传入组件渲染组件
       footerEle = footer;
     } else if (footer === undefined || footer || (0, _lodash.isObject)(footer)) {
@@ -262,11 +260,10 @@ var ProForm = function ProForm(props, ref) {
         colProps: colProps,
         viewEmpty: viewEmpty,
         labelWidth: labelWidth,
-        originalValues: originalValues,
+        diffConfig: diffConfig,
         clearNotShow: clearNotShow,
         requiredOnView: requiredOnView,
         required: required,
-        originalDiffTip: originalDiffTip,
         globalControl: globalControl
       }), footerRender()]
     })), children]