@zat-design/sisyphus-react 3.9.2 → 3.9.3

package/.vscode/extensions.json

@@ -0,0 +1,5 @@
+{
+    "recommendations": [
+        "kisstkondoros.vscode-codemetrics"
+    ]
+}

package/dist/index.esm.css

@@ -1931,9 +1931,10 @@
 }
 .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell,
 .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell {
+  display: block;
   margin-left: -8px;
   padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
-  background: var(--zaui-contract-bg, #fffaa1) !important;
+  background-color: var(--zaui-contract-bg, #fffaa1) !important;
   border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container,
@@ -1942,6 +1943,20 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell,
+.pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell {
+  display: block;
+  margin-left: -8px;
+  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+  border-radius: var(--zaui-border-radius, 8px);
+}
+.pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container,
+.pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container,
 .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
   overflow: hidden;
@@ -2185,6 +2200,11 @@
 .ant-table .original-value-tooltip {
   position: fixed;
 }
+.ant-table .original-value-tooltip.ant-tooltip > ant-tooltip-content > ant-tooltip-inner {
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+}
 .pro-tooltip {
   cursor: pointer;
 }

package/dist/less.esm.css

@@ -1931,9 +1931,10 @@
 }
 .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell,
 .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .varied-cell {
+  display: block;
   margin-left: -8px;
   padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
-  background: var(--zaui-contract-bg, #fffaa1) !important;
+  background-color: var(--zaui-contract-bg, #fffaa1) !important;
   border-radius: var(--zaui-border-radius, 8px);
 }
 .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .varied-cell .pro-form-view-container,
@@ -1942,6 +1943,20 @@
   white-space: nowrap;
   text-overflow: ellipsis;
 }
+.pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell,
+.pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell {
+  display: block;
+  margin-left: -8px;
+  padding: var(--zaui-space-size-xs, 4px) var(--zaui-space-size-sm, 8px);
+  background-color: var(--zaui-contract-bg-add, #d2fff4) !important;
+  border-radius: var(--zaui-border-radius, 8px);
+}
+.pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container,
+.pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .add-cell .pro-form-view-container {
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
 .pro-table .ant-table table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container,
 .pro-table .ant-table.ant-table-scroll-horizontal table tbody.ant-table-tbody .ant-table-cell .ant-typography-ellipsis .pro-form-view-container {
   overflow: hidden;
@@ -2185,6 +2200,11 @@
 .ant-table .original-value-tooltip {
   position: fixed;
 }
+.ant-table .original-value-tooltip.ant-tooltip > ant-tooltip-content > ant-tooltip-inner {
+  width: -webkit-max-content;
+  width: -moz-max-content;
+  width: max-content;
+}
 .pro-tooltip {
   cursor: pointer;
 }

package/es/ProConfigProvider/index.js

@@ -2,7 +2,7 @@ import "antd/es/config-provider/style";
 import _ConfigProvider from "antd/es/config-provider";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import { jsxs as _jsxs, jsx as _jsx } from "react/jsx-runtime";
+import { jsx as _jsx } from "react/jsx-runtime";
 import React, { useContext, useEffect, useReducer } from 'react';
 import zhCN from 'antd/es/locale/zh_CN';
 import enUS from 'antd/es/locale/en_US';
@@ -105,8 +105,8 @@ export var ProConfigProvider = function ProConfigProvider(props) {
     },
     children: _jsx(_ConfigProvider, {
       locale: antdLangMap[lang],
-      children: _jsxs("div", {
-        children: [" ", props.children]
+      children: _jsx("div", {
+        children: props.children
       })
     })
   });

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

@@ -75,7 +75,8 @@ var RenderField = function RenderField(_ref) {
     _config$validateTrigg = config.validateTrigger,
     validateTrigger = _config$validateTrigg === void 0 ? ['onChange', 'onBlur', 'onSubmit'] : _config$validateTrigg,
     otherProps = config.otherProps,
-    diffConfig = config.diffConfig;
+    diffConfig = config.diffConfig,
+    getIsNew = config.getIsNew;
   var _fieldProps = fieldProps || formItemProps || {};
   var _rules = rules || [];
   var _required = required;
@@ -546,7 +547,7 @@ var RenderField = function RenderField(_ref) {
     var _componentProps;
     var FormItem = null;
     var FieldComponent = /*#__PURE__*/React.isValidElement(TargetComponent) ? (/*#__PURE__*/React.cloneElement(TargetComponent, componentProps)) : _jsx(TargetComponent, _objectSpread({}, componentProps));
-    if (originalValues) {
+    if (originalValues && !getIsNew(record)) {
       FieldComponent = _jsx(ListChangedWrapper, {
         name: cellName,
         names: names,

package/es/ProEditTable/index.js

@@ -2,7 +2,6 @@ import "antd/es/affix/style";
 import _Affix from "antd/es/affix";
 import _typeof from "@babel/runtime/helpers/esm/typeof";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import "antd/es/config-provider/style";
 import _ConfigProvider from "antd/es/config-provider";
@@ -13,7 +12,7 @@ import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutPr
 var _excluded = ["value", "onChange", "onDrag", "className", "columns", "type", "mode", "stripe", "draggable", "virtual", "disabled", "insertType", "emptyBtnText", "actionWidth", "actionProps", "toolbarProps", "toolbarSticky", "rowSelection", "onlyOneLineMsg", "deletePoConfirmMsg", "mulDeletePoConfirmMsg", "requiredAlign", "summary", "max", "headerRender", "pagination", "rowKey", "rowDisabled", "rowDraggable", "footerRender", "scroll", "actionDirection", "diffConfig"];
 import { jsx as _jsx, Fragment as _Fragment, jsxs as _jsxs } from "react/jsx-runtime";
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useRef } from 'react';
-import { get, isArray, isBoolean } from 'lodash';
+import { get, isArray, isBoolean, set } from 'lodash';
 import { useDeepCompareEffect, useLocalStorageState, useSetState } from 'ahooks';
 import classnames from 'classnames';
 import { transformColumns } from './utils';
@@ -127,17 +126,9 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     }
     return key;
   };
-  var IsNew = function IsNew(preArr, record) {
-    var _preArr$find;
-    if (!(preArr === null || preArr === void 0 ? void 0 : preArr.length)) {
-      return false;
-    }
-    return !(preArr === null || preArr === void 0 ? void 0 : (_preArr$find = preArr.find) === null || _preArr$find === void 0 ? void 0 : _preArr$find.call(preArr, function (item) {
-      return getRowKey(item) === getRowKey(record);
-    }));
-  };
   var originalValues = useMemo(function () {
     var _originalArr$every, _originalArr$some;
+    var nextOriginalValues;
     // 原始值也需要设置对应的rowkey，后续比对通过rowkey对比
     var originalArr = get(resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues, name);
     var isOriginalAllHasKey = originalArr ? originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$every = originalArr.every) === null || _originalArr$every === void 0 ? void 0 : _originalArr$every.call(originalArr, function (item) {
@@ -153,8 +144,22 @@ var ProEditTable = function ProEditTable(_ref, ref) {
         item.rowKey = getRowKey(item);
       });
     }
-    return (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) ? _defineProperty({}, name, originalArr) : undefined;
+    if (originalArr === null || originalArr === void 0 ? void 0 : originalArr.length) {
+      nextOriginalValues = {};
+      set(nextOriginalValues, name, originalArr);
+    }
+    return nextOriginalValues;
   }, [resetProps === null || resetProps === void 0 ? void 0 : resetProps.originalValues]);
+  var getIsNew = function getIsNew(record) {
+    var _originalArr$find;
+    var originalArr = get(originalValues, name);
+    if (!(originalArr === null || originalArr === void 0 ? void 0 : originalArr.length)) {
+      return false;
+    }
+    return !(originalArr === null || originalArr === void 0 ? void 0 : (_originalArr$find = originalArr.find) === null || _originalArr$find === void 0 ? void 0 : _originalArr$find.call(originalArr, function (item) {
+      return getRowKey(item) === getRowKey(record);
+    }));
+  };
   var config = _objectSpread({
     form: form,
     mode: mode,
@@ -188,14 +193,14 @@ var ProEditTable = function ProEditTable(_ref, ref) {
     prefixCls: prefixCls,
     rowDisabled: rowDisabled,
     actionDirection: actionDirection,
-    diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig)
+    diffConfig: _objectSpread(_objectSpread({}, resetProps === null || resetProps === void 0 ? void 0 : (_resetProps$otherProp = resetProps.otherProps) === null || _resetProps$otherProp === void 0 ? void 0 : _resetProps$otherProp.diffConfig), diffConfig),
+    getIsNew: getIsNew
   }, resetProps);
   // 编辑行设置下样式
   var _rowClassName = function _rowClassName(record) {
     var isEdit = !virtualKey || editingKeys.includes(record.rowKey);
     var className = isEdit ? 'is-editing' : '';
-    var originalArr = get(originalValues, name);
-    if (IsNew(originalArr, record)) {
+    if (getIsNew(record)) {
       return "is-new-row ".concat(className);
     }
     return className;

package/es/ProEnum/hooks/useEnum.js

@@ -22,6 +22,8 @@ function useEnum(codes, value, compose) {
     _ref3$clear = _ref3.clear,
     clear = _ref3$clear === void 0 ? true : _ref3$clear;
   var catchData = getEnumData(storage, cacheKey, baseEnumStorage);
+  // 默认枚举缓存数据
+  baseEnumStorage = catchData;
   if (!codes) {
     return catchData;
   }

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

@@ -13,11 +13,12 @@ var _excluded = ["label", "onClick", "onHandle", "type", "needConfirm", "confirm
   _excluded2 = ["onClick", "label"];
 import { createElement as _createElement } from "react";
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
-import { isFunction } from 'lodash';
+import { isFunction, omit } from 'lodash';
 import { useMemo } from 'react';
 import { CopyOutlined, DownSquareOutlined, PlusSquareOutlined, UpSquareOutlined } from '@ant-design/icons';
 import ProIcon from '../../../../../ProIcon';
 import locale from '../../../../../locale';
+var filterKeys = ['actionType'];
 var getDefaultActions = function getDefaultActions(mode) {
   var originActions = {
     add: {
@@ -42,9 +43,11 @@ var getDefaultActions = function getDefaultActions(mode) {
       label: "".concat(locale.ProForm.formListActions[1]),
       icon: mode === 'less' ? _jsx(ProIcon, {
         type: "solid-close",
-        className: "single-delete"
+        className: "single-delete",
+        buttonIcon: false
       }) : _jsx(ProIcon, {
-        type: "delete"
+        type: "delete",
+        buttonIcon: false
       })
     },
     copy: {
@@ -240,14 +243,14 @@ var ActionButton = function ActionButton(props) {
             handleClick(internalOnClick, _onClick, index, item);
           }
         }, _confirmProps), {}, {
-          children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+          children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), 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)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), rest), {}, {
+        }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, defaultRest), omit(rest, filterKeys)), {}, {
           type: "text",
           onClick: function onClick(e) {
             e.stopPropagation();
@@ -265,14 +268,14 @@ var ActionButton = function ActionButton(props) {
           return customClick(_onClick, index);
         }
       }, _confirmProps), {}, {
-        children: _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+        children: _jsx(_Button, _objectSpread(_objectSpread({}, 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__*/_createElement(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+      }), "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index)) : (/*#__PURE__*/_createElement(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
         key: "".concat(item === null || item === void 0 ? void 0 : item.type).concat(index),
         type: "text",
         onClick: function onClick(e) {

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

@@ -62,7 +62,8 @@ var LineFields = function LineFields(props) {
       ref: setActivatorNodeRef,
       children: _jsx(ProIcon, {
         className: "drag-icon",
-        type: "drag"
+        type: "drag",
+        buttonIcon: false
       })
     })), _jsx(_Row, {
       gutter: isLess ? 0 : 24,

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

@@ -10,8 +10,10 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 var _excluded = ["label", "onClick", "onHandle", "type"],
   _excluded2 = ["onClick", "label"];
 import { jsx as _jsx, Fragment as _Fragment } from "react/jsx-runtime";
+/* eslint-disable react/no-array-index-key */
+
 import { PlusOutlined } from '@ant-design/icons';
-import { isFunction } from 'lodash';
+import { isFunction, omit } from 'lodash';
 import { useMemo } from 'react';
 import locale from '../../../../../locale';
 var actions = {
@@ -27,6 +29,7 @@ var actions = {
 var defaultActionProps = [{
   type: 'add'
 }];
+var filterKeys = ['actionType'];
 var ToolbarButton = function ToolbarButton(props) {
   var namePath = props.namePath,
     form = props.form,
@@ -128,7 +131,7 @@ var ToolbarButton = function ToolbarButton(props) {
         if (max && max <= fields.length && type === 'add') {
           return false;
         }
-        return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), rest), {}, {
+        return _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({}, actions[type]), omit(rest, filterKeys)), {}, {
           type: "link",
           onClick: function onClick() {
             return handleClick(internalOnClick, _onClick, item);
@@ -136,7 +139,7 @@ var ToolbarButton = function ToolbarButton(props) {
           children: label || defaultLabel
         }), "".concat(type).concat(index));
       }
-      return _jsx(_Button, _objectSpread(_objectSpread({}, rest), {}, {
+      return _jsx(_Button, _objectSpread(_objectSpread({}, omit(rest, filterKeys)), {}, {
         type: "link",
         onClick: function onClick() {
           return customClick(_onClick2, item);

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

@@ -95,7 +95,7 @@ var FormList = function FormList(props, ref) {
       }),
       strategy: verticalListSortingStrategy,
       children: [_fields.map(function (field, index) {
-        var namePath = [].concat(_toConsumableArray(_namePath), [index]);
+        var namePath = [].concat(_toConsumableArray(_namePath), [field.name]);
         var _columns = processColumns(index, namePath);
         return mode === 'block' ? _jsx(BlockFields, _objectSpread(_objectSpread({}, props), {}, {
           columns: _columns,

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

@@ -13,7 +13,7 @@ import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/typography/style";
 import _Typography from "antd/es/typography";
-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"];
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState, memo, useMemo } from 'react';
 import { omit, find as _find } from 'lodash';
@@ -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 = _objectWithoutProperties(props, _excluded);
   var _ref3 = ProForm.useFieldProps() || {},
     isViewCon = _ref3.isView,
@@ -273,8 +274,11 @@ var ProCascader = function ProCascader(props) {
         filter: handlefilter,
         limit: 1000
       },
-      onChange: handleChange
-    }, omit(otherProps, 'otherProps'))), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {
+      onChange: handleChange,
+      getPopupContainer: function getPopupContainer(trigger) {
+        return scrollFollowParent ? trigger.parentElement : document.body;
+      }
+    }, omit(otherProps, ['otherProps', 'scrollFollowParent']))), hasDetail && (tooltip && disabled && detail ? _jsx(_Tooltip, {
       title: detail,
       children: _jsx("span", {
         className: "pro-address-detail",

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

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

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

@@ -13,6 +13,7 @@ import React, { useMemo } from 'react';
 import { diffOriginal } from '../../utils/diffOriginal';
 import { useProConfig } from '../../../ProConfigProvider';
 import { isEmpty } from '../../../utils';
+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,
@@ -98,6 +99,9 @@ var ChangedWrapper = function ChangedWrapper(props) {
     'pro-form-item-add': isAdd
   });
   var open = tipOpenCalc();
+  var scrollFollowParentConfig = componentsWithFloatWindow.includes(type) ? {
+    scrollFollowParent: scrollFollowParent
+  } : {};
   return _jsx(_Tooltip, {
     open: open,
     getPopupContainer: function getPopupContainer(trigger) {
@@ -115,8 +119,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
         children: ["\u521D\u59CB\u503C\uFF1A", tipContent]
       }), _showEllipse && _jsxs(_Space, {
         className: "current-value-container",
-        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
-          scrollFollowParent: scrollFollowParent,
+        children: ["\u5F53\u524D\u503C\uFF1A", /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
           isView: true
         })) : undefined]
       })]
@@ -124,8 +127,7 @@ var ChangedWrapper = function ChangedWrapper(props) {
     children: _jsx("div", {
       className: diffClassName,
       style: style,
-      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread({}, children.props), rest), {}, {
-        scrollFollowParent: scrollFollowParent,
+      children: /*#__PURE__*/React.isValidElement(children) ? /*#__PURE__*/React.cloneElement(children, _objectSpread(_objectSpread(_objectSpread(_objectSpread({}, children.props), rest), scrollFollowParentConfig), {}, {
         otherProps: _objectSpread(_objectSpread({}, (_children$props3 = children.props) === null || _children$props3 === void 0 ? void 0 : _children$props3.otherProps), {}, {
           isDiffChange: isChanged
         })

package/es/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) ? transformNames(_objectSpread(_objectSpread({}, 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, _objectSpread({}, isTrim(type, trim, useProConfig())), // 优先取传进来的，其次取ProConfigProvider配置的
   _objectSpread({}, isUpperCase(type, upperCase)), {
     validateFirst: true
+  },
+  // 当某一规则校验不通过时，是否停止剩下的规则的校验
+  {
+    disabled: lastDisabled
   });
   // 添加label宽度
   if (labelWidth) {
@@ -157,12 +167,6 @@ var Render = function Render(props) {
   }
   /** 移除多余参数，防止透传给formItem报错 */
   var _otherFormItemProps = 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/es/ProForm/index.js

@@ -16,7 +16,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { DoubleLeftOutlined } from '@ant-design/icons';
 import classnames from 'classnames';
 import React, { forwardRef, useImperativeHandle, useMemo } from 'react';
-import { isObject, merge } from 'lodash';
+import { isObject, merge, omit } from 'lodash';
 import { FormFooter, InputRange, ProAddress, ProCascader, ProCertNo, ProCertValidity, ProCombination, ProModalSelect, ProNumberRange, ProRangeBox, ProTimeLimit, transferAddressInfoToRegion, ProUpload, ProTreeModal, ProTree, EnumSelect } from './components';
 import RenderFields from './components/render/RenderFields';
 import { useProConfig, useContextForms } from '../ProConfigProvider';
@@ -91,12 +91,15 @@ var ProForm = function ProForm(props, ref) {
   useMemo(function () {
     if (formKey && forms[formKey] !== form) {
       forms[formKey] = form;
-      dispatch({
-        type: 'set',
-        payload: {
-          forms: _objectSpread({}, forms)
-        }
-      });
+      // fix:  Cannot update a component (`ProConfigProvider`) while rendering a different component (`ForwardRef(ProForm)`).
+      setTimeout(function () {
+        dispatch({
+          type: 'set',
+          payload: {
+            forms: _objectSpread({}, forms)
+          }
+        });
+      }, 300);
     }
     // 销毁
     return function () {
@@ -237,7 +240,7 @@ var ProForm = function ProForm(props, ref) {
     },
     className: cls,
     form: form
-  }, formProps), config), otherProps), {}, {
+  }, formProps), 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/es/ProForm/utils/diffOriginal.js

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

package/es/ProIcon/index.js

@@ -1,3 +1,5 @@
+import "antd/es/space/style";
+import _Space from "antd/es/space";
 import "antd/es/button/style";
 import _Button from "antd/es/button";
 import "antd/es/tooltip/style";
@@ -5,7 +7,7 @@ import _Tooltip from "antd/es/tooltip";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import _objectWithoutProperties from "@babel/runtime/helpers/esm/objectWithoutProperties";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
-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"];
 import { Fragment as _Fragment, jsx as _jsx } from "react/jsx-runtime";
 import { useLocalStorageState, useSetState, useDeepCompareLayoutEffect } from 'ahooks';
 import classNames from 'classnames';
@@ -50,6 +52,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 = _objectWithoutProperties(_config, _excluded);
   var _useSetState = useSetState({
       IconInstance: _jsx(_Fragment, {})
@@ -130,6 +134,25 @@ var ProIcon = function ProIcon(props) {
       height: size
     }, rotateStyle), style)
   };
+  var icon = !src ? _jsx("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
+    onClick: onClick,
+    "aria-hidden": "true",
+    children: _jsx("use", {
+      xlinkHref: "#icon-".concat(_type)
+    })
+  })) : _jsx(ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
+    // @ts-ignore
+    onClick: onClick,
+    "aria-hidden": "true",
+    src: src,
+    beforeInjection: function beforeInjection(svg) {
+      onBeforeInjection({
+        svg: svg,
+        actionMap: actionMap,
+        primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
+      });
+    }
+  }));
   var RenderIcon = _jsx("span", _objectSpread(_objectSpread({
     className: "anticon",
     style: {
@@ -138,7 +161,7 @@ var ProIcon = function ProIcon(props) {
   }, reset), {}, {
     children: _jsx(_Tooltip, {
       title: iconText,
-      children: _jsx(_Button, _objectSpread({
+      children: buttonIcon ? _jsx(_Button, _objectSpread({
         style: {
           width: size,
           height: size,
@@ -148,26 +171,20 @@ var ProIcon = function ProIcon(props) {
           verticalAlign: 'baseline'
         },
         type: "text",
-        icon: !src ? _jsx("svg", _objectSpread(_objectSpread({}, svgProps), {}, {
-          onClick: onClick,
-          "aria-hidden": "true",
-          children: _jsx("use", {
-            xlinkHref: "#icon-".concat(_type)
-          })
-        })) : _jsx(ReactSVG, _objectSpread(_objectSpread({}, svgProps), {}, {
-          // @ts-ignore
-          onClick: onClick,
-          "aria-hidden": "true",
-          src: src,
-          beforeInjection: function beforeInjection(svg) {
-            onBeforeInjection({
-              svg: svg,
-              actionMap: actionMap,
-              primaryColor: isQiankun ? qiankunPrimaryColor : primaryColor
-            });
-          }
-        }))
-      }, buttonProps))
+        icon: icon
+      }, buttonProps)) : _jsx(_Space, {
+        children: _jsx("span", {
+          style: {
+            width: size,
+            height: size,
+            border: 'none',
+            borderRadius: 0,
+            padding: 0,
+            verticalAlign: 'baseline'
+          },
+          children: icon
+        })
+      })
     })
   }));
   useEffect(function () {

package/es/ProIcon/propsTypes.d.ts

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