@oceanbase/ui 0.2.13 → 0.2.15

package/es/Action/Item.js

@@ -55,18 +55,16 @@ export var ActionButton = /*#__PURE__*/function (_React$PureComponent) {
         danger: danger,
         disabled: disabled,
         onClick: function onClick(_) {
-          if (enableLoading) {
+          var handle = _onClick === null || _onClick === void 0 ? void 0 : _onClick();
+          if (enableLoading && handle !== null && handle !== void 0 && handle.then) {
             _this2.setState({
               loading: true
             });
-            var handle = _onClick === null || _onClick === void 0 ? void 0 : _onClick();
-            if (handle.then) {
-              handle.then(function () {
-                _this2.setState({
-                  loading: false
-                });
+            handle.then(function () {
+              _this2.setState({
+                loading: false
               });
-            }
+            });
           }
         }
       }, children));

package/es/BackgroundTaskManager/index.d.ts

@@ -1,5 +1,5 @@
-import type { GlobalConfigProps, NotificationInstance } from 'antd/es/notification/interface';
 import React from 'react';
+import type { GlobalConfigProps, NotificationInstance } from '@oceanbase/design/es/notification/interface';
 export declare enum NotificationApi {
     success = "success",
     error = "error",
@@ -16,9 +16,9 @@ export declare const BackgroundTaskManagerConstants: {
     };
     NotificationApi: typeof NotificationApi;
 };
-declare type Namespace = string;
-export declare type TaskMgrID = string | number;
-export declare type ITaskMgrQueue = Record<TaskMgrID, Namespace>;
+type Namespace = string;
+export type TaskMgrID = string | number;
+export type ITaskMgrQueue = Record<TaskMgrID, Namespace>;
 interface NotificationAction {
     api: (params: any) => Promise<any>;
     successCb: (response: any, id: TaskMgrID) => {
@@ -30,7 +30,7 @@ interface NotificationAction {
         config: GlobalConfigProps;
     } | null;
 }
-export declare type ITaskMgrPreset = Record<Namespace, NotificationAction>;
+export type ITaskMgrPreset = Record<Namespace, NotificationAction>;
 export interface BackgroundTaskManagerRef {
     pushQueue: (queue: ITaskMgrQueue) => void;
     popQueue: (id: TaskMgrID) => void;

package/es/BackgroundTaskManager/index.js

@@ -10,8 +10,8 @@ function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o =
 function _arrayLikeToArray(arr, len) { if (len == null || len > arr.length) len = arr.length; for (var i = 0, arr2 = new Array(len); i < len; i++) arr2[i] = arr[i]; return arr2; }
 function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefined" != typeof Symbol && arr[Symbol.iterator] || arr["@@iterator"]; if (null != _i) { var _s, _e, _x, _r, _arr = [], _n = !0, _d = !1; try { if (_x = (_i = _i.call(arr)).next, 0 === i) { if (Object(_i) !== _i) return; _n = !1; } else for (; !(_n = (_s = _x.call(_i)).done) && (_arr.push(_s.value), _arr.length !== i); _n = !0); } catch (err) { _d = !0, _e = err; } finally { try { if (!_n && null != _i.return && (_r = _i.return(), Object(_r) !== _r)) return; } finally { if (_d) throw _e; } } return _arr; } }
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
-import { notification } from '@oceanbase/design';
 import React, { forwardRef, useCallback, useEffect, useImperativeHandle, useMemo, useState } from 'react';
+import { notification } from '@oceanbase/design';
 import { REFRESH_FREQUENCY } from "./constants";
 import { RefreshMan } from "./RefreshMan";
 

package/es/BasicLayout/Header.d.ts

@@ -2,7 +2,7 @@ import React from 'react';
 import type { Locale } from '../interface';
 import type { LocaleWrapperProps } from '../locale/LocaleWrapper';
 import './Header.less';
-export declare type OverlayFunc = () => React.ReactElement;
+export type OverlayFunc = () => React.ReactElement;
 export interface HeaderLocale {
     help: string;
     welcome: string;

package/es/BasicLayout/Header.js

@@ -20,7 +20,7 @@ import React, { useState } from 'react';
 import { OB_SITE_LINK } from "../constant";
 import LocaleWrapper from "../locale/LocaleWrapper";
 import { directTo, getPrefix } from "../_util";
-import useHistory from "../_util/useHistory";
+import useNavigate from "../_util/useNavigate";
 import zhCN from "./locale/zh-CN";
 // @ts-ignore
 import logoImg from "../assets/logo/oceanbase_logo.svg";
@@ -56,7 +56,7 @@ var Header = function Header(_ref) {
     locales = _ref.locales,
     langs = _ref.langs,
     restProps = _objectWithoutProperties(_ref, _excluded);
-  var history = useHistory();
+  var navigate = useNavigate();
   var _useState = useState(false),
     _useState2 = _slicedToArray(_useState, 2),
     visible = _useState2[0],
@@ -69,7 +69,7 @@ var Header = function Header(_ref) {
     onClick: function onClick(_ref2) {
       var key = _ref2.key;
       if (key === 'welcome') {
-        history.push(welcomePath);
+        navigate === null || navigate === void 0 ? void 0 : navigate(welcomePath);
       } else if (key === 'viewDocs') {
         directTo(docsPath);
       } else if (key === 'downloadDocs') {
@@ -98,7 +98,7 @@ var Header = function Header(_ref) {
     src: simpleLogoUrl,
     alt: "",
     onClick: function onClick() {
-      history.push('/');
+      navigate === null || navigate === void 0 ? void 0 : navigate('/');
     },
     className: "".concat(prefix, "-logo")
   }), title && /*#__PURE__*/React.createElement("div", {

package/es/BasicLayout/index.d.ts

@@ -1,5 +1,5 @@
-import type { BadgeProps } from 'antd/es/badge';
-import type { MenuProps } from 'antd/es/menu';
+import type { BadgeProps } from '@oceanbase/design/es/badge';
+import type { MenuProps } from '@oceanbase/design/es/menu';
 import React from 'react';
 import type { LocaleWrapperProps } from '../locale/LocaleWrapper';
 import type { HeaderProps } from './Header';
@@ -39,6 +39,7 @@ export interface BasicLayoutProps extends LocaleWrapperProps {
     sideHeader?: React.ReactNode;
     subSideMenus?: MenuItem[];
     subSideMenuProps?: MenuProps;
+    prefixCls?: string;
     style?: React.CSSProperties;
 }
 declare const _default: any;

package/es/BasicLayout/index.js

@@ -23,7 +23,7 @@ import { pathToRegexp } from 'path-to-regexp';
 import React, { useContext, useEffect, useState } from 'react';
 import LocaleWrapper from "../locale/LocaleWrapper";
 import { getPrefix, isEnglish, urlToList } from "../_util";
-import useHistory from "../_util/useHistory";
+import useNavigate from "../_util/useNavigate";
 import Header from "./Header";
 import zhCN from "./locale/zh-CN";
 import useStyle from "./style";
@@ -62,10 +62,9 @@ var BasicLayout = function BasicLayout(_ref) {
     getPrefixCls = _useContext.getPrefixCls;
   var prefixCls = getPrefixCls('basic-layout', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
-  var basicLayoutCls = classNames(className, hashId);
-  var history = useHistory();
+    wrapSSR = _useStyle.wrapSSR;
+  var basicLayoutCls = classNames(className);
+  var navigate = useNavigate();
   // 侧边栏导航是否收起
   var _useState = useState(defaultCollapsed),
     _useState2 = _slicedToArray(_useState, 2),
@@ -166,7 +165,7 @@ var BasicLayout = function BasicLayout(_ref) {
           key: item.link,
           onClick: function onClick() {
             if (pathname !== item.link) {
-              history.push(item.link);
+              navigate === null || navigate === void 0 ? void 0 : navigate(item.link);
             }
           }
         }, /*#__PURE__*/React.createElement(Tooltip, _extends({
@@ -218,7 +217,7 @@ var BasicLayout = function BasicLayout(_ref) {
           key: item.link,
           onClick: function onClick() {
             if (pathname !== item.link) {
-              history.push(item.link);
+              navigate === null || navigate === void 0 ? void 0 : navigate(item.link);
             }
           }
         }, /*#__PURE__*/React.createElement(Tooltip, {

package/es/BasicLayout/style/index.d.ts

@@ -1,5 +1,9 @@
-import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
-export declare type BasicLayoutToken = FullToken<any>;
+/// <reference types="react" />
+import type { FullToken, GenerateStyle } from '@oceanbase/design/es/theme';
+export type BasicLayoutToken = FullToken<any>;
 export declare const genBasicLayoutStyle: GenerateStyle<BasicLayoutToken>;
-declare const _default: (prefixCls: string) => any;
+declare const _default: (prefixCls: string) => {
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    hashId: string;
+};
 export default _default;

package/es/BatchOperationBar/index.d.ts

@@ -7,9 +7,9 @@ export interface AlertRenderParams {
     setSelectedRows: (selectedRows: any[]) => void;
     cleanSelectedRows: (cleanSelectdRows?: any[]) => void;
 }
-export declare type RenderFun = ((props: AlertRenderParams) => ReactNode) | false;
-export declare type Vertical = 'top' | 'bottom';
-export declare type Horizontal = 'left' | 'right';
+export type RenderFun = ((props: AlertRenderParams) => ReactNode) | false;
+export type Vertical = 'top' | 'bottom';
+export type Horizontal = 'left' | 'right';
 export interface Props extends LocaleWrapperProps {
     width?: number | string;
     title?: ReactNode;

package/es/Boundary/constant.d.ts

@@ -4,10 +4,10 @@ export interface ConfigType {
     buttonText?: string;
     onClick?: () => void;
 }
-export declare type FunctionConfigType = Record<string, ConfigType>;
-export declare type FunctionStateType = keyof FunctionConfigType;
-export declare type CodeType = 404 | 403;
-export declare type CodePresetType = Record<CodeType, ConfigType>;
+export type FunctionConfigType = Record<string, ConfigType>;
+export type FunctionStateType = keyof FunctionConfigType;
+export type CodeType = 404 | 403;
+export type CodePresetType = Record<CodeType, ConfigType>;
 export declare const CODE_PRESET: (locale: any) => CodePresetType;
 export declare const EXCEPTION_PRESET: (locale: any) => {
     ERROR_BOUNDARY: {

package/es/ContentWithIcon/index.d.ts

@@ -0,0 +1,21 @@
+import React from 'react';
+import './index.less';
+export interface ContentWithIconProps {
+    content?: React.ReactNode;
+    tooltip?: any;
+    prefixIcon?: React.ReactNode | boolean;
+    suffixIcon?: React.ReactNode;
+    className?: string;
+    iconType?: 'question' | 'info' | 'exclamation';
+    color?: string;
+    style?: React.CSSProperties;
+    onClick?: (e: React.SyntheticEvent) => void;
+    tooltipWithLink?: boolean;
+    textHidden?: boolean;
+    popOver?: any;
+    size?: number;
+    infoColor?: string;
+    exclamationColor?: string;
+}
+declare const ContentWithIcon: React.FC<ContentWithIconProps>;
+export default ContentWithIcon;

package/es/ContentWithIcon/index.js

@@ -0,0 +1,110 @@
+function _typeof(obj) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (obj) { return typeof obj; } : function (obj) { return obj && "function" == typeof Symbol && obj.constructor === Symbol && obj !== Symbol.prototype ? "symbol" : typeof obj; }, _typeof(obj); }
+var _excluded = ["content", "tooltip", "prefixIcon", "suffixIcon", "className", "children", "iconType", "color", "tooltipWithLink", "popOver", "textHidden", "size", "infoColor", "exclamationColor"];
+function _extends() { _extends = Object.assign ? Object.assign.bind() : function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; }; return _extends.apply(this, arguments); }
+function _defineProperty(obj, key, value) { key = _toPropertyKey(key); if (key in obj) { Object.defineProperty(obj, key, { value: value, enumerable: true, configurable: true, writable: true }); } else { obj[key] = value; } return obj; }
+function _toPropertyKey(arg) { var key = _toPrimitive(arg, "string"); return _typeof(key) === "symbol" ? key : String(key); }
+function _toPrimitive(input, hint) { if (_typeof(input) !== "object" || input === null) return input; var prim = input[Symbol.toPrimitive]; if (prim !== undefined) { var res = prim.call(input, hint || "default"); if (_typeof(res) !== "object") return res; throw new TypeError("@@toPrimitive must return a primitive value."); } return (hint === "string" ? String : Number)(input); }
+function _objectWithoutProperties(source, excluded) { if (source == null) return {}; var target = _objectWithoutPropertiesLoose(source, excluded); var key, i; if (Object.getOwnPropertySymbols) { var sourceSymbolKeys = Object.getOwnPropertySymbols(source); for (i = 0; i < sourceSymbolKeys.length; i++) { key = sourceSymbolKeys[i]; if (excluded.indexOf(key) >= 0) continue; if (!Object.prototype.propertyIsEnumerable.call(source, key)) continue; target[key] = source[key]; } } return target; }
+function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) return {}; var target = {}; var sourceKeys = Object.keys(source); var key, i; for (i = 0; i < sourceKeys.length; i++) { key = sourceKeys[i]; if (excluded.indexOf(key) >= 0) continue; target[key] = source[key]; } return target; }
+import React, { isValidElement } from 'react';
+import { Tooltip, Space, Popover } from 'antd';
+import { ExclamationCircleFilled, InfoCircleFilled, InfoCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import classNames from 'classnames';
+import { getPrefix } from "../_util";
+import "./index.less";
+var prefix = getPrefix('content-with-question');
+var ContentWithIcon = function ContentWithIcon(_ref) {
+  var _classNames;
+  var content = _ref.content,
+    tooltip = _ref.tooltip,
+    _ref$prefixIcon = _ref.prefixIcon,
+    prefixIcon = _ref$prefixIcon === void 0 ? null : _ref$prefixIcon,
+    suffixIcon = _ref.suffixIcon,
+    className = _ref.className,
+    children = _ref.children,
+    iconType = _ref.iconType,
+    color = _ref.color,
+    _ref$tooltipWithLink = _ref.tooltipWithLink,
+    tooltipWithLink = _ref$tooltipWithLink === void 0 ? false : _ref$tooltipWithLink,
+    popOver = _ref.popOver,
+    _ref$textHidden = _ref.textHidden,
+    textHidden = _ref$textHidden === void 0 ? true : _ref$textHidden,
+    _ref$size = _ref.size,
+    size = _ref$size === void 0 ? 14 : _ref$size,
+    infoColor = _ref.infoColor,
+    _ref$exclamationColor = _ref.exclamationColor,
+    exclamationColor = _ref$exclamationColor === void 0 ? '#FAAD14' : _ref$exclamationColor,
+    restProps = _objectWithoutProperties(_ref, _excluded);
+  var defaultIconType = function defaultIconType() {
+    if (iconType === 'question') {
+      return /*#__PURE__*/React.createElement(QuestionCircleOutlined, {
+        style: {
+          color: color === 'default' ? '#132039' : color,
+          fontSize: size
+        },
+        className: "".concat(prefix, "-help")
+      });
+    }
+    if (iconType === 'info') {
+      if (infoColor) {
+        return /*#__PURE__*/React.createElement(InfoCircleFilled, {
+          style: {
+            color: infoColor,
+            fontSize: size
+          },
+          className: "".concat(prefix, "-help")
+        });
+      } else {
+        return /*#__PURE__*/React.createElement(InfoCircleOutlined, {
+          style: {
+            color: '3333333',
+            fontSize: size
+          },
+          className: "".concat(prefix, "-help")
+        });
+      }
+    }
+    if (iconType === 'exclamation') {
+      return /*#__PURE__*/React.createElement(ExclamationCircleFilled, {
+        style: {
+          color: exclamationColor,
+          fontSize: size
+        },
+        className: "".concat(prefix, "-help")
+      });
+    }
+  };
+
+  // 图标在文字后
+  suffixIcon = suffixIcon !== null && iconType ? defaultIconType() : suffixIcon; // 自定义图标，非内置
+
+  // FIXME: antd 已经废弃 icon type 的用法，该组件也需要做相应处理，后面将会是传入 Icon 的形式而非 type
+  var getIcon = function getIcon(iconConfig) {
+    return iconConfig ? !textHidden && iconType === 'info' ?
+    /*#__PURE__*/
+    // 文本描述直接展示且只在 info 类型下生效
+    React.createElement(Space, {
+      size: 4
+    }, iconConfig, /*#__PURE__*/React.createElement("span", {
+      style: {
+        color: '#5C6B8A'
+      }
+    }, "\u6587\u672C\u793A\u610F\u4E0D\u8D85\u8FC7\u4E8C\u5341\u5B57\u6587\u672C\u793A\u610F\u4E0D\u8D85\u8FC7\u4E8C\u5341\u5B57")) :
+    // 提示文案描述带有链接
+    tooltipWithLink ? /*#__PURE__*/React.createElement(Popover, popOver, /*#__PURE__*/isValidElement(iconConfig) ? iconConfig : defaultIconType()) : /*#__PURE__*/React.createElement(Tooltip, tooltip, /*#__PURE__*/isValidElement(iconConfig) ? iconConfig : defaultIconType()) : null;
+  };
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement("span", _extends({
+    className: classNames((_classNames = {}, _defineProperty(_classNames, "".concat(prefix, "-item"), true), _defineProperty(_classNames, className, !!className), _classNames))
+  }, restProps), /*#__PURE__*/React.createElement(Space, {
+    size: 4
+  }, getIcon(
+  //  图标在文字前
+  prefixIcon === true ? defaultIconType() : prefixIcon), /*#__PURE__*/React.createElement("span", {
+    "data-testid": "content",
+    style: {
+      color: color === 'default' ? '#5C6B8A' : color,
+      fontSize: size
+    }
+  }, content !== null && content !== void 0 ? content : children), getIcon(suffixIcon))));
+};
+export default ContentWithIcon;

package/{lib/ContentWithQuestion → es/ContentWithIcon}/index.less

@@ -1,4 +1,4 @@
-@prefix: ob-content-with-question;
+@prefix: ob-content-with-icon;
 
 .@{prefix}-item {
   display: inline-flex;
@@ -15,4 +15,8 @@
   .@{prefix}-help {
     cursor: help;
   }
+  .@{prefix}-color {
+    color: red;
+    
+  }
 }

package/es/DocDialog/index.js

@@ -12,7 +12,6 @@ function _iterableToArrayLimit(arr, i) { var _i = null == arr ? null : "undefine
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 import { debounce } from 'lodash';
 import React, { useEffect, useMemo, useState } from 'react';
-import { useLocation } from 'react-router-dom';
 import Dialog from "../Dialog";
 import LocaleWrapper from "../locale/LocaleWrapper";
 import zhCN from "./locale/zh-CN";
@@ -45,7 +44,7 @@ var DocDialogComp = function DocDialogComp(props) {
     _useState4 = _slicedToArray(_useState3, 2),
     clientWidth = _useState4[0],
     setClientWidth = _useState4[1];
-  var location = useLocation();
+  var location = window.location;
   var currentLink = useMemo(function () {
     var _link$;
     var pathname = location.pathname;

package/es/FullscreenBox/index.d.ts

@@ -2,7 +2,7 @@ import type { ReactNode } from 'react';
 import React from 'react';
 import type { LocaleWrapperProps } from '../locale/LocaleWrapper';
 import './index.less';
-export declare type FullscreenModeType = 'viewport' | 'browser';
+export type FullscreenModeType = 'viewport' | 'browser';
 export interface FullscreenBoxRef {
     changeFullscreen: () => void;
 }

package/es/Highlight/index.d.ts

@@ -28,9 +28,9 @@ export declare const languageMap: {
 export declare const THEME_DARK = "dark";
 export declare const THEME_LIGHT = "light";
 declare const ThemeTypes: ["dark", "light"];
-export declare type ThemeType = (typeof ThemeTypes)[number];
+export type ThemeType = (typeof ThemeTypes)[number];
 declare const supportedLanguages: ("ruby" | "json" | "javascript" | "typescript" | "css" | "groovy" | "java" | "python" | "bash" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "go" | "yaml" | "solidity" | "tsx" | "jsx")[];
-export declare type LanguageType = (typeof supportedLanguages)[number] | 'html';
+export type LanguageType = (typeof supportedLanguages)[number] | 'html';
 export interface HighlightProps extends LocaleWrapperProps {
     /**
      * @description 样式

package/es/LocaleDropdown/index.d.ts

@@ -1,4 +1,4 @@
-import type { DropdownProps } from 'antd/es/dropdown';
+import type { DropdownProps } from '@oceanbase/design/es/dropdown';
 import React from 'react';
 import type { Locale } from '../interface';
 export interface LocaleDropdownProps extends DropdownProps {

package/es/Login/ActivateForm.d.ts

@@ -1,4 +1,4 @@
-import type { FormProps } from 'antd/es/form';
+import type { FormProps } from '@oceanbase/design/es/form';
 import React from 'react';
 import type { LoginLocale } from './index';
 import './index.less';

package/es/Login/ActivateForm.js

@@ -24,19 +24,19 @@ var Activate = function Activate(_ref) {
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    formRef = _Form$useForm2[0];
+    form = _Form$useForm2[0];
   var handleValidateConfirmPassword = useCallback(function (rule, value, callback) {
-    if (!formRef) {
+    if (!form) {
       callback();
       return;
     }
-    var pwd = formRef.getFieldValue('password');
+    var pwd = form.getFieldValue('password');
     if (toString(value) !== toString(pwd)) {
       callback(locale.samePasswordMessage);
       return;
     }
     callback();
-  }, [formRef]);
+  }, [form]);
   var passwordRegexpRule = passwordRule || {
     pattern: PASSWORD_REGEX,
     message: locale.passwordHelp
@@ -45,7 +45,7 @@ var Activate = function Activate(_ref) {
     layout: "vertical",
     requiredMark: false,
     className: "".concat(prefix, "-form"),
-    form: formRef
+    form: form
   }, restProps, {
     "data-testid": "login.register"
   }), errorMessage && /*#__PURE__*/React.createElement(Alert, {

package/es/Login/LoginForm.d.ts

@@ -1,4 +1,4 @@
-import type { FormProps } from 'antd/es/form';
+import type { FormProps } from '@oceanbase/design/es/form';
 import React from 'react';
 import type { LoginLocale } from '.';
 import './index.less';

package/es/Login/RegisterForm.d.ts

@@ -1,4 +1,4 @@
-import type { FormProps } from 'antd/es/form';
+import type { FormProps } from '@oceanbase/design/es/form';
 import React from 'react';
 import type { LoginLocale } from './index';
 import './index.less';

package/es/Login/RegisterForm.js

@@ -33,7 +33,7 @@ var Register = function Register(_ref) {
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _Form$useForm = Form.useForm(),
     _Form$useForm2 = _slicedToArray(_Form$useForm, 1),
-    formRef = _Form$useForm2[0];
+    form = _Form$useForm2[0];
   var handleValidateAccount = useCallback( /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(rule, value) {
       var isExists;
@@ -66,17 +66,17 @@ var Register = function Register(_ref) {
     };
   }(), [isUserExists]);
   var handleValidateConfirmPassword = useCallback(function (rule, value, callback) {
-    if (!formRef) {
+    if (!form) {
       callback();
       return;
     }
-    var pwd = formRef.getFieldValue('password');
+    var pwd = form.getFieldValue('password');
     if (toString(value) !== toString(pwd)) {
       callback(locale.samePasswordMessage);
       return;
     }
     callback();
-  }, [formRef]);
+  }, [form]);
   var passwordRegexpRule = passwordRule || {
     pattern: PASSWORD_REGEX,
     message: locale.passwordHelp
@@ -85,7 +85,7 @@ var Register = function Register(_ref) {
     layout: "vertical",
     requiredMark: false,
     className: "".concat(prefix, "-form"),
-    form: formRef
+    form: form
   }, restProps, {
     "data-testid": "login.register"
   }), errorMessage && /*#__PURE__*/React.createElement(Alert, {

package/es/Login/index.d.ts

@@ -1,5 +1,5 @@
-import type { AlertProps } from 'antd/es/alert';
-import type { FormProps } from 'antd/es/form';
+import type { AlertProps } from '@oceanbase/design/es/alert';
+import type { FormProps } from '@oceanbase/design/es/form';
 import React from 'react';
 import type { IActivateFormProps } from './ActivateForm';
 import type { ILoginFormProps } from './LoginForm';

package/es/Lottie/index.d.ts

@@ -1,7 +1,8 @@
 import type { AnimationConfig, AnimationItem } from 'lottie-web';
 import React from 'react';
 export interface LottieProps extends Omit<AnimationConfig, 'container'> {
-    path: string;
+    path?: string;
+    animationData?: any;
     mode?: 'default' | 'icon';
     loop?: boolean;
     speed?: number;

package/es/NavMenu/index.js

@@ -8,9 +8,8 @@ import { Menu } from '@oceanbase/design';
 import { isArray } from 'lodash';
 import { pathToRegexp } from 'path-to-regexp';
 import React, { useCallback, useEffect, useState } from 'react';
-import { useLocation } from 'react-router-dom';
 import { getPrefix } from "../_util";
-import useHistory from "../_util/useHistory";
+import useNavigate from "../_util/useNavigate";
 import "./index.less";
 var prefix = getPrefix('menu');
 export default (function (props) {
@@ -25,8 +24,8 @@ export default (function (props) {
     _useState4 = _slicedToArray(_useState3, 2),
     menus = _useState4[0],
     setMenus = _useState4[1];
-  var location = useLocation();
-  var history = useHistory();
+  var location = window.location;
+  var navigate = useNavigate();
   var preProcess = useCallback(function (list) {
     var pathname = location.pathname;
     try {
@@ -71,8 +70,8 @@ export default (function (props) {
   }, [setSelectedKeys, menus]);
   var onMenuClick = useCallback(function (link) {
     var linkList = isArray(link) ? link : [link];
-    history.push(linkList[0]);
-  }, [history]);
+    navigate === null || navigate === void 0 ? void 0 : navigate(linkList[0]);
+  }, [navigate]);
   return /*#__PURE__*/React.createElement("div", {
     className: "".concat(prefix, "-container ").concat(className),
     style: style

package/es/PageContainer/ItemRender.js

@@ -1,5 +1,5 @@
 import React from 'react';
-import useHistory from "../_util/useHistory";
+import useNavigate from "../_util/useNavigate";
 export default (function (_ref) {
   var route = _ref.route,
     params = _ref.params,
@@ -13,10 +13,10 @@ export default (function (_ref) {
   var path = route.href || routes.slice(0, routeIndex + 1).map(function (item) {
     return item.path;
   }).join('/');
-  var history = useHistory();
+  var navigate = useNavigate();
   return last ? /*#__PURE__*/React.createElement("span", null, title) : /*#__PURE__*/React.createElement("a", {
     onClick: function onClick() {
-      history.push(path);
+      navigate === null || navigate === void 0 ? void 0 : navigate(path);
     }
   }, title);
 });

package/es/PageContainer/index.d.ts

@@ -1,11 +1,11 @@
 import type { IconComponentProps } from '@oceanbase/icons/es/components/Icon';
 import type { PageContainerProps as AntPageContainerProps, PageHeaderProps as AntPageHeaderProps } from '@ant-design/pro-components';
 import React from 'react';
-export declare type ReloadType = boolean | IconComponentProps | React.ReactNode;
+export type ReloadType = boolean | IconComponentProps | React.ReactNode;
 export interface PageContainerLocale {
     reload?: string;
 }
-export declare type PageHeaderProps = AntPageHeaderProps & {
+export type PageHeaderProps = AntPageHeaderProps & {
     reload?: ReloadType;
 };
 export interface PageContainerProps extends AntPageContainerProps {

package/es/PageContainer/index.js

@@ -33,8 +33,7 @@ var PageContainer = function PageContainer(_ref) {
   var rootPrefixCls = getPrefixCls();
   var prefixCls = getPrefixCls('pro-page-container', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
-    wrapSSR = _useStyle.wrapSSR,
-    hashId = _useStyle.hashId;
+    wrapSSR = _useStyle.wrapSSR;
   var _ref2 = header || {},
     reload = _ref2.reload,
     subTitle = _ref2.subTitle,
@@ -64,7 +63,7 @@ var PageContainer = function PageContainer(_ref) {
   var noHasHeader = ['title', 'subTitle', 'extra', 'tags', 'footer', 'avatar', 'backIcon', 'breadcrumb'].every(function (item) {
     return !(newHeader !== null && newHeader !== void 0 && newHeader[item]);
   }) && !content && !extraContent && !tabList && !tabBarExtraContent;
-  var pageContainerCls = classNames(_defineProperty({}, "".concat(prefixCls, "-no-page-header"), noHasHeader), className, hashId);
+  var pageContainerCls = classNames(_defineProperty({}, "".concat(prefixCls, "-no-page-header"), noHasHeader), className);
   return wrapSSR( /*#__PURE__*/React.createElement(AntPageContainer, _extends({
     prefixCls: customizePrefixCls,
     className: pageContainerCls,

package/es/PageContainer/style/index.d.ts

@@ -1,5 +1,9 @@
+/// <reference types="react" />
 import type { PageContainerToken } from '@ant-design/pro-layout/es/components/PageContainer/style';
-import type { GenerateStyle } from 'antd/es/theme/internal';
+import type { GenerateStyle } from '@oceanbase/design/es/theme';
 export declare const genPageContainerStyle: GenerateStyle<PageContainerToken>;
-declare const _default: (prefixCls: string) => any;
+declare const _default: (prefixCls: string) => {
+    wrapSSR: (node: import("react").ReactElement<any, string | import("react").JSXElementConstructor<any>>) => import("react").JSX.Element;
+    hashId: string;
+};
 export default _default;