@zat-design/sisyphus-react 3.9.2 → 3.9.3-beta.1

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

@@ -19,6 +19,7 @@ var _ProIcon = _interopRequireDefault(require("../../../../../ProIcon"));
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirmProps", "title"],
   _excluded2 = ["onClick", "label"];
+var filterKeys = ['actionType'];
 var getDefaultActions = function getDefaultActions(mode) {
   var originActions = {
     add: {
@@ -43,9 +44,11 @@ var getDefaultActions = function getDefaultActions(mode) {
       label: "".concat(_locale.default.ProForm.formListActions[1]),
       icon: mode === 'less' ? (0, _jsxRuntime.jsx)(_ProIcon.default, {
         type: "solid-close",
-        className: "single-delete"
+        className: "single-delete",
+        buttonIcon: false
       }) : (0, _jsxRuntime.jsx)(_ProIcon.default, {
-        type: "delete"
+        type: "delete",
+        buttonIcon: false
       })
     },
     copy: {
@@ -241,14 +244,14 @@ var ActionButton = function ActionButton(props) {
             handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
-          children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
+          children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
             type: "text",
             onClick: function onClick(e) {
               return e.stopPropagation();
             },
             children: label || defaultLabel
           }))
-        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), rest), {}, {
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, defaultRest), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "text",
           onClick: function onClick(e) {
             e.stopPropagation();
@@ -266,14 +269,14 @@ var ActionButton = function ActionButton(props) {
           return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
-        children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+        children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "text",
           onClick: function onClick(e) {
             return e.stopPropagation();
           },
           children: label
         }))
-      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/(0, _react.createElement)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

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

@@ -68,7 +68,8 @@ var LineFields = function LineFields(props) {
       ref: setActivatorNodeRef,
       children: (0, _jsxRuntime.jsx)(_ProIcon.default, {
         className: "drag-icon",
-        type: "drag"
+        type: "drag",
+        buttonIcon: false
       })
     })), (0, _jsxRuntime.jsx)(_antd.Row, {
       gutter: isLess ? 0 : 24,

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

@@ -18,6 +18,7 @@ var _react = require("react");
 var _locale = _interopRequireDefault(require("../../../../../locale"));
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
+/* eslint-disable react/no-array-index-key */
 var actions = {
   add: {
     onClick: function onClick(value, _ref) {
@@ -31,6 +32,7 @@ var actions = {
 var defaultActionProps = [{
   type: 'add'
 }];
+var filterKeys = ['actionType'];
 var ToolbarButton = function ToolbarButton(props) {
   var namePath = props.namePath,
     form = props.form,
@@ -132,7 +134,7 @@ var ToolbarButton = function ToolbarButton(props) {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), rest), {}, {
+        return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, actions[type]), (0, _lodash.omit)(rest, filterKeys)), {}, {
           type: "link",
           onClick: function onClick() {
             return handleClick(internalOnClick, _onClick, item);
@@ -140,7 +142,7 @@ var ToolbarButton = function ToolbarButton(props) {
           children: label || defaultLabel
         }), "".concat(type).concat(index));
       }
-      return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, rest), {}, {
+      return (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, (0, _lodash.omit)(rest, filterKeys)), {}, {
         type: "link",
         onClick: function onClick() {
           return customClick(_onClick2, item);

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

@@ -101,7 +101,7 @@ var FormList = function FormList(props, ref) {
       }),
       strategy: _sortable.verticalListSortingStrategy,
       children: [_fields.map(function (field, index) {
-        var namePath = [].concat((0, _toConsumableArray2.default)(_namePath), [index]);
+        var namePath = [].concat((0, _toConsumableArray2.default)(_namePath), [field.name]);
         var _columns = processColumns(index, namePath);
         return mode === 'block' ? (0, _jsxRuntime.jsx)(_BlockFields.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, props), {}, {
           columns: _columns,

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

@@ -22,7 +22,7 @@ var _useEnum = _interopRequireDefault(require("../../../../ProEnum/hooks/useEnum
 var _locale = _interopRequireDefault(require("../../../../locale"));
 var _ = _interopRequireDefault(require("../../.."));
 var _Container = _interopRequireDefault(require("../../Container"));
-var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder"];
+var _excluded = ["className", "hasDetail", "detailMaxLength", "fieldNames", "value", "disabled", "dataSource", "onChange", "useRequest", "transformResponse", "level", "isView", "enumCode", "code", "tooltip", "separator", "detailPlaceholder", "scrollFollowParent"];
 var Text = _antd.Typography.Text;
 var defaultFieldNames = {
   label: 'name',
@@ -87,6 +87,7 @@ var ProCascader = function ProCascader(props) {
     _props$separator = props.separator,
     separator = _props$separator === void 0 ? '/' : _props$separator,
     detailPlaceholder = props.detailPlaceholder,
+    scrollFollowParent = props.scrollFollowParent,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
   var _ref3 = _.default.useFieldProps() || {},
     isViewCon = _ref3.isView,
@@ -273,8 +274,11 @@ var ProCascader = function ProCascader(props) {
         filter: handlefilter,
         limit: 1000
       },
-      onChange: handleChange
-    }, (0, _lodash.omit)(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
+      onChange: handleChange,
+      getPopupContainer: function getPopupContainer(trigger) {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      }
+    }, (0, _lodash.omit)(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && disabled && detail ? (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: detail,
       children: (0, _jsxRuntime.jsx)("span", {
         className: "pro-address-detail",

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

@@ -34,4 +34,6 @@ export interface ProCascaderProps {
     separator?: string;
     /** 详情框占位符 */
     detailPlaceholder?: string;
+    /** 浮窗是否跟随父级 */
+    scrollFollowParent?: boolean;
 }

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

@@ -18,6 +18,7 @@ var _diffOriginal = require("../../utils/diffOriginal");
 var _ProConfigProvider = require("../../../ProConfigProvider");
 var _utils = require("../../../utils");
 var _excluded = ["name", "names", "namesStr", "form", "equalWith", "children", "type", "diffConfig", "valuePropName", "normalize", "getValueProps", "viewRender"];
+var componentsWithFloatWindow = ['Select', 'ProSelect', 'ProEnum', 'ProTimeLimit', 'ProModalSelect', 'ProCascader', 'DataPicker', 'RangePicker', 'TimePicker'];
 var ChangedWrapper = function ChangedWrapper(props) {
   var _diffConfig$toolTip, _children$props, _children$props2, _children$props3;
   var name = props.name,
@@ -51,9 +52,11 @@ var ChangedWrapper = function ChangedWrapper(props) {
     if (!isWatch || noChange) return 'same';
     var _value = normalize ? normalize(props[valuePropName], undefined, undefined, true) // true 代表是值比对时的调用
     : props[valuePropName];
+    // fix:修复 InputNumber 时，originalValue 为 '0' 时，显示为 changed的问题
+    var _originalValue = normalize && ['InputNumber', 'ProNumberRange'].includes(props.type) ? normalize(props[valuePropName], undefined, undefined, true) : originalValue;
     return (0, _diffOriginal.diffOriginal)({
-      originalValue: originalValue,
       value: _value,
+      originalValue: _originalValue,
       form: form,
       equalWith: equalWith
       // name: namesStr || name,
@@ -103,6 +106,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
+  var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
+    scrollFollowParent: scrollFollowParent
+  } : {};
   return (0, _jsxRuntime.jsx)(_antd.Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
@@ -120,8 +126,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && (0, _jsxRuntime.jsxs)(_antd.Space, {
         className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
-          scrollFollowParent: scrollFollowParent,
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
           isView: true
         })) : undefined]
       })]
@@ -129,8 +134,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     children: (0, _jsxRuntime.jsx)("div", {
       className: diffClassName,
       style: style,
-      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), {}, {
-        scrollFollowParent: scrollFollowParent,
+      children: /*#__PURE__*/_react.default.isValidElement(children) ? /*#__PURE__*/_react.default.cloneElement(children, (0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)((0, _objectSpread3.default)({}, children.props), rest), scrollFollowParentConfig), {}, {
         otherProps: (0, _objectSpread3.default)((0, _objectSpread3.default)({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

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

@@ -136,6 +136,12 @@ var Render = function Render(props) {
   var transforms = Array.isArray(otherProps === null || otherProps === void 0 ? void 0 : otherProps.names) ? (0, _transformNames.default)((0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherFormItemProps), valueTypeTransform()),
   // 合并valueType的transform
   form, otherProps.names, namesStr, otherProps.type) : valueTypeTransform();
+  /**
+   * globalControl 全局控制优先
+   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
+   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
+   */
+  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   // ↑↑↑↑↑↑  formItem参数整理  ↑↑↑↑↑↑
   Object.assign(otherFormItemProps, transforms, {
     names: otherProps.names
@@ -148,6 +154,10 @@ var Render = function Render(props) {
   } : null, (0, _objectSpread2.default)({}, (0, _index.isTrim)(type, trim, (0, _ProConfigProvider.useProConfig)())), // 优先取传进来的，其次取ProConfigProvider配置的
   (0, _objectSpread2.default)({}, (0, _index.isUpperCase)(type, upperCase)), {
     validateFirst: true
+  },
+  // 当某一规则校验不通过时，是否停止剩下的规则的校验
+  {
+    disabled: lastDisabled
   });
   // 添加label宽度
   if (labelWidth) {
@@ -157,12 +167,6 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = (0, _lodash.omit)(otherFormItemProps, ['component', 'names', 'format', 'toISOString', 'toCSTString', 'switchValue', 'precision', 'clearNotShow', 'dependNames']);
-  /**
-   * globalControl 全局控制优先
-   * globalControl true时，优先级 全局【formDisabled】> formitem上【column.disabled】 > 组件上【fieldProps.disabled】
-   * globalControl false时，优先级 组件上【fieldProps.disabled】 > formitem上【column.disabled】 >  全局【formDisabled】
-   */
-  var lastDisabled = globalControl ? (_ref2 = (_ref3 = formDisabled !== null && formDisabled !== void 0 ? formDisabled : _disabled) !== null && _ref3 !== void 0 ? _ref3 : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref2 !== void 0 ? _ref2 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled : (_ref4 = (_ref5 = _disabled !== null && _disabled !== void 0 ? _disabled : _fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.disabled) !== null && _ref5 !== void 0 ? _ref5 : componentProps === null || componentProps === void 0 ? void 0 : componentProps.disabled) !== null && _ref4 !== void 0 ? _ref4 : formDisabled;
   /**
    * 最新fieldProps: 更新后的组件Props
    */
@@ -401,7 +405,7 @@ var Render = function Render(props) {
       };
     }
     // 需要过滤掉的form_item的key
-    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName'];
+    var filterFormItemKey = ['onFieldChange', 'shouldUpdate', 'namePath', 'isView', 'parentNames', 'space', 'before', 'after', 'globalControl', 'listName', 'fixed'];
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';

package/lib/ProForm/index.js

@@ -92,12 +92,15 @@ var ProForm = function ProForm(props, ref) {
   (0, _react.useMemo)(function () {
     if (formKey && forms[formKey] !== form) {
       forms[formKey] = form;
-      dispatch({
-        type: 'set',
-        payload: {
-          forms: (0, _objectSpread2.default)({}, forms)
-        }
-      });
+      // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
+      setTimeout(function () {
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: (0, _objectSpread2.default)({}, forms)
+          }
+        });
+      }, 300);
     }
     // 销毁
     return function () {
@@ -238,7 +241,7 @@ var ProForm = function ProForm(props, ref) {
     },
     className: cls,
     form: form
-  }, formProps), config), otherProps), {}, {
+  }, formProps), (0, _lodash.omit)(config, ['isDiffAll'])), otherProps), {}, {
     labelAlign: (_ref = labelAlign !== null && labelAlign !== void 0 ? labelAlign : config.labelAlign) !== null && _ref !== void 0 ? _ref : 'left',
     onValuesChange: handleValuesChange,
     onFinish: handleFinish,

package/lib/ProForm/utils/diffOriginal.js

@@ -20,7 +20,6 @@ var filterObject = function filterObject(data) {
   if (!Object.keys(resData).length) return null;
   return resData;
 };
-var nullValue = [null, undefined, '']; // 输入框空值时可能存在的三种值 视为相等
 var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   var originalValue = params.originalValue,
     value = params.value,

package/lib/ProIcon/index.js

@@ -20,7 +20,7 @@ var _config2 = require("./config");
 var _utils = require("./utils");
 var _locale = _interopRequireDefault(require("../locale"));
 require("./symbolIcon.js");
-var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip"];
+var _excluded = ["type", "onClick", "size", "color", "className", "style", "spin", "rotate", "theme", "disabled", "mode", "buttonProps", "children", "mapList", "src", "actionMap", "tooltip", "buttonIcon"];
 var ProIcon = function ProIcon(props) {
   var _window, _window2;
   var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
@@ -54,6 +54,8 @@ var ProIcon = function ProIcon(props) {
     src = _config.src,
     actionMap = _config.actionMap,
     tooltip = _config.tooltip,
+    _config$buttonIcon = _config.buttonIcon,
+    buttonIcon = _config$buttonIcon === void 0 ? true : _config$buttonIcon,
     reset = (0, _objectWithoutProperties2.default)(_config, _excluded);
   var _useSetState = (0, _ahooks.useSetState)({
       IconInstance: (0, _jsxRuntime.jsx)(_jsxRuntime.Fragment, {})
@@ -134,6 +136,25 @@ var ProIcon = function ProIcon(props) {
       height: size
     }, rotateStyle), style)
   };
+  var icon = !src ? (0, _jsxRuntime.jsx)("svg", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+    onClick: onClick,
+    "aria-hidden": "true",
+    children: (0, _jsxRuntime.jsx)("use", {
+      xlinkHref: "#icon-".concat(_type)
+    })
+  })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
+    // @ts-ignore
+    onClick: onClick,
+    "aria-hidden": "true",
+    src: src,
+    beforeInjection: function beforeInjection(svg) {
+      (0, _utils.onBeforeInjection)({
+        svg: svg,
+        actionMap: actionMap,
+        primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
+      });
+    }
+  }));
   var RenderIcon = (0, _jsxRuntime.jsx)("span", (0, _objectSpread2.default)((0, _objectSpread2.default)({
     className: "anticon",
     style: {
@@ -142,7 +163,7 @@ var ProIcon = function ProIcon(props) {
   }, reset), {}, {
     children: (0, _jsxRuntime.jsx)(_antd.Tooltip, {
       title: iconText,
-      children: (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)({
+      children: buttonIcon ? (0, _jsxRuntime.jsx)(_antd.Button, (0, _objectSpread2.default)({
         style: {
           width: size,
           height: size,
@@ -152,26 +173,20 @@ var ProIcon = function ProIcon(props) {
           verticalAlign: 'baseline'
         },
         type: "text",
-        icon: !src ? (0, _jsxRuntime.jsx)("svg", (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
-          onClick: onClick,
-          "aria-hidden": "true",
-          children: (0, _jsxRuntime.jsx)("use", {
-            xlinkHref: "#icon-".concat(_type)
-          })
-        })) : (0, _jsxRuntime.jsx)(_reactSvg.ReactSVG, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, svgProps), {}, {
-          // @ts-ignore
-          onClick: onClick,
-          "aria-hidden": "true",
-          src: src,
-          beforeInjection: function beforeInjection(svg) {
-            (0, _utils.onBeforeInjection)({
-              svg: svg,
-              actionMap: actionMap,
-              primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
-            });
-          }
-        }))
-      }, buttonProps))
+        icon: icon
+      }, buttonProps)) : (0, _jsxRuntime.jsx)(_antd.Space, {
+        children: (0, _jsxRuntime.jsx)("span", {
+          style: {
+            width: size,
+            height: size,
+            border: 'none',
+            borderRadius: 0,
+            padding: 0,
+            verticalAlign: 'baseline'
+          },
+          children: icon
+        })
+      })
     })
   }));
   (0, _react.useEffect)(function () {

package/lib/ProIcon/propsTypes.d.ts

@@ -99,5 +99,7 @@ export interface ProIconProps {
      * @default
      */
     actionMap?: actionMap;
+    /** 内部使用 */
+    buttonIcon?: boolean;
 }
 export {};

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

@@ -119,9 +119,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
     }
   };
   if (column === null || column === void 0 ? void 0 : column.render) {
-    if (!originalObj && Object.keys(originalObj !== null && originalObj !== void 0 ? originalObj : {}).length === 0 && !onDiff) {
-      return;
-    }
+    // if (!originalObj && Object.keys(originalObj ?? {}).length === 0 && !onDiff) {
+    //   return;
+    // }
     var originalRender = column.render; // 保存原始的 render 方法
     // 自定义render 手动重载下
     column.render = function (value, record, index) {
@@ -129,8 +129,10 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var _value = isFn ? originalRender === null || originalRender === void 0 ? void 0 : originalRender(value, record !== null && record !== void 0 ? record : {}, index) : null;
       var originalResult = (0, _utils2.getOriginalValue)(value, record !== null && record !== void 0 ? record : {}, originalObj, rowKey, dataIndex);
       var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        isAddCell = originalResult.isAddCell;
       var isInNewRowFlag = isInNewRow(record);
+      var _isAddCell = isAddCell;
       otherProps.isChanged = isChanged;
       // 存在比对
       if ((0, _lodash.isFunction)(otherProps === null || otherProps === void 0 ? void 0 : otherProps.viewRender) && (diffConfig === null || diffConfig === void 0 ? void 0 : diffConfig.originalDataSource)) {
@@ -148,6 +150,27 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         }
         originalValue = diffResult;
       }
+      // 存在自定义onDiff比对
+      if ((0, _lodash.isFunction)(onDiff)) {
+        var _originalObj$record$r2;
+        var _diffResult = onDiff({
+          originalValue: originalValue,
+          originalRecord: (_originalObj$record$r2 = originalObj === null || originalObj === void 0 ? void 0 : originalObj[record === null || record === void 0 ? void 0 : record[rowKey]]) !== null && _originalObj$record$r2 !== void 0 ? _originalObj$record$r2 : {},
+          value: value,
+          record: record,
+          index: index
+        });
+        if (_diffResult === 'changed') {
+          otherProps.isChanged = true;
+        }
+        if (_diffResult === 'same') {
+          otherProps.isChanged = false;
+        }
+        if (_diffResult === 'add') {
+          _isAddCell = true;
+          otherProps.isChanged = false;
+        }
+      }
       return (0, _jsxRuntime.jsx)(_RenderColumn.default, (0, _objectSpread2.default)((0, _objectSpread2.default)({}, otherProps), {}, {
         valueType: valueType,
         originalValue: (0, _utils3.isEmpty)(originalValue) ? null : originalValue,
@@ -158,7 +181,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: _value,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: _isAddCell
       }));
     };
     return;
@@ -183,8 +207,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var realValue = _utils.tools.calc(Number(value !== null && value !== void 0 ? value : 0), '*', multiple);
       var renderValue = (0, _utils2.getDecimalDigits)(value) > valueTypePrecision ? realValue : realValue.toFixed(valueTypePrecision);
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = _utils.tools.calc(Number(originalValue || null), '*', multiple);
       var originalRenderValue = (0, _utils2.getDecimalDigits)(originalValue) > valueTypePrecision ? originalRealValue : originalRealValue.toFixed(valueTypePrecision);
@@ -214,7 +239,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
     // 千分位, 千分位带CNY前缀
@@ -223,8 +249,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var valueStr = valueTypePrecision ? "".concat(Number(value).toFixed(valueTypePrecision)) : "".concat(value);
       var renderValue = valueStr.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = valueTypePrecision ? "".concat(Number(originalValue).toFixed(valueTypePrecision)) : "".concat(originalValue);
       var originalRenderValue = originalRealValue.replace(/\B(?=(\d{3})+(?!\d))/g, ',');
@@ -254,7 +281,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (['datePicker', 'date', 'dateTime', 'dateStartTime', 'dateEndTime', 'dateStartEndTime'].includes(valueType)) {
@@ -262,8 +290,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var _moment, _moment2, _moment3, _moment4, _moment5, _moment6, _moment7, _moment8, _moment9, _moment10, _moment11, _moment12, _moment13, _moment14;
       var renderValue = (_moment = (0, _moment15.default)(value)) === null || _moment === void 0 ? void 0 : _moment.format(format);
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = (_moment2 = (0, _moment15.default)(originalValue)) === null || _moment2 === void 0 ? void 0 : _moment2.format(format);
       switch (valueType) {
@@ -317,7 +346,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (['enumName', 'enumCodeName'].includes(valueType)) {
@@ -325,8 +355,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var realCode = typeof code === 'function' ? code(value, record) : code;
       var renderValue = (0, _getEnumLabel.default)(realCode, value, valueType === 'enumCodeName');
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = (0, _getEnumLabel.default)(realCode, originalValue, valueType === 'enumCodeName');
       if (Array.isArray(column === null || column === void 0 ? void 0 : column.codeValues) && !realCode) {
@@ -360,15 +391,17 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (precision || prefix || suffix) {
     column.render = function (value, record, index) {
       var renderValue = value === 'number' ? value.toFixed(precision) : value;
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRenderValue = originalValue === 'number' ? originalValue.toFixed(precision) : originalValue;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
@@ -397,7 +430,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (valueType === 'address') {
@@ -405,8 +439,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
       var _realValue$filter;
       var realValue = transform ? transform(value, record) : value;
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var originalRealValue = transform ? transform(originalValue, record) : originalValue;
       var isEmpty = !realValue || Array.isArray(realValue) && (realValue === null || realValue === void 0 ? void 0 : (_realValue$filter = realValue.filter(function (item) {
@@ -454,7 +489,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: renderValue,
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   } else if (copyable) {
@@ -479,8 +515,9 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
   } else if (ellipsis) {
     column.render = function (value, record, index) {
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       if (!value && value !== 0 && value === originalValue) {
         (0, _jsxRuntime.jsx)("div", {
@@ -503,15 +540,17 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
           currentValue: value || '-',
           toolTipProps: _toolTipProps,
           minWidth: minWidth,
-          isInNewRowFlag: isInNewRowFlag
+          isInNewRowFlag: isInNewRowFlag,
+          isAddCell: isAddCell
         })), suffixNode(value, record, index)]
       });
     };
   } else {
     column.render = function (value, record, index) {
       var originalResult = (0, _utils2.getOriginalValue)(value, record, originalObj, rowKey, dataIndex);
-      var originalValue = originalResult.originalValue;
-      var isChanged = originalResult.isChanged;
+      var isChanged = originalResult.isChanged,
+        originalValue = originalResult.originalValue,
+        isAddCell = originalResult.isAddCell;
       otherProps.isChanged = isChanged;
       var node = (0, _jsxRuntime.jsxs)(_antd.Space, {
         size: 8,
@@ -536,7 +575,8 @@ var formatColumn = exports.formatColumn = function formatColumn(_ref2) {
         currentValue: value || '-',
         toolTipProps: _toolTipProps,
         minWidth: minWidth,
-        isInNewRowFlag: isInNewRowFlag
+        isInNewRowFlag: isInNewRowFlag,
+        isAddCell: isAddCell
       }));
     };
   }

package/lib/ProTable/components/RenderColumn/index.d.ts

@@ -13,6 +13,8 @@ interface Props {
     minWidth?: number;
     isInNewRowFlag?: boolean;
     isChanged?: boolean;
+    /** 新增单元格字段 */
+    isAddCell?: boolean;
 }
 declare const RenderColumn: FC<Props>;
 export default RenderColumn;