@zat-design/sisyphus-react 3.13.13-beta.6 → 4.0.0-beta.2

package/es/ProForm/utils/index.js

@@ -6,10 +6,9 @@ import _isNaN from "lodash/isNaN";
 import _omit from "lodash/omit";
 import _set from "lodash/set";
 import _get from "lodash/get";
-import _isFunction from "lodash/isFunction";
 import _isObject from "lodash/isObject";
-import React, { useState } from 'react';
-import moment from 'moment';
+import dayjs from 'dayjs';
+import { useState } from 'react';
 export var getLayout = function getLayout(params) {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -62,7 +61,7 @@ export var isTrim = function isTrim(type, trim, configData) {
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
   var _trim = trim || (state === null || state === void 0 ? void 0 : (_state$type = state[type]) === null || _state$type === void 0 ? void 0 : _state$type.trim);
-  if (['Input', 'ProCombination'].includes(type) && _trim) {
+  if (['Input'].includes(type) && _trim) {
     result.getValueFromEvent = function (event) {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -83,7 +82,7 @@ export var isTrim = function isTrim(type, trim, configData) {
  */
 export var isUpperCase = function isUpperCase(type, upperCase) {
   var result = {};
-  if (['Input', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input'].includes(type) && upperCase) {
     result.getValueFromEvent = function (event) {
       var _event$target, _event$target$value2;
       if (Array.isArray(event)) {
@@ -130,8 +129,8 @@ var _filterInternalFields = function filterInternalFields(values, optimize) {
     return values;
   }
   var nextValues = values;
-  // fix: braft-editor对象不可遍历 Moment不过滤
-  if ((values === null || values === void 0 ? void 0 : values._immutable) || moment.isMoment(values)) {
+  // fix: braft-editor对象不可遍历 Dayjs不过滤
+  if ((values === null || values === void 0 ? void 0 : values._immutable) || dayjs.isDayjs(values)) {
     return nextValues;
   }
   if (values instanceof File) {
@@ -285,10 +284,6 @@ export function initialValuesToNames() {
         values[key] = formInitialValue;
       }
     }
-    // 给FormList默认增加一行
-    if (item.type === 'FormList' && !item.initialValue && !_get(values, item.name)) {
-      item.initialValue = [{}];
-    }
   });
   return values;
 }
@@ -302,12 +297,6 @@ export function getArrayBeforeNumber(arr) {
   });
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
-// 自定义深比对 如果两边都是函数类型则认为相等
-export var customEqualForFun = function customEqualForFun(value, other) {
-  if (_isFunction(value) && _isFunction(other) || /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
-    return true;
-  }
-};
 /**
  * 查询数据中是否包含rowKey
  */
@@ -456,4 +445,60 @@ export function findNamesKeyInArray(arr, key) {
     _iterator.f();
   }
   return null;
-}
+}
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export var mergeNames = function mergeNames(data1, data2) {
+  // 步骤 1: 将 data1 的最后一个元素存入 Set 以便快速查找
+  var baseFields = new Set(data1.map(function (item) {
+    return item[item.length - 1];
+  }));
+  var finalResult = [];
+  var coveredFields = new Set();
+  // 步骤 2 & 3: 处理 data2，找出有效的合并项
+  data2.forEach(function (item) {
+    // 确保数组有可处理的合并字段，并且该字段是字符串类型
+    var combinedField = item[item.length - 1];
+    if (item.length < 3 || typeof combinedField !== 'string') {
+      return;
+    }
+    var subFields = combinedField.split('-');
+    // 检查所有子字段是否都存在于 baseFields 中
+    var allFieldsValid = subFields.every(function (field) {
+      return baseFields.has(field);
+    });
+    // 步骤 4: 如果有效，则添加到结果中，并记录已覆盖的字段
+    if (allFieldsValid) {
+      finalResult.push(item);
+      subFields.forEach(function (field) {
+        return coveredFields.add(field);
+      });
+    }
+  });
+  // 步骤 5: 处理 data1，添加未被覆盖的字段
+  data1.forEach(function (item) {
+    var field = item[item.length - 1];
+    if (!coveredFields.has(field)) {
+      finalResult.push(item);
+    }
+  });
+  return finalResult;
+};
+/**
+ * 是否 formlist或者pro-edit-table 场景
+ * 使用正则表达式判断一个由逗号分隔的字符串中，是否包含一个纯数字的片段。
+ * @param {string} str - 输入的字符串。
+ * @returns {boolean} - 如果匹配成功，返回 true；否则返回 false。
+ */
+export var isListForm = function isListForm(str) {
+  if (!str) {
+    return false;
+  }
+  // 正则表达式：查找被逗号或字符串边界包围的数字
+  var regex = /(?:^|,)\s*\d+\s*(?:,|$)/;
+  return regex.test(str);
+};

package/es/ProForm/utils/useDeepCompareMemo.js

@@ -1,11 +1,11 @@
 import _isEqualWith from "lodash/isEqualWith";
 import { useRef } from 'react';
-import { customEqualForFun } from '.';
+import { customEqualForFunction } from '../../utils';
 /** 深度比较依赖变化memo */
 export var useDeepCompareMemo = function useDeepCompareMemo(fun, changedCb, depList) {
-  var lastDependency = useRef(); // 上一次的依赖
-  var lastRes = useRef(); // 上一次的结果
-  if (!_isEqualWith(depList, lastDependency.current, customEqualForFun)) {
+  var lastDependency = useRef({}); // 上一次的依赖
+  var lastRes = useRef({}); // 上一次的结果
+  if (!_isEqualWith(depList, lastDependency === null || lastDependency === void 0 ? void 0 : lastDependency.current, customEqualForFunction)) {
     var res = fun();
     changedCb === null || changedCb === void 0 ? void 0 : changedCb(lastRes.current, res);
     lastRes.current = res;

package/es/ProForm/utils/useForm.js

@@ -1,13 +1,13 @@
-import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 import _toConsumableArray from "@babel/runtime/helpers/esm/toConsumableArray";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIteratorHelper";
 import _asyncToGenerator from "@babel/runtime/helpers/esm/asyncToGenerator";
-import "antd/es/form/style";
-import _Form from "antd/es/form";
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
+function _regenerator() { /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/babel/babel/blob/main/packages/babel-helpers/LICENSE */ var e, t, r = "function" == typeof Symbol ? Symbol : {}, n = r.iterator || "@@iterator", o = r.toStringTag || "@@toStringTag"; function i(r, n, o, i) { var c = n && n.prototype instanceof Generator ? n : Generator, u = Object.create(c.prototype); return _regeneratorDefine2(u, "_invoke", function (r, n, o) { var i, c, u, f = 0, p = o || [], y = !1, G = { p: 0, n: 0, v: e, a: d, f: d.bind(e, 4), d: function d(t, r) { return i = t, c = 0, u = e, G.n = r, a; } }; function d(r, n) { for (c = r, u = n, t = 0; !y && f && !o && t < p.length; t++) { var o, i = p[t], d = G.p, l = i[2]; r > 3 ? (o = l === n) && (u = i[(c = i[4]) ? 5 : (c = 3, 3)], i[4] = i[5] = e) : i[0] <= d && ((o = r < 2 && d < i[1]) ? (c = 0, G.v = n, G.n = i[1]) : d < l && (o = r < 3 || i[0] > n || n > l) && (i[4] = r, i[5] = n, G.n = l, c = 0)); } if (o || r > 1) return a; throw y = !0, n; } return function (o, p, l) { if (f > 1) throw TypeError("Generator is already running"); for (y && 1 === p && d(p, l), c = p, u = l; (t = c < 2 ? e : u) || !y;) { i || (c ? c < 3 ? (c > 1 && (G.n = -1), d(c, u)) : G.n = u : G.v = u); try { if (f = 2, i) { if (c || (o = "next"), t = i[o]) { if (!(t = t.call(i, u))) throw TypeError("iterator result is not an object"); if (!t.done) return t; u = t.value, c < 2 && (c = 0); } else 1 === c && (t = i.return) && t.call(i), c < 2 && (u = TypeError("The iterator does not provide a '" + o + "' method"), c = 1); i = e; } else if ((t = (y = G.n < 0) ? u : r.call(n, G)) !== a) break; } catch (t) { i = e, c = 1, u = t; } finally { f = 1; } } return { value: t, done: y }; }; }(r, o, i), !0), u; } var a = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} t = Object.getPrototypeOf; var c = [][n] ? t(t([][n]())) : (_regeneratorDefine2(t = {}, n, function () { return this; }), t), u = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(c); function f(e) { return Object.setPrototypeOf ? Object.setPrototypeOf(e, GeneratorFunctionPrototype) : (e.__proto__ = GeneratorFunctionPrototype, _regeneratorDefine2(e, o, "GeneratorFunction")), e.prototype = Object.create(u), e; } return GeneratorFunction.prototype = GeneratorFunctionPrototype, _regeneratorDefine2(u, "constructor", GeneratorFunctionPrototype), _regeneratorDefine2(GeneratorFunctionPrototype, "constructor", GeneratorFunction), GeneratorFunction.displayName = "GeneratorFunction", _regeneratorDefine2(GeneratorFunctionPrototype, o, "GeneratorFunction"), _regeneratorDefine2(u), _regeneratorDefine2(u, o, "Generator"), _regeneratorDefine2(u, n, function () { return this; }), _regeneratorDefine2(u, "toString", function () { return "[object Generator]"; }), (_regenerator = function _regenerator() { return { w: i, m: f }; })(); }
+function _regeneratorDefine2(e, r, n, t) { var i = Object.defineProperty; try { i({}, "", {}); } catch (e) { i = 0; } _regeneratorDefine2 = function _regeneratorDefine(e, r, n, t) { if (r) i ? i(e, r, { value: n, enumerable: !t, configurable: !t, writable: !t }) : e[r] = n;else { var o = function o(r, n) { _regeneratorDefine2(e, r, function (e) { return this._invoke(r, n, e); }); }; o("next", 0), o("throw", 1), o("return", 2); } }, _regeneratorDefine2(e, r, n, t); }
+import { Form } from 'antd';
 import { useContext } from 'react';
-import { filterInternalFields, getFormFieldPaths } from './index';
+import { filterInternalFields, getFormFieldPaths, mergeNames, isListForm } from './index';
 import { handleScrollToError as handleScrollToErrorProEditTable } from '../../ProEditTable/utils/tools';
 import { FormsContext } from '../../FormsProvider';
 export var useForm = function useForm(originForm, options) {
@@ -25,7 +25,7 @@ export var useForm = function useForm(originForm, options) {
     source = _ref.source;
   // formKey全局共享逻辑
   var forms = useContext(FormsContext);
-  var _Form$useForm = _Form.useForm(forms[formKey] || _originForm),
+  var _Form$useForm = Form.useForm(forms[formKey] || _originForm),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
     form = _Form$useForm2[0];
   if (formKey && forms[formKey] !== form) {
@@ -40,7 +40,7 @@ export var useForm = function useForm(originForm, options) {
     setFieldsValue = form.setFieldsValue;
   if (isModified) return [form];
   // @ts-ignore
-  var _getFieldsValue = function _getFieldsValue(nameList, filterFunc) {
+  var nextGetFieldsValue = function nextGetFieldsValue(nameList, filterFunc) {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
@@ -48,8 +48,8 @@ export var useForm = function useForm(originForm, options) {
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  var _validateFields = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
+  var nextValidateFields = /*#__PURE__*/function () {
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regenerator().m(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
         _len,
@@ -68,104 +68,115 @@ export var useForm = function useForm(originForm, options) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        fieldsNames,
         _document,
         tablePagination,
         _tablePagination$clic,
         _error$errorFields2,
         _error$errorFields$2,
-        _args = arguments;
-      return _regeneratorRuntime().wrap(function _callee$(_context) {
-        while (1) switch (_context.prev = _context.next) {
+        _args = arguments,
+        _t,
+        _t2,
+        _t3;
+      return _regenerator().w(function (_context) {
+        while (1) switch (_context.p = _context.n) {
           case 0:
-            _context.prev = 0;
+            _context.p = 0;
             for (_len = _args.length, rest = new Array(_len > 1 ? _len - 1 : 0), _key = 1; _key < _len; _key++) {
               rest[_key - 1] = _args[_key];
             }
             isRecursive = rest === null || rest === void 0 ? void 0 : (_rest$ = rest[0]) === null || _rest$ === void 0 ? void 0 : _rest$.recursive;
             stopOnFirstError = form === null || form === void 0 ? void 0 : (_form$__INTERNAL_CONF = form.__INTERNAL_CONFIG__) === null || _form$__INTERNAL_CONF === void 0 ? void 0 : _form$__INTERNAL_CONF.stopOnFirstError; // 如果启用了 stopOnFirstError 且没有指定字段列表
             if (!(stopOnFirstError && !nameList)) {
-              _context.next = 33;
+              _context.n = 11;
               break;
             }
             // 获取所有表单字段
             allFields = getFormFieldPaths(form); // 单独验证每个字段
             // eslint-disable-next-line no-restricted-syntax
             _iterator = _createForOfIteratorHelper(allFields);
-            _context.prev = 7;
+            _context.p = 1;
             _iterator.s();
-          case 9:
+          case 2:
             if ((_step = _iterator.n()).done) {
-              _context.next = 24;
+              _context.n = 7;
               break;
             }
             field = _step.value;
-            _context.prev = 11;
+            _context.p = 3;
             // 创建不包含 stopOnFirstError 的选项
             // @ts-ignore
             _options2 = (rest === null || rest === void 0 ? void 0 : rest[0]) ? _objectSpread({}, rest[0]) : {};
             delete _options2.stopOnFirstError;
             // 验证单个字段
             // eslint-disable-next-line no-await-in-loop
-            _context.next = 16;
+            _context.n = 4;
             return validateFields([field], _options2);
-          case 16:
-            _context.next = 22;
+          case 4:
+            _context.n = 6;
             break;
-          case 18:
-            _context.prev = 18;
-            _context.t0 = _context["catch"](11);
+          case 5:
+            _context.p = 5;
+            _t = _context.v;
             // 遇到错误，滚动到错误位置
-            if (scrollToError && (_context.t0 === null || _context.t0 === void 0 ? void 0 : (_error$errorFields = _context.t0.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
-              form.scrollToField((_error$errorFields$ = _context.t0.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
+            if (scrollToError && (_t === null || _t === void 0 ? void 0 : (_error$errorFields = _t.errorFields) === null || _error$errorFields === void 0 ? void 0 : _error$errorFields.length)) {
+              form.scrollToField((_error$errorFields$ = _t.errorFields[0]) === null || _error$errorFields$ === void 0 ? void 0 : _error$errorFields$.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             // 中止验证，抛出错误
-            throw _context.t0;
-          case 22:
-            _context.next = 9;
+            throw _t;
+          case 6:
+            _context.n = 2;
             break;
-          case 24:
-            _context.next = 29;
+          case 7:
+            _context.n = 9;
             break;
-          case 26:
-            _context.prev = 26;
-            _context.t1 = _context["catch"](7);
-            _iterator.e(_context.t1);
-          case 29:
-            _context.prev = 29;
+          case 8:
+            _context.p = 8;
+            _t2 = _context.v;
+            _iterator.e(_t2);
+          case 9:
+            _context.p = 9;
             _iterator.f();
-            return _context.finish(29);
-          case 32:
-            return _context.abrupt("return", form.getFieldsValue());
-          case 33:
+            return _context.f(9);
+          case 10:
+            return _context.a(2, form.getFieldsValue());
+          case 11:
             validateNames = []; // 前缀校验模式
             if (!isRecursive) {
-              _context.next = 42;
+              _context.n = 13;
               break;
             }
             // @ts-ignore
             _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
-            fieldsList = getFields();
-            fieldsList.forEach(function (item) {
-              var _item$name, _item$name2, _item$name2$;
-              if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || ((_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : (_item$name2$ = _item$name2[0]) === null || _item$name2$ === void 0 ? void 0 : _item$name2$.startsWith("".concat(nameList[0], "_")))) {
-                validateNames.push(item.name);
-              }
-            });
+            fieldsList = getFields(); // formList& proEditTable 特殊处理
+            if (Array.isArray(nameList) && isListForm(String(nameList))) {
+              fieldsNames = fieldsList.map(function (item) {
+                return item.name;
+              });
+              validateNames = mergeNames(nameList, fieldsNames);
+            } else {
+              // 其他情况
+              fieldsList.forEach(function (item) {
+                var _item$name, _item$name2, _item$name2$;
+                if (nameList[0] === ((_item$name = item.name) === null || _item$name === void 0 ? void 0 : _item$name[0]) || ((_item$name2 = item.name) === null || _item$name2 === void 0 ? void 0 : (_item$name2$ = _item$name2[0]) === null || _item$name2$ === void 0 ? void 0 : _item$name2$.startsWith("".concat(nameList[0], "_")))) {
+                  validateNames.push(item.name);
+                }
+              });
+            }
             if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
               validateNames = _toConsumableArray(nameList);
             }
             // @ts-ignore
-            // delete rest[0].recursive;
-            _context.next = 41;
+            _context.n = 12;
             return validateFields.apply(void 0, [validateNames].concat(rest)).then(function (values) {
               return filterInternalFields(values, optimize);
             });
-          case 41:
-            return _context.abrupt("return", _context.sent);
-          case 42:
+          case 12:
+            return _context.a(2, _context.v);
+          case 13:
             // 解决，单个pro-edit-table的表单校验
             if ((nameList === null || nameList === void 0 ? void 0 : nameList.length) && !nameList.join('-').includes(',')) {
               tablePagination = document && ((_document = document) === null || _document === void 0 ? void 0 : _document.querySelector("#pro-edit-table-pagination-".concat(nameList.join('-'))));
@@ -173,34 +184,33 @@ export var useForm = function useForm(originForm, options) {
                 tablePagination === null || tablePagination === void 0 ? void 0 : (_tablePagination$clic = tablePagination.click) === null || _tablePagination$clic === void 0 ? void 0 : _tablePagination$clic.call(tablePagination);
               }
             }
-            _context.next = 45;
+            _context.n = 14;
             return validateFields.apply(void 0, [nameList].concat(rest)).then(function (values) {
-              return nameList ? values : _getFieldsValue();
+              return nameList ? values : nextGetFieldsValue();
             });
-          case 45:
-            return _context.abrupt("return", _context.sent);
-          case 48:
-            _context.prev = 48;
-            _context.t2 = _context["catch"](0);
-            if (scrollToError && (_context.t2 === null || _context.t2 === void 0 ? void 0 : (_error$errorFields2 = _context.t2.errorFields) === null || _error$errorFields2 === void 0 ? void 0 : _error$errorFields2.length) && source === 'ProForm') {
-              form.scrollToField((_error$errorFields$2 = _context.t2.errorFields[0]) === null || _error$errorFields$2 === void 0 ? void 0 : _error$errorFields$2.name, {
+          case 14:
+            return _context.a(2, _context.v);
+          case 15:
+            _context.p = 15;
+            _t3 = _context.v;
+            if (scrollToError && (_t3 === null || _t3 === void 0 ? void 0 : (_error$errorFields2 = _t3.errorFields) === null || _error$errorFields2 === void 0 ? void 0 : _error$errorFields2.length) && source === 'ProForm') {
+              form.scrollToField((_error$errorFields$2 = _t3.errorFields[0]) === null || _error$errorFields$2 === void 0 ? void 0 : _error$errorFields$2.name, {
                 block: 'center',
                 behavior: 'smooth'
               });
             }
             handleScrollToErrorProEditTable();
-            throw _context.t2;
-          case 53:
-          case "end":
-            return _context.stop();
+            throw _t3;
+          case 16:
+            return _context.a(2);
         }
-      }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
+      }, _callee, null, [[3, 5], [1, 8, 9, 10], [0, 15]]);
     }));
-    return function _validateFields(_x) {
+    return function nextValidateFields(_x) {
       return _ref2.apply(this, arguments);
     };
   }();
-  var _setFieldValue = function _setFieldValue(name, value, info) {
+  var nextSetFieldValue = function nextSetFieldValue(name, value, info) {
     if (info) {
       setFields([_objectSpread({
         name: name,
@@ -215,7 +225,7 @@ export var useForm = function useForm(originForm, options) {
       }]);
     }
   };
-  var _setFieldsValue = function _setFieldsValue(values) {
+  var nextSetFieldsValue = function nextSetFieldsValue(values) {
     var errors = getFieldsError();
     var errorNames = errors.reduce(function (acc, entry) {
       if (entry.errors.length > 0) {
@@ -239,10 +249,10 @@ export var useForm = function useForm(originForm, options) {
       setFieldsValue(values);
     }
   };
-  form.getFieldsValue = _getFieldsValue;
-  form.setFieldValue = _setFieldValue;
-  form.setFieldsValue = _setFieldsValue;
-  form.validateFields = _validateFields;
+  form.getFieldsValue = nextGetFieldsValue;
+  form.setFieldValue = nextSetFieldValue;
+  form.setFieldsValue = nextSetFieldsValue;
+  form.validateFields = nextValidateFields;
   form.isModified = true;
   form.__INTERNAL_CONFIG__ = {};
   return [form];

package/es/ProForm/utils/useShouldUpdate.js

@@ -3,7 +3,7 @@ import _get from "lodash/get";
 import _isEqualWith from "lodash/isEqualWith";
 import _isFunction from "lodash/isFunction";
 import { useRef, useState } from 'react';
-import { customEqualForFun } from './index';
+import { customEqualForFunction } from '../../utils';
 /** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
 var isDeleteLine = function isDeleteLine(form, namePath) {
   if (namePath) {
@@ -32,16 +32,16 @@ var useShouldUpdate = function useShouldUpdate(props) {
     namePath = formItemProps.namePath,
     names = formItemProps.names,
     dependNames = formItemProps.dependNames;
-  var timerRef = useRef();
-  var needClear = useRef(); // 是否需要执行清值操作
-  var showRef = useRef();
-  var disabledRef = useRef();
-  var requiredRef = useRef();
-  var rulesRef = useRef();
-  var fieldPropsRef = useRef();
-  var originComponentRef = useRef();
-  var dependNamesRef = useRef();
-  var desensitizationRef = useRef();
+  var timerRef = useRef(null); // 清值防抖
+  var needClear = useRef(false); // 是否需要执行清值操作
+  var showRef = useRef(false);
+  var disabledRef = useRef(false);
+  var requiredRef = useRef(false);
+  var rulesRef = useRef([]);
+  var fieldPropsRef = useRef(null);
+  var originComponentRef = useRef(null);
+  var dependNamesRef = useRef([]);
+  var desensitizationRef = useRef([0, 0]);
   var newComponent = originComponent || component; // 解决component默认赋值污染问题，需要使用originComponent
   var _useState = useState({}),
     _useState2 = _slicedToArray(_useState, 2),
@@ -154,7 +154,7 @@ var useShouldUpdate = function useShouldUpdate(props) {
         var curDependNamesValue = dependNames.map(function (name) {
           return _get(currentValues, name);
         });
-        var dependNamesChanged = !_isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFun);
+        var dependNamesChanged = !_isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFunction);
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
       }
@@ -218,8 +218,8 @@ var useShouldUpdate = function useShouldUpdate(props) {
           clearTimeout(timerRef.current);
         }
       }
-      var equalRes = _isEqualWith(rulesRef.current, _rules, customEqualForFun);
-      var proEqualRes = _isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFun);
+      var equalRes = _isEqualWith(rulesRef.current, _rules, customEqualForFunction);
+      var proEqualRes = _isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFunction);
       var desensitizationRes = _isEqualWith(desensitizationRef.current, _desensitization);
       if (_show !== showRef.current || _disabled !== disabledRef.current || _required !== requiredRef.current || !equalRes || !proEqualRes || !desensitizationRes || (_fieldProps === null || _fieldProps === void 0 ? void 0 : _fieldProps.transformResponse) // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
       ) {

package/es/ProForm/utils/valueType.js

@@ -280,9 +280,9 @@ export default {
     });
   },
   /** 百分比 */
-  percentage: function percentage(_ref10) {
-    var type = _ref10.type,
-      valueType = _ref10.valueType;
+  percentage: function percentage(_ref0) {
+    var type = _ref0.type,
+      valueType = _ref0.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -290,9 +290,9 @@ export default {
     });
   },
   /** 千分比 */
-  permillage: function permillage(_ref11) {
-    var type = _ref11.type,
-      valueType = _ref11.valueType;
+  permillage: function permillage(_ref1) {
+    var type = _ref1.type,
+      valueType = _ref1.valueType;
     return transformRatio({
       type: type,
       valueType: valueType,
@@ -300,8 +300,8 @@ export default {
     });
   },
   /**  开关 YN转换 */
-  switch: function _switch(_ref12) {
-    var switchValue = _ref12.switchValue;
+  switch: function _switch(_ref10) {
+    var switchValue = _ref10.switchValue;
     return switchTransform(switchValue);
   }
 };

package/es/ProIcon/index.js

@@ -1,9 +1,3 @@
-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";
-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";
@@ -11,6 +5,7 @@ import _uniqBy from "lodash/uniqBy";
 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 { Button, Tooltip, Space } from 'antd';
 import classNames from 'classnames';
 import { ReactSVG } from 'react-svg';
 import { useEffect } from 'react';
@@ -162,9 +157,9 @@ var ProIcon = function ProIcon(props) {
   var RenderIcon = _jsx("span", _objectSpread(_objectSpread({
     className: "anticon"
   }, reset), {}, {
-    children: _jsx(_Tooltip, {
+    children: _jsx(Tooltip, {
       title: iconText,
-      children: buttonIcon ? _jsx(_Button, _objectSpread({
+      children: buttonIcon ? _jsx(Button, _objectSpread({
         style: {
           width: size,
           height: size,
@@ -175,7 +170,7 @@ var ProIcon = function ProIcon(props) {
         },
         type: "text",
         icon: icon
-      }, buttonProps)) : _jsx(_Space, {
+      }, buttonProps)) : _jsx(Space, {
         children: _jsx("span", {
           style: {
             width: size,
@@ -216,7 +211,8 @@ var ProIcon = function ProIcon(props) {
                     theme: {
                       primaryColor: primaryColor,
                       qiankunPrimaryColor: value === null || value === void 0 ? void 0 : value.trim()
-                    }
+                    },
+                    forms: {}
                   }
                 });
               }
@@ -250,7 +246,8 @@ var ProIcon = function ProIcon(props) {
             theme: {
               primaryColor: primaryColor,
               qiankunPrimaryColor: extendFromMainColor
-            }
+            },
+            forms: {}
           }
         });
       }
@@ -268,9 +265,9 @@ var ProIcon = function ProIcon(props) {
       IconInstance: RenderIcon
     });
   }, [_config, primaryColor, qiankunPrimaryColor, language, svgProps]);
-  return !isExtendButtonMode ? IconInstance : _jsx(_Tooltip, {
+  return !isExtendButtonMode ? IconInstance : _jsx(Tooltip, {
     title: tooltip,
-    children: _jsx(_Button, _objectSpread(_objectSpread(_objectSpread({
+    children: _jsx(Button, _objectSpread(_objectSpread(_objectSpread({
       type: isIconMode ? 'text' : (buttonProps === null || buttonProps === void 0 ? void 0 : buttonProps.type) || 'link',
       className: proIconClassNames,
       disabled: disabled,

package/es/ProIcon/style/index.less

@@ -1,5 +1,5 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
+/* @root-entry-name: 'default'; */
+/* @import (reference) '~antd/es/style/themes/index.less'; */
 
 .pro-icon {
   cursor: pointer;

package/es/ProLayout/components/Layout/Header/index.js

@@ -15,7 +15,7 @@ var Header = function Header(props) {
   return _jsxs("div", {
     className: classNames({
       'pro-layout-header': true,
-      'pro-layout-header-pure': typeof pure !== 'boolean' ? pure.topMenu : pure
+      'pro-layout-header-pure': typeof pure !== 'boolean' ? pure === null || pure === void 0 ? void 0 : pure.topMenu : pure
     }),
     style: {
       height: headerHeight

package/es/ProLayout/components/Layout/Menu/FoldMenu/index.js

@@ -1,10 +1,7 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import "antd/es/popover/style";
-import _Popover from "antd/es/popover";
 import _objectSpread from "@babel/runtime/helpers/esm/objectSpread2";
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useContext } from 'react';
+import { Popover, Tooltip } from 'antd';
 import classnames from 'classnames';
 import { Link } from 'react-router-dom';
 import { Icon } from '../../index';
@@ -77,7 +74,7 @@ var FoldMenu = function FoldMenu(props) {
             })]
           })
         }, "".concat(id, "-").concat(name));
-        return hasChildrenMenu ? _jsx(_Popover, {
+        return hasChildrenMenu ? _jsx(Popover, {
           mouseEnterDelay: 0,
           content: _jsx(SideMenu, {
             dataSource: _objectSpread(_objectSpread({}, dataSource), {}, {
@@ -85,14 +82,18 @@ var FoldMenu = function FoldMenu(props) {
             })
           }),
           color: "#fff",
-          overlayClassName: noticeCls,
-          overlayInnerStyle: {
-            marginTop: headerHeight - 48,
-            height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0), "px)")
+          classNames: {
+            root: noticeCls
+          },
+          styles: {
+            body: {
+              marginTop: headerHeight - 48,
+              height: "calc(100vh - ".concat(headerHeight + (notice ? 32 : 0), "px)")
+            }
           },
           placement: "rightTop",
           children: LiNode
-        }, "".concat(id, "-").concat(name)) : !collapsed ? _jsx(_Tooltip, {
+        }, "".concat(id, "-").concat(name)) : !collapsed ? _jsx(Tooltip, {
           placement: "right",
           title: name,
           children: _jsx("span", {