@zat-design/sisyphus-react 3.9.0-beta.9 → 3.9.1

package/es/ProTable/utils/index.js

@@ -16,18 +16,27 @@ export var getDecimalDigits = function getDecimalDigits() {
  * @param any value
  * @param any originalObj
  * @param {any} dataIndex
- * @return {any}
+ * @return {any} isChanged 返回bool值，表示存在比对
  */
 export var getOriginalValue = function getOriginalValue(value, record, originalObj, rowKey, dataIndex) {
   if (!originalObj) {
-    return null;
+    return {
+      originalValue: null,
+      isChanged: null
+    };
   }
   var originalRecord = get(originalObj, get(record, rowKey));
   var originalValue = get(originalRecord, dataIndex);
   if (!isEqual(originalValue, value)) {
-    return originalValue;
+    return {
+      originalValue: originalValue,
+      isChanged: true
+    };
   }
-  return null;
+  return {
+    originalValue: null,
+    isChanged: false
+  };
 };
 export var getColumnDataIndex = function getColumnDataIndex(dataIndex) {
   return typeof dataIndex === 'string' ? dataIndex : dataIndex === null || dataIndex === void 0 ? void 0 : dataIndex.join('-');

package/es/style/theme/antd.less

@@ -280,8 +280,10 @@
     table {
       .@{ant-prefix}-table-tbody {
         .@{ant-prefix}-table-row:nth-child(even) {
-          &:hover td {
-            background-color: @zaui-table-hover-bg;
+          &:hover td,
+          &:hover td.@{ant-prefix}-table-cell-fix-right,
+          &:hover td.@{ant-prefix}-table-cell-fix-left {
+            background-color: @zaui-table-hover-bg !important;
           }
 
           & td,

package/es/utils/index.d.ts

@@ -1,3 +1,3 @@
 /** 判断一个值是否是空值 */
-export declare const isEmpty: (value: any) => boolean;
+export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/es/utils/index.js

@@ -2,7 +2,10 @@ import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useEffect, useState } from 'react';
 var EMPTY_VALUE = [undefined, null, ''];
 /** 判断一个值是否是空值 */
-export var isEmpty = function isEmpty(value) {
+export var isEmpty = function isEmpty(value, emptyValue) {
+  if (emptyValue) {
+    EMPTY_VALUE.push(emptyValue);
+  }
   if (EMPTY_VALUE.includes(value)) {
     return true;
   }

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

@@ -167,6 +167,10 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
   };
   // @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);
+  var classNames = (0, _classnames.default)({
+    'original-value-tooltip': true,
+    'original-value-tooltip-fixed': true
+  });
   var diffClassName = (0, _classnames.default)({
     'pro-form-item-changed': isChanged,
     'pro-form-item-add': isAdd
@@ -177,7 +181,7 @@ var ListChangedWrapper = function ListChangedWrapper(props) {
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: "original-value-tootip",
+    overlayClassName: classNames,
     placement: "topLeft",
     autoAdjustOverflow: false,
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {

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

@@ -30,7 +30,7 @@ var _utils = require("../../../ProForm/utils");
 var _ConfirmWrapper = _interopRequireDefault(require("../../../ProForm/components/render/ConfirmWrapper"));
 var _getDefaultProps = require("../../utils/getDefaultProps");
 var _ListChangedWrapper = _interopRequireDefault(require("./ListChangedWrapper"));
-var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "className", "trim", "confirm"];
+var _excluded = ["type", "valueType", "names", "fieldProps", "labelRequired", "editRender", "component", "viewRender", "title", "originTitle", "label", "dataIndex", "formItemProps", "isEditable", "required", "rules", "equalWith", "onDiff", "className", "trim", "confirm"];
 /* eslint-disable prefer-destructuring */
 /* eslint-disable prefer-const */
 var RenderField = function RenderField(_ref) {
@@ -60,6 +60,7 @@ var RenderField = function RenderField(_ref) {
     _column$rules = column.rules,
     rules = _column$rules === void 0 ? [] : _column$rules,
     equalWith = column.equalWith,
+    onDiff = column.onDiff,
     className = column.className,
     trim = column.trim,
     confirm = column.confirm,
@@ -562,7 +563,7 @@ var RenderField = function RenderField(_ref) {
         originalNames: originalNames,
         originalValues: originalValues,
         form: form,
-        equalWith: equalWith,
+        equalWith: onDiff || equalWith,
         type: type,
         onChange: _onChange,
         valuePropName: _formItemProps.valuePropName,

package/lib/ProEditTable/index.js

@@ -8,6 +8,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.default = void 0;
 var _typeof2 = _interopRequireDefault(require("@babel/runtime/helpers/typeof"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
+var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
@@ -24,7 +25,7 @@ var _ProForm = _interopRequireDefault(require("../ProForm"));
 var _empty = _interopRequireDefault(require("../assets/empty.png"));
 var _locale = _interopRequireWildcard(require("../locale"));
 var _RcTable = require("./components/RcTable");
-var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "originalValues", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
+var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 var ProEditTable = function ProEditTable(_ref, ref) {
   var _resetProps$id, _resetProps$id$split, _themeConfig$data2, _resetProps$otherProp;
   var value = _ref.value,
@@ -53,7 +54,6 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     max = _ref.max,
     headerRender = _ref.headerRender,
     pagination = _ref.pagination,
-    originalValues = _ref.originalValues,
     rowKey = _ref.rowKey,
     rowDisabled = _ref.rowDisabled,
     rowDraggable = _ref.rowDraggable,
@@ -139,6 +139,25 @@ var ProEditTable = function ProEditTable(_ref, ref) {
       return getRowKey(item) === getRowKey(record);
     }));
   };
+  var originalValues = (0, _react.useMemo)(function () {
+    var _originalArr$every, _originalArr$some;
+    // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
+    var originalArr = (0, _lodash.get)(resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues, name);
+    var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
+      return item.rowKey;
+    }) : true;
+    var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
+      return item.rowKey !== getRowKey(item);
+    });
+    // 初始化默认生成row-key
+    if ((originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
+      var _originalArr$forEach;
+      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
+        item.rowKey = getRowKey(item);
+      });
+    }
+    return (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) ? (0, _defineProperty2.default)({}, name, originalArr) : undefined;
+  }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
   var config = (0, _objectSpread2.default)({
     form: form,
     mode: mode,
@@ -278,33 +297,21 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     return (0, _utils.transformColumns)(columns, config);
   }, [valueChangeRef.current, disabled, forceUpdate, columns, page, actionProps, editingKeys, cellNamePath]);
   var initDataSource = function initDataSource() {
-    var _value$every, _originalArr$every, _value$some, _originalArr$some;
+    var _value$every, _value$some;
     var isAllHasKey = value === null || value === void 0 ? void 0 : (_value$every = value.every) === null || _value$every === void 0 ? void 0 : _value$every.call(value, function (item) {
       return item.rowKey;
     });
-    // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
-    var originalArr = (0, _lodash.get)(originalValues, name);
-    var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
-      return item.rowKey;
-    }) : true;
     // 检测当前rowkey是否与制定key的值是否一致，不一致，则执行覆盖
     var isNeedCover = value === null || value === void 0 ? void 0 : (_value$some = value.some) === null || _value$some === void 0 ? void 0 : _value$some.call(value, function (item) {
       return item.rowKey !== getRowKey(item);
     });
-    var isNeedCoverOriginal = originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$some = originalArr.some) === null || _originalArr$some === void 0 ? void 0 : _originalArr$some.call(originalArr, function (item) {
-      return item.rowKey !== getRowKey(item);
-    });
     // 初始化默认生成row-key
-    if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover) || (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) && (!isOriginalAllHasKey || isNeedCoverOriginal)) {
-      var _originalArr$forEach;
+    if ((value === null || value === void 0 ? void 0 : value.length) && (!isAllHasKey || isNeedCover)) {
       var nextValues = value === null || value === void 0 ? void 0 : value.map(function (item) {
         return (0, _objectSpread2.default)((0, _objectSpread2.default)({}, item), {}, {
           rowKey: getRowKey(item)
         });
       });
-      originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$forEach = originalArr.forEach) === null || _originalArr$forEach === void 0 ? void 0 : _originalArr$forEach.call(originalArr, function (item) {
-        item.rowKey = getRowKey(item);
-      });
       onChange(nextValues);
       if (virtualKey) {
         form.setFieldValue(virtualRowName, nextValues);

package/lib/ProEditTable/style/index.less

@@ -5,6 +5,15 @@
   td[rowspan]{
     vertical-align: middle !important;
   }
+  .@{ant-prefix}-table-content{
+    .@{ant-prefix}-table-tbody{
+      .pro-form-item-add .pro-form-view-container{
+        padding: 0;
+        border-radius: 0;
+      }
+    }
+  }
+
 
   .pro-edit-table-tooltip {
     display    : inline-flex;
@@ -281,8 +290,11 @@
     }
   }
 
-  .is-new-row, .is-new-row.@{ant-prefix}-table-row:hover {
-    td, .@{ant-prefix}-table-cell-row-hover {
+  .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row  td{
+    background: var(--zaui-contract-bg-add, #d2fff4) !important;
+  }
+  .@{ant-prefix}-table .@{ant-prefix}-table-tbody .is-new-row.@{ant-prefix}-table-row:hover{
+       td, .@{ant-prefix}-table-cell-row-hover {
       background: var(--zaui-contract-bg-add, #d2fff4) !important;
     }
   }

package/lib/ProEnum/index.js

@@ -45,6 +45,7 @@ var ProEnum = function ProEnum(props) {
   var _ref = otherProps || {},
     viewEmpty = _ref.viewEmpty;
   var _isView = isView !== undefined && isView !== null ? isView : otherProps === null || otherProps === void 0 ? void 0 : otherProps.isView;
+  var _defalutValue = props === null || props === void 0 ? void 0 : props.defaultValue;
   var _ref2 = (0, _ProConfigProvider.useProConfig)('ProEnum') || {},
     fieldNames = _ref2.fieldNames,
     _ref2$clear = _ref2.clear,
@@ -274,16 +275,17 @@ var ProEnum = function ProEnum(props) {
     return (0, _lodash.isFunction)(props.optionRender) && record.length ? _optionRender() : labelList === null || labelList === void 0 ? void 0 : labelList.join('，');
   };
   if (_isView) {
-    if (Array.isArray(value)) {
+    var __value = value || _defalutValue;
+    if (Array.isArray(__value)) {
       return (0, _jsxRuntime.jsx)(_Container.default, {
         tooltip: true,
         viewEmpty: viewEmpty,
-        children: transToLabel(value)
+        children: transToLabel(__value)
       });
     }
     return (0, _jsxRuntime.jsx)(_Container.default, {
       viewEmpty: viewEmpty,
-      children: value || (0, _lodash.isNumber)(value) ? transToLabel([value]) : null
+      children: __value || (0, _lodash.isNumber)(__value) ? transToLabel([__value]) : null
     });
   }
   return (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {

package/lib/ProEnum/propsType.d.ts

@@ -77,6 +77,7 @@ export interface ProEnum {
     otherProps?: ProFormOtherProps;
     allowClear?: boolean;
     id?: string;
+    defaultValue?: any;
 }
 export type PropProSelectsMap = {
     type?: 'ProSelect';

package/lib/ProForm/components/base/SwitchCheckbox/index.js

@@ -10,15 +10,17 @@ var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/h
 var _jsxRuntime = require("react/jsx-runtime");
 var _antd = require("antd");
 var _lodash = require("lodash");
+var _classnames = _interopRequireDefault(require("classnames"));
 var _ProConfigProvider = require("../../../../ProConfigProvider");
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ProForm = _interopRequireDefault(require("../../../../ProForm"));
-var _excluded = ["onChange", "disabled", "value", "otherProps"];
+var _excluded = ["onChange", "disabled", "value", "otherProps", "className"];
 var SwitchCheckbox = function SwitchCheckbox(props) {
   var onChange = props.onChange,
     disabled = props.disabled,
     value = props.value,
     otherProps = props.otherProps,
+    className = props.className,
     restProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref = _ProForm.default.useFieldProps() || {},
     isViewCon = _ref.isView,
@@ -53,9 +55,14 @@ var SwitchCheckbox = function SwitchCheckbox(props) {
       })]
     });
   }
+  var classNames = (0, _classnames.default)({
+    'pro-switch-checkbox': true,
+    className: className
+  });
   return (0, _jsxRuntime.jsx)(_antd.Checkbox, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({
     disabled: disabled,
-    onChange: changeVal
+    onChange: changeVal,
+    className: classNames
   }, initialConfig), restProps), {}, {
     children: restProps.label
   }));

package/lib/ProForm/components/combination/Group/component/ComRender.d.ts

@@ -16,6 +16,7 @@ interface Props {
     valuePropName?: string;
     isView?: boolean;
     getValueProps?: (value: any) => Record<string, unknown>;
+    viewRender?: (props: any) => any;
 }
 /** 渲染组件 */
 declare const ComRender: React.FC<Props>;

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

@@ -15,7 +15,7 @@ var _ConfirmWrapper = _interopRequireDefault(require("../../../../components/ren
 var _useFieldProps = require("../../../../utils/useFieldProps");
 var componentMap = _interopRequireWildcard(require("../../../../../index"));
 var _AddonWrapper = _interopRequireDefault(require("./AddonWrapper"));
-var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView"];
+var _excluded = ["type", "confirm", "component", "fieldProps", "contextProps", "before", "after", "getValueProps", "valuePropName", "valueType", "isView", "viewRender"];
 // 这里的key与组件内参数一致, 决定使用哪个包裹组件
 var wrapperMap = {
   confirm: _ConfirmWrapper.default,
@@ -50,6 +50,7 @@ var ComRender = function ComRender(props) {
     valuePropName = _props$valuePropName === void 0 ? 'value' : _props$valuePropName,
     valueType = props.valueType,
     isView = props.isView,
+    viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
   var TypeComponent = componentMap[type];
   var mergedGetValueProps = getValueProps || function (val) {
@@ -57,6 +58,16 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
+  if (viewRender && isView) {
+    return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {
+      value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {
+        valueType: valueType,
+        type: type,
+        isView: isView
+      }),
+      children: viewRender(componentProps)
+    });
+  }
   var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
   var Com = getComRender(Component, props, componentProps);
   return (0, _jsxRuntime.jsx)(_useFieldProps.FieldProvider, {

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

@@ -29,7 +29,7 @@ var _excluded = ["value", "onChange", "disabled", "labelInValue", "fieldNames",
   _excluded2 = ["onOk"],
   _excluded3 = ["rowKey", "columns", "rowSelection"];
 var ProModalSelect = function ProModalSelect(props, ref) {
-  var _formColumns$;
+  var _useRequest$options9, _formColumns$;
   var value = props.value,
     onChange = props.onChange,
     disabled = props.disabled,
@@ -142,13 +142,21 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     })),
     run = _useRequestList.run,
     selectLoading = _useRequestList.loading;
+  var initParams = (0, _react.useMemo)(function () {
+    var nextInitParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams;
+    if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
+      var _contentForm$getField;
+      nextInitParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
+    }
+    return nextInitParams;
+  }, [value]);
   var _useRequestList2 = (0, _useRequestList3.default)(useRequest === null || useRequest === void 0 ? void 0 : useRequest.service, {
       withPagination: withPagination,
       transformParams: transformParams,
       transformResponse: transformResponse
     }, (0, _objectSpread3.default)({
       manual: true,
-      ready: ((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne) && !readOnly || visible
+      ready: (initParams || defaultOne) && !readOnly || visible
     }, useRequest === null || useRequest === void 0 ? void 0 : useRequest.options)),
     data = _useRequestList2.data,
     loading = _useRequestList2.loading,
@@ -453,18 +461,15 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
     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;
+      var _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) {
           case 0:
-            if (typeof (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) === 'function') {
-              useRequest.initParams = useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams(value, contentForm === null || contentForm === void 0 ? void 0 : (_contentForm$getField = contentForm.getFieldsValue) === null || _contentForm$getField === void 0 ? void 0 : _contentForm$getField.call(contentForm));
-            }
-            if (!((useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || defaultOne)) {
-              _context4.next = 10;
+            if (!(initParams || defaultOne)) {
+              _context4.next = 9;
               break;
             }
-            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), (useRequest === null || useRequest === void 0 ? void 0 : useRequest.initParams) || {});
+            queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options2 = useRequest.options) === null || _useRequest$options2 === void 0 ? void 0 : _useRequest$options2.defaultParams), initParams || {});
             page = (0, _objectSpread3.default)({
               pageNum: 1,
               pageSize: 10
@@ -473,9 +478,9 @@ var ProModalSelect = function ProModalSelect(props, ref) {
               queryBean: queryBean !== null && queryBean !== void 0 ? queryBean : {}
             }) : queryBean;
             params = transformParams ? transformParams(params) : params;
-            _context4.next = 8;
+            _context4.next = 7;
             return runAsync(params);
-          case 8:
+          case 7:
             res = _context4.sent;
             if (res === null || res === void 0 ? void 0 : res.data) {
               list = withPagination ? res === null || res === void 0 ? void 0 : (_res$data2 = res.data) === null || _res$data2 === void 0 ? void 0 : _res$data2.list : res === null || res === void 0 ? void 0 : res.data;
@@ -503,7 +508,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
                 });
               }
             }
-          case 10:
+          case 9:
           case "end":
             return _context4.stop();
         }
@@ -594,7 +599,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       });
     }
   });
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  (0, _ahooks.useDebounceEffect)(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) {
@@ -629,13 +634,13 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }
       setState(nextState);
     }
