@oceanbase/ui 0.4.10 → 0.4.12

package/es/Action/Group.js

@@ -11,6 +11,7 @@ import { isBoolean, max, omit } from 'lodash';
 import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
+import { Fragment as _Fragment } from "react/jsx-runtime";
 var getOrder = function getOrder(_ref) {
   var type = _ref.type,
     fixed = _ref.fixed;
@@ -124,24 +125,22 @@ export default (function (_ref2) {
           if (isBoolean(action.props.disabled)) disabled = action.props.disabled;else if (shouldDisabled) disabled = shouldDisabled(action.key);
           // 当用户传入loading 或者 传入 disabled 的情况都要禁用按钮
           var actionDisabled = action.props.loading || (isBoolean(action.props.disabled) ? action.props.disabled : getDefaultDisabled(action.key));
-          return (
-            /*#__PURE__*/
-            // @ts-ignore
-            _jsx(Menu.Item, _objectSpread(_objectSpread({
+          return /*#__PURE__*/_jsxs(_Fragment, {
+            children: [/*#__PURE__*/_jsx(Menu.Item, _objectSpread(_objectSpread({
               // @ts-ignore
               onClick: function onClick(_ref4) {
                 var _action$props$onClick, _action$props;
                 var domEvent = _ref4.domEvent;
                 (_action$props$onClick = (_action$props = action.props).onClick) === null || _action$props$onClick === void 0 || _action$props$onClick.call(_action$props, domEvent);
               }
-            }, omit(action.props, 'disabled')), {}, {
+            }, omit(action.props, ['disabled'])), {}, {
               disabled: actionDisabled,
               children: /*#__PURE__*/_jsxs(Tooltip, {
                 title: action.props.tooltip,
                 children: [action.props.loading && /*#__PURE__*/_jsx(LoadingOutlined, {}), ' ', action.props.children || action]
               })
-            }), (_ref3 = actionKey) !== null && _ref3 !== void 0 ? _ref3 : index.toString())
-          );
+            }), (_ref3 = actionKey) !== null && _ref3 !== void 0 ? _ref3 : index.toString()), action.props.divider && /*#__PURE__*/_jsx(Menu.Divider, {})]
+          });
         })
       }),
       children: moreDom

package/es/Action/Item.d.ts

