@zat-design/sisyphus-react 3.9.5 → 3.9.6-beta.2

package/es/ProLayout/components/ProHeader/index.js

@@ -2,29 +2,30 @@ import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import "antd/es/modal/style";
 import _Modal from "antd/es/modal";
 import _defineProperty from "@babel/runtime/helpers/esm/defineProperty";
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
 import "antd/es/breadcrumb/style";
 import _Breadcrumb from "antd/es/breadcrumb";
 import "antd/es/divider/style";
 import _Divider from "antd/es/divider";
+import "antd/es/tooltip/style";
+import _Tooltip from "antd/es/tooltip";
 import "antd/es/space/style";
 import _Space from "antd/es/space";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { jsx as _jsx, jsxs as _jsxs, Fragment as _Fragment } from "react/jsx-runtime";
 /* eslint-disable react/no-array-index-key */
 
-import { memo, useEffect, useState } from 'react';
+import { memo, useEffect, useState, useRef } from 'react';
 import { tools } from '@zat-design/utils';
 import classnames from 'classnames';
 import moment from 'moment';
-import { useToggle } from 'ahooks';
+import { useToggle, useSize } from 'ahooks';
 import { isFunction, isEmpty, isNumber, isString } from 'lodash';
 import { ReactSVG } from 'react-svg';
 import foldSvg from '../../../assets/arrow.svg';
 import { Copy, ProBackBtn } from './components';
 import getEnumLabel from '../../../ProEnum/utils/getEnumLabel';
 import locale from '../../../locale';
+import { checkDescribeItemsHidden } from './utils';
 var formatAmount = tools.formatAmount;
 var ProHeader = function ProHeader(props) {
   var _props$breadcrumbList = props.breadcrumbList,
@@ -64,6 +65,8 @@ var ProHeader = function ProHeader(props) {
     _useToggle2 = _slicedToArray(_useToggle, 2),
     fold = _useToggle2[0],
     toggle = _useToggle2[1].toggle;
+  var ref = useRef(null);
+  var size = useSize(ref);
   var _title = title;
   // 面包屑配置数据源
   var _breadcrumbColumns = breadcrumbColumns || breadcrumbList;
@@ -94,7 +97,11 @@ var ProHeader = function ProHeader(props) {
       return null;
     }
     return _jsx("ul", {
-      className: "pro-header-describe",
+      className: classnames({
+        'pro-header-describe': true,
+        'pro-header-describe-open': fold,
+        'pro-header-describe-hidden': !fold
+      }),
       children: describeData.map(function (item, index) {
         var value = item.value,
           copyable = item.copyable,
@@ -102,20 +109,20 @@ var ProHeader = function ProHeader(props) {
           show = _item$show === void 0 ? true : _item$show,
           tag = item.tag,
           label = item.label,
-          link = item.link;
+          link = item.link,
+          _item$items = item.items,
+          items = _item$items === void 0 ? [] : _item$items,
+          width = item.width;
         // show为false直接隐藏¸
         if (show === false || !show) {
           return null;
         }
         var onlyTag = tag && !label && !value;
-        var tagCls = classnames({
-          'pro-header-only-tag': onlyTag
-        });
-        var tagRender = function tagRender() {
-          if (Array.isArray(tag) && tag.length) {
+        var tagRender = function tagRender(parmas) {
+          if (Array.isArray(parmas === null || parmas === void 0 ? void 0 : parmas.tag) && (parmas === null || parmas === void 0 ? void 0 : parmas.tag.length)) {
             return _jsx(_Space, {
               size: 4,
-              children: tag.map(function (tagItem, index) {
+              children: parmas.tag.map(function (tagItem, index) {
                 return _jsx("div", {
                   className: "pro-header-tag",
                   children: tagItem
@@ -123,32 +130,91 @@ var ProHeader = function ProHeader(props) {
               })
             });
           }
-          return tag ? _jsx("div", {
+          return (parmas === null || parmas === void 0 ? void 0 : parmas.tag) ? _jsx("div", {
             className: "pro-header-tag",
-            children: tag
+            children: parmas === null || parmas === void 0 ? void 0 : parmas.tag
           }) : null;
         };
-        var valueRender = function valueRender() {
+        /** 单行渲染 */
+        var valueRender = function valueRender(parmas) {
           return _jsxs(_Space, {
             size: 4,
-            align: tag ? 'baseline' : 'center',
-            children: [link ? _jsx("a", {
-              href: link,
+            align: (parmas === null || parmas === void 0 ? void 0 : parmas.tag) ? 'baseline' : 'center',
+            children: [(parmas === null || parmas === void 0 ? void 0 : parmas.link) ? _jsx("a", {
+              href: parmas.link,
               rel: "noopener noreferrer",
               target: "_blank",
-              children: value
-            }) : value, copyable && isString(value) ? _jsx(Copy, {
-              text: value
-            }) : null, tagRender()]
+              children: parmas === null || parmas === void 0 ? void 0 : parmas.value
+            }) : parmas === null || parmas === void 0 ? void 0 : parmas.value, (parmas === null || parmas === void 0 ? void 0 : parmas.copyable) && isString(parmas === null || parmas === void 0 ? void 0 : parmas.value) ? _jsx(Copy, {
+              text: parmas.value
+            }) : null, tagRender({
+              tag: parmas === null || parmas === void 0 ? void 0 : parmas.tag
+            })]
           });
         };
-        return _jsxs("li", {
+        /** 多行渲染 */
+        var itemsRender = function itemsRender() {
+          // items配置是否超长，超长配置... + tip 提示
+          var itemsHidden = checkDescribeItemsHidden(ref === null || ref === void 0 ? void 0 : ref.current);
+          var result = _jsxs("div", {
+            ref: ref,
+            className: classnames({
+              'pro-header-describe-items': true,
+              'pro-header-describe-items-more': items.length >= 2
+            }),
+            children: [(items === null || items === void 0 ? void 0 : items.length) > 3 ? "\u5171".concat(items === null || items === void 0 ? void 0 : items.length, "\u4E2A\uFF0C") : null, items.map(function (item, index) {
+              return _jsxs("span", {
+                children: [valueRender(item), (items === null || items === void 0 ? void 0 : items.length) !== index + 1 ? ' 、' : null]
+              }, index);
+            }), itemsHidden ? _jsx("span", {
+              className: "pro-header-describe-items-omit",
+              children: "..."
+            }) : null]
+          });
+          if (itemsHidden) {
+            var tipResult = _jsx(_Fragment, {
+              children: items.map(function (item, index) {
+                return _jsx("p", {
+                  className: "pro-header-describe-items-tip-value",
+                  children: valueRender(item)
+                }, index);
+              })
+            });
+            return _jsx(_Tooltip, {
+              placement: "bottomLeft",
+              overlayClassName: "pro-header-describe-items-tip",
+              title: tipResult,
+              children: result
+            });
+          }
+          return result;
+        };
+        var tagCls = classnames({
+          'pro-header-only-tag': onlyTag,
+          'pro-header-describe-items-calc': isString(width) ? width.includes('calc') : false
+        });
+        return _jsx("li", {
           className: tagCls,
-          children: [label ? _jsx("span", {
-            children: label
-          }) : null, _jsx("span", {
-            children: valueRender()
-          })]
+          style: {
+            width: width
+          },
+          children: _jsxs(_Space, {
+            size: 4,
+            children: [label ? _jsx("span", {
+              className: "pro-header-describe-label",
+              children: label
+            }) : null, _jsx("span", {
+              className: "pro-header-describe-value",
+              children: (items === null || items === void 0 ? void 0 : items.length) ? itemsRender() : _jsx("span", {
+                children: valueRender({
+                  value: value,
+                  copyable: copyable,
+                  tag: tag,
+                  link: link
+                })
+              })
+            })]
+          })
         }, index);
       })
     });

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

@@ -3,7 +3,7 @@
 @import '../components/ProBackBtn/style/index';
 
 .pro-header {
-  padding: 16px 0 0 0 !important;
+  padding: 10px 0 0 0 !important;
   background-color: var(--zaui-base-bg, #ffffff);
   box-shadow: 2px 3px 8px 0px rgba(0, 55, 93, 0.1);
 
@@ -46,9 +46,49 @@
   }
 
   .pro-header-describe {
+    transition: height 0.2s ease-in-out;
     a {
       color: var(--zaui-link, #006aff);
     }
+    .pro-header-describe-items-calc{
+      position: relative;
+    }
+    &.pro-header-describe-hidden {
+      height: 0;
+      padding: 0;
+      overflow: hidden;
+      border: 0;
+    }
+    .@{ant-prefix}-space {
+      .pro-header-describe-label {
+        font-weight: normal;
+      }
+      .pro-header-describe-value{
+        font-weight: 600;
+        .@{ant-prefix}-space-item{
+          font-weight: 600;
+        }
+        .pro-header-describe-items{
+          span:first-child{
+            margin-right: 2px;
+          }
+          .pro-header-describe-items-omit{
+            position: absolute;
+            right: 0;
+            background: #fff;
+            letter-spacing: 2px;
+          }
+          &.pro-header-describe-items-more{
+            .pro-header-tag{
+              padding: 0;
+              background: transparent;
+              color: #333 ;
+            }
+
+          }
+        }
+      }
+    }
   }
 
   .pro-header-copy {
@@ -334,8 +374,10 @@
     font-size: var(--zaui-font-size, 14px);
 
     li {
-      margin-left: var(--zaui-space-card, 32px);
-
+      flex: 0 0 auto;
+      white-space: nowrap;
+      overflow: hidden;
+      text-overflow: ellipsis;
       &.pro-header-only-tag {
         margin-left: var(--zaui-space-size-sm, 8px);
 
@@ -344,9 +386,6 @@
         }
       }
 
-      &:first-child {
-        margin-left: 0;
-      }
 
       span {
         color: #0a0a0a;
@@ -369,6 +408,13 @@
   }
 }
 
+.pro-header-describe-items-tip{
+  max-width: 600px;
+  .pro-header-describe-items-tip-value{
+    margin-bottom: var(--zaui-space-size-sm, 8px);
+  }
+}
+
 @media (max-width: 1366px) {
   .pro-header-describe {
     li span:last-child {

package/es/ProLayout/components/ProHeader/utils/index.d.ts

@@ -0,0 +1,5 @@
+/**
+ * 检查描述dom是否部分隐藏
+ * @param ele  dom节点
+ */
+export declare const checkDescribeItemsHidden: (ele?: any) => boolean;

package/es/ProLayout/components/ProHeader/utils/index.js

@@ -0,0 +1,14 @@
+/**
+ * 检查描述dom是否部分隐藏
+ * @param ele  dom节点
+ */
+export var checkDescribeItemsHidden = function checkDescribeItemsHidden(ele) {
+  var childElement = ele;
+  if (!childElement) {
+    return false;
+  }
+  var element = childElement.parentNode.parentNode.parentNode.parentNode;
+  var itemsScrollWidth = element.scrollWidth;
+  var itemsClientWidth = element.clientWidth;
+  return itemsScrollWidth > itemsClientWidth;
+};

package/es/ProLayout/style/index.less

@@ -79,7 +79,7 @@
     // pro-header调整
     .pro-header{
       &.pro-header-no-describe{
-        padding: var(--zaui-space-size-md, 16px) !important;
+        padding: 10px var(--zaui-space-size-md, 16px) !important;
         .pro-header-top{
           padding-bottom: 0;
         }

package/es/ProSelect/index.js

@@ -296,7 +296,7 @@ export var ProSelect = function ProSelect(props, ref) {
       showArrow: true,
       loading: fetchFunction === null || fetchFunction === void 0 ? void 0 : fetchFunction.loading,
       onChange: handleChange,
-      optionLabelProp: (otherProps === null || otherProps === void 0 ? void 0 : otherProps.isDiffChange) ? 'label' : 'children',
+      // optionLabelProp={otherProps?.isDiffChange ? 'label' : 'children'} // 解决warning报错，添加默认值
       // optionLabelProp="label" // 解决warning报错，添加默认值
       showSearch: true,
       filterOption: isFunction(_onSearch) ? false : function (input, option) {

package/es/ProTreeModal/components/Trigger.js

@@ -52,6 +52,10 @@ function Trigger(props) {
       setState({
         mode: 'all'
       });
+    } else {
+      setState({
+        mode: 'appoint'
+      });
     }
   }, [checkAll]);
   var onIconClick = function onIconClick() {

package/es/index.d.ts

@@ -17,6 +17,7 @@ export { default as ProIcon } from './ProIcon';
 export { default as ProDownload } from './ProDownload';
 export { default as ProWaterMark } from './ProWaterMark';
 export { default as ProConfigProvider } from './ProConfigProvider';
+export { default as FormsProvider } from './FormsProvider';
 export { default as ProUpload } from './ProUpload';
 export { default as ProThemeTools } from './ProThemeTools';
 export { default as ProAction } from './ProAction';

package/es/index.js

@@ -22,6 +22,7 @@ export { default as ProIcon } from './ProIcon';
 export { default as ProDownload } from './ProDownload';
 export { default as ProWaterMark } from './ProWaterMark';
 export { default as ProConfigProvider } from './ProConfigProvider';
+export { default as FormsProvider } from './FormsProvider';
 export { default as ProUpload } from './ProUpload';
 export { default as ProThemeTools } from './ProThemeTools';
 export { default as ProAction } from './ProAction';

package/es/utils/index.d.ts

@@ -1,3 +1,6 @@
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 export declare const isEmpty: (value: any, emptyValue?: string) => boolean;
 export declare const useFocus: (element: Element) => boolean;

package/es/utils/index.js

@@ -1,7 +1,10 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 import { useEffect, useState } from 'react';
 var EMPTY_VALUE = [undefined, null, ''];
-/** 判断一个值是否是空值 */
+/**
+ * 判断一个值是否是空值
+ * 空值 或者 仅包含空值的数组视为空
+ */
 export var isEmpty = function isEmpty(value, emptyValue) {
   if (emptyValue) {
     EMPTY_VALUE.push(emptyValue);

package/lib/FormsProvider/index.d.ts

@@ -0,0 +1,15 @@
+import React from 'react';
+import { ModifiedFormInstance } from '../ProForm/utils/useForm';
+type Forms = Record<string, ModifiedFormInstance<any>>;
+export declare const FormsContext: React.Context<Forms>;
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+export declare const useForms: () => Forms;
+/** 获取所有表单实例 */
+export declare const useContextForms: () => Forms;
+declare const FormsProvider: React.FC;
+export default FormsProvider;

package/lib/FormsProvider/index.js

@@ -0,0 +1,39 @@
+"use strict";
+
+var _interopRequireWildcard = require("@babel/runtime/helpers/interopRequireWildcard").default;
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+exports.useForms = exports.useContextForms = exports.default = exports.FormsContext = void 0;
+var _jsxRuntime = require("react/jsx-runtime");
+var _react = _interopRequireWildcard(require("react"));
+var FormsContext = exports.FormsContext = /*#__PURE__*/_react.default.createContext({});
+/**
+ * @param formKey 表单实例key
+ * @param formIst form实例, 如果传了会把传入的实例存入全局
+ * @returns 没有入参: 返回表单实例但是不存入全局
+ *          有formKey: 取全局中的表单实例返回, 如果不存在则创建后返回
+ */
+var useForms = exports.useForms = function useForms() {
+  var forms = (0, _react.useContext)(FormsContext);
+  return forms;
+};
+/** 获取所有表单实例 */
+var useContextForms = exports.useContextForms = function useContextForms() {
+  var forms = (0, _react.useContext)(FormsContext);
+  return forms;
+};
+var FormsProvider = function FormsProvider(props) {
+  var formsRef = (0, _react.useRef)({});
+  (0, _react.useEffect)(function () {
+    // 销毁
+    return function () {
+      formsRef.current = {};
+    };
+  }, []);
+  return (0, _jsxRuntime.jsx)(FormsContext.Provider, {
+    value: formsRef.current,
+    children: props.children
+  });
+};
+var _default = exports.default = FormsProvider;

package/lib/ProConfigProvider/index.d.ts

@@ -20,7 +20,6 @@ interface ConfigContext {
 export declare const ProConfigContext: React.Context<ConfigContext>;
 export declare function useProConfig(): ConfigContext;
 export declare function useProConfig(name: keyof ConfigContext['state']): ConfigContext['state'][keyof ConfigContext['state']];
-export declare function useContextForms(): Record<string, FormInstance<any>>;
 type ActionsType = 'set' | 'setProEnum' | 'setProEnumDic' | 'setWithLocal';
 interface Actions {
     type: ActionsType;

package/lib/ProConfigProvider/index.js

@@ -6,7 +6,6 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProConfigProvider = exports.ProConfigContext = void 0;
-exports.useContextForms = useContextForms;
 exports.useProConfig = useProConfig;
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
@@ -44,11 +43,6 @@ function useProConfig(name) {
   var config = (0, _react.useContext)(ProConfigContext);
   return name ? config.state[name] : config;
 }
-function useContextForms() {
-  var _config$state;
-  var config = (0, _react.useContext)(ProConfigContext);
-  return (_config$state = config.state) === null || _config$state === void 0 ? void 0 : _config$state.forms;
-}
 var antdLangMap = {
   'zh-CN': _zh_CN.default,
   'en-US': _en_US.default // en-US

package/lib/ProEditTable/utils/diffOriginal.js

@@ -52,14 +52,17 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
     return 'add';
   }
   if (Array.isArray(_originalValue)) {
-    var isSame = _originalValue.every(function (valueItem, index) {
-      // 如果两个值有一个不是空值, 则进行深比较
-      if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
-        return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
-      }
-      return true;
-    });
-    return isSame ? 'same' : 'changed';
+    if ((_originalValue === null || _originalValue === void 0 ? void 0 : _originalValue.length) === (_value === null || _value === void 0 ? void 0 : _value.length)) {
+      var isSame = _originalValue.every(function (valueItem, index) {
+        // 如果两个值有一个不是空值, 则进行深比较
+        if (!isEmpty(value === null || value === void 0 ? void 0 : value[index]) || !isEmpty(valueItem)) {
+          return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
+        }
+        return true;
+      });
+      return isSame ? 'same' : 'changed';
+    }
+    return 'changed';
   }
   if (!isEmpty(_originalValue) || !isEmpty(_value)) {
     return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';

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

@@ -409,7 +409,10 @@ var Render = function Render(props) {
     if (type === 'FormList') {
       lastComponentProps.disabled = lastDisabled;
       var lessMode = lastComponentProps.mode === 'less';
-      child = (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
+      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
+        span: lessMode ? colProps.span : 24 // 默认占一行
+      });
+      return (0, _jsxRuntime.jsx)(_antd.Form.List, (0, _objectSpread2.default)((0, _objectSpread2.default)({
         name: _otherFormItemProps.name
       }, (0, _lodash.omit)(_otherFormItemProps, ['rules'])), {}, {
         children: function children(fields, operation, meta) {
@@ -421,9 +424,6 @@ var Render = function Render(props) {
           }));
         }
       }));
-      colProps = (0, _objectSpread2.default)((0, _objectSpread2.default)({}, colProps), {}, {
-        span: lessMode ? colProps.span : 24 // 默认占一行
-      });
     }
     //  默认占据一行
     if (['ProCollapse', 'Container'].includes(type)) {

package/lib/ProForm/index.js

@@ -6,9 +6,9 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.default = exports.ProFormProvider = void 0;
+var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _defineProperty2 = _interopRequireDefault(require("@babel/runtime/helpers/defineProperty"));
 var _toConsumableArray2 = _interopRequireDefault(require("@babel/runtime/helpers/toConsumableArray"));
-var _objectSpread2 = _interopRequireDefault(require("@babel/runtime/helpers/objectSpread2"));
 var _slicedToArray2 = _interopRequireDefault(require("@babel/runtime/helpers/slicedToArray"));
 var _objectWithoutProperties2 = _interopRequireDefault(require("@babel/runtime/helpers/objectWithoutProperties"));
 var _jsxRuntime = require("react/jsx-runtime");
@@ -25,9 +25,10 @@ var _useForm3 = require("./utils/useForm");
 var _useFieldProps = require("./utils/useFieldProps");
 var _locale = _interopRequireDefault(require("../locale"));
 var _useWatch = _interopRequireDefault(require("./utils/useWatch"));
+var _FormsProvider = _interopRequireWildcard(require("../FormsProvider"));
 var _excluded = ["mode", "span", "disabled", "isView", "columns", "footer", "onOk", "okText", "onCancel", "confirmLoading", "cancelText", "form", "children", "rowProps", "className", "expand", "expandOpen", "expandOpenChange", "viewEmpty", "labelAlign", "labelWidth", "onValuesChange", "onFinish", "diffConfig", "submitOnEnter", "clearNotShow", "initialValues", "requiredOnView", "formId", "required", "formKey", "globalControl", "scrollToError", "optimize"];
 var ProForm = function ProForm(props, ref) {
-  var _forms$formKey, _localStorage, _ref;
+  var _localStorage, _ref;
   var _props$mode = props.mode,
     mode = _props$mode === void 0 ? 'search' : _props$mode,
     span = props.span,
@@ -70,14 +71,11 @@ var ProForm = function ProForm(props, ref) {
     _props$optimize = props.optimize,
     optimize = _props$optimize === void 0 ? false : _props$optimize,
     otherProps = (0, _objectWithoutProperties2.default)(props, _excluded);
-  var _useProConfig = (0, _ProConfigProvider.useProConfig)(),
-    state = _useProConfig.state,
-    dispatch = _useProConfig.dispatch;
-  var config = state.ProForm,
-    forms = state.forms;
-  var _useForm = (0, _useForm3.useForm)((_forms$formKey = forms[formKey]) !== null && _forms$formKey !== void 0 ? _forms$formKey : originForm, {
+  var config = (0, _ProConfigProvider.useProConfig)('ProForm');
+  var _useForm = (0, _useForm3.useForm)(originForm, {
       scrollToError: scrollToError,
-      optimize: optimize
+      optimize: optimize,
+      formKey: formKey
     }),
     _useForm2 = (0, _slicedToArray2.default)(_useForm, 1),
     form = _useForm2[0];
@@ -88,33 +86,6 @@ var ProForm = function ProForm(props, ref) {
     _useControlled2 = (0, _slicedToArray2.default)(_useControlled, 2),
     openState = _useControlled2[0],
     setOpenState = _useControlled2[1];
-  // 把表单实例存入表单组
-  (0, _react.useMemo)(function () {
-    if (formKey && forms[formKey] !== form) {
-      forms[formKey] = form;
-      // 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 () {
-      if (formKey && forms[formKey]) {
-        delete forms[formKey];
-        dispatch({
-          type: 'set',
-          payload: {
-            forms: (0, _objectSpread2.default)({}, forms)
-          }
-        });
-      }
-    };
-  }, [formKey, form]);
   var _getLayout = (0, _index.getLayout)({
       span: span,
       form: form
@@ -311,7 +282,10 @@ var ProFormProvider = exports.ProFormProvider = function ProFormProvider(props)
 };
 ProFormForward.Provider = ProFormProvider; // 包装Provider
 ProFormForward.useFieldProps = _useFieldProps.useFieldProps; // 获取每个字段的其他参数  -otherProps
-ProFormForward.useContextForms = _ProConfigProvider.useContextForms; // 获取 ProConfigProvider中的表单实例map
+// 表单实例共享
+ProFormForward.FormsProvider = _FormsProvider.default; // 表单实例共享Provider
+ProFormForward.useForms = _FormsProvider.useForms; // 获取上下文中的共享的表单实例map
+ProFormForward.useContextForms = _FormsProvider.useContextForms; // 获取上下文中的共享的表单实例map
 // 内置组合
 ProFormForward.ProCascader = _components.ProCascader;
 ProFormForward.ProCombination = _components.ProCombination;

package/lib/ProForm/style/index.less

@@ -495,6 +495,7 @@
 
 .original-value-tooltip{
   width: max-content;
+  max-width: 100%;
   .changed-tooltip {
     .original-value-container {
       .ant-space-item:nth-child(1) {

package/lib/ProForm/utils/diffOriginal.js

@@ -9,7 +9,13 @@ var _utils = require("../../utils");
 // 过滤对象中undefined字段
 // 防止{a: '1'} {a: '1', b: undefined | null}被认为不相等
 var filterObject = function filterObject(data) {
-  if (!(0, _lodash.isObject)(data) || Array.isArray(data) || data === null) return data;
+  if (!(0, _lodash.isObject)(data) || data === null) return data;
+  // ['1', undefined] ['1', ''] 视为相等
+  if (Array.isArray(data)) {
+    return data.map(function (item) {
+      return (0, _utils.isEmpty)(item) ? null : item;
+    });
+  }
   var resData = {};
   Object.keys(data).forEach(function (key) {
     if (!(0, _utils.isEmpty)(data[key])) {
@@ -37,22 +43,11 @@ var diffOriginal = exports.diffOriginal = function diffOriginal(params) {
   }
   var _value = filterObject(value);
   var _originalValue = filterObject(originalValue);
-  // 如果原始值为空 且当前有值的话 认为变更类型是新增
-  if ((0, _utils.isEmpty)(_originalValue) && !(0, _utils.isEmpty)(_value)) {
-    return 'add';
-  }
-  if (Array.isArray(_originalValue)) {
-    var isSame = _originalValue.every(function (valueItem, index) {
-      // 如果两个值有一个不是空值, 则进行深比较
-      if (!(0, _utils.isEmpty)(value === null || value === void 0 ? void 0 : value[index]) || !(0, _utils.isEmpty)(valueItem)) {
-        return (0, _lodash.isEqual)(value === null || value === void 0 ? void 0 : value[index], valueItem);
-      }
-      return true;
-    });
-    return isSame ? 'same' : 'changed';
-  }
-  if (!(0, _utils.isEmpty)(_originalValue) || !(0, _utils.isEmpty)(_value)) {
-    return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
-  }
-  return 'same';
+  var isEmptyVal = (0, _utils.isEmpty)(_value);
+  var isEmptyOrg = (0, _utils.isEmpty)(_originalValue);
+  // 都为空视为相等
+  if (isEmptyOrg && isEmptyVal) return 'same';
+  // 如果原始值为空 且当前有值的话 视为新增
+  if (isEmptyOrg && !isEmptyVal) return 'add';
+  return (0, _lodash.isEqual)(_value, _originalValue) ? 'same' : 'changed';
 };