@oceanbase/ui 0.4.7 → 0.4.9

package/es/DateRanger/PickerPanel.js

@@ -462,8 +462,15 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               startTime = values.startTime,
               endDate = values.endDate,
               endTime = values.endTime;
-            var start = "".concat(startDate, " ").concat(startTime.format(TIME_FORMAT));
-            var end = "".concat(endDate, " ").concat(endTime.format(TIME_FORMAT));
+            // 日期同一天时对时间进行排序，保证开始时间在结束时间之前
+            var _ref7 = startDate === endDate ? [startTime, endTime].sort(function (a, b) {
+                return (a === null || a === void 0 ? void 0 : a.valueOf()) - (b === null || b === void 0 ? void 0 : b.valueOf());
+              }) : [startTime, endTime],
+              _ref8 = _slicedToArray(_ref7, 2),
+              sTime = _ref8[0],
+              eTime = _ref8[1];
+            var start = "".concat(startDate, " ").concat(sTime.format(TIME_FORMAT));
+            var end = "".concat(endDate, " ").concat(eTime.format(TIME_FORMAT));
             var errorList = [];
             var message = '';
             rules === null || rules === void 0 || rules.some(function (item) {

package/es/DateRanger/Ranger.d.ts

@@ -35,6 +35,9 @@ export interface DateRangerProps extends Omit<RangePickerProps, 'mode' | 'picker
     defaultValue?: RangeValue;
     size?: 'small' | 'large' | 'middle';
     tooltipProps?: TooltipProps;
+    autoAdjustOverflow?: boolean;
+    overlayClassName?: string;
+    overlayStyle?: React.CSSProperties;
     locale?: any;
 }
 declare const _default: React.ForwardRefExoticComponent<DateRangerProps & React.RefAttributes<unknown>>;

package/es/DateRanger/Ranger.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 = ["selects", "value", "defaultValue", "defaultQuickValue", "hasRewind", "hasPlay", "hasSync", "hasForward", "hasZoomOut", "hasTagInPicker", "pastOnly", "simpleMode", "hideYear", "hideSecond", "autoCalcRange", "onChange", "disabledDate", "locale", "size", "stickRangeName", "tooltipProps", "isMoment", "rules", "tip"];
+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"];
 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; }
@@ -22,7 +22,7 @@ import moment from 'moment';
 import classNames from 'classnames';
 import LocaleWrapper from "../locale/LocaleWrapper";
 import { getPrefix } from "../_util";
-import { CUSTOMIZE, DATE_TIME_FORMAT, NEAR_1_MINUTES, NEAR_30_MINUTES, NEAR_1_HOURS, NEAR_3_HOURS, NEAR_6_HOURS, TODAY, NEAR_TIME_LIST, YEAR_DATE_TIME_FORMAT, LAST_3_DAYS, DATE_TIME_SECOND_FORMAT, YEAR_DATE_TIME_SECOND_FORMAT, DATE_TIME_FORMAT_CN, DATE_TIME_SECOND_FORMAT_CN, YEAR_DATE_TIME_FORMAT_CN, YEAR_DATE_TIME_SECOND_FORMAT_CN } from "./constant";
+import { CUSTOMIZE, DATE_TIME_FORMAT, NEAR_1_MINUTES, NEAR_30_MINUTES, NEAR_1_HOURS, NEAR_3_HOURS, NEAR_6_HOURS, TODAY, YEAR_DATE_TIME_FORMAT, LAST_3_DAYS, DATE_TIME_SECOND_FORMAT, YEAR_DATE_TIME_SECOND_FORMAT, DATE_TIME_FORMAT_CN, DATE_TIME_SECOND_FORMAT_CN, YEAR_DATE_TIME_FORMAT_CN, YEAR_DATE_TIME_SECOND_FORMAT_CN } from "./constant";
 import InternalPickerPanel from "./PickerPanel";
 import zhCN from "./locale/zh-CN";
 import "./index.less";
