@zat-design/sisyphus-react 3.14.0-beta.2 → 4.0.0-beta.10

package/es/ProForm/utils/index.js

@@ -2,9 +2,9 @@ import _createForOfIteratorHelper from "@babel/runtime/helpers/esm/createForOfIt
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
 /* eslint-disable no-restricted-syntax */
 
-import React, { useState } from 'react';
-import moment from 'moment';
-import _, { isObject, isFunction, get, set, omit, isNaN } from 'lodash';
+import dayjs from 'dayjs';
+import _, { isObject, get, set, omit, isNaN } from 'lodash';
+import { useState } from 'react';
 export var getLayout = params => {
   var _params$span = params.span,
     span = _params$span === void 0 ? 8 : _params$span,
@@ -59,7 +59,7 @@ export var isTrim = (type, trim, configData) => {
     _ref$state = _ref.state,
     state = _ref$state === void 0 ? {} : _ref$state;
   var _trim = trim || (state === null || state === 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 = event => {
       var _event$target$value;
       if (Array.isArray(event)) {
@@ -79,7 +79,7 @@ export var isTrim = (type, trim, configData) => {
  */
 export var isUpperCase = (type, upperCase) => {
   var result = {};
-  if (['Input', 'ProCombination'].includes(type) && upperCase) {
+  if (['Input'].includes(type) && upperCase) {
     result.getValueFromEvent = event => {
       var _event$target;
       if (Array.isArray(event)) {
@@ -128,8 +128,8 @@ export var filterInternalFields = (values, optimize) => {
     return values;
   }
   var nextValues = values;
-  // fix: braft-editor对象不可遍历 Moment不过滤
-  if (values !== null && values !== void 0 && values._immutable || moment.isMoment(values)) {
+  // fix: braft-editor对象不可遍历 Dayjs不过滤
+  if (values !== null && values !== void 0 && values._immutable || dayjs.isDayjs(values)) {
     return nextValues;
   }
   if (values instanceof File) {
@@ -296,13 +296,6 @@ export function getArrayBeforeNumber(arr) {
   return index !== -1 ? arr.slice(0, index + 1) : arr;
 }
 
-// 自定义深比对 如果两边都是函数类型则认为相等
-export var customEqualForFun = (value, other) => {
-  if (isFunction(value) && isFunction(other) || /*#__PURE__*/React.isValidElement(value) && /*#__PURE__*/React.isValidElement(other)) {
-    return true;
-  }
-};
-
 /**
  * 查询数据中是否包含rowKey
  */
@@ -447,4 +440,62 @@ export function findNamesKeyInArray(arr, key) {
     _iterator.f();
   }
   return null;
-}
+}
+
+// 为内层数组定义一个类型别名，以增加代码清晰度
+
+/**
+ * 根据特定规则合并两个数据源 (TypeScript 版本)
+ * @param data1 第一个数据源
+ * @param data2 第二个数据源
+ * @returns 合并后的结果数组
+ */
+export var mergeNames = (data1, data2) => {
+  // 步骤 1: 将 data1 的最后一个元素存入 Set 以便快速查找
+  var baseFields = new Set(data1.map(item => item[item.length - 1]));
+  var finalResult = [];
+  var coveredFields = new Set();
+
+  // 步骤 2 & 3: 处理 data2，找出有效的合并项
+  data2.forEach(item => {
+    // 确保数组有可处理的合并字段，并且该字段是字符串类型
+    var combinedField = item[item.length - 1];
+    if (item.length < 3 || typeof combinedField !== 'string') {
+      return;
+    }
+    var subFields = combinedField.split('-');
+
+    // 检查所有子字段是否都存在于 baseFields 中
+    var allFieldsValid = subFields.every(field => baseFields.has(field));
+
+    // 步骤 4: 如果有效，则添加到结果中，并记录已覆盖的字段
+    if (allFieldsValid) {
+      finalResult.push(item);
+      subFields.forEach(field => coveredFields.add(field));
+    }
+  });
+
+  // 步骤 5: 处理 data1，添加未被覆盖的字段
+  data1.forEach(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 = str => {
+  if (!str) {
+    return false;
+  }
+  // 正则表达式：查找被逗号或字符串边界包围的数字
+  var regex = /(?:^|,)\s*\d+\s*(?:,|$)/;
+  return regex.test(str);
+};

package/es/ProForm/utils/useDeepCompareMemo.js

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

package/es/ProForm/utils/useForm.js

@@ -2,11 +2,10 @@ import _regeneratorRuntime from "@babel/runtime/helpers/esm/regeneratorRuntime";
 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";
+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 +24,7 @@ export var useForm = function useForm(originForm, options) {
 
   // formKey全局共享逻辑
   var forms = useContext(FormsContext);
-  var _ref2 = _Form.useForm(forms[formKey] || _originForm),
+  var _ref2 = Form.useForm(forms[formKey] || _originForm),
     _ref3 = _slicedToArray(_ref2, 1),
     form = _ref3[0];
   if (formKey && forms[formKey] !== form) {
@@ -41,7 +40,7 @@ export var useForm = function useForm(originForm, options) {
   if (isModified) return [form];
 
   // @ts-ignore
-  var _getFieldsValue = (nameList, filterFunc) => {
+  var nextGetFieldsValue = (nameList, filterFunc) => {
     // 全部查询
     if (nameList !== true) {
       var values = getFieldsValue(nameList || true, filterFunc);
@@ -49,7 +48,7 @@ export var useForm = function useForm(originForm, options) {
     }
     return getFieldsValue(nameList, filterFunc);
   };
-  var _validateFields = /*#__PURE__*/function () {
+  var nextValidateFields = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(nameList) {
       var _rest$,
         _form$__INTERNAL_CONF,
@@ -69,6 +68,7 @@ export var useForm = function useForm(originForm, options) {
         _form$getInternalHook,
         getFields,
         fieldsList,
+        fieldsNames,
         _document,
         tablePagination,
         _tablePagination$clic,
@@ -148,19 +148,24 @@ export var useForm = function useForm(originForm, options) {
             }
             // @ts-ignore
             _form$getInternalHook = form.getInternalHooks('RC_FORM_INTERNAL_HOOKS'), getFields = _form$getInternalHook.getFields;
-            fieldsList = getFields();
-            fieldsList.forEach(item => {
-              var _item$name, _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 && (_item$name2 = _item$name2[0]) !== null && _item$name2 !== void 0 && _item$name2.startsWith(`${nameList[0]}_`)) {
-                validateNames.push(item.name);
-              }
-            });
+            fieldsList = getFields(); // formList& proEditTable 特殊处理
+            if (Array.isArray(nameList) && isListForm(String(nameList))) {
+              fieldsNames = fieldsList.map(item => item.name);
+              validateNames = mergeNames(nameList, fieldsNames);
+            } else {
+              // 其他情况
+              fieldsList.forEach(item => {
+                var _item$name, _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 && (_item$name2 = _item$name2[0]) !== null && _item$name2 !== void 0 && _item$name2.startsWith(`${nameList[0]}_`)) {
+                  validateNames.push(item.name);
+                }
+              });
+            }
             if (Array.isArray(nameList) && nameList.length && !validateNames.length) {
               validateNames = [...nameList];
             }
 
             // @ts-ignore
-            // delete rest[0].recursive;
             _context.next = 41;
             return validateFields(validateNames, ...rest).then(values => {
               return filterInternalFields(values, optimize);
@@ -177,7 +182,7 @@ export var useForm = function useForm(originForm, options) {
             }
             _context.next = 45;
             return validateFields(nameList, ...rest).then(values => {
-              return nameList ? values : _getFieldsValue();
+              return nameList ? values : nextGetFieldsValue();
             });
           case 45:
             return _context.abrupt("return", _context.sent);
@@ -198,11 +203,11 @@ export var useForm = function useForm(originForm, options) {
         }
       }, _callee, null, [[0, 48], [7, 26, 29, 32], [11, 18]]);
     }));
-    return function _validateFields(_x) {
+    return function nextValidateFields(_x) {
       return _ref4.apply(this, arguments);
     };
   }();
-  var _setFieldValue = (name, value, info) => {
+  var nextSetFieldValue = (name, value, info) => {
     if (info) {
       setFields([_objectSpread({
         name,
@@ -217,7 +222,7 @@ export var useForm = function useForm(originForm, options) {
       }]);
     }
   };
-  var _setFieldsValue = values => {
+  var nextSetFieldsValue = values => {
     var errors = getFieldsError();
     var errorNames = errors.reduce((acc, entry) => {
       if (entry.errors.length > 0) {
@@ -241,10 +246,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.d.ts

@@ -19,6 +19,7 @@ interface UseShouldUpdateProps<Values> {
     rules?: ProRule[];
     required?: boolean;
     type: string;
+    shouldUpdateDebounce?: number;
     [key: string]: any;
 }
 type HookShouldUpdate<Values = any> = (props: UseShouldUpdateProps<Values>) => Result<Values>;

package/es/ProForm/utils/useShouldUpdate.js

@@ -1,7 +1,7 @@
 import _slicedToArray from "@babel/runtime/helpers/esm/slicedToArray";
-import { useRef, useState } from 'react';
-import { isFunction, isEqualWith, get } from 'lodash';
-import { customEqualForFun } from "./index";
+import { useRef, useState, useEffect } from 'react';
+import { isFunction, isEqualWith, get, debounce } from 'lodash';
+import { customEqualForFunction } from "../../utils";
 /** FormList中被删除的行也会再触发一次响应式函数 排除这种场景 */
 var isDeleteLine = (form, namePath) => {
   if (namePath) {
@@ -23,7 +23,8 @@ var useShouldUpdate = props => {
     component = props.component,
     originComponent = props.originComponent,
     type = props.type,
-    desensitization = props.desensitization;
+    desensitization = props.desensitization,
+    shouldUpdateDebounce = props.shouldUpdateDebounce;
   var _shouldUpdate = formItemProps.shouldUpdate,
     name = formItemProps.name,
     clearNotShow = formItemProps.clearNotShow,
@@ -31,22 +32,96 @@ var 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 debouncedShouldUpdateRef = useRef(null); // shouldUpdate防抖函数
+  var pendingValuesRef = 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),
     reRender = _useState2[1];
   var values = {};
 
+  // 处理表单值更新的函数
+  var processValuesUpdate = currentValues => {
+    var _currentValues;
+    if (namePath) {
+      _currentValues = form.getFieldValue(namePath) || {};
+    } else {
+      _currentValues = currentValues;
+    }
+    var _show = isFunction(show) ? Boolean(show(_currentValues, {
+      form,
+      index,
+      namePath
+    })) : show;
+    var _disabled = isFunction(disabled) ? disabled(_currentValues, {
+      form,
+      index,
+      namePath
+    }) : disabled;
+    var _required = isFunction(required) ? required(_currentValues, {
+      form,
+      index,
+      namePath
+    }) : required;
+    var _rules = isFunction(rules) ? rules(_currentValues, {
+      form,
+      index,
+      namePath
+    }) : rules;
+    var _fieldProps = isFunction(fieldProps) ? fieldProps(_currentValues, {
+      form,
+      index,
+      namePath
+    }) : fieldProps;
+    var _desensitization = isFunction(desensitization) ? desensitization(_currentValues, {
+      form,
+      index,
+      namePath
+    }) : desensitization;
+    var equalRes = isEqualWith(rulesRef.current, _rules, customEqualForFunction);
+    var proEqualRes = isEqualWith(fieldPropsRef.current, _fieldProps, customEqualForFunction);
+    var desensitizationRes = isEqualWith(desensitizationRef.current, _desensitization);
+    if (_show !== showRef.current || !isEqualWith(disabledRef.current, _disabled, customEqualForFunction) || _required !== requiredRef.current || !equalRes || !proEqualRes || !desensitizationRes || _fieldProps !== null && _fieldProps !== void 0 && _fieldProps.transformResponse) {
+      showRef.current = _show;
+      disabledRef.current = _disabled;
+      requiredRef.current = _required;
+      rulesRef.current = _rules;
+      fieldPropsRef.current = _fieldProps;
+      desensitizationRef.current = _desensitization;
+      reRender({});
+    }
+  };
+
+  // 创建防抖函数
+  useEffect(() => {
+    if (shouldUpdateDebounce > 0 && (dependNames !== null && dependNames !== void 0 && dependNames.length || isFunction(show) || isFunction(disabled) || isFunction(required) || isFunction(rules) || isFunction(fieldProps) || isFunction(originComponent) || isFunction(desensitization))) {
+      debouncedShouldUpdateRef.current = debounce(() => {
+        if (pendingValuesRef.current) {
+          var currentValues = pendingValuesRef.current;
+          pendingValuesRef.current = null;
+
+          // 使用最新的values重新计算状态
+          processValuesUpdate(currentValues);
+        }
+      }, shouldUpdateDebounce);
+    }
+    return () => {
+      var _debouncedShouldUpdat;
+      (_debouncedShouldUpdat = debouncedShouldUpdateRef.current) === null || _debouncedShouldUpdat === void 0 || _debouncedShouldUpdat.cancel();
+    };
+  }, [shouldUpdateDebounce, dependNames === null || dependNames === void 0 ? void 0 : dependNames.length, show, disabled, required, rules, fieldProps, originComponent, desensitization]);
+
   // 不是动态函数直接返回
   if (!(dependNames !== null && dependNames !== void 0 && dependNames.length) && !isFunction(show) && !isFunction(disabled) && !isFunction(required) && !isFunction(rules) && !isFunction(fieldProps) && !isFunction(originComponent) && !isFunction(desensitization)) {
     return {
@@ -150,10 +225,21 @@ var useShouldUpdate = props => {
       // @ts-ignore formList场景取当前行数据，不取shouldUpdate变更后值
       if (dependNames !== null && dependNames !== void 0 && dependNames.length) {
         var curDependNamesValue = dependNames.map(name => get(currentValues, name));
-        var dependNamesChanged = !isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFun);
+        var dependNamesChanged = !isEqualWith(dependNamesRef.current, curDependNamesValue, customEqualForFunction);
         dependNamesRef.current = curDependNamesValue;
         if (!dependNamesChanged) return false;
       }
+
+      // 如果启用了防抖且存在防抖函数
+      if (shouldUpdateDebounce > 0 && debouncedShouldUpdateRef.current) {
+        // 缓存最新的表单值
+        pendingValuesRef.current = currentValues;
+        // 触发防抖函数
+        debouncedShouldUpdateRef.current();
+        return false; // 暂时不更新，由防抖函数控制
+      }
+
+      // 原有的非防抖逻辑
       var _currentValues;
       if (namePath) {
         // formList场景values取当前行数据
@@ -215,8 +301,8 @@ var 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 && _fieldProps.transformResponse // 防止fieldProps变更时，transformResponse根据fieldProps新值无法触发更新
       ) {

package/es/ProIcon/index.js

@@ -1,14 +1,9 @@
-import "antd/es/tooltip/style";
-import _Tooltip from "antd/es/tooltip";
-import "antd/es/space/style";
-import _Space from "antd/es/space";
-import "antd/es/button/style";
-import _Button from "antd/es/button";
 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", "buttonIcon"];
 import { useLocalStorageState, useSetState, useDeepCompareLayoutEffect } from 'ahooks';
+import { Button, Tooltip, Space } from 'antd';
 import classNames from 'classnames';
 import { uniqBy } from 'lodash';
 import { ReactSVG } from 'react-svg';
@@ -168,9 +163,9 @@ var ProIcon = props => {
   var RenderIcon = /*#__PURE__*/_jsx("span", _objectSpread(_objectSpread({
     className: "anticon"
   }, reset), {}, {
-    children: /*#__PURE__*/_jsx(_Tooltip, {
+    children: /*#__PURE__*/_jsx(Tooltip, {
       title: iconText,
-      children: buttonIcon ? /*#__PURE__*/_jsx(_Button, _objectSpread({
+      children: buttonIcon ? /*#__PURE__*/_jsx(Button, _objectSpread({
         style: {
           width: size,
           height: size,
@@ -181,7 +176,7 @@ var ProIcon = props => {
         },
         type: "text",
         icon: icon
-      }, buttonProps)) : /*#__PURE__*/_jsx(_Space, {
+      }, buttonProps)) : /*#__PURE__*/_jsx(Space, {
         children: /*#__PURE__*/_jsx("span", {
           style: {
             width: size,
@@ -220,7 +215,8 @@ var ProIcon = props => {
                     theme: {
                       primaryColor,
                       qiankunPrimaryColor: value === null || value === void 0 ? void 0 : value.trim()
-                    }
+                    },
+                    forms: {}
                   }
                 });
               }
@@ -254,7 +250,8 @@ var ProIcon = props => {
             theme: {
               primaryColor,
               qiankunPrimaryColor: extendFromMainColor
-            }
+            },
+            forms: {}
           }
         });
       }
@@ -272,9 +269,9 @@ var ProIcon = props => {
       IconInstance: RenderIcon
     });
   }, [_config, primaryColor, qiankunPrimaryColor, language, svgProps]);
-  return !isExtendButtonMode ? IconInstance : /*#__PURE__*/_jsx(_Tooltip, {
+  return !isExtendButtonMode ? IconInstance : /*#__PURE__*/_jsx(Tooltip, {
     title: tooltip,
-    children: /*#__PURE__*/_jsx(_Button, _objectSpread(_objectSpread(_objectSpread({
+    children: /*#__PURE__*/_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,3 @@
-@root-entry-name: 'default';
-@import (reference) '~antd/es/style/themes/index.less';
 
 .pro-icon {
   cursor: pointer;

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

@@ -17,7 +17,7 @@ var Header = props => {
   return /*#__PURE__*/_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,9 +1,6 @@
-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 { useContext } from 'react';
+import { Popover, Tooltip } from 'antd';
 import classnames from 'classnames';
 import { Link as RouterLink } from 'react-router-dom';
 import { Icon } from "../../index";
@@ -88,7 +85,7 @@ var FoldMenu = props => {
             })]
           })
         }, `${id}-${name}`);
-        return hasChildrenMenu ? /*#__PURE__*/_jsx(_Popover, {
+        return hasChildrenMenu ? /*#__PURE__*/_jsx(Popover, {
           mouseEnterDelay: 0,
           content: /*#__PURE__*/_jsx(SideMenu, {
             dataSource: _objectSpread(_objectSpread({}, dataSource), {}, {
@@ -120,7 +117,7 @@ var FoldMenu = props => {
             },
             children: LiNode
           })
-        }, `${id}-${name}`) : !collapsed ? /*#__PURE__*/_jsx(_Tooltip, {
+        }, `${id}-${name}`) : !collapsed ? /*#__PURE__*/_jsx(Tooltip, {
           placement: "right",
           title: name,
           children: /*#__PURE__*/_jsx("span", {