@@ -10,6 +10,7 @@ export interface BaseProps extends ButtonProps {
     enableLoading?: boolean;
     tooltip?: string;
     loading?: boolean;
+    divider?: boolean;
 }
 export declare class ActionButton extends React.PureComponent<BaseProps> {
     static __DISPLAY_NAME: string;

package/es/BasicLayout/Header.d.ts

@@ -5,6 +5,7 @@ export type OverlayFunc = () => React.ReactElement;
 export interface HeaderLocale {
     help: string;
     welcome: string;
+    versionNotice?: string;
     viewDocs: string;
     downloadDocs?: string;
     about: string;
@@ -27,6 +28,7 @@ export interface HeaderProps extends LocaleWrapperProps {
     extra?: React.ReactNode;
     pathname?: string;
     welcomePath?: string;
+    versionNoticePath?: string;
     docsPath?: string;
     pdfPath?: string;
     iconUrl?: string;

package/es/BasicLayout/Header.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 = ["prefixCls", "showLabel", "title", "extra", "pathname", "welcomePath", "docsPath", "pdfPath", "iconUrl", "logoUrl", "simpleLogoUrl", "username", "userMenu", "appData", "locale", "showHelp", "showLocale", "locales", "langs"];
+var _excluded = ["prefixCls", "showLabel", "title", "extra", "pathname", "welcomePath", "versionNoticePath", "docsPath", "pdfPath", "iconUrl", "logoUrl", "simpleLogoUrl", "username", "userMenu", "appData", "locale", "showHelp", "showLocale", "locales", "langs"];
 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; }
@@ -42,6 +42,7 @@ var Header = function Header(_ref) {
     extra = _ref.extra,
     pathname = _ref.pathname,
     welcomePath = _ref.welcomePath,
+    versionNoticePath = _ref.versionNoticePath,
     docsPath = _ref.docsPath,
     pdfPath = _ref.pdfPath,
     iconUrl = _ref.iconUrl,
@@ -81,6 +82,8 @@ var Header = function Header(_ref) {
       var key = _ref2.key;
       if (key === 'welcome') {
         navigate === null || navigate === void 0 || navigate(welcomePath);
+      } else if (key === 'versionNotice') {
+        directTo(versionNoticePath);
       } else if (key === 'viewDocs') {
         directTo(docsPath);
       } else if (key === 'downloadDocs') {
@@ -96,7 +99,9 @@ var Header = function Header(_ref) {
     },
     children: [welcomePath && /*#__PURE__*/_jsx(Menu.Item, {
       children: locale.welcome
-    }, "welcome"), docsPath && /*#__PURE__*/_jsx(Menu.Item, {
+    }, "welcome"), versionNoticePath && /*#__PURE__*/_jsx(Menu.Item, {
+      children: locale.versionNotice
+    }, "versionNotice"), docsPath && /*#__PURE__*/_jsx(Menu.Item, {
       children: locale.viewDocs
     }, "viewDocs"), pdfPath && /*#__PURE__*/_jsx(Menu.Item, {
       children: locale.downloadDocs

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

@@ -1,6 +1,7 @@
 declare const _default: {
     help: string;
     welcome: string;
+    versionNotice: string;
     viewDocs: string;
     downloadDocs: string;
     about: string;

package/es/BasicLayout/locale/en-US.js

@@ -1,6 +1,7 @@
 export default {
   help: 'Help',
   welcome: 'Welcome page',
+  versionNotice: 'version notice',
   viewDocs: 'Check the user manual',
   downloadDocs: 'Download the user manual',
   about: 'About',

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

@@ -1,6 +1,7 @@
 declare const _default: {
     help: string;
     welcome: string;
+    versionNotice: string;
     viewDocs: string;
     downloadDocs: string;
     about: string;

package/es/BasicLayout/locale/zh-CN.js

@@ -1,6 +1,7 @@
 export default {
   help: '帮助',
   welcome: '欢迎页',
+  versionNotice: '版本公告',
   viewDocs: '查看用户手册',
   downloadDocs: '下载用户手册',
   about: '关于',

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

@@ -1,6 +1,7 @@
 declare const _default: {
     help: string;
     welcome: string;
+    versionNotice: string;
     viewDocs: string;
     downloadDocs: string;
     about: string;

package/es/BasicLayout/locale/zh-TW.js

@@ -1,6 +1,7 @@
 export default {
   help: '幫助',
   welcome: '歡迎頁',
+  versionNotice: '版本公告',
   viewDocs: '查看用戶手冊',
   downloadDocs: '下載用戶手冊',
   about: '關於',

package/es/ContentWithIcon/index.js

@@ -9,7 +9,7 @@ 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, { isValidElement } from 'react';
 import { Tooltip, Space, Popover } from 'antd';
-import { ExclamationCircleFilled, InfoCircleFilled, InfoCircleOutlined, QuestionCircleOutlined } from '@ant-design/icons';
+import { ExclamationCircleFilled, InfoCircleFilled, InfoCircleOutlined, QuestionCircleOutlined } from '@oceanbase/icons';
 import classNames from 'classnames';
 import { getPrefix } from "../_util";
 import "./index.less";

package/es/DateRanger/PickerPanel.js

@@ -15,7 +15,7 @@ import useCSSVarCls from 'antd/es/config-provider/hooks/useCSSVarCls';
 import useStyle from 'antd/es/date-picker/style/index';
 import { PickerPanel } from 'rc-picker';
 import classNames from 'classnames';
-import { Alert, Button, Col, Divider, Form, Input, Row, Space, TimePicker } from '@oceanbase/design';
+import { Alert, Button, Col, DatePicker, Divider, Form, Row, Space, TimePicker } from '@oceanbase/design';
 import { noop } from 'lodash';
 import moment from 'moment';
 import dayjs from 'dayjs';
@@ -24,6 +24,28 @@ import { DATE_TIME_MONTH_FORMAT, DATE_TIME_MONTH_FORMAT_CN } from "./constant";
 import { jsx as _jsx } from "react/jsx-runtime";
 import { jsxs as _jsxs } from "react/jsx-runtime";
 var ALL_ERROR_TYPE_LIST = ['endDate', 'startDate', 'endTime', 'startTime'];
+/**
+ * 点击交互/时间选择交互
+ *  - 首次点击时，开始时间和结束时间都置为所点击的时间
+ *  - 第二次点击时，根据点击的时间，判断是开始时间还是结束时间进行赋值
+ *  - 新一轮交互开始...
+ */
+var CLICK_STATE = {
+  START: 'START',
+  END: 'END'
+};
+var useClickFSA = function useClickFSA() {
+  var _useState = useState(CLICK_STATE.END),
+    _useState2 = _slicedToArray(_useState, 2),
+    state = _useState2[0],
+    setState = _useState2[1];
+  var next = function next() {
+    setState(function (ps) {
+      return ps === CLICK_STATE.START ? CLICK_STATE.END : CLICK_STATE.START;
+    });
+  };
+  return [state, next];
+};
 var prefix = getPrefix('ranger-picker-panel');
 var prefixCls = 'ant-picker';
 var TIME_FORMAT = 'HH:mm:ss';
@@ -46,6 +68,10 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
     wrapCSSVar = _useStyle2[0],
     hashId = _useStyle2[1],
     cssVarCls = _useStyle2[2];
+  var _useClickFSA = useClickFSA(),
+    _useClickFSA2 = _slicedToArray(_useClickFSA, 2),
+    clickFSA = _useClickFSA2[0],
+    clickFSANext = _useClickFSA2[1];
   var _defaultValue = _slicedToArray(defaultValue, 2),
     defaultS = _defaultValue[0],
     defaultE = _defaultValue[1];
@@ -85,7 +111,7 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
     return clone;
   }
   var onPanelHover = function onPanelHover(date) {
-    setInternalHoverValues(date ? fillCalendarValue(date, activeIndex) : null);
+    setInternalHoverValues(date && clickFSA === CLICK_STATE.START ? fillCalendarValue(date, activeIndex) : null);
   };
 
   // 对日期进行排序
@@ -102,8 +128,8 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
     _eDate = _formatValues[1];
   var setFormatDateToForm = function setFormatDateToForm() {
     form.setFieldsValue({
-      startDate: _sDate,
-      endDate: _eDate
+      startDate: getDateInstance(_sDate),
+      endDate: getDateInstance(_eDate)
     });
   };
   useEffect(function () {
@@ -112,111 +138,25 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
   var defaultTime = useMemo(function () {
     return getDateInstance();
   }, []);
-  var _useState = useState(''),
-    _useState2 = _slicedToArray(_useState, 2),
-    errorMessage = _useState2[0],
-    setErrorMessage = _useState2[1];
-  var _useState3 = useState([]),
+  var _useState3 = useState(''),
     _useState4 = _slicedToArray(_useState3, 2),
-    errorTypeList = _useState4[0],
-    setErrorTypeList = _useState4[1];
+    errorMessage = _useState4[0],
+    setErrorMessage = _useState4[1];
+  var _useState5 = useState([]),
+    _useState6 = _slicedToArray(_useState5, 2),
+    errorTypeList = _useState6[0],
+    setErrorTypeList = _useState6[1];
   var errorTypeMap = errorTypeList.reduce(function (pre, errorKey) {
     pre[errorKey] = 'error';
     return pre;
   }, {});
-  var validateInputDate = function validateInputDate(e) {
-    var v = e.target.value;
+  var formatDate = function formatDate(v) {
     var date = getDateInstance(v, DATE_FORMAT, true);
     return date.isValid() ? date.format(DATE_FORMAT) : null;
   };
-  var validateInputTime = function validateInputTime(e) {
-    var _v$split;
+  var validateInputDate = function validateInputDate(e) {
     var v = e.target.value;
-    var _ref = (_v$split = v === null || v === void 0 ? void 0 : v.split(':')) !== null && _v$split !== void 0 ? _v$split : [],
-      _ref2 = _slicedToArray(_ref, 3),
-      h = _ref2[0],
-      m = _ref2[1],
-      s = _ref2[2];
-    if (!(h && m && s)) return null;
-    if (!(h.length === 2 && m.length === 2 && s.length === 2)) return null;
-    var date = getDateInstance(v, TIME_FORMAT, true);
-    return date.isValid() ? date.format(TIME_FORMAT) : null;
-  };
-  var selectDateInputRange = function selectDateInputRange(inputDomRef) {
-    if (!inputDomRef) return;
-    // year
-    if (inputDomRef.selectionStart >= 0 && inputDomRef.selectionStart <= 4) {
-      inputDomRef.setSelectionRange(0, 4);
-    }
-    // month
-    if (inputDomRef.selectionStart > 4 && inputDomRef.selectionStart <= 7) {
-      inputDomRef.setSelectionRange(5, 7);
-    }
-    // day
-    if (inputDomRef.selectionStart > 7 && inputDomRef.selectionStart <= 10) {
-      inputDomRef.setSelectionRange(8, 10);
-    }
-  };
-  var selectTimeInputRange = function selectTimeInputRange(inputDomRef) {
-    if (!inputDomRef) return;
-    // hour
-    if (inputDomRef.selectionStart >= 0 && inputDomRef.selectionStart <= 2) {
-      inputDomRef.setSelectionRange(0, 2);
-    }
-    // minute
-    if (inputDomRef.selectionStart > 2 && inputDomRef.selectionStart <= 5) {
-      inputDomRef.setSelectionRange(3, 5);
-    }
-    // second
-    if (inputDomRef.selectionStart > 5 && inputDomRef.selectionStart <= 8) {
-      inputDomRef.setSelectionRange(6, 8);
-    }
-  };
-  var handleDateInputKeyDown = function handleDateInputKeyDown(inputDomRef, e) {
-    if (!inputDomRef) return;
-    if (e.key === 'Enter') {
-      inputDomRef.blur();
-      return;
-    }
-    if (e.key === 'ArrowLeft') {
-      var curIndex = inputDomRef.selectionStart;
-      inputDomRef.setSelectionRange(curIndex - 1, curIndex - 1);
-    }
-    if (e.key === 'ArrowRight') {
-      var _curIndex = inputDomRef.selectionEnd;
-      inputDomRef.setSelectionRange(_curIndex + 1, _curIndex + 1);
-    }
-    // NOTE: onKeyDown事件执行时，由于TimePicker需要执行受控逻辑，这会引起React rerender，
-    // 导致onKeyDown事件中拿到的Event还未更新，将下述校验逻辑放入requestIdleCallback确保其跟在React fiber调用栈后执行，这可取到最新的Event对象。
-    requestIdleCallback(function () {
-      // 校验
-      if (validateInputDate(e)) {
-        selectDateInputRange(inputDomRef);
-      }
-    });
-  };
-  var handleTimeInputKeyDown = function handleTimeInputKeyDown(inputDomRef, e) {
-    if (!inputDomRef) return;
-    if (e.key === 'Enter') {
-      inputDomRef.blur();
-      return;
-    }
-    if (e.key === 'ArrowLeft') {
-      var curIndex = inputDomRef.selectionStart;
-      inputDomRef.setSelectionRange(curIndex - 1, curIndex - 1);
-    }
-    if (e.key === 'ArrowRight') {
-      var _curIndex2 = inputDomRef.selectionEnd;
-      inputDomRef.setSelectionRange(_curIndex2 + 1, _curIndex2 + 1);
-    }
-    // NOTE: onKeyDown事件执行时，由于TimePicker需要执行受控逻辑，这会引起React rerender，
-    // 导致onKeyDown事件中拿到的Event还未更新，将下述校验逻辑放入requestIdleCallback确保其跟在React fiber调用栈后执行，这可取到最新的Event对象。
-    requestIdleCallback(function () {
-      // 校验
-      if (validateInputTime(e)) {
-        selectTimeInputRange(inputDomRef);
-      }
-    });
+    return formatDate(v);
   };
   return /*#__PURE__*/_jsxs("div", {
     className: classNames(prefix),
@@ -254,26 +194,29 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               rules: [{
                 required: true
               }],
-              children: /*#__PURE__*/_jsx(Input, {
-                size: "middle",
+              children: /*#__PURE__*/_jsx(DatePicker, {
+                format: {
+                  format: 'YYYY-MM-DD',
+                  type: 'mask'
+                },
+                style: {
+                  width: 128
+                },
+                open: false,
+                suffixIcon: null,
+                allowClear: false,
                 onBlur: function onBlur(e) {
                   var v = validateInputDate(e);
                   if (v) {
-                    form.setFieldValue('startDate', v);
-                    setCalendarValue(function (_ref3) {
-                      var _ref4 = _slicedToArray(_ref3, 2),
-                        eDate = _ref4[1];
+                    form.setFieldValue('startDate', getDateInstance(v));
+                    setCalendarValue(function (_ref) {
+                      var _ref2 = _slicedToArray(_ref, 2),
+                        eDate = _ref2[1];
                       return [getDateInstance(v), eDate];
                     });
                   } else {
                     setFormatDateToForm();
                   }
-                },
-                onClick: function onClick() {
-                  selectDateInputRange(form.getFieldInstance('startDate').nativeElement);
-                },
-                onKeyDown: function onKeyDown(e) {
-                  handleDateInputKeyDown(form.getFieldInstance('startDate').nativeElement, e);
                 }
               })
             })
@@ -303,11 +246,9 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
                 style: {
                   width: '100%'
                 },
-                onClick: function onClick() {
-                  selectTimeInputRange(form.getFieldInstance('startTime').nativeElement.querySelector('input'));
-                },
-                onKeyDown: function onKeyDown(e) {
-                  handleTimeInputKeyDown(form.getFieldInstance('startTime').nativeElement.querySelector('input'), e);
+                format: {
+                  format: 'HH:mm:ss',
+                  type: 'mask'
                 }
               })
             })
@@ -329,25 +270,29 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               rules: [{
                 required: true
               }],
-              children: /*#__PURE__*/_jsx(Input, {
+              children: /*#__PURE__*/_jsx(DatePicker, {
+                format: {
+                  format: 'YYYY-MM-DD',
+                  type: 'mask'
+                },
+                style: {
+                  width: 128
+                },
+                open: false,
+                suffixIcon: null,
+                allowClear: false,
                 onBlur: function onBlur(e) {
                   var v = validateInputDate(e);
                   if (v) {
-                    form.setFieldValue('endDate', v);
-                    setCalendarValue(function (_ref5) {
-                      var _ref6 = _slicedToArray(_ref5, 1),
-                        sDate = _ref6[0];
+                    form.setFieldValue('endDate', getDateInstance(v));
+                    setCalendarValue(function (_ref3) {
+                      var _ref4 = _slicedToArray(_ref3, 1),
+                        sDate = _ref4[0];
                       return [sDate, getDateInstance(v)];
                     });
                   } else {
                     setFormatDateToForm();
                   }
-                },
-                onClick: function onClick() {
-                  selectDateInputRange(form.getFieldInstance('endDate').nativeElement);
-                },
-                onKeyDown: function onKeyDown(e) {
-                  handleDateInputKeyDown(form.getFieldInstance('endDate').nativeElement, e);
                 }
               })
             })
@@ -377,11 +322,9 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
                 style: {
                   width: '100%'
                 },
-                onClick: function onClick() {
-                  selectTimeInputRange(form.getFieldInstance('endTime').nativeElement.querySelector('input'));
-                },
-                onKeyDown: function onKeyDown(e) {
-                  handleTimeInputKeyDown(form.getFieldInstance('endTime').nativeElement.querySelector('input'), e);
+                format: {
+                  format: 'HH:mm:ss',
+                  type: 'mask'
                 }
               })
             })
@@ -407,7 +350,12 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
           onPanelHover(arguments.length <= 0 ? undefined : arguments[0]);
         },
         onSelect: function onSelect() {
-          setCalendarValue(fillCalendarValue(arguments.length <= 0 ? undefined : arguments[0], activeIndex));
+          clickFSANext();
+          if (clickFSA === CLICK_STATE.END) {
+            setCalendarValue([arguments.length <= 0 ? undefined : arguments[0], arguments.length <= 0 ? undefined : arguments[0]]);
+          } else {
+            setCalendarValue(fillCalendarValue(arguments.length <= 0 ? undefined : arguments[0], activeIndex));
+          }
           setActiveIndex(function (index) {
             return index + 1 === 2 ? 0 : index + 1;
           });
@@ -463,14 +411,14 @@ var InternalPickerPanel = function InternalPickerPanel(props) {
               endDate = values.endDate,
               endTime = values.endTime;
             // 日期同一天时对时间进行排序，保证开始时间在结束时间之前
-            var _ref7 = startDate === endDate ? [startTime, endTime].sort(function (a, b) {
+            var _ref5 = startDate.isSame(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));
+              _ref6 = _slicedToArray(_ref5, 2),
+              sTime = _ref6[0],
+              eTime = _ref6[1];
+            var start = "".concat(formatDate(startDate), " ").concat(sTime.format(TIME_FORMAT));
+            var end = "".concat(formatDate(endDate), " ").concat(eTime.format(TIME_FORMAT));
             var errorList = [];
             var message = '';
             rules === null || rules === void 0 || rules.some(function (item) {

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

package/es/ProCard/index.js

@@ -10,6 +10,7 @@ function _objectWithoutPropertiesLoose(source, excluded) { if (source == null) r
 import React, { useContext } from 'react';
 import { ProCard as AntProCard } from '@ant-design/pro-components';
 import { ConfigProvider } from '@oceanbase/design';
+import { isHorizontalPaddingZero } from '@oceanbase/design/es/_util';
 import classNames from 'classnames';
 import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
@@ -28,10 +29,10 @@ var ProCard = function ProCard(_ref) {
   var prefixCls = getPrefixCls('pro-card', customizePrefixCls);
   var _useStyle = useStyle(prefixCls),
     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) || 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);
+
+  // 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);
   return wrapSSR( /*#__PURE__*/_jsx(AntProCard, _objectSpread({
     prefixCls: customizePrefixCls,
     ghost: ghost,

package/es/ProCard/style/index.js

@@ -10,9 +10,10 @@ export var genProCardStyle = function genProCardStyle(token) {
   var componentCls = token.componentCls,
     antCls = token.antCls,
     prefixCls = token.prefixCls;
+  var tableComponentCls = "".concat(antCls, "-table");
   var tabsComponentCls = "".concat(antCls, "-tabs");
   var tabsPrefixCls = "".concat(prefixCls, "-tabs");
-  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "div".concat(componentCls), {
+  return _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "div".concat(componentCls), {
     borderRadius: token.borderRadiusLG
   }), "".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)'
@@ -25,9 +26,11 @@ export var genProCardStyle = function genProCardStyle(token) {
   }), "".concat(componentCls, "-body"), {
     paddingBlock: 0,
     paddingInline: 0
-  })), "".concat(componentCls).concat(componentCls, "-no-body-padding:not(").concat(componentCls, "-contain-tabs)"), _objectSpread(_defineProperty({}, "".concat(componentCls, "-header"), {
+  })), "&".concat(componentCls, "-has-title").concat(componentCls, "-no-divider:not(").concat(componentCls, "-contain-tabs)"), _defineProperty({}, "".concat(componentCls, "-body"), _defineProperty({}, "& > ".concat(tableComponentCls, "-wrapper ").concat(tableComponentCls, ":not(").concat(tableComponentCls, "-bordered):first-child"), {
+    marginTop: -token.marginSM
+  }))), "".concat(componentCls).concat(componentCls, "-no-body-horizontal-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"), {
+  }), Card.genTableStyle(token.paddingLG, token))), "".concat(componentCls).concat(componentCls, "-no-body-horizontal-padding").concat(componentCls, "-size-small:not(").concat(componentCls, "-contain-tabs)"), _objectSpread(_defineProperty({}, "".concat(componentCls, "-header"), {
     paddingBlockEnd: token.paddingXS
   }), Card.genTableStyle(token.paddingSM, token))), "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-tabs"), _objectSpread(_defineProperty({}, "".concat(tabsComponentCls, "-top, ").concat(tabsComponentCls, "-bottom"), _defineProperty({}, ">".concat(tabsComponentCls, "-nav ").concat(tabsComponentCls, "-nav-list"), {
     marginBlockStart: 0,

package/es/ProTable/index.d.ts

@@ -1,5 +1,10 @@
-import { ProTable as AntProTable } from '@ant-design/pro-components';
-import type { ProTableProps } from '@ant-design/pro-components';
-export { ProTableProps };
-declare const ProTable: typeof AntProTable;
+import React from 'react';
+import type { ProTableProps as AntProTableProps } from '@ant-design/pro-components';
+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 namespace ProTable {
+    var Summary;
+}
 export default ProTable;

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", "expandable", "rowSelection", "pagination", "footer", "locale", "cardProps", "prefixCls", "tableClassName", "className"],
+var _excluded = ["form", "headerTitle", "options", "optionsRender", "toolbar", "toolBarRender", "size", "bordered", "innerBordered", "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; }
@@ -16,7 +16,9 @@ import { isEmpty } from 'lodash';
 import useLightFilterStyle from "../LightFilter/style";
 import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
-var ProTable = function ProTable(_ref) {
+// type CompoundedComponent = React.FC<ProTableProps<T, U, ValueType>> & typeof AntProTable;
+
+function ProTable(_ref) {
   var form = _ref.form,
     headerTitle = _ref.headerTitle,
     options = _ref.options,
@@ -24,6 +26,8 @@ var ProTable = function ProTable(_ref) {
     toolbar = _ref.toolbar,
     toolBarRender = _ref.toolBarRender,
     size = _ref.size,
+    bordered = _ref.bordered,
+    innerBordered = _ref.innerBordered,
     expandable = _ref.expandable,
     rowSelection = _ref.rowSelection,
     customPagination = _ref.pagination,
@@ -42,7 +46,7 @@ var ProTable = function ProTable(_ref) {
   var _Table$useStyle = Table.useStyle(tablePrefixCls),
     tableWrapSSR = _Table$useStyle.wrapSSR;
   var pagination = Table.useDefaultPagination(customPagination);
-  var tableCls = classNames(_defineProperty(_defineProperty(_defineProperty({}, "".concat(tablePrefixCls, "-expandable"), !isEmpty(expandable)), "".concat(tablePrefixCls, "-selectable"), !!rowSelection), "".concat(tablePrefixCls, "-has-footer"), !!footer), tableClassName);
+  var tableCls = classNames(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(tablePrefixCls, "-expandable"), !isEmpty(expandable)), "".concat(tablePrefixCls, "-selectable"), !!rowSelection), "".concat(tablePrefixCls, "-has-footer"), !!footer), "".concat(tablePrefixCls, "-inner-bordered"), innerBordered), tableClassName);
 
   // customize LightFilter style
   var lightFilterPrefixCls = getPrefixCls('pro-form-light-filter', customizePrefixCls);
@@ -65,6 +69,7 @@ var ProTable = function ProTable(_ref) {
   , _objectSpread({
     defaultSize: "large",
     size: size,
+    bordered: bordered || innerBordered,
     form: _objectSpread({
       // query form should remove required mark
       requiredMark: false
@@ -93,6 +98,6 @@ var ProTable = function ProTable(_ref) {
     tableClassName: tableCls,
     className: proTableCls
   }, restProps)))));
-};
+}
 ProTable.Summary = AntProTable.Summary;
 export default ProTable;

package/es/SideTip/Dragger.d.ts

@@ -17,6 +17,7 @@ interface DraggableProps {
     id?: string;
     getPopupContainer?: () => HTMLElement;
     children?: any;
+    draggable?: boolean;
 }
 interface DraggableState {
     dragged?: boolean;