-  }, [onOff, visible, value]);
+  }, [onOff, visible, JSON.stringify(value)]);
   (0, _ahooks.useDeepCompareEffect)(function () {
     if (value && !visible && isInit && !readOnly) {
       getInitValues();
     }
-  }, [value, visible, isInit]);
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  }, [JSON.stringify(value), visible, isInit]);
+  (0, _ahooks.useDebounceEffect)(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) {
@@ -647,11 +652,6 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       // 加定时器 修复依赖数据同步更新未取到问题
       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,
@@ -661,8 +661,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         run(nextParams);
       }, 300);
     }
-  }, [value, options, visible, useRequest]);
-  (0, _ahooks.useDeepCompareEffect)(function () {
+  }, [JSON.stringify(value), JSON.stringify(options), visible, JSON.stringify(useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams), JSON.stringify(initParams)]);
+  (0, _ahooks.useDebounceEffect)(function () {
     if (!value) {
       if (defaultOne) {
         getDefaultOneValues();
@@ -713,8 +713,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       }) : null,
       onFocus: function onFocus() {
         if (useRequest) {
-          var _useRequest$options9;
-          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options9 = useRequest.options) === null || _useRequest$options9 === void 0 ? void 0 : _useRequest$options9.defaultParams) || {};
+          var _useRequest$options10;
+          var queryBean = (useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams) || {};
           var params = withPagination ? {
             pageNum: 1,
             pageSize: 50,
@@ -728,8 +728,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
         }
       },
       onSearch: (0, _lodash.debounce)(function (val) {
-        var _useRequest$options10;
-        var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options10 = useRequest.options) === null || _useRequest$options10 === void 0 ? void 0 : _useRequest$options10.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
+        var _useRequest$options11;
+        var queryBean = (0, _objectSpread3.default)((0, _objectSpread3.default)({}, useRequest === null || useRequest === void 0 ? void 0 : (_useRequest$options11 = useRequest.options) === null || _useRequest$options11 === void 0 ? void 0 : _useRequest$options11.defaultParams), {}, (0, _defineProperty2.default)({}, searchKey !== null && searchKey !== void 0 ? searchKey : labelKey, val));
         var params = withPagination ? {
           pageNum: 1,
           pageSize: 50,

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

@@ -107,7 +107,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getPopupContainer: function getPopupContainer(trigger) {
       return scrollFollowParent ? trigger.parentElement : document.body;
     },
-    overlayClassName: "original-value-tootip",
+    overlayClassName: "original-value-tooltip",
     placement: "topLeft",
     autoAdjustOverflow: false,
     title: (0, _jsxRuntime.jsxs)(_antd.Space, {

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

@@ -17,7 +17,7 @@ var componentMap = _interopRequireWildcard(require("../index"));
 var _utils = require("../../utils");
 var _useFieldProps = require("../../utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../../../locale"));
-var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "clearNotShow", "required", "confirm"];
+var _excluded = ["show", "type", "viewRender", "viewType", "valueType", "formItemProps", "colProps", "formItemChildProps", "fieldProps", "equalWith", "onDiff", "clearNotShow", "required", "confirm"];
 var RenderFields = function RenderFields(props) {
   var isView = props.isView,
     _props$columns = props.columns,
@@ -77,6 +77,7 @@ var RenderFields = function RenderFields(props) {
       _column$fieldProps = column.fieldProps,
       fieldProps = _column$fieldProps === void 0 ? {} : _column$fieldProps,
       equalWith = column.equalWith,
+      onDiff = column.onDiff,
       _column$clearNotShow = column.clearNotShow,
       clearNotShow = _column$clearNotShow === void 0 ? outerClearNotShow : _column$clearNotShow,
       columnRequired = column.required,
@@ -216,7 +217,7 @@ var RenderFields = function RenderFields(props) {
         fieldProps: (0, _lodash.isFunction)(fieldProps) ? fieldProps : null,
         isSelect: _isSelect,
         diffConfig: diffConfig,
-        equalWith: equalWith,
+        equalWith: onDiff || equalWith,
         requiredOnView: requiredOnView,
         globalControl: globalControl,
         viewRender: viewRender

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

@@ -207,6 +207,7 @@ export interface ProFormColumnProps<Values = any> extends Omit<FormItemProps<Val
     hiddenNames?: string[] | any[];
     rules?: ProRule[] | ReactiveFunction<Values, ProRule[]>;
     equalWith?: DiffOriginalParams['equalWith'];
+    onDiff?: DiffOriginalParams['equalWith'];
     required?: boolean | boolean[] | ReactiveFunction<Values, boolean | boolean[]>;
     labelRequired?: boolean;
     toISOString?: boolean;

package/lib/ProForm/style/index.less

@@ -385,7 +385,7 @@
     }
 
     // checkbox
-    .@{ant-prefix}-checkbox-group {
+    .@{ant-prefix}-checkbox-group,.pro-switch-checkbox {
       padding: 5px 0
     }
     // switch
@@ -412,7 +412,7 @@
     background: @zaui-contract-bg-add !important;
 
     .@{ant-prefix}-input {
-      background: @zaui-contract-bg !important;
+      background: @zaui-contract-bg-add !important;
     }
     
     .@{ant-prefix}-select.@{ant-prefix}-select-disabled .@{ant-prefix}-select-selector{
@@ -463,7 +463,7 @@
     }
 
     // checkbox
-    .@{ant-prefix}-checkbox-group {
+    .@{ant-prefix}-checkbox-group,.pro-switch-checkbox {
       padding: 5px 0
     }
     // switch
@@ -485,10 +485,8 @@
   }
 }
 
-.original-value-tootip{
-  max-width: 100%;
+.original-value-tooltip{
   width: max-content;
-  position: fixed;
   .changed-tooltip {
     .original-value-container {
       .ant-space-item:nth-child(1) {
@@ -511,3 +509,9 @@
   }
 }
 
+.original-value-tooltip-fixed {
+  position: fixed;
+}
+
+
+