@@ -69,6 +69,9 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     isMomentProps = props.isMoment,
     rules = props.rules,
     tip = props.tip,
+    autoAdjustOverflow = props.autoAdjustOverflow,
+    overlayClassName = props.overlayClassName,
+    overlayStyle = props.overlayStyle,
     rest = _objectWithoutProperties(props, _excluded);
   var _theme$useToken = theme.useToken(),
     token = _theme$useToken.token;
@@ -211,7 +214,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
     return isEN ? "Nearly ".concat(differenceSeconds, " seconds") : "\u8FD1 ".concat(differenceSeconds, " \u79D2");
   };
   var setNow = function setNow() {
-    var selected = NEAR_TIME_LIST.find(function (item) {
+    var selected = selects.find(function (item) {
       return item.name === rangeName;
     });
     if (selected !== null && selected !== void 0 && selected.range) {
@@ -255,7 +258,9 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
         className: classNames("".concat(prefix, "-wrapper"), _defineProperty({}, "".concat(prefix, "-wrapper-has-jumper"), hasRewind || hasForward)),
         children: [/*#__PURE__*/_jsx(Dropdown, {
           trigger: ['click'],
-          open: open
+          open: open,
+          placement: rest.placement,
+          autoAdjustOverflow: autoAdjustOverflow
           // 关闭后进行销毁，才可以将 Tooltip 进行同步关闭
           ,
           destroyPopupOnHide: true
@@ -269,7 +274,8 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
           },
           dropdownRender: function dropdownRender(originNode) {
             return /*#__PURE__*/_jsxs("div", {
-              className: "".concat(prefix, "-dropdown-picker"),
+              className: classNames("".concat(prefix, "-dropdown-picker"), overlayClassName),
+              style: overlayStyle,
               children: [originNode, /*#__PURE__*/_jsx(Divider, {
                 type: "vertical",
                 style: {
@@ -310,7 +316,7 @@ var Ranger = /*#__PURE__*/React.forwardRef(function (props, ref) {
               } else {
                 refState.current.tooltipOpen = false;
               }
-              var selected = NEAR_TIME_LIST.find(function (_item) {
+              var selected = selects.find(function (_item) {
                 return _item.name === key;
               });
               // 存在快捷选项切换为极简模式

package/es/DateRanger/locale/en-US.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     dateSelect: string;
     weekSelect?: string;
     clear: string;
+    week: string;
     month: string;
     year: string;
     previousMonth: string;

package/es/DateRanger/locale/zh-CN.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     dateSelect: string;
     weekSelect?: string;
     clear: string;
+    week: string;
     month: string;
     year: string;
     previousMonth: string;

package/es/DateRanger/locale/zh-TW.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     dateSelect: string;
     weekSelect?: string;
     clear: string;
+    week: string;
     month: string;
     year: string;
     previousMonth: string;

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" | "go" | "java" | "json" | "bash" | "javascript" | "typescript" | "groovy" | "python" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
+declare const supportedLanguages: ("ruby" | "css" | "go" | "bash" | "json" | "java" | "javascript" | "typescript" | "groovy" | "python" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "yaml" | "solidity" | "tsx" | "jsx")[];
 export type LanguageType = (typeof supportedLanguages)[number] | 'html';
 export interface HighlightProps extends LocaleWrapperProps {
     /**

package/es/ProCard/index.js

@@ -1,4 +1,4 @@
-var _excluded = ["title", "tabs", "headerBordered", "bodyStyle", "prefixCls", "className"];
+var _excluded = ["ghost", "title", "tabs", "headerBordered", "bodyStyle", "prefixCls", "className"];
 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); }
@@ -15,7 +15,8 @@ import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 // @ts-ignore
 var ProCard = function ProCard(_ref) {
-  var title = _ref.title,
+  var ghost = _ref.ghost,
+    title = _ref.title,
     tabs = _ref.tabs,
     headerBordered = _ref.headerBordered,
     bodyStyle = _ref.bodyStyle,
@@ -29,10 +30,11 @@ var ProCard = function ProCard(_ref) {
     wrapSSR = _useStyle.wrapSSR;
   var zeroPaddingList = [0, '0', '0px'];
   // ProCard body has no padding
-  var noBodyPadding = zeroPaddingList.includes(bodyStyle === null || bodyStyle === void 0 ? void 0 : bodyStyle.padding);
+  var noBodyPadding = zeroPaddingList.includes(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-padding"), noBodyPadding), "".concat(prefixCls, "-no-divider"), !headerBordered), "".concat(prefixCls, "-contain-tabs"), !!tabs), className);
   return wrapSSR( /*#__PURE__*/_jsx(AntProCard, _objectSpread({
     prefixCls: customizePrefixCls,
+    ghost: ghost,
     title: title,
     tabs: _typeof(tabs) === 'object' ? _objectSpread({
       size: 'large'

package/es/ProCard/style/index.js

@@ -12,15 +12,20 @@ export var genProCardStyle = function genProCardStyle(token) {
     prefixCls = token.prefixCls;
   var tabsComponentCls = "".concat(antCls, "-tabs");
   var tabsPrefixCls = "".concat(prefixCls, "-tabs");
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "div".concat(componentCls), {
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "div".concat(componentCls), {
     borderRadius: token.borderRadiusLG
-  }), "".concat(componentCls, ":not(").concat(componentCls, "-border)"), {
+  }), "".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)"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-body"), {
+  }), "".concat(componentCls, ":not(").concat(componentCls, "-size-small):not(").concat(componentCls, "-ghost)"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-body"), {
     paddingBlock: token.paddingLG
   }), "&".concat(componentCls, "-has-title").concat(componentCls, "-no-divider"), _defineProperty({}, "".concat(componentCls, "-body"), {
     paddingBlockStart: token.padding
-  }))), "".concat(componentCls).concat(componentCls, "-no-body-padding:not(").concat(componentCls, "-contain-tabs)"), _objectSpread(_defineProperty({}, "".concat(componentCls, "-header"), {
+  }))), "".concat(componentCls).concat(componentCls, "-size-small").concat(componentCls, "-ghost"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-header"), {
+    paddingInline: 0
+  }), "".concat(componentCls, "-body"), {
+    paddingBlock: 0,
+    paddingInline: 0
+  })), "".concat(componentCls).concat(componentCls, "-no-body-padding:not(").concat(componentCls, "-contain-tabs)"), _objectSpread(_defineProperty({}, "".concat(componentCls, "-header"), {
     paddingBlockEnd: token.padding
   }), Card.genTableStyle(token.paddingLG, token))), "".concat(componentCls).concat(componentCls, "-no-body-padding").concat(componentCls, "-size-small:not(").concat(componentCls, "-contain-tabs)"), _objectSpread(_defineProperty({}, "".concat(componentCls, "-header"), {
     paddingBlockEnd: token.paddingXS

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", "expandable", "rowSelection", "pagination", "footer", "locale", "prefixCls", "tableClassName", "className"],
+var _excluded = ["form", "headerTitle", "options", "optionsRender", "toolbar", "toolBarRender", "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; }
@@ -18,11 +18,17 @@ import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 var ProTable = function ProTable(_ref) {
   var form = _ref.form,
+    headerTitle = _ref.headerTitle,
+    options = _ref.options,
+    optionsRender = _ref.optionsRender,
+    toolbar = _ref.toolbar,
+    toolBarRender = _ref.toolBarRender,
     expandable = _ref.expandable,
     rowSelection = _ref.rowSelection,
     customPagination = _ref.pagination,
     footer = _ref.footer,
     locale = _ref.locale,
+    outerCardProps = _ref.cardProps,
     customizePrefixCls = _ref.prefixCls,
     tableClassName = _ref.tableClassName,
     className = _ref.className,
@@ -51,6 +57,8 @@ var ProTable = function ProTable(_ref) {
       image: Empty.PRESENTED_IMAGE_SIMPLE
     }) : _ref2$emptyText,
     restLocale = _objectWithoutProperties(_ref2, _excluded2);
+  var cardProps = 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
   , _objectSpread({
@@ -59,6 +67,14 @@ var ProTable = function ProTable(_ref) {
       // query form should remove required mark
       requiredMark: false
     }, form),
+    headerTitle: headerTitle,
+    options: options,
+    optionsRender: optionsRender,
+    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)
+    }),
     expandable: expandable ? _objectSpread({
       columnWidth: 32
     }, expandable) : undefined,

package/es/ProTable/style/index.js

@@ -1,15 +1,25 @@
 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 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; }
 function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
 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); }
+import { Card } from '@oceanbase/design';
 import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
 export var genProTableStyle = function genProTableStyle(token) {
   var antCls = token.antCls,
     componentCls = token.componentCls,
     proComponentsCls = token.proComponentsCls;
-  return _defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(proComponentsCls, "-query-filter-actions"), _defineProperty({}, "".concat(antCls, "-space").concat(antCls, "-space-horizontal").concat(antCls, "-space-align-center"), {
+  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"), {
     flexDirection: 'row-reverse'
-  })));
+  })), "".concat(proCardComponentCls).concat(proCardComponentCls, "-no-padding"), _objectSpread(_defineProperty({}, "".concat(proCardComponentCls, "-body"), _defineProperty({
+    paddingInline: 0
+  }, "".concat(componentCls, "-list-toolbar-container"), {
+    paddingInline: token.paddingLG
+  })), Card.genTableStyle(token.paddingLG, _objectSpread(_objectSpread({}, token), {}, {
+    componentCls: proCardComponentCls
+  })))));
 };
 export default (function (prefixCls) {
   var useStyle = genComponentStyleHook('ProTable', function (token) {

package/lib/DateRanger/PickerPanel.js

@@ -400,8 +400,11 @@ var InternalPickerPanel = (props) => {
         onClick: () => {
           form.validateFields().then((values) => {
             const { startDate, startTime, endDate, endTime } = values;
-            const start = `${startDate} ${startTime.format(TIME_FORMAT)}`;
-            const end = `${endDate} ${endTime.format(TIME_FORMAT)}`;
+            const [sTime, eTime] = startDate === endDate ? [startTime, endTime].sort((a, b) => {
+              return (a == null ? void 0 : a.valueOf()) - (b == null ? void 0 : b.valueOf());
+            }) : [startTime, endTime];
+            const start = `${startDate} ${sTime.format(TIME_FORMAT)}`;
+            const end = `${endDate} ${eTime.format(TIME_FORMAT)}`;
             let errorList = [];
             let message = "";
             rules == null ? void 0 : rules.some((item) => {

package/lib/DateRanger/Ranger.d.ts

@@ -35,6 +35,9 @@ export interface DateRangerProps extends Omit<RangePickerProps, 'mode' | 'picker
     defaultValue?: RangeValue;
     size?: 'small' | 'large' | 'middle';
     tooltipProps?: TooltipProps;
+    autoAdjustOverflow?: boolean;
+    overlayClassName?: string;
+    overlayStyle?: React.CSSProperties;
     locale?: any;
 }
 declare const _default: React.ForwardRefExoticComponent<DateRangerProps & React.RefAttributes<unknown>>;

package/lib/DateRanger/Ranger.js

@@ -82,6 +82,9 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
     isMoment: isMomentProps,
     rules,
     tip,
+    autoAdjustOverflow,
+    overlayClassName,
+    overlayStyle,
     ...rest
   } = props;
   const { token } = import_design.theme.useToken();
@@ -201,7 +204,7 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
     return isEN ? `Nearly ${differenceSeconds} seconds` : `近 ${differenceSeconds} 秒`;
   };
   const setNow = () => {
-    const selected = import_constant.NEAR_TIME_LIST.find((item) => item.name === rangeName);
+    const selected = selects.find((item) => item.name === rangeName);
     if (selected == null ? void 0 : selected.range) {
       rangeChange(selected.range(isMoment ? (0, import_moment.default)() : (0, import_dayjs.default)()));
     }
@@ -246,6 +249,8 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
         {
           trigger: ["click"],
           open,
+          placement: rest.placement,
+          autoAdjustOverflow,
           destroyPopupOnHide: true,
           onOpenChange: (o) => {
             if (o === false && refState.current.tooltipOpen) {
@@ -254,30 +259,39 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
             setOpen(o);
           },
           dropdownRender: (originNode) => {
-            return /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-dropdown-picker` }, originNode, /* @__PURE__ */ import_react.default.createElement(import_design.Divider, { type: "vertical", style: { height: "auto", margin: "0px 4px 0px 0px" } }), /* @__PURE__ */ import_react.default.createElement(
-              import_PickerPanel.default,
+            return /* @__PURE__ */ import_react.default.createElement(
+              "div",
               {
-                defaultValue: innerValue || [],
-                locale,
-                disabledDate: pastOnly ? disabledFuture : disabledDate,
-                tip,
-                isMoment,
-                rules,
-                onOk: (vList) => {
-                  setIsPlay(false);
-                  handleNameChange(import_constant.CUSTOMIZE);
-                  rangeChange(
-                    vList.map((v) => {
-                      return isMoment ? (0, import_moment.default)(v) : (0, import_dayjs.default)(v);
-                    })
-                  );
-                  closeTooltip();
-                },
-                onCancel: () => {
-                  closeTooltip();
+                className: (0, import_classnames.default)(`${prefix}-dropdown-picker`, overlayClassName),
+                style: overlayStyle
+              },
+              originNode,
+              /* @__PURE__ */ import_react.default.createElement(import_design.Divider, { type: "vertical", style: { height: "auto", margin: "0px 4px 0px 0px" } }),
+              /* @__PURE__ */ import_react.default.createElement(
+                import_PickerPanel.default,
+                {
+                  defaultValue: innerValue || [],
+                  locale,
+                  disabledDate: pastOnly ? disabledFuture : disabledDate,
+                  tip,
+                  isMoment,
+                  rules,
+                  onOk: (vList) => {
+                    setIsPlay(false);
+                    handleNameChange(import_constant.CUSTOMIZE);
+                    rangeChange(
+                      vList.map((v) => {
+                        return isMoment ? (0, import_moment.default)(v) : (0, import_dayjs.default)(v);
+                      })
+                    );
+                    closeTooltip();
+                  },
+                  onCancel: () => {
+                    closeTooltip();
+                  }
                 }
-              }
-            ));
+              )
+            );
           },
           menu: {
             selectable: true,
@@ -288,7 +302,7 @@ var Ranger = import_react.default.forwardRef((props, ref) => {
               } else {
                 refState.current.tooltipOpen = false;
               }
-              const selected = import_constant.NEAR_TIME_LIST.find((_item) => _item.name === key);
+              const selected = selects.find((_item) => _item.name === key);
               if (selected == null ? void 0 : selected.range) {
                 handleNameChange(key);
                 setIsPlay(true);

package/lib/DateRanger/locale/en-US.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     dateSelect: string;
     weekSelect?: string;
     clear: string;
+    week: string;
     month: string;
     year: string;
     previousMonth: string;

package/lib/DateRanger/locale/zh-CN.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     dateSelect: string;
     weekSelect?: string;
     clear: string;
+    week: string;
     month: string;
     year: string;
     previousMonth: string;

package/lib/DateRanger/locale/zh-TW.d.ts

@@ -25,6 +25,7 @@ declare const _default: {
     dateSelect: string;
     weekSelect?: string;
     clear: string;
+    week: string;
     month: string;
     year: string;
     previousMonth: string;

package/lib/ProCard/index.js

@@ -38,6 +38,7 @@ var import_design = require("@oceanbase/design");
 var import_classnames = __toESM(require("classnames"));
 var import_style = __toESM(require("./style"));
 var ProCard = ({
+  ghost,
   title,
   tabs,
   headerBordered,
@@ -50,7 +51,7 @@ var ProCard = ({
   const prefixCls = getPrefixCls("pro-card", customizePrefixCls);
   const { wrapSSR } = (0, import_style.default)(prefixCls);
   const zeroPaddingList = [0, "0", "0px"];
-  const noBodyPadding = zeroPaddingList.includes(bodyStyle == null ? void 0 : bodyStyle.padding);
+  const noBodyPadding = zeroPaddingList.includes(bodyStyle == null ? void 0 : bodyStyle.padding) || ghost;
   const proCardCls = (0, import_classnames.default)(
     {
       [`${prefixCls}-has-title`]: !!title,
@@ -65,6 +66,7 @@ var ProCard = ({
       import_pro_components.ProCard,
       {
         prefixCls: customizePrefixCls,
+        ghost,
         title,
         tabs: typeof tabs === "object" ? {
           size: "large",

package/lib/ProCard/style/index.js

@@ -35,10 +35,10 @@ var genProCardStyle = (token) => {
     [`div${componentCls}`]: {
       borderRadius: token.borderRadiusLG
     },
-    [`${componentCls}:not(${componentCls}-border)`]: {
+    [`${componentCls}:not(${componentCls}-border):not(${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)"
     },
-    [`${componentCls}:not(${componentCls}-size-small)`]: {
+    [`${componentCls}:not(${componentCls}-size-small):not(${componentCls}-ghost)`]: {
       [`${componentCls}-body`]: {
         paddingBlock: token.paddingLG
       },
@@ -48,6 +48,16 @@ var genProCardStyle = (token) => {
         }
       }
     },
+    // need to handle style for small and ghost ProCard
+    [`${componentCls}${componentCls}-size-small${componentCls}-ghost`]: {
+      [`${componentCls}-header`]: {
+        paddingInline: 0
+      },
+      [`${componentCls}-body`]: {
+        paddingBlock: 0,
+        paddingInline: 0
+      }
+    },
     // no body padding card
     [`${componentCls}${componentCls}-no-body-padding:not(${componentCls}-contain-tabs)`]: {
       [`${componentCls}-header`]: {

package/lib/ProTable/index.js

@@ -41,11 +41,17 @@ var import_style = __toESM(require("../LightFilter/style"));
 var import_style2 = __toESM(require("./style"));
 var ProTable = ({
   form,
+  headerTitle,
+  options,
+  optionsRender,
+  toolbar,
+  toolBarRender,
   expandable,
   rowSelection,
   pagination: customPagination,
   footer,
   locale,
+  cardProps: outerCardProps,
   prefixCls: customizePrefixCls,
   tableClassName,
   className,
@@ -69,6 +75,8 @@ var ProTable = ({
   const { wrapSSR } = (0, import_style2.default)(prefixCls);
   const proTableCls = (0, import_classnames.default)(className);
   const { emptyText = /* @__PURE__ */ import_react.default.createElement(import_design.Empty, { image: import_design.Empty.PRESENTED_IMAGE_SIMPLE }), ...restLocale } = locale || {};
+  const cardProps = typeof outerCardProps === "boolean" ? {} : outerCardProps;
+  const proCardCls = getPrefixCls("pro-card", customizePrefixCls);
   return tableWrapSSR(
     lightFilterWrapSSR(
       wrapSSR(
@@ -81,6 +89,23 @@ var ProTable = ({
               requiredMark: false,
               ...form
             },
+            headerTitle,
+            options,
+            optionsRender,
+            toolbar,
+            toolBarRender,
+            cardProps: {
+              ...cardProps,
+              className: (0, import_classnames.default)(
+                {
+                  [`${proCardCls}-has-title`]: !!headerTitle || options || options === void 0 || optionsRender || toolbar || toolBarRender,
+                  [`${proCardCls}-no-divider`]: !(cardProps == null ? void 0 : cardProps.headerBordered),
+                  [`${proCardCls}-no-padding`]: true,
+                  [`${proCardCls}-contain-tabs`]: !!(cardProps == null ? void 0 : cardProps.tabs)
+                },
+                cardProps == null ? void 0 : cardProps.className
+              )
+            },
             expandable: expandable ? {
               columnWidth: 32,
               ...expandable

package/lib/ProTable/style/index.js

@@ -23,9 +23,11 @@ __export(style_exports, {
   genProTableStyle: () => genProTableStyle
 });
 module.exports = __toCommonJS(style_exports);
+var import_design = require("@oceanbase/design");
 var import_genComponentStyleHook = require("../../_util/genComponentStyleHook");
 var genProTableStyle = (token) => {
   const { antCls, componentCls, proComponentsCls } = token;
+  const proCardComponentCls = `${proComponentsCls}-card`;
   return {
     [`${componentCls}`]: {
       [`${proComponentsCls}-query-filter-actions`]: {
@@ -33,6 +35,18 @@ var genProTableStyle = (token) => {
         [`${antCls}-space${antCls}-space-horizontal${antCls}-space-align-center`]: {
           flexDirection: "row-reverse"
         }
+      },
+      [`${proCardComponentCls}${proCardComponentCls}-no-padding`]: {
+        [`${proCardComponentCls}-body`]: {
+          paddingInline: 0,
+          [`${componentCls}-list-toolbar-container`]: {
+            paddingInline: token.paddingLG
+          }
+        },
+        ...import_design.Card.genTableStyle(token.paddingLG, {
+          ...token,
+          componentCls: proCardComponentCls
+        })
       }
     }
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/ui",
-  "version": "0.4.7",
+  "version": "0.4.9",
   "description": "The UI library based on OceanBase Design",
   "keywords": [
     "oceanbase",
@@ -39,11 +39,11 @@
     "build": "NODE_OPTIONS=--max_old_space_size=4096 father build"
   },
   "dependencies": {
-    "@ant-design/cssinjs": "^1.22.1",
-    "@ant-design/pro-components": "^2.8.3",
+    "@ant-design/cssinjs": "^1.23.0",
+    "@ant-design/pro-components": "^2.8.5",
     "@antv/g6": "3.4.10",
-    "@oceanbase/design": "^0.4.6",
-    "@oceanbase/icons": "^0.4.4",
+    "@oceanbase/design": "^0.4.8",
+    "@oceanbase/icons": "^0.4.5",
     "@oceanbase/util": "^0.4.2",
     "ahooks": "^2.10.14",
     "classnames": "^2.5.1",
@@ -56,20 +56,20 @@
     "moment": "^2.30.1",
     "path-to-regexp": "^7.2.0",
     "randexp": "^0.5.3",
-    "rc-picker": "^4.9.2",
-    "rc-util": "^5.44.3",
+    "rc-picker": "^4.11.1",
+    "rc-util": "^5.44.4",
     "react-copy-to-clipboard": "^5.1.0",
     "react-json-view": "^1.21.3",
     "react-split-pane": "^0.1.92",
     "screenfull": "^6.0.2"
   },
   "devDependencies": {
-    "@ant-design/pro-form": "^2.31.3",
-    "@ant-design/pro-layout": "^7.22.0"
+    "@ant-design/pro-form": "^2.31.5",
+    "@ant-design/pro-layout": "^7.22.2"
   },
   "peerDependencies": {
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
-  "gitHead": "8db06c5cc511bdbbb32a90a93d6d1e1ecd2a6f54"
+  "gitHead": "617efa9eb09833f74f0ab0065467b556b5b6843e"
 }