@zat-design/sisyphus-react 3.9.7 → 3.9.8-beta.10

package/lib/ProForm/utils/valueType.js

@@ -4,7 +4,8 @@ var _interopRequireDefault = require("@babel/runtime/helpers/interopRequireDefau
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports.default = void 0;
+exports.maskStringRangeWithRegex = exports.default = void 0;
+var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _big = _interopRequireDefault(require("big.js"));
 var _lodash = require("lodash");
@@ -195,13 +196,31 @@ var dateTransform = function dateTransform(_ref2) {
   }
   return result;
 };
+/** 脱敏处理函数 */
+var maskStringRangeWithRegex = exports.maskStringRangeWithRegex = function maskStringRangeWithRegex(input, range) {
+  var _ref3 = range || [],
+    _ref4 = (0, _slicedToArray2.default)(_ref3, 2),
+    start = _ref4[0],
+    end = _ref4[1];
+  if (start < 0) {
+    throw new Error('脱敏数据: start index cannot be negative');
+  }
+  var adjustedEnd = Math.min(end, input.length - 1);
+  if (start >= input.length) {
+    return '';
+  }
+  var regexPattern = "^(.{".concat(start, "})(.{").concat(adjustedEnd - start + 1, "})(.*)$");
+  var regex = new RegExp(regexPattern);
+  var maskedValue = input.replace(regex, "$1".concat('*'.repeat(adjustedEnd - start + 1), "$3"));
+  return maskedValue;
+};
 var _default = exports.default = {
   /** 年月日 */
-  date: function date(_ref3) {
-    var type = _ref3.type,
-      toISOString = _ref3.toISOString,
-      toCSTString = _ref3.toCSTString,
-      mode = _ref3.mode;
+  date: function date(_ref5) {
+    var type = _ref5.type,
+      toISOString = _ref5.toISOString,
+      toCSTString = _ref5.toCSTString,
+      mode = _ref5.mode;
     return dateTransform({
       type: type,
       _valueType: 'date',
@@ -211,11 +230,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 时分秒 */
-  dateTime: function dateTime(_ref4) {
-    var type = _ref4.type,
-      toISOString = _ref4.toISOString,
-      toCSTString = _ref4.toCSTString,
-      mode = _ref4.mode;
+  dateTime: function dateTime(_ref6) {
+    var type = _ref6.type,
+      toISOString = _ref6.toISOString,
+      toCSTString = _ref6.toCSTString,
+      mode = _ref6.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateTime',
@@ -225,11 +244,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 00:00:00 */
-  dateStartTime: function dateStartTime(_ref5) {
-    var type = _ref5.type,
-      toISOString = _ref5.toISOString,
-      toCSTString = _ref5.toCSTString,
-      mode = _ref5.mode;
+  dateStartTime: function dateStartTime(_ref7) {
+    var type = _ref7.type,
+      toISOString = _ref7.toISOString,
+      toCSTString = _ref7.toCSTString,
+      mode = _ref7.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartTime',
@@ -239,11 +258,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 23:59:59 */
-  dateEndTime: function dateEndTime(_ref6) {
-    var type = _ref6.type,
-      toISOString = _ref6.toISOString,
-      toCSTString = _ref6.toCSTString,
-      mode = _ref6.mode;
+  dateEndTime: function dateEndTime(_ref8) {
+    var type = _ref8.type,
+      toISOString = _ref8.toISOString,
+      toCSTString = _ref8.toCSTString,
+      mode = _ref8.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateEndTime',
@@ -253,11 +272,11 @@ var _default = exports.default = {
     });
   },
   /** 年月日 00:00:00 ~ 年月日 23:59:59 */
-  dateStartEndTime: function dateStartEndTime(_ref7) {
-    var type = _ref7.type,
-      toISOString = _ref7.toISOString,
-      toCSTString = _ref7.toCSTString,
-      mode = _ref7.mode;
+  dateStartEndTime: function dateStartEndTime(_ref9) {
+    var type = _ref9.type,
+      toISOString = _ref9.toISOString,
+      toCSTString = _ref9.toCSTString,
+      mode = _ref9.mode;
     return dateTransform({
       type: type,
       _valueType: 'dateStartEndTime',
@@ -267,9 +286,9 @@ var _default = exports.default = {
     });
   },
   /** 百分比 */
-  percentage: function percentage(_ref8) {
-    var type = _ref8.type,
-      valueType = _ref8.valueType;
+  percentage: function percentage(_ref10) {
+    var type = _ref10.type,
+      valueType = _ref10.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -277,9 +296,9 @@ var _default = exports.default = {
     });
   },
   /** 千分比 */
-  permillage: function permillage(_ref9) {
-    var type = _ref9.type,
-      valueType = _ref9.valueType;
+  permillage: function permillage(_ref11) {
+    var type = _ref11.type,
+      valueType = _ref11.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -287,8 +306,54 @@ var _default = exports.default = {
     });
   },
   /**  开关 YN转换 */
-  switch: function _switch(_ref10) {
-    var switchValue = _ref10.switchValue;
+  switch: function _switch(_ref12) {
+    var switchValue = _ref12.switchValue;
     return switchTransform(switchValue);
+  },
+  /**  脱敏 转换 */
+  desensitization: function desensitization(props) {
+    var desensitization = props.desensitization,
+      type = props.type,
+      mode = props.mode,
+      names = props.names;
+    // 判断是否是地址控件，并带地址详情场景
+    if (type === 'ProCascader' && mode === 'address' && (names === null || names === void 0 ? void 0 : names.length) === 4) {
+      return {
+        getValueProps: function getValueProps(value) {
+          try {
+            if (value === null || value === void 0 ? void 0 : value.length) {
+              var _value = (0, _slicedToArray2.default)(value, 4),
+                province = _value[0],
+                city = _value[1],
+                county = _value[2],
+                address = _value[3];
+              return {
+                value: [province, city, county, maskStringRangeWithRegex(address, desensitization)]
+              };
+            }
+            return {
+              value: value
+            };
+          } catch (error) {
+            return {
+              value: value
+            }; // 如果发生错误，返回原始值
+          }
+        }
+      };
+    }
+    return {
+      getValueProps: function getValueProps(value) {
+        try {
+          return {
+            value: maskStringRangeWithRegex(value, desensitization)
+          };
+        } catch (error) {
+          return {
+            value: value
+          }; // 如果发生错误，返回原始值
+        }
+      }
+    };
   }
 };

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 () {

package/lib/ProLayout/components/ProCollapse/index.d.ts

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

package/lib/ProLayout/components/ProFooter/index.d.ts

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

package/lib/ProLayout/components/ProHeader/components/Copy/index.d.ts

@@ -1,4 +1,4 @@
 declare const Copy: ({ text }: {
     text: any;
-}) => import("react/jsx-runtime").JSX.Element;
+}) => JSX.Element;
 export default Copy;

package/lib/ProLayout/components/ProHeader/index.d.ts

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

package/lib/ProLayout/components/ProHeader/style/index.less

@@ -78,14 +78,6 @@
             background: #fff;
             letter-spacing: 2px;
           }
-          &.pro-header-describe-items-more{
-            .pro-header-tag{
-              padding: 0;
-              background: transparent;
-              color: #333 ;
-            }
-
-          }
         }
       }
     }

package/lib/ProLayout/index.d.ts

@@ -5,7 +5,7 @@ export declare const LayoutContext: import("react").Context<{
     onSelected: (params: any) => void;
 }>;
 declare const ProLayout: {
-    (props: ProLayoutProps): import("react/jsx-runtime").JSX.Element;
+    (props: ProLayoutProps): JSX.Element;
     defaultProps: {
         menus: any[];
         iconfontUrl: string;
@@ -17,8 +17,8 @@ declare const ProLayout: {
         headerHeight: number;
         contentStyle: {};
     };
-    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => import("react/jsx-runtime").JSX.Element;
-    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => import("react/jsx-runtime").JSX.Element>;
-    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => import("react/jsx-runtime").JSX.Element>;
+    ProCollapse: (props: import("./components/ProCollapse/PropTypes").ProCollapseProps) => JSX.Element;
+    ProFooter: import("react").MemoExoticComponent<(props: import("./components/ProFooter/PropTypes").ProFooterProps) => JSX.Element>;
+    ProHeader: import("react").MemoExoticComponent<(props: import("./components/ProHeader/PropTypes").ProHeaderProps) => JSX.Element>;
 };
 export default ProLayout;

package/lib/ProLayout/utils/index.js

@@ -25,7 +25,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
     _pathName = activeMenu;
   }
   var result;
-  var _menuDeep = function menuDeep(menuDeepItem) {
+  var menuDeep = function menuDeep(menuDeepItem) {
     for (var i = 0; i <= menuDeepItem.length - 1; i++) {
       var item = menuDeepItem[i];
       // 只包含一级菜单时，解决URL：/endorsement/demo/123无法选中问题
@@ -34,7 +34,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
-        _menuDeep(item.children);
+        menuDeep(item.children);
       } else if (((item === null || item === void 0 ? void 0 : item.url) && _pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && _pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
         // 当循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
@@ -42,7 +42,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
       }
     }
   };
-  _menuDeep(menus);
+  menuDeep(menus);
   return result || [];
 };
 /**
@@ -52,7 +52,7 @@ var getIdsByPathName = exports.getIdsByPathName = function getIdsByPathName(menu
  */
 var transformMenu = exports.transformMenu = function transformMenu(menuData, pathPrefix) {
   var data = (0, _toConsumableArray2.default)(menuData);
-  var _menuDeep2 = function menuDeep(menuDeepItem) {
+  var menuDeep = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
@@ -85,11 +85,11 @@ var transformMenu = exports.transformMenu = function transformMenu(menuData, pat
           childrenItem.keyUrlPath = (0, _toConsumableArray2.default)(item.keyUrlPath);
           childrenItem.keyIdPath = (0, _toConsumableArray2.default)(item.keyIdPath);
         });
-        _menuDeep2(item.children);
+        menuDeep(item.children);
       }
     });
   };
-  _menuDeep2(data);
+  menuDeep(data);
   return data;
 };
 /**
@@ -144,7 +144,7 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
   var menus = _ref.menus,
     pathName = _ref.pathName;
   var result;
-  var _menuDeep3 = function menuDeep(menuDeepItem) {
+  var menuDeep = function menuDeep(menuDeepItem) {
     if (!Array.isArray(menuDeepItem) || !menuDeepItem.length) {
       return [];
     }
@@ -158,7 +158,7 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
         break;
       }
       if (Array.isArray(item.children) && item.children.length) {
-        _menuDeep3(item.children);
+        menuDeep(item.children);
       } else if (((item === null || item === void 0 ? void 0 : item.url) && pathName.includes(item.url.split('?')[0]) || (item === null || item === void 0 ? void 0 : item.redirectUrl) && pathName.includes(item.redirectUrl.split('?')[0])) && !result) {
         // URL未匹配时，循环到最后一层时判断URL是否包含最后一层的URL，解决URL在URL中不存在的场景
         result = item.keyIdPath;
@@ -166,6 +166,6 @@ var getPathNameKey = exports.getPathNameKey = function getPathNameKey(_ref) {
       }
     }
   };
-  _menuDeep3(menus);
+  menuDeep(menus);
   return result;
 };

package/lib/ProSelect/components/AdaptiveTooltip.d.ts

@@ -1,4 +1,4 @@
 declare const AdaptiveTooltip: ({ children }: {
     children: any;
-}) => import("react/jsx-runtime").JSX.Element;
+}) => JSX.Element;
 export default AdaptiveTooltip;

package/lib/ProSelect/index.d.ts

@@ -1,6 +1,6 @@
 import React from 'react';
 import { PropSelectProps, ProSelectAction } from './propsType';
 import './index.less';
-export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => import("react/jsx-runtime").JSX.Element;
+export declare const ProSelect: (props: PropSelectProps, ref: React.Ref<ProSelectAction> | undefined) => JSX.Element;
 declare const _default: React.ForwardRefExoticComponent<PropSelectProps & React.RefAttributes<ProSelectAction>>;
 export default _default;

package/lib/ProStep/components/Anchor/index.d.ts

@@ -1,2 +1,2 @@
-export declare const MenuItem: (props: any) => import("react/jsx-runtime").JSX.Element;
+export declare const MenuItem: (props: any) => JSX.Element;
 export default MenuItem;

package/lib/ProStep/components/Item/index.d.ts

@@ -1,3 +1,3 @@
 import { ProStepItem } from '../../propsType';
-declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => import("react/jsx-runtime").JSX.Element;
+declare const _default: ({ id, title, collapse: collapseItem, children, ...restProps }: ProStepItem) => JSX.Element;
 export default _default;

package/lib/ProStep/components/Listener/index.js

@@ -21,7 +21,7 @@ var _default = exports.default = function _default(_ref) {
   var _useStep = (0, _index.useStep)(),
     notify = _useStep.notify;
   return /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
-    onClick: (0, _lodash.throttle)(/*#__PURE__*/(0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+    onClick: (0, _lodash.throttle)( /*#__PURE__*/(0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
       var values;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {

package/lib/ProStep/components/Step/index.d.ts

@@ -1,5 +1,5 @@
 import { ProStepPropsType } from '../../propsType';
 export declare const Step: ({ fixedTop, dataSource, activeKey, errorCollection, style, targetOffset, scrollToError, }: ProStepPropsType & {
     errorCollection: object;
-}) => import("react/jsx-runtime").JSX.Element;
+}) => JSX.Element;
 export default Step;

package/lib/ProStep/index.d.ts

@@ -4,9 +4,9 @@ import './style/index.less';
 export declare const ProStepContext: import("react").Context<any>;
 export declare const useStep: () => any;
 declare const ProStep: {
-    ({ children, ...resetProps }: ProStepPropsType): import("react/jsx-runtime").JSX.Element;
+    ({ children, ...resetProps }: ProStepPropsType): JSX.Element;
     useStep: () => any;
-    Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => import("react/jsx-runtime").JSX.Element;
+    Item: ({ id, title, collapse: collapseItem, children, ...restProps }: import("./propsType").ProStepItem) => JSX.Element;
     Listener: ({ children, delayTime, excludes, ...props }: any) => import("react").DetailedReactHTMLElement<any, HTMLElement>;
 };
 export default ProStep;

package/lib/ProStep/index.js

@@ -8,11 +8,11 @@ exports.useStep = exports.default = exports.ProStepContext = void 0;
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _regeneratorRuntime2 = _interopRequireDefault(require("@babel/runtime/helpers/regeneratorRuntime"));
 var _asyncToGenerator2 = _interopRequireDefault(require("@babel/runtime/helpers/asyncToGenerator"));
-var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
 var _react = require("react");
+var _lodash = require("lodash");
 var _ahooks = require("ahooks");
 var _utils = require("./utils");
 var _Step = _interopRequireDefault(require("./components/Step"));
@@ -27,10 +27,9 @@ var useStep = exports.useStep = function useStep() {
 var ProStep = function ProStep(_ref) {
   var children = _ref.children,
     resetProps = (0, _objectWithoutProperties2.default)(_ref, _excluded);
-  var _useState = (0, _react.useState)([]),
+  var _useState = (0, _react.useState)({}),
     _useState2 = (0, _slicedToArray2.default)(_useState, 2),
-    ids = _useState2[0],
-    setIds = _useState2[1];
+    reRender = _useState2[1];
   var _useSetState = (0, _ahooks.useSetState)({}),
     _useSetState2 = (0, _slicedToArray2.default)(_useSetState, 2),
     errorCollection = _useSetState2[0],
@@ -40,6 +39,7 @@ var ProStep = function ProStep(_ref) {
   var _useLocalStorageState = (0, _ahooks.useLocalStorageState)('cache-pro-step'),
     _useLocalStorageState2 = (0, _slicedToArray2.default)(_useLocalStorageState, 2),
     setLocalData = _useLocalStorageState2[1];
+  var ids = Object.keys(registerMap.current);
   var targetOffset = resetProps.targetOffset,
     _resetProps$collapse = resetProps.collapse,
     collapse = _resetProps$collapse === void 0 ? false : _resetProps$collapse,
@@ -68,6 +68,9 @@ var ProStep = function ProStep(_ref) {
       return pre.order - next.order;
     });
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.dataSource, registerMap.current, ids]);
+  var debounceReRender = (0, _react.useCallback)((0, _lodash.debounce)(function () {
+    return reRender({});
+  }, 500), []);
   // 用来注册form匹配到对应的模块id
   var register = function register(_ref4) {
     var id = _ref4.id,
@@ -79,17 +82,15 @@ var ProStep = function ProStep(_ref) {
     var record = {};
     record.title = title;
     record.order = order;
-    if (!ids.includes(id)) {
-      setIds(function (preState) {
-        return [].concat((0, _toConsumableArray2.default)(preState), [id]);
-      });
+    if (!registerMap.current[id]) {
+      debounceReRender();
     }
     if (disabled) {
       registerMap.current[id] = record;
       return null;
     }
     var subEvent = /*#__PURE__*/function () {
-      var _ref5 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
+      var _ref5 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee() {
         var value, _form$validateFields, _error$errorFields;
         return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
           while (1) switch (_context.prev = _context.next) {
@@ -135,7 +136,7 @@ var ProStep = function ProStep(_ref) {
     registerMap.current[id] = record;
   };
   var notify = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(params) {
       var _ref7, excludes, triggerIds, events, res, nextErrorCollection;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
@@ -174,7 +175,7 @@ var ProStep = function ProStep(_ref) {
     };
   }();
   var triggerTo = /*#__PURE__*/function () {
-    var _ref9 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
+    var _ref9 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee3(keys) {
       var events, result, nextErrorCollection;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {

package/lib/ProTable/components/FormatColumn/index.js

@@ -84,6 +84,7 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     minWidth = column.minWidth,
     onDiff = column.onDiff,
     otherProps = (0, _objectWithoutProperties2.default)(column, _excluded);
+  otherProps.scroll = scroll;
   // 仅在 {x: 'max-content', y: 300 } 且 column无指定 width minWidth 情况下 才开启 minWidth的自动计算
   var isMaxContentOverFlow = (0, _lodash.isObject)(scroll) ? (scroll === null || scroll === void 0 ? void 0 : scroll.x) === 'max-content' && Reflect.ownKeys(scroll).includes('y') : false;
   calcMinWidth({
@@ -145,8 +146,29 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           index: index
         });
         // viewRender 返回值为 false 时，不显示对比
-        if ((0, _lodash.isBoolean)(diffResult) && !diffResult) {
-          otherProps.isChanged = false;
+        if ((0, _lodash.isBoolean)(diffResult)) {
+          if (!diffResult) {
+            otherProps.isChanged = false;
+            _isAddCell = false;
+          } else {
+            otherProps.isChanged = true;
+            _isAddCell = false;
+          }
+        }
+        // 指定返回相同了
+        if (typeof diffResult === 'string') {
+          if (diffResult === 'changed') {
+            _isAddCell = false;
+            otherProps.isChanged = true;
+          }
+          if (diffResult === 'same') {
+            _isAddCell = false;
+            otherProps.isChanged = false;
+          }
+          if (diffResult === 'add') {
+            _isAddCell = true;
+            otherProps.isChanged = false;
+          }
         }
         originalValue = diffResult;
       }
@@ -161,9 +183,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           index: index
         });
         if (_diffResult === 'changed') {
+          _isAddCell = false;
           otherProps.isChanged = true;
         }
         if (_diffResult === 'same') {
+          _isAddCell = false;
           otherProps.isChanged = false;
         }
         if (_diffResult === 'add') {
@@ -323,6 +347,11 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       if (!originalValue) {
         originalRenderValue = '-';
       }
+      if (originalObj && renderValue !== originalRenderValue) {
+        otherProps.isChanged = true;
+      } else {
+        otherProps.isChanged = false;
+      }
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
         children: [prefixNode(value, record, index), renderValue, suffixNode(value, record, index)]
@@ -594,14 +623,14 @@ var getParentElement = exports.getParentElement = function getParentElement(elem
   if (!element || !name) {
     return result;
   }
-  var _searchDom = function searchDom(element, name) {
+  var searchDom = function searchDom(element, name) {
     var type = arguments.length > 2 && arguments[2] !== undefined ? arguments[2] : 'className';
     if (element.parentElement[type] === name) {
       result = element.parentElement;
       return false;
     }
-    _searchDom(element.parentElement, name, type = 'className');
+    searchDom(element.parentElement, name, type = 'className');
   };
-  _searchDom(element, name, type = 'className');
+  searchDom(element, name, type = 'className');
   return result;
 };

package/lib/ProTable/components/RcTable/components/BaseTable/index.d.ts

@@ -7,5 +7,5 @@ declare const _default: import("react").MemoExoticComponent<({ dataSource, table
     draggableProps: any;
     summaryProps: any;
     emptyTextProps: any;
-}) => import("react/jsx-runtime").JSX.Element>;
+}) => JSX.Element>;
 export default _default;

package/lib/ProTable/components/RcTable/components/DraggableTable/components/DndWrapper/index.js

@@ -81,7 +81,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     onDragStartGuard = _ref2.onDragStartGuard,
     onDragEndGuard = _ref2.onDragEndGuard;
   var onDragStart = /*#__PURE__*/function () {
-    var _ref4 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
+    var _ref4 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee(_ref3) {
       var active, _transformedValue, activeObject;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
@@ -112,7 +112,7 @@ var DndWrapper = function DndWrapper(_ref2) {
     };
   }();
   var onDragEnd = /*#__PURE__*/function () {
-    var _ref6 = (0, _asyncToGenerator2.default)(/*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
+    var _ref6 = (0, _asyncToGenerator2.default)( /*#__PURE__*/(0, _regeneratorRuntime2.default)().mark(function _callee2(_ref5) {
       var active, over, transformedValue, activeObject, overObject, activeLevel, activeParentId, overLevel, overParentId, nextDataSource, _nextDataSource, _flatTree, activeIndex, overIndex, nextValue;
       return (0, _regeneratorRuntime2.default)().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {