@oceanbase/design 0.4.13 → 0.4.14

package/es/modal/Modal.d.ts

@@ -1,7 +1,10 @@
-import type { ModalFuncProps, ModalProps } from 'antd/es/modal';
+import type { ModalFuncProps, ModalProps as AntModalProps } from 'antd/es/modal';
 import React from 'react';
+export interface ModalProps extends AntModalProps {
+    extra?: React.ReactNode;
+}
 declare const Modal: {
-    ({ footer, prefixCls: customizePrefixCls, className, ...restProps }: ModalProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+    ({ extra, footer, prefixCls: customizePrefixCls, className, ...restProps }: ModalProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
     info(props: ModalFuncProps): {
         destroy: () => void;
         update: (configUpdate: import("antd/es/modal/confirm").ConfigUpdate) => void;

package/es/modal/Modal.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 = ["footer", "prefixCls", "className"];
+var _excluded = ["extra", "footer", "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 _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; }
@@ -11,11 +11,14 @@ import { Modal as AntModal } from 'antd';
 import classNames from 'classnames';
 import React, { useContext } from 'react';
 import ConfigProvider from "../config-provider";
+import Space from "../space";
 import { modal } from "../static-function";
 import useStyle from "./style";
 import { jsx as _jsx } from "react/jsx-runtime";
+import { jsxs as _jsxs } from "react/jsx-runtime";
 var Modal = function Modal(_ref) {
-  var footer = _ref.footer,
+  var extra = _ref.extra,
+    footer = _ref.footer,
     customizePrefixCls = _ref.prefixCls,
     className = _ref.className,
     restProps = _objectWithoutProperties(_ref, _excluded);
@@ -30,7 +33,17 @@ var Modal = function Modal(_ref) {
     // convert false to null to hide .ant-modal-footer dom
     // ref: https://github.com/ant-design/ant-design/blob/master/components/modal/Modal.tsx#L105
     ,
-    footer: footer === false ? null : footer,
+    footer: footer === false ? null : extra ? function (originNode) {
+      return /*#__PURE__*/_jsxs("div", {
+        className: "".concat(prefixCls, "-footer-content"),
+        children: [/*#__PURE__*/_jsx("div", {
+          className: "".concat(prefixCls, "-footer-extra"),
+          children: extra
+        }), /*#__PURE__*/_jsx(Space, {
+          children: originNode
+        })]
+      });
+    } : footer,
     prefixCls: customizePrefixCls,
     className: modalCls
   }, restProps)));

package/es/modal/style/index.js

@@ -18,9 +18,17 @@ export var genModalStyle = function genModalStyle(token) {
   var titleHeight = fontSizeHeading5 * lineHeightHeading5;
   return _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, ":not(").concat(componentCls, "-confirm)"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-header"), {
     marginBottom: marginLG
-  }), "".concat(componentCls, "-footer"), {
+  }), "".concat(componentCls, "-footer"), _defineProperty({
     marginTop: marginLG
-  })), "".concat(componentCls).concat(componentCls, "-progress"), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty({
+  }, "".concat(componentCls, "-footer-content"), _defineProperty({
+    display: 'flex',
+    justifyContent: 'space-between',
+    alignItems: 'center'
+  }, "".concat(componentCls, "-footer-extra"), {
+    marginInlineEnd: token.margin,
+    // make extra align to start
+    textAlign: 'start'
+  })))), "".concat(componentCls).concat(componentCls, "-progress"), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty({
     padding: "".concat(token.paddingXL + token.padding, "px ").concat(token.paddingLG + token.padding, "px")
   }, "".concat(componentCls, "-header"), _defineProperty({
     textAlign: 'center',

package/es/table/index.d.ts

@@ -38,8 +38,8 @@ declare const _default: (<RecordType extends AnyObject = AnyObject>(props: Table
     SELECTION_ALL: "SELECT_ALL";
     SELECTION_INVERT: "SELECT_INVERT";
     SELECTION_NONE: "SELECT_NONE";
-    Column: <RecordType_1 extends import("antd/es/_util/type").AnyObject>(_: import("antd").TableColumnProps<RecordType_1>) => null;
-    ColumnGroup: <RecordType_2 extends import("antd/es/_util/type").AnyObject>(_: import("antd/es/table/ColumnGroup").ColumnGroupProps<RecordType_2>) => null;
+    Column: <RecordType extends import("antd/es/_util/type").AnyObject>(_: import("antd").TableColumnProps<RecordType>) => null;
+    ColumnGroup: <RecordType_1 extends import("antd/es/_util/type").AnyObject>(_: import("antd/es/table/ColumnGroup").ColumnGroupProps<RecordType_1>) => null;
     Summary: typeof Summary;
     useStyle: (prefixCls: string) => {
         wrapSSR: (node: ReactNode) => ReactElement<any, string | React.JSXElementConstructor<any>>;

package/es/tag/style/index.js

@@ -39,9 +39,7 @@ export var genTagStyle = function genTagStyle(token) {
     paddingInline: token.paddingXS,
     borderColor: getTagBorderColor(token.colorBorder),
     fontSize: token.fontSizeSM
-  }, "".concat(antCls, "-typography"), _defineProperty({
-    fontSize: token.fontSizeSM
-  }, "".concat(componentCls, "-icon"), {
+  }, "".concat(antCls, "-typography"), _defineProperty({}, "".concat(componentCls, "-icon"), {
     marginInlineEnd: paddingInline
   })), '&-ellipsis', {
     maxWidth: '100%',

package/lib/modal/Modal.d.ts

@@ -1,7 +1,10 @@
-import type { ModalFuncProps, ModalProps } from 'antd/es/modal';
+import type { ModalFuncProps, ModalProps as AntModalProps } from 'antd/es/modal';
 import React from 'react';
+export interface ModalProps extends AntModalProps {
+    extra?: React.ReactNode;
+}
 declare const Modal: {
-    ({ footer, prefixCls: customizePrefixCls, className, ...restProps }: ModalProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
+    ({ extra, footer, prefixCls: customizePrefixCls, className, ...restProps }: ModalProps): React.ReactElement<any, string | React.JSXElementConstructor<any>>;
     info(props: ModalFuncProps): {
         destroy: () => void;
         update: (configUpdate: import("antd/es/modal/confirm").ConfigUpdate) => void;

package/lib/modal/Modal.js

@@ -36,9 +36,16 @@ var import_antd = require("antd");
 var import_classnames = __toESM(require("classnames"));
 var import_react = __toESM(require("react"));
 var import_config_provider = __toESM(require("../config-provider"));
+var import_space = __toESM(require("../space"));
 var import_static_function = require("../static-function");
 var import_style = __toESM(require("./style"));
-var Modal = ({ footer, prefixCls: customizePrefixCls, className, ...restProps }) => {
+var Modal = ({
+  extra,
+  footer,
+  prefixCls: customizePrefixCls,
+  className,
+  ...restProps
+}) => {
   const { getPrefixCls } = (0, import_react.useContext)(import_config_provider.default.ConfigContext);
   const prefixCls = getPrefixCls("modal", customizePrefixCls);
   const { wrapSSR } = (0, import_style.default)(prefixCls);
@@ -48,7 +55,7 @@ var Modal = ({ footer, prefixCls: customizePrefixCls, className, ...restProps })
       import_antd.Modal,
       {
         destroyOnClose: true,
-        footer: footer === false ? null : footer,
+        footer: footer === false ? null : extra ? (originNode) => /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-footer-content` }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefixCls}-footer-extra` }, extra), /* @__PURE__ */ import_react.default.createElement(import_space.default, null, originNode)) : footer,
         prefixCls: customizePrefixCls,
         className: modalCls,
         ...restProps

package/lib/modal/style/index.js

@@ -46,7 +46,17 @@ var genModalStyle = (token) => {
         marginBottom: marginLG
       },
       [`${componentCls}-footer`]: {
-        marginTop: marginLG
+        marginTop: marginLG,
+        [`${componentCls}-footer-content`]: {
+          display: "flex",
+          justifyContent: "space-between",
+          alignItems: "center",
+          [`${componentCls}-footer-extra`]: {
+            marginInlineEnd: token.margin,
+            // make extra align to start
+            textAlign: "start"
+          }
+        }
       }
     },
     /* Modal.Progress */

package/lib/table/index.d.ts

@@ -38,8 +38,8 @@ declare const _default: (<RecordType extends AnyObject = AnyObject>(props: Table
     SELECTION_ALL: "SELECT_ALL";
     SELECTION_INVERT: "SELECT_INVERT";
     SELECTION_NONE: "SELECT_NONE";
-    Column: <RecordType_1 extends import("antd/es/_util/type").AnyObject>(_: import("antd").TableColumnProps<RecordType_1>) => null;
-    ColumnGroup: <RecordType_2 extends import("antd/es/_util/type").AnyObject>(_: import("antd/es/table/ColumnGroup").ColumnGroupProps<RecordType_2>) => null;
+    Column: <RecordType extends import("antd/es/_util/type").AnyObject>(_: import("antd").TableColumnProps<RecordType>) => null;
+    ColumnGroup: <RecordType_1 extends import("antd/es/_util/type").AnyObject>(_: import("antd/es/table/ColumnGroup").ColumnGroupProps<RecordType_1>) => null;
     Summary: typeof Summary;
     useStyle: (prefixCls: string) => {
         wrapSSR: (node: ReactNode) => ReactElement<any, string | React.JSXElementConstructor<any>>;

package/lib/tag/style/index.js

@@ -59,7 +59,6 @@ var genTagStyle = (token) => {
       borderColor: getTagBorderColor(token.colorBorder),
       fontSize: token.fontSizeSM,
       [`${antCls}-typography`]: {
-        fontSize: token.fontSizeSM,
         [`${componentCls}-icon`]: {
           marginInlineEnd: paddingInline
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/design",
-  "version": "0.4.13",
+  "version": "0.4.14",
   "description": "The Design System of OceanBase",
   "keywords": [
     "oceanbase",
@@ -39,14 +39,14 @@
     "build": "father build && cp src/style/reset.css dist/"
   },
   "dependencies": {
-    "@ant-design/cssinjs": "^1.23.0",
+    "@ant-design/cssinjs": "^1.24.0",
     "@ctrl/tinycolor": "^4.1.0",
     "@inline-svg-unique-id/react": "^1.2.3",
     "@oceanbase/aliyun-theme": "^0.1.6",
     "@oceanbase/icons": "^0.4.7",
     "@oceanbase/util": "^0.4.4",
     "ahooks": "^2.10.14",
-    "antd": "^5.26.4",
+    "antd": "^5.26.7",
     "classnames": "^2.5.1",
     "lodash": "^4.17.21",
     "lottie-web": "^5.13.0",
@@ -66,5 +66,5 @@
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
-  "gitHead": "2d9213d7c374b9dc207ebd40663f1c50828e72b7"
+  "gitHead": "e5b9f06614070e38c9d6a77244da2320679e3ffa"
 }