@oceanbase/ui 1.0.0-alpha.0 → 1.0.0-alpha.2

package/es/DateRanger/Ranger.d.ts

@@ -8,6 +8,7 @@ import type { Rule } from './PickerPanel';
 import './index.less';
 export type RangeName = 'customize' | string;
 export type RangeValue = [Moment, Moment] | [Dayjs, Dayjs] | [] | null;
+export type RangeValueFormat = [string, string] | [] | null;
 export type RangeDateValue = {
     name: RangeName;
     range: RangeValue;
@@ -20,6 +21,9 @@ export interface DateRangerProps extends Omit<RangePickerProps, 'mode' | 'picker
     hasSync?: boolean;
     hasForward?: boolean;
     hasZoomOut?: boolean;
+    history?: boolean | {
+        capacity: number;
+    };
     hasTagInPicker?: boolean;
     tip?: string;
     rules?: Rule[];

package/es/DateRanger/Ranger.js

@@ -1,5 +1,4 @@
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["selects", "value", "defaultValue", "defaultQuickValue", "hasRewind", "hasPlay", "hasSync", "hasForward", "hasZoomOut", "hasTagInPicker", "pastOnly", "simpleMode", "hideYear", "hideSecond", "autoCalcRange", "onChange", "disabledDate", "locale", "size", "stickRangeName", "tooltipProps", "isMoment", "rules", "tip", "autoAdjustOverflow", "overlayClassName", "overlayStyle", "getPopupContainer"];
+var _excluded = ["selects", "value", "defaultValue", "defaultQuickValue", "hasRewind", "hasPlay", "hasSync", "hasForward", "hasZoomOut", "hasTagInPicker", "pastOnly", "simpleMode", "hideYear", "hideSecond", "autoCalcRange", "history", "onChange", "disabledDate", "locale", "size", "stickRangeName", "tooltipProps", "isMoment", "rules", "tip", "autoAdjustOverflow", "overlayClassName", "overlayStyle", "getPopupContainer"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 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; }
@@ -9,6 +8,7 @@ function _toConsumableArray(arr) { return _arrayWithoutHoles(arr) || _iterableTo
 function _nonIterableSpread() { throw new TypeError("Invalid attempt to spread non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _iterableToArray(iter) { if (typeof Symbol !== "undefined" && iter[Symbol.iterator] != null || iter["@@iterator"] != null) return Array.from(iter); }
 function _arrayWithoutHoles(arr) { if (Array.isArray(arr)) return _arrayLikeToArray(arr); }
+function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
 function _slicedToArray(arr, i) { return _arrayWithHoles(arr) || _iterableToArrayLimit(arr, i) || _unsupportedIterableToArray(arr, i) || _nonIterableRest(); }
 function _nonIterableRest() { throw new TypeError("Invalid attempt to destructure non-iterable instance.\nIn order to be iterable, non-array objects must have a [Symbol.iterator]() method."); }
 function _unsupportedIterableToArray(o, minLen) { if (!o) return; if (typeof o === "string") return _arrayLikeToArray(o, minLen); var n = Object.prototype.toString.call(o).slice(8, -1); if (n === "Object" && o.constructor) n = o.constructor.name; if (n === "Map" || n === "Set") return Array.from(o); if (n === "Arguments" || /^(?:Ui|I)nt(?:8|16|32)(?:Clamped)?Array$/.test(n)) return _arrayLikeToArray(o, minLen); }
@@ -17,11 +17,11 @@ function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" !=
 function _arrayWithHoles(arr) { if (Array.isArray(arr)) return arr; }
 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, { useEffect, useState, useImperativeHandle, useRef } from 'react';
-import { Button, DatePicker, Divider, Dropdown, Radio, Space, Tooltip, theme } from '@oceanbase/design';
-import { LeftOutlined, RightOutlined, ZoomOutOutlined, SyncOutlined } from '@oceanbase/icons';
+import React, { useEffect, useRef, useState, useImperativeHandle, useMemo } from 'react';
+import { Button, DatePicker, Divider, Dropdown, Flex, Menu, Radio, Space, Tooltip, message, theme } from '@oceanbase/design';
+import { LeftOutlined, RightOutlined, ZoomOutOutlined, SyncOutlined, ArrowLeftOutlined, CopyOutlined, DeleteOutlined } from '@oceanbase/icons';
 import dayjs from 'dayjs';
-import { findIndex, isNil, noop, omit } from 'lodash';
+import { findIndex, isEqual as _isEqual, isNil, noop, omit } from 'lodash';
 import moment from 'moment';
 import classNames from 'classnames';
 import LocaleWrapper from "../locale/LocaleWrapper";
@@ -31,8 +31,10 @@ import InternalPickerPanel from "./PickerPanel";
 import zhCN from "./locale/zh-CN";
 import "./index.less";
 import { useClickAway } from 'ahooks';
+import { useLocalStorageState } from '@oceanbase/util';
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+var DefaultMaxHistoryCapacity = 20;
 var prefix = getPrefix('date-ranger');
 var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var _selects$;
@@ -63,6 +65,8 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     hideSecond = _props$hideSecond === void 0 ? false : _props$hideSecond,
     _props$autoCalcRange = props.autoCalcRange,
     autoCalcRange = _props$autoCalcRange === void 0 ? false : _props$autoCalcRange,
+    _props$history = props.history,
+    historyProp = _props$history === void 0 ? false : _props$history,
     _props$onChange = props.onChange,
     onChange = _props$onChange === void 0 ? noop : _props$onChange,
     disabledDate = props.disabledDate,
@@ -116,15 +120,59 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     _useState10 = _slicedToArray(_useState9, 2),
     backRadioFocused = _useState10[0],
     setBackRadioFocused = _useState10[1];
+  var _useState11 = useState(false),
+    _useState12 = _slicedToArray(_useState11, 2),
+    historyMenuVisible = _useState12[0],
+    setHistoryMenuVisible = _useState12[1];
   var rangeRef = useRef(null);
   var popRef = useRef(null);
   var labelRef = useRef(null);
 
   // 没有 selects 时，回退到普通 RangePicker, 当前时间选项为自定义时，应该显示 RangePicker
-  var _useState11 = useState(rangeName !== CUSTOMIZE),
-    _useState12 = _slicedToArray(_useState11, 2),
-    isPlay = _useState12[0],
-    setIsPlay = _useState12[1];
+  var _useState13 = useState(rangeName !== CUSTOMIZE),
+    _useState14 = _slicedToArray(_useState13, 2),
+    isPlay = _useState14[0],
+    setIsPlay = _useState14[1];
+  var history = useMemo(function () {
+    if (historyProp) {
+      return {
+        capacity: _typeof(historyProp) === 'object' ? historyProp.capacity : DefaultMaxHistoryCapacity
+      };
+    }
+    return false;
+  }, [historyProp]);
+  var _useLocalStorageState = useLocalStorageState('ob-design-date-ranger-local-storage-range-history-state', {
+      defaultValue: [],
+      listenStorageChange: true
+    }),
+    _useLocalStorageState2 = _slicedToArray(_useLocalStorageState, 2),
+    rangeHistory = _useLocalStorageState2[0],
+    setRangeHistory = _useLocalStorageState2[1];
+  var updateRangeHistory = function updateRangeHistory(range) {
+    if (!range) {
+      return;
+    }
+    if (range.length < 2 || !history) {
+      return;
+    }
+    var formattedValue = [range[0].format(YEAR_DATE_TIME_SECOND_FORMAT_CN), range[1].format(YEAR_DATE_TIME_SECOND_FORMAT_CN)];
+    if (rangeHistory.find(function (item) {
+      return _isEqual(item, formattedValue);
+    })) {
+      return;
+    }
+    var updatedValue = [formattedValue].concat(_toConsumableArray(rangeHistory));
+    if (updatedValue.length > history.capacity) {
+      updatedValue.splice(0, history.capacity);
+    }
+    setRangeHistory(updatedValue);
+  };
+  var delRangeHistory = function delRangeHistory(range) {
+    var updatedValue = rangeHistory.filter(function (item) {
+      return !_isEqual(item, range);
+    });
+    setRangeHistory(updatedValue);
+  };
   var compare = function compare(m1, m2) {
     if (Array.isArray(m1) && !Array.isArray(m2)) return false;
     if (Array.isArray(m2) && !Array.isArray(m1)) return false;
@@ -159,6 +207,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
   var rangeChange = function rangeChange(range) {
     setInnerValue(range);
     onChange(range);
+    updateRangeHistory(range);
   };
   var datePickerChange = function datePickerChange(range) {
     rangeChange(range);
@@ -221,6 +270,9 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     }
     return isEN ? "Nearly ".concat(differenceSeconds, " seconds") : "\u8FD1 ".concat(differenceSeconds, " \u79D2");
   };
+  var getHistoryTitle = function getHistoryTitle() {
+    return isEN ? 'History records' : '历史记录';
+  };
   var setNow = function setNow() {
     var selected = selects.find(function (item) {
       return item.name === rangeName;
@@ -284,7 +336,99 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
               ref: popRef,
               className: classNames("".concat(prefix, "-dropdown-picker"), overlayClassName),
               style: overlayStyle,
-              children: [originNode, /*#__PURE__*/_jsx(Divider, {
+              children: [/*#__PURE__*/_jsxs(Flex, {
+                vertical: true,
+                justify: "space-between",
+                children: [!historyMenuVisible && /*#__PURE__*/_jsx("div", {
+                  className: "options",
+                  children: originNode
+                }), history && historyMenuVisible && /*#__PURE__*/_jsxs("div", {
+                  className: "history",
+                  children: [/*#__PURE__*/_jsxs(Button, {
+                    type: "link",
+                    style: {
+                      paddingLeft: 8,
+                      color: token.colorTextBase
+                    },
+                    onClick: function onClick(e) {
+                      setHistoryMenuVisible(false);
+                      e.stopPropagation();
+                    },
+                    children: [/*#__PURE__*/_jsx(ArrowLeftOutlined, {
+                      color: token.colorTextLabel
+                    }), getHistoryTitle()]
+                  }), /*#__PURE__*/_jsx(Menu, {
+                    onClick: function onClick(_ref4) {
+                      var rangeString = _ref4.key;
+                      var vList = rangeString.split(',').map(function (v) {
+                        return v.trim();
+                      });
+                      rangeChange(vList.map(function (v) {
+                        return isMoment ? moment(v) : dayjs(v);
+                      }));
+                      handleNameChange(CUSTOMIZE);
+                    },
+                    style: {
+                      maxHeight: 480,
+                      overflowY: 'auto'
+                    },
+                    items: rangeHistory.map(function (range) {
+                      return {
+                        key: String(range),
+                        label: /*#__PURE__*/_jsxs(Flex, {
+                          className: "".concat(prefix, "-history-menu-item"),
+                          vertical: true,
+                          children: [/*#__PURE__*/_jsxs("span", {
+                            children: [(isMoment ? moment(range[0]) : dayjs(range[0])).format(YEAR_DATE_TIME_SECOND_FORMAT_CN), "~"]
+                          }), /*#__PURE__*/_jsx("span", {
+                            children: (isMoment ? moment(range[1]) : dayjs(range[1])).format(YEAR_DATE_TIME_SECOND_FORMAT_CN)
+                          }), /*#__PURE__*/_jsxs(Space, {
+                            className: "".concat(prefix, "-menu-text-btn-wrapper"),
+                            children: [/*#__PURE__*/_jsx(Button, {
+                              className: "".concat(prefix, "-menu-text-btn"),
+                              type: "text",
+                              color: "default",
+                              variant: "filled",
+                              size: "small",
+                              onClick: function onClick(e) {
+                                e.stopPropagation();
+                                var vList = range.map(function (v) {
+                                  return v;
+                                });
+                                var text = "".concat(vList.join('~'));
+                                navigator.clipboard.writeText(text);
+                                message.success(text);
+                              },
+                              children: /*#__PURE__*/_jsx(CopyOutlined, {})
+                            }), /*#__PURE__*/_jsx(Button, {
+                              className: "".concat(prefix, "-menu-text-btn"),
+                              type: "text",
+                              color: "default",
+                              variant: "filled",
+                              size: "small",
+                              onClick: function onClick(e) {
+                                e.stopPropagation();
+                                delRangeHistory(range);
+                              },
+                              children: /*#__PURE__*/_jsx(DeleteOutlined, {})
+                            })]
+                          })]
+                        }, String(range))
+                      };
+                    })
+                  })]
+                }), history && !historyMenuVisible && /*#__PURE__*/_jsxs(Button, {
+                  type: "link",
+                  style: {
+                    width: 'max-content'
+                  },
+                  onClick: function onClick(e) {
+                    setHistoryMenuVisible(true);
+                    e.stopPropagation();
+                  },
+                  children: [getHistoryTitle(), /*#__PURE__*/_jsx(RightOutlined, {})]
+                })]
+              }), /*#__PURE__*/_jsx(Divider, {
                 type: "vertical",
                 style: {
                   height: 'auto',
@@ -317,9 +461,9 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
           menu: {
             selectable: true,
             defaultSelectedKeys: [rangeName],
-            onClick: function onClick(_ref4) {
-              var key = _ref4.key,
-                domEvent = _ref4.domEvent;
+            onClick: function onClick(_ref5) {
+              var key = _ref5.key,
+                domEvent = _ref5.domEvent;
               var selected = selects.find(function (_item) {
                 return _item.name === key;
               });

package/es/DateRanger/constant/index.js

@@ -192,7 +192,7 @@ export var THIS_WEEK = {
 export var LAST_WEEK = {
   label: '上周',
   enLabel: 'Last week',
-  rangeLabel: 'last week',
+  rangeLabel: '1w',
   name: 'LAST_WEEK',
   range: function range() {
     var current = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : moment();

package/es/DateRanger/index.less

@@ -10,7 +10,7 @@
     border: 1px solid @colorBorder;
     box-sizing: border-box;
     display: flex;
-    border-radius: ~'@{borderRadius}px';
+    border-radius: @borderRadius;
     transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
     // FIXED: 存在不生效情况
     .@{prefix}-picker {
@@ -155,3 +155,26 @@
     }
   }
 }
+
+.@{prefix}-history-menu-item {
+  .@{prefix}-menu-text-btn-wrapper {
+    justify-content: space-between;
+    height: 0;
+    transition: height 0.2s;
+    overflow: hidden;
+  }
+  &:hover {
+    .@{prefix}-menu-text-btn-wrapper {
+      height: 22px;
+    }
+  }
+}
+
+.@{prefix}-menu-text-btn {
+  width: 72px;
+
+  background-color: @colorFillSecondary !important;
+  &:hover {
+    background-color: @colorFill !important;
+  }
+}

package/es/GraphToolbar/index.less

@@ -45,7 +45,7 @@
     color: @colorTextSecondary;
     font-size: 12px;
     background-color: #f5f6fa;
-    border-radius: ~'@{borderRadius}px';
+    border-radius: @borderRadius;
 
     .@{iconPrefixCls} {
       font-size: 12px;

package/es/Highlight/index.d.ts

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

package/es/Highlight/index.less

@@ -10,7 +10,7 @@
   font-size: 14px;
   line-height: 1.5714285714285714;
   list-style: none;
-  border-radius: ~'@{borderRadius}px';
+  border-radius: @borderRadius;
 
   &:not(:hover) .@{prefix}-copy {
     visibility: hidden;
@@ -192,7 +192,7 @@
     overflow-x: auto;
     color: #c0c5ce;
     background: #2b303b;
-    border-radius: ~'@{borderRadius}px';
+    border-radius: @borderRadius;
 
     &.@{prefix}-index {
       border-inline-end: 1px solid rgba(255, 255, 255, 0.05);

package/es/PageContainer/index.js

@@ -7,12 +7,12 @@ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol"
 function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
 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 { SyncOutlined } from '@oceanbase/icons';
+import { ArrowLeftOutlined, SyncOutlined } from '@oceanbase/icons';
 import { PageContainer as AntPageContainer } from '@ant-design/pro-components';
 import classNames from 'classnames';
 import { isObject } from 'lodash';
 import React, { useContext } from 'react';
-import { ConfigProvider, Space, Tooltip } from '@oceanbase/design';
+import { Button, ConfigProvider, Space, Tooltip, theme } from '@oceanbase/design';
 import LocaleWrapper from "../locale/LocaleWrapper";
 import ItemRender from "./ItemRender";
 import PageLoading from "../PageLoading";
@@ -39,10 +39,19 @@ var PageContainer = function PageContainer(_ref) {
   var prefixCls = getPrefixCls('pro-page-container', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR;
+  var _theme$useToken = theme.useToken(),
+    token = _theme$useToken.token;
   var _ref2 = header || {},
     reload = _ref2.reload,
     subTitle = _ref2.subTitle,
-    breadcrumb = _ref2.breadcrumb;
+    breadcrumb = _ref2.breadcrumb,
+    _ref2$backIcon = _ref2.backIcon,
+    backIcon = _ref2$backIcon === void 0 ? /*#__PURE__*/_jsx(Button, {
+      style: {
+        fontSize: token.fontSizeLG
+      },
+      icon: /*#__PURE__*/_jsx(ArrowLeftOutlined, {})
+    }) : _ref2$backIcon;
   var reloadProps = isObject(reload) && ! /*#__PURE__*/React.isValidElement(reload) ? reload : {};
   var reloadCls = classNames("".concat(rootPrefixCls, "-page-header-heading-reload"), reloadProps.className);
   var newSubTitle = (reload || subTitle) && /*#__PURE__*/_jsxs(Space, {
@@ -64,7 +73,8 @@ var PageContainer = function PageContainer(_ref) {
           paths: paths
         });
       }
-    }, breadcrumb)
+    }, breadcrumb),
+    backIcon: backIcon
   });
   var noHasHeader = !title && ['title', 'subTitle', 'extra', 'tags', 'avatar', 'backIcon', 'breadcrumb'].every(function (item) {
     return !(newHeader !== null && newHeader !== void 0 && newHeader[item]);

package/es/PageContainer/style/index.js

@@ -11,18 +11,16 @@ export var genPageContainerStyle = function genPageContainerStyle(token) {
     proComponentsCls = token.proComponentsCls,
     componentCls = token.componentCls,
     colorBgLayout = token.colorBgLayout,
-    fontSizeHeading3 = token.fontSizeHeading3,
+    fontSizeHeading2 = token.fontSizeHeading2,
     controlHeightLG = token.controlHeightLG,
     padding = token.padding,
     paddingLG = token.paddingLG;
-  var height = controlHeightLG;
-  var lineHeight = "".concat(controlHeightLG, "px");
   return _objectSpread(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty(_defineProperty(_defineProperty({
     minHeight: '100vh',
     backgroundColor: colorBgLayout
   }, "".concat(proComponentsCls, "-grid-content"), {
     minHeight: 'auto'
-  }), "".concat(componentCls, "-warp-page-header,").concat(componentCls, "-wrap-page-header"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
+  }), "".concat(componentCls, "-warp-page-header,").concat(componentCls, "-wrap-page-header"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
     // 减小内容区左右两侧间距
     paddingInlineStart: "".concat(paddingLG, "px !important"),
     paddingInlineEnd: "".concat(paddingLG, "px !important"),
@@ -34,15 +32,15 @@ export var genPageContainerStyle = function genPageContainerStyle(token) {
   }), "".concat(antCls, "-page-header-heading"), {
     paddingBlockStart: 0
   }), "".concat(antCls, "-page-header-heading-title"), {
-    fontSize: fontSizeHeading3,
+    fontSize: fontSizeHeading2,
     marginInlineEnd: token.marginXS
   }), "".concat(antCls, "-page-header-heading-reload"), {
     cursor: 'pointer',
     fontSize: token.fontSizeLG,
     marginTop: token.marginXXS
+  }), "".concat(antCls, "-page-header-heading-left"), {
+    marginBlock: 0
   }), "".concat(antCls, "-page-header-heading-extra"), {
-    height: height,
-    lineHeight: lineHeight,
     marginBlock: 0
   }), "".concat(antCls, "-page-header-footer"), {
     marginBlockStart: 0

package/es/ProCard/index.d.ts

@@ -1,5 +1,6 @@
 import { ProCard as AntProCard } from '@ant-design/pro-components';
 import type { ProCardProps } from '@ant-design/pro-components';
 export { ProCardProps };
-declare const ProCard: typeof AntProCard;
+export type ProCardType = typeof AntProCard;
+declare const ProCard: ProCardType;
 export default ProCard;

package/es/ProCard/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["ghost", "title", "tabs", "headerBordered", "bodyStyle", "prefixCls", "className"];
+var _excluded = ["loading", "bordered", "ghost", "title", "tabs", "headerBordered", "bodyStyle", "prefixCls", "className", "style"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -9,26 +9,29 @@ function _objectWithoutProperties(source, excluded) { if (source == null) return
 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, { useContext } from 'react';
 import { ProCard as AntProCard } from '@ant-design/pro-components';
-import { ConfigProvider } from '@oceanbase/design';
+import { ConfigProvider, Skeleton, theme } from '@oceanbase/design';
 import { isHorizontalPaddingZero } from '@oceanbase/design/es/_util';
-import { theme } from '@oceanbase/design';
+import { CaretRightFilled } from '@oceanbase/icons';
 import classNames from 'classnames';
 import useStyle from "./style";
-import { CaretRightFilled } from '@oceanbase/icons';
 import { jsx as _jsx } from "react/jsx-runtime";
 // @ts-ignore
 var ProCard = function ProCard(_ref) {
-  var ghost = _ref.ghost,
+  var loading = _ref.loading,
+    bordered = _ref.bordered,
+    ghost = _ref.ghost,
     title = _ref.title,
     tabs = _ref.tabs,
     headerBordered = _ref.headerBordered,
     bodyStyle = _ref.bodyStyle,
     customizePrefixCls = _ref.prefixCls,
     className = _ref.className,
+    style = _ref.style,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _useContext = useContext(ConfigProvider.ConfigContext),
     getPrefixCls = _useContext.getPrefixCls,
-    iconPrefixCls = _useContext.iconPrefixCls;
+    iconPrefixCls = _useContext.iconPrefixCls,
+    contextCard = _useContext.card;
   var prefixCls = getPrefixCls('pro-card', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
     wrapSSR = _useStyle.wrapSSR;
@@ -37,17 +40,26 @@ var ProCard = function ProCard(_ref) {
 
   // ProCard body no horizontal padding
   var noBodyHorizontalPadding = isHorizontalPaddingZero(bodyStyle === null || bodyStyle === void 0 ? void 0 : bodyStyle.padding) || ghost;
-  var proCardCls = classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-has-title"), !!title), "".concat(prefixCls, "-no-body-horizontal-padding"), noBodyHorizontalPadding), "".concat(prefixCls, "-no-divider"), !headerBordered), "".concat(prefixCls, "-contain-tabs"), !!tabs), className);
+  var proCardCls = classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-has-title"), !!title), "".concat(prefixCls, "-no-body-horizontal-padding"), noBodyHorizontalPadding), "".concat(prefixCls, "-no-divider"), !headerBordered), "".concat(prefixCls, "-contain-tabs"), !!tabs), contextCard === null || contextCard === void 0 ? void 0 : contextCard.className, className);
   return wrapSSR( /*#__PURE__*/_jsx(AntProCard, _objectSpread({
+    loading: loading === true ? /*#__PURE__*/_jsx(Skeleton, {
+      active: true,
+      title: false,
+      paragraph: {
+        rows: 4
+      }
+    }) : loading,
     prefixCls: customizePrefixCls,
+    bordered: bordered !== null && bordered !== void 0 ? bordered : contextCard !== null && contextCard !== void 0 && contextCard.variant ? (contextCard === null || contextCard === void 0 ? void 0 : contextCard.variant) === 'outlined' : undefined,
     ghost: ghost,
     title: title,
     tabs: _typeof(tabs) === 'object' ? _objectSpread({
       size: 'large'
     }, tabs) : tabs,
-    headerBordered: headerBordered,
+    headerBordered: headerBordered !== null && headerBordered !== void 0 ? headerBordered : contextCard === null || contextCard === void 0 ? void 0 : contextCard.divided,
     bodyStyle: bodyStyle,
     className: proCardCls,
+    style: _objectSpread(_objectSpread({}, contextCard === null || contextCard === void 0 ? void 0 : contextCard.style), style),
     collapsibleIconRender: function collapsibleIconRender(_ref2) {
       var collapsed = _ref2.collapsed;
       return /*#__PURE__*/_jsx(CaretRightFilled, {

package/es/ProCard/style/index.js

@@ -13,8 +13,10 @@ export var genProCardStyle = function genProCardStyle(token) {
   var tableComponentCls = "".concat(antCls, "-table");
   var tabsComponentCls = "".concat(antCls, "-tabs");
   var tabsPrefixCls = "".concat(prefixCls, "-tabs");
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "div".concat(componentCls), {
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "div".concat(componentCls), {
     borderRadius: token.borderRadiusLG
+  }), "".concat(componentCls).concat(componentCls, "-border"), {
+    border: "".concat(token.lineWidth, "px solid ").concat(token.colorBorderSecondary)
   }), "".concat(componentCls, ":not(").concat(componentCls, "-border):not(").concat(componentCls, "-ghost)"), {
     boxShadow: '0 1px 2px 0 rgba(0, 0, 0, 0.03),0 1px 6px -1px rgba(0, 0, 0, 0.02),0 2px 4px 0 rgba(0, 0, 0, 0.02)'
   }), "".concat(componentCls, ":not(").concat(componentCls, "-size-small):not(").concat(componentCls, "-ghost)"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-body"), {

package/es/ProTable/index.d.ts

@@ -3,7 +3,7 @@ import type { ProTableProps as AntProTableProps } from '@ant-design/pro-componen
 export interface ProTableProps<T, U, ValueType> extends AntProTableProps<T, U, ValueType> {
     innerBordered?: boolean;
 }
-declare function ProTable<T, U, ValueType>({ form, headerTitle, options, optionsRender, toolbar, toolBarRender, size, bordered, innerBordered, expandable, rowSelection, pagination: customPagination, footer, locale, cardProps: outerCardProps, prefixCls: customizePrefixCls, tableClassName, className, ...restProps }: ProTableProps<T, U, ValueType>): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+declare function ProTable<T, U, ValueType>({ form, headerTitle, options, optionsRender, toolbar, toolBarRender, size, bordered, innerBordered, cardBordered, expandable, rowSelection, pagination: customPagination, footer, locale, cardProps: outerCardProps, prefixCls: customizePrefixCls, tableClassName, className, ...restProps }: ProTableProps<T, U, ValueType>): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
 declare namespace ProTable {
     var Summary;
 }

package/es/ProTable/index.js

@@ -1,5 +1,5 @@
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-var _excluded = ["form", "headerTitle", "options", "optionsRender", "toolbar", "toolBarRender", "size", "bordered", "innerBordered", "expandable", "rowSelection", "pagination", "footer", "locale", "cardProps", "prefixCls", "tableClassName", "className"],
+var _excluded = ["form", "headerTitle", "options", "optionsRender", "toolbar", "toolBarRender", "size", "bordered", "innerBordered", "cardBordered", "expandable", "rowSelection", "pagination", "footer", "locale", "cardProps", "prefixCls", "tableClassName", "className"],
   _excluded2 = ["emptyText"];
 function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -12,7 +12,7 @@ import React, { useContext } from 'react';
 import { ProTable as AntProTable } from '@ant-design/pro-components';
 import { ConfigProvider, Empty, Table } from '@oceanbase/design';
 import classNames from 'classnames';
-import { isEmpty } from 'lodash';
+import { isEmpty, merge } from 'lodash';
 import useLightFilterStyle from "../LightFilter/style";
 import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -28,6 +28,7 @@ function ProTable(_ref) {
     size = _ref.size,
     bordered = _ref.bordered,
     innerBordered = _ref.innerBordered,
+    cardBordered = _ref.cardBordered,
     expandable = _ref.expandable,
     rowSelection = _ref.rowSelection,
     customPagination = _ref.pagination,
@@ -39,7 +40,8 @@ function ProTable(_ref) {
     className = _ref.className,
     restProps = _objectWithoutProperties(_ref, _excluded);
   var _useContext = useContext(ConfigProvider.ConfigContext),
-    getPrefixCls = _useContext.getPrefixCls;
+    getPrefixCls = _useContext.getPrefixCls,
+    contextCard = _useContext.card;
 
   // customize Table style
   var tablePrefixCls = getPrefixCls('table', customizePrefixCls);
@@ -62,7 +64,7 @@ function ProTable(_ref) {
       image: Empty.PRESENTED_IMAGE_SIMPLE
     }) : _ref2$emptyText,
     restLocale = _objectWithoutProperties(_ref2, _excluded2);
-  var cardProps = typeof outerCardProps === 'boolean' ? {} : outerCardProps;
+  var cardProps = merge({}, contextCard, typeof outerCardProps === 'boolean' ? {} : outerCardProps);
   var proCardCls = getPrefixCls('pro-card', customizePrefixCls);
   return tableWrapSSR(lightFilterWrapSSR(wrapSSR( /*#__PURE__*/_jsx(AntProTable
   // default size change to `large` as same as Table
@@ -70,6 +72,7 @@ function ProTable(_ref) {
     defaultSize: "large",
     size: size,
     bordered: bordered || innerBordered,
+    cardBordered: cardBordered !== null && cardBordered !== void 0 ? cardBordered : contextCard !== null && contextCard !== void 0 && contextCard.variant ? (contextCard === null || contextCard === void 0 ? void 0 : contextCard.variant) === 'outlined' : undefined,
     form: _objectSpread({
       // query form should remove required mark
       requiredMark: false
@@ -80,7 +83,10 @@ function ProTable(_ref) {
     toolbar: toolbar,
     toolBarRender: toolBarRender,
     cardProps: _objectSpread(_objectSpread({}, cardProps), {}, {
-      className: classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(proCardCls, "-has-title"), !!headerTitle || options || options === undefined || optionsRender || toolbar || toolBarRender), "".concat(proCardCls, "-no-divider"), !(cardProps !== null && cardProps !== void 0 && cardProps.headerBordered)), "".concat(proCardCls, "-no-padding"), true), "".concat(proCardCls, "-contain-tabs"), !!(cardProps !== null && cardProps !== void 0 && cardProps.tabs)), cardProps === null || cardProps === void 0 ? void 0 : cardProps.className)
+      className: classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(proCardCls, "-has-title"), !!headerTitle || options || options === undefined || optionsRender || toolbar || toolBarRender), "".concat(proCardCls, "-no-divider"), !(cardProps !== null && cardProps !== void 0 && cardProps.headerBordered) && !(cardProps !== null && cardProps !== void 0 && cardProps.divided)), "".concat(proCardCls, "-no-padding"), true), "".concat(proCardCls, "-contain-tabs"), !!(cardProps !== null && cardProps !== void 0 && cardProps.tabs)), cardProps === null || cardProps === void 0 ? void 0 : cardProps.className),
+      bodyStyle: _objectSpread({
+        paddingBlock: 0
+      }, cardProps === null || cardProps === void 0 ? void 0 : cardProps.bodyStyle)
     }),
     expandable: expandable ? _objectSpread({
       columnWidth: !size || size === 'large' ? 40 : 32

package/es/ProTable/style/index.js

@@ -11,9 +11,11 @@ export var genProTableStyle = function genProTableStyle(token) {
     componentCls = token.componentCls,
     proComponentsCls = token.proComponentsCls;
   var proCardComponentCls = "".concat(proComponentsCls, "-card");
-  return _defineProperty({}, "".concat(componentCls), _defineProperty(_defineProperty({}, "".concat(proComponentsCls, "-query-filter-actions"), _defineProperty({}, "".concat(antCls, "-space").concat(antCls, "-space-horizontal").concat(antCls, "-space-align-center"), {
+  return _defineProperty({}, "".concat(componentCls), _defineProperty(_defineProperty(_defineProperty({}, "".concat(proComponentsCls, "-query-filter-actions"), _defineProperty({}, "".concat(antCls, "-space").concat(antCls, "-space-horizontal").concat(antCls, "-space-align-center"), {
     flexDirection: 'row-reverse'
-  })), "".concat(proCardComponentCls).concat(proCardComponentCls, "-no-padding"), _objectSpread(_defineProperty({}, "".concat(proCardComponentCls, "-body"), _defineProperty({
+  })), "".concat(proCardComponentCls, ":not(").concat(proCardComponentCls, "-no-divider)"), _defineProperty({}, "".concat(proCardComponentCls, "-body"), _defineProperty({}, "".concat(componentCls, "-list-toolbar-container"), {
+    borderBottom: "".concat(token.lineWidth, "px solid ").concat(token.colorBorderSecondary)
+  }))), "".concat(proCardComponentCls).concat(proCardComponentCls, "-no-padding"), _objectSpread(_defineProperty({}, "".concat(proCardComponentCls, "-body"), _defineProperty({
     paddingInline: 0
   }, "".concat(componentCls, "-list-toolbar-container"), {
     paddingInline: token.paddingLG