@zat-design/sisyphus-react 3.9.0-beta.2 → 3.9.0-beta.21

package/lib/ProForm/components/combination/FormList/utils.js

@@ -30,7 +30,7 @@ var namesPathTransform = exports.namesPathTransform = function namesPathTransfor
 // 比较memo
 var memoWith = exports.memoWith = function memoWith(pre, next) {
   return (0, _lodash.isEqualWith)(pre, next, function (objValue, othValue) {
-    if (/*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
+    if ( /*#__PURE__*/_react.default.isValidElement(objValue) && /*#__PURE__*/_react.default.isValidElement(othValue)) {
       return true;
     }
     // 移除解决formlist函数里不更新问题

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,7 +58,17 @@ var ComRender = function ComRender(props) {
   };
   var _props = mergedGetValueProps(fieldProps.value);
   var componentProps = (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, fieldProps), rest), _props);
-  var Component = component ? (/*#__PURE__*/_react.default.cloneElement(component, (0, _objectSpread3.default)({}, componentProps))) : (0, _jsxRuntime.jsx)(TypeComponent, (0, _objectSpread3.default)({}, componentProps));
+  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, {
     value: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, contextProps), {}, {

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

@@ -32,7 +32,8 @@ var Group = function Group(props) {
     value = props.value,
     onChange = props.onChange,
     otherProps = props.otherProps,
-    id = props.id;
+    id = props.id,
+    isParentView = props.isView;
   var contextProps = _ProForm.default.useFieldProps() || {};
   var names = contextProps.names,
     name = contextProps.name,
@@ -77,7 +78,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);
@@ -88,7 +89,7 @@ var Group = function Group(props) {
       children: columns.map(function (column, index) {
         return (0, _jsxRuntime.jsx)(_ComRender.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({
           contextProps: contextProps,
-          isView: isView
+          isView: isParentView || isView
         }, column), {}, {
           otherProps: otherProps
         }), column.name);

package/lib/ProForm/components/combination/ProCascader/index.d.ts

@@ -1,4 +1,4 @@
 /// <reference types="react" />
 import { ProCascaderProps } from './propsType';
-declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => import("react/jsx-runtime").JSX.Element>;
+declare const _default: import("react").MemoExoticComponent<(props: ProCascaderProps) => JSX.Element>;
 export default _default;

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

@@ -29,9 +29,9 @@ var defaultFieldNames = {
   value: 'code',
   children: 'children'
 };
-var _filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
+var filterDataSource = function filterDataSource(dataSource, level, fieldNames) {
   return dataSource === null || dataSource === void 0 ? void 0 : dataSource.map(function (item) {
-    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : _filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
+    return (0, _objectSpread3.default)((0, _objectSpread3.default)({}, item), {}, (0, _defineProperty2.default)({}, (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children', level === 1 ? [] : filterDataSource(item === null || item === void 0 ? void 0 : item[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], level - 1, fieldNames)));
   });
 };
 var getViewLabel = function getViewLabel(_ref) {
@@ -101,7 +101,7 @@ var ProCascader = function ProCascader(props) {
   }, [dics === null || dics === void 0 ? void 0 : dics[addressCode], enumData]);
   var realDataSource = (0, _react.useMemo)(function () {
     var innerDataSource = dataSource || (addressCode ? enumDataSource : []);
-    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? _filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
+    var result = (0, _index.transformDataName)(isAddressMode && realLevel === 2 ? filterDataSource(innerDataSource, level, fieldNames) : innerDataSource, fieldNames);
     return result;
   }, [isAddressMode, addressCode, realLevel, dataSource, enumDataSource === null || enumDataSource === void 0 ? void 0 : enumDataSource.length]);
   var _useRequest = (0, _objectSpread3.default)({}, useRequest),
@@ -117,7 +117,7 @@ var ProCascader = function ProCascader(props) {
     defaultLabel = _useState4[0],
     setDefaultLabel = _useState4[1];
   var getFirstLevelOptions = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var _yield$service, data, newData, transFormData, serviceData;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -136,7 +136,7 @@ var ProCascader = function ProCascader(props) {
               value: fieldNames.value,
               children: (fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'
             });
-            serviceData = isAddressMode && realLevel === 2 ? _filterDataSource(transFormData, level, fieldNames) : transFormData;
+            serviceData = isAddressMode && realLevel === 2 ? filterDataSource(transFormData, level, fieldNames) : transFormData;
             setServiceData(serviceData);
           case 9:
           case "end":
@@ -206,7 +206,7 @@ var ProCascader = function ProCascader(props) {
   })) === null || _ref5$filter === void 0 ? void 0 : _ref5$filter.join(separator)) || '-' : (defaultLabel === null || defaultLabel === void 0 ? void 0 : (_defaultLabel$filter = defaultLabel.filter(function (item) {
     return !!item;
   })) === null || _defaultLabel$filter === void 0 ? void 0 : _defaultLabel$filter.join(separator)) || '-';
-  var _findSelectedOptions = function findSelectedOptions(options, value) {
+  var findSelectedOptions = function findSelectedOptions(options, value) {
     var path = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : [];
     var _value = value !== null && value !== void 0 ? value : [];
     // 基准情况：如果 value 数组为空，且 path 不为空，说明找到了完整的路径
@@ -225,7 +225,7 @@ var ProCascader = function ProCascader(props) {
     if (foundOption) {
       // 如果找到了匹配的选项，并且还有更多的 value 需要匹配，递归地在子选项中查找
       if (_value.length > 1 && foundOption.children) {
-        return _findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
+        return findSelectedOptions(foundOption.children, _value.slice(1), [].concat((0, _toConsumableArray2.default)(path), [foundOption]));
       }
       // 如果没有更多的 value 需要匹配，返回当前选项（以及之前的路径）
       return [].concat((0, _toConsumableArray2.default)(path), [foundOption]);
@@ -234,7 +234,7 @@ var ProCascader = function ProCascader(props) {
     return null;
   };
   var _selectedOptions = (0, _react.useMemo)(function () {
-    return _findSelectedOptions(service ? serviceData : realDataSource, addressValue);
+    return findSelectedOptions(service ? serviceData : realDataSource, addressValue);
   }, [service, serviceData, realDataSource, addressValue]);
   var handleAddressChange = function handleAddressChange(e) {
     var cascaderValue = value === null || value === void 0 ? void 0 : value.slice(0, realLevel);

package/lib/ProForm/components/combination/ProModalSelect/hooks/useRequestList.js

@@ -33,7 +33,7 @@ var useDefaultOptions = function useDefaultOptions(options) {
   });
 };
 var defaultService = /*#__PURE__*/function () {
-  var _ref = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+  var _ref = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
     return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:

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

@@ -247,7 +247,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     onChange(val, option);
   };
   var handleClick = /*#__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 _yield$beforeOpen, res;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -314,7 +314,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     }
   };
   var handleFinish = /*#__PURE__*/function () {
-    var _ref8 = (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) {
@@ -379,7 +379,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
     };
   }();
   var handleSearch = /*#__PURE__*/function () {
-    var _ref9 = (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) {
@@ -452,7 +452,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   };
   // 初始化回显，当传入initParams时，前端用来回险
   var getInitValues = /*#__PURE__*/function () {
-    var _ref10 = (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) {
@@ -515,7 +515,7 @@ var ProModalSelect = function ProModalSelect(props, ref) {
   }();
   // 初始化回显，当传入initParams时，前端用来回险
   var getDefaultOneValues = /*#__PURE__*/function () {
-    var _ref11 = (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) {
@@ -840,7 +840,8 @@ var ProModalSelect = function ProModalSelect(props, ref) {
       onOk: handleFinish,
       // @ts-ignore
       onCancel: handleClose,
-      visible: visible
+      visible: visible,
+      zIndex: 1071
     }, restModalProps), {}, {
       children: [(0, _jsxRuntime.jsx)(_index.ProForm, {
         submitOnEnter: true,

package/lib/ProForm/components/old/InputRange/index.d.ts

@@ -12,5 +12,5 @@ export interface InputRangeProps {
     isPositiveInteger?: boolean;
     precision?: number;
 }
-declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => import("react/jsx-runtime").JSX.Element;
+declare const InputRange: ({ value, onChange, min, max, group, disabled, precision, isPositiveInteger, }: InputRangeProps) => JSX.Element;
 export default InputRange;

package/lib/ProForm/components/old/InputWithSuffix/index.d.ts

@@ -1,3 +1,3 @@
 import { comPropsType } from './propsTypes';
-declare const InputWithSuffix: (props: comPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const InputWithSuffix: (props: comPropsType) => JSX.Element;
 export default InputWithSuffix;

package/lib/ProForm/components/old/ProAddress/index.d.ts

@@ -1,3 +1,4 @@
+/// <reference types="react" />
 import { ProAddressPropsType } from './propsTypes';
 export declare const transferAddressInfoToRegion: () => {
     normalize: (value: any) => {
@@ -23,5 +24,5 @@ export declare const transferAddressInfoToRegion: () => {
         };
     };
 };
-export declare function ProAddress({ ...props }: ProAddressPropsType): import("react/jsx-runtime").JSX.Element;
+export declare function ProAddress({ ...props }: ProAddressPropsType): JSX.Element;
 export default ProAddress;

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/old/ProRangeBox/index.d.ts

@@ -1,2 +1,3 @@
+/// <reference types="react" />
 import { ProRangeBoxPropsType } from './propsType';
-export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): import("react/jsx-runtime").JSX.Element;
+export default function ProRangeBox({ configOption }: ProRangeBoxPropsType): JSX.Element;

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

@@ -34,7 +34,6 @@ var ChangedWrapper = function ChangedWrapper(props) {
     getValueProps = props.getValueProps,
     viewRender = props.viewRender,
     rest = (0, _objectWithoutProperties2.default)(props, _excluded);
-  // const contentRef = useRef(null);
   var _useProConfig = (0, _ProConfigProvider.useProConfig)('ProForm'),
     isDiffAll = _useProConfig.isDiffAll;
   var originalValues = diffConfig.originalValues,
@@ -108,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/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

@@ -241,7 +241,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 +291,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 +374,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,

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/index.js

@@ -201,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)) {

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,9 @@
   }
 }
 
-.original-value-tootip{
+.original-value-tooltip{
   max-width: 100%;
   width: max-content;
-  position: fixed;
   .changed-tooltip {
     .original-value-container {
       .ant-space-item:nth-child(1) {
@@ -511,3 +510,7 @@
   }
 }
 
+.original-value-tooltip-fixed {
+  position: fixed;
+}
+

package/lib/ProForm/utils/diffOriginal.js

@@ -7,15 +7,17 @@ exports.diffOriginal = void 0;
 var _lodash = require("lodash");
 var _utils = require("../../utils");
 // 过滤对象中undefined字段
-// 防止{a: '1'} {a: '1', b: undefined}被认为不相等
-var filterUndefined = function filterUndefined(data) {
+// 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
+var filterObject = function filterObject(data) {
   if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
   var resData = {};
   Object.keys(data).forEach(function (key) {
-    if (data[key] !== undefined) {
+    if (!(0, _utils.isEmpty)(data[key])) {
       resData[key] = data[key];
     }
   });
+  // 空对象视为null 比较时 null undefined {} [] '' 视为相等
+  if (!Object.keys(resData).length) return null;
   return resData;
 };
 var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
@@ -26,18 +28,22 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   // 支持传入自定义比较事件
   if ((0, _lodash.isFunction)(equalWith)) {
     var diffRes = equalWith(originalValue, value);
-    if (diffRes === undefined) return 'same';
-    if (typeof diffRes === 'boolean') {
-      return diffRes ? 'same' : 'changed';
+    // 如果返回undefined走内置比较逻辑
+    if (diffRes !== undefined) {
+      if (typeof diffRes === 'boolean') {
+        return diffRes ? 'same' : 'changed';
+      }
+      return diffRes;
     }
-    return diffRes;
   }
+  var _value = filterObject(value);
+  var _originalValue = filterObject(originalValue);
   // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if ((0, _utils.isEmpty)(originalValue) && !(0, _utils.isEmpty)(value)) {
+  if ((0, _utils.isEmpty)(_originalValue) && !(0, _utils.isEmpty)(_value)) {
     return 'add';
   }
-  if (Array.isArray(originalValue)) {
-    var isSame = originalValue.every(function (valueItem, index) {
+  if (Array.isArray(_originalValue)) {
+    var isSame = _originalValue.every(function (valueItem, index) {
       // 如果两个值有一个不是空值, 则进行深比较
       if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
         return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
@@ -46,8 +52,8 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     });
     return isSame ? 'same' : 'changed';
   }
-  if (!nullValue.includes(value) || !nullValue.includes(originalValue)) {
-    return (0, _lodash.isEqual)(filterUndefined(value), filterUndefined(originalValue)) ? 'same' : 'changed';
+  if (!(0, _utils.isEmpty)(_originalValue) || !(0, _utils.isEmpty)(_value)) {
+    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
   }
   return 'same';
 };

package/lib/ProForm/utils/index.js

@@ -136,7 +136,7 @@ var splitNameStr = exports.splitNameStr = function splitNameStr(name) {
   });
 };
 // 过滤掉字段名中包含 '-' 的字段
-var _filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
+var filterInternalFields = exports.filterInternalFields = function filterInternalFields(values, optimize) {
   if (optimize) {
     return values;
   }
@@ -150,20 +150,20 @@ var _filterInternalFields = exports.filterInternalFields = function filterIntern
   }
   if (Array.isArray(nextValues)) {
     return nextValues.map(function (item) {
-      return _filterInternalFields(item);
+      return filterInternalFields(item);
     });
   }
   if ((0, _lodash.isObject)(nextValues)) {
     var result = {};
     Object.keys(nextValues).forEach(function (key) {
       if (key.includes('-')) return;
-      result[key] = _filterInternalFields(nextValues[key]);
+      result[key] = filterInternalFields(nextValues[key]);
     });
     return result;
   }
   return nextValues;
 };
-var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
+var getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
   var currentPath = arguments.length > 1 && arguments[1] !== undefined ? arguments[1] : [];
   var keys = Object.keys(object);
   var resultKeys = [];
@@ -177,7 +177,7 @@ var _getAllNamePath = exports.getAllNamePath = function getAllNamePath(object) {
     }
     // 深度获取对象key
     if ((0, _lodash.isObject)(value)) {
-      resultKeys.concat(_getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
+      resultKeys.concat(getAllNamePath(value, [].concat((0, _toConsumableArray2.default)(currentPath), [key])));
     }
     resultKeys.push([].concat((0, _toConsumableArray2.default)(currentPath), [key]));
   });
@@ -320,7 +320,7 @@ var customEqualForFun = exports.customEqualForFun = function customEqualForFun(v
 /**
  * 查询数据中是否包含rowKey
  */
-var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
+var hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
   if ((0, _typeof2.default)(obj) !== 'object' || obj === null) {
     return false;
   }
@@ -330,7 +330,7 @@ var _hasRowKey = exports.hasRowKey = function hasRowKey(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
@@ -346,7 +346,7 @@ var view = exports.view = function view(obj) {
     return true;
   }
   return keys.some(function (key) {
-    return _hasRowKey(obj[key]);
+    return hasRowKey(obj[key]);
   });
 };
 /**
@@ -382,7 +382,7 @@ var deleteForPath = exports.deleteForPath = function deleteForPath(values, nameP
  * @param value 选中值
  * @returns {}
  */
-var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
+var findOptionByValue = exports.findOptionByValue = function findOptionByValue(treeData, value, fieldNames) {
   if ((0, _lodash.isObject)(value)) {
     return value;
   }
@@ -392,7 +392,7 @@ var _findOptionByValue = exports.findOptionByValue = function findOptionByValue(
       return (0, _lodash.omit)(node, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
     }
     if (node.children) {
-      var foundNode = _findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
+      var foundNode = findOptionByValue(node[(fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children) || 'children'], value, fieldNames);
       if (foundNode) {
         return (0, _lodash.omit)(foundNode, ['children', fieldNames === null || fieldNames === void 0 ? void 0 : fieldNames.children]);
       }

package/lib/ProForm/utils/useForm.js

@@ -44,7 +44,7 @@ var useForm = exports.useForm = function useForm(originForm, options) {
     return getFieldsValue(nameList, filterFunc);
   };
   var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
+    var _ref2 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(nameList) {
       var _rest$,
         _len,
         rest,

package/lib/ProIcon/utils/index.js

@@ -7,7 +7,7 @@ Object.defineProperty(exports, "__esModule", {
 exports.recurseGetNodes = exports.onBeforeInjection = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _config = require("../config");
-var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
+var recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type, node, queue) {
   switch (type) {
     // 渐变
     case 'gradation':
@@ -26,7 +26,7 @@ var _recurseGetNodes = exports.recurseGetNodes = function recurseGetNodes(type,
   }
   if (node.childNodes) {
     for (var i = 0; i < node.childNodes.length; i++) {
-      _recurseGetNodes(type, node.childNodes[i], queue);
+      recurseGetNodes(type, node.childNodes[i], queue);
     }
   }
 };
@@ -56,7 +56,7 @@ var onBeforeInjection = exports.onBeforeInjection = function onBeforeInjection(_
     // 目前只支持处理渐变及fill填充
     var types = Reflect.ownKeys(nodeMap !== null && nodeMap !== void 0 ? nodeMap : {});
     types.forEach(function (typeKey) {
-      _recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
+      recurseGetNodes(typeKey, svg, nodeMap[typeKey]);
     });
     if ((gradList === null || gradList === void 0 ? void 0 : gradList.length) > 0) {
       nodeMap.gradation.forEach(function (item, index) {

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.d.ts

@@ -1,3 +1,3 @@
 import type { OpenMenuPropsType } from './propsType';
-declare const OpenMenu: (props: OpenMenuPropsType) => import("react/jsx-runtime").JSX.Element;
+declare const OpenMenu: (props: OpenMenuPropsType) => JSX.Element;
 export default OpenMenu;

package/lib/ProLayout/components/Layout/Menu/OpenMenu/index.js

@@ -56,7 +56,7 @@ var OpenMenu = function OpenMenu(props) {
     if (!Array.isArray(result) || !result.length) {
       return [];
     }
-    var _menuDeep = function menuDeep(data) {
+    var menuDeep = function menuDeep(data) {
       data.forEach(function (item) {
         var _item$keyIdPath, _item$keyIdPath2, _item$children;
         // 是否是第一级菜单，展开模式一级菜单有icon, 收起模式二级菜单有icon
@@ -97,7 +97,7 @@ var OpenMenu = function OpenMenu(props) {
           if ((_item === null || _item === void 0 ? void 0 : _item.hideInMenu) || ['TAB', 'QUERY', 'BUTTON'].includes(_item === null || _item === void 0 ? void 0 : _item.type)) {
             delete item.children;
           } else {
-            _menuDeep(item.children);
+            menuDeep(item.children);
           }
         } else {
           delete item.children;
@@ -105,7 +105,7 @@ var OpenMenu = function OpenMenu(props) {
       });
       return data;
     };
-    _menuDeep(result);
+    menuDeep(result);
     return result;
   }, [dataSource]);
   (0, _ahooks.useDeepCompareEffect)(function () {