@oceanbase/design 1.0.0-alpha.3 → 1.0.0-alpha.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (60) hide show
  1. package/dist/design.min.js +1 -1
  2. package/es/alert/index.d.ts +2 -2
  3. package/es/alert/index.js +13 -4
  4. package/es/alert/style/index.js +152 -58
  5. package/es/badge/index.js +2 -3
  6. package/es/badge/style/index.js +1 -3
  7. package/es/card/index.d.ts +4 -0
  8. package/es/card/index.js +64 -7
  9. package/es/card/style/index.js +29 -5
  10. package/es/config-provider/index.d.ts +2 -2
  11. package/es/config-provider/index.js +26 -2
  12. package/es/descriptions/hooks/useItems.d.ts +6 -6
  13. package/es/drawer/style/index.js +24 -6
  14. package/es/form/FormItem.d.ts +1 -0
  15. package/es/form/FormItem.js +14 -4
  16. package/es/form/style/index.js +13 -2
  17. package/es/input-number/index.d.ts +2 -1
  18. package/es/locale/ja-JP.d.ts +3 -0
  19. package/es/locale/ja-JP.js +28 -0
  20. package/es/modal/Modal.js +20 -6
  21. package/es/modal/style/index.js +62 -19
  22. package/es/static-function/index.js +13 -4
  23. package/es/table/style/index.js +3 -4
  24. package/es/tabs/style/index.js +4 -2
  25. package/es/tag/index.d.ts +1 -0
  26. package/es/tag/index.js +3 -2
  27. package/es/tag/style/index.js +8 -2
  28. package/es/theme/default.js +9 -3
  29. package/es/theme/style/compact.less +7 -7
  30. package/es/theme/style/default.less +7 -7
  31. package/lib/alert/index.d.ts +2 -2
  32. package/lib/alert/index.js +11 -3
  33. package/lib/alert/style/index.js +170 -71
  34. package/lib/badge/index.js +2 -2
  35. package/lib/badge/style/index.js +1 -3
  36. package/lib/card/index.d.ts +4 -0
  37. package/lib/card/index.js +61 -4
  38. package/lib/card/style/index.js +52 -6
  39. package/lib/config-provider/index.d.ts +2 -2
  40. package/lib/config-provider/index.js +35 -2
  41. package/lib/descriptions/hooks/useItems.d.ts +6 -6
  42. package/lib/drawer/style/index.js +25 -4
  43. package/lib/form/FormItem.d.ts +1 -0
  44. package/lib/form/FormItem.js +10 -2
  45. package/lib/form/style/index.js +19 -0
  46. package/lib/input-number/index.d.ts +2 -1
  47. package/lib/locale/ja-JP.d.ts +3 -0
  48. package/lib/locale/ja-JP.js +60 -0
  49. package/lib/modal/Modal.js +26 -6
  50. package/lib/modal/style/index.js +76 -17
  51. package/lib/static-function/index.js +7 -1
  52. package/lib/table/style/index.js +3 -4
  53. package/lib/tabs/style/index.js +5 -0
  54. package/lib/tag/index.d.ts +1 -0
  55. package/lib/tag/index.js +3 -1
  56. package/lib/tag/style/index.js +8 -0
  57. package/lib/theme/default.js +9 -3
  58. package/lib/theme/style/compact.less +7 -7
  59. package/lib/theme/style/default.less +7 -7
  60. package/package.json +5 -5
@@ -5,17 +5,33 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
5
5
  import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
6
6
  export var genDrawerStyle = function genDrawerStyle(token) {
7
7
  var componentCls = token.componentCls,
8
- antCls = token.antCls;
9
- var contentPadding = "".concat(token.paddingXS, "px ").concat(token.paddingLG, "px ").concat(token.paddingLG, "px ").concat(token.paddingLG, "px");
8
+ antCls = token.antCls,
9
+ fontSizeHeading3 = token.fontSizeHeading3,
10
+ colorSplit = token.colorSplit;
11
+ var contentPadding = token.paddingLG;
10
12
  var boxShadowBottom = '0 2px 4px 0 rgba(54,69,99,0.04), 0 1px 6px -1px rgba(54,69,99,0.04), 0 1px 2px 0 rgba(54,69,99,0.06)';
11
13
  var boxShadowTop = '0 -2px 4px 0 rgba(54,69,99,0.04), 0 -1px 6px -1px rgba(54,69,99,0.04), 0 -1px 2px 0 rgba(54,69,99,0.06)';
12
- return _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-header"), {
14
+ return _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-header"), _defineProperty(_defineProperty({
15
+ position: 'relative',
13
16
  padding: "".concat(token.padding, "px ").concat(token.paddingLG, "px"),
14
17
  borderBottom: 'none',
15
18
  transition: "box-shadow ".concat(token.motionDurationMid),
16
19
  // ensure header box-shadow cover body content
17
20
  zIndex: 10
18
- }), "".concat(componentCls, "-header-shadow"), {
21
+ }, "".concat(componentCls, "-title"), {
22
+ fontSize: fontSizeHeading3
23
+ }), '&::after', {
24
+ content: '""',
25
+ position: 'absolute',
26
+ bottom: 0,
27
+ left: 0,
28
+ right: 0,
29
+ height: '1px',
30
+ backgroundColor: colorSplit,
31
+ // 使用负margin让分割线贯通到content边缘
32
+ marginLeft: "-".concat(token.paddingLG, "px"),
33
+ marginRight: "-".concat(token.paddingLG, "px")
34
+ })), "".concat(componentCls, "-header-shadow"), {
19
35
  boxShadow: boxShadowBottom
20
36
  }), "".concat(componentCls, "-body"), {
21
37
  padding: 0,
@@ -35,12 +51,14 @@ export var genDrawerStyle = function genDrawerStyle(token) {
35
51
  display: 'flex',
36
52
  justifyContent: 'space-between',
37
53
  alignItems: 'center'
38
- })), "".concat(componentCls, "-footer-container-shadow"), {
54
+ })), "".concat(componentCls, "-footer-container-no-padding-top"), {
55
+ paddingTop: 0
56
+ }), "".concat(componentCls, "-footer-container-shadow"), {
39
57
  boxShadow: boxShadowTop
40
58
  }))), "".concat(componentCls).concat(componentCls, "-loading"), _defineProperty({}, "".concat(componentCls, "-body > ").concat(antCls, "-skeleton"), {
41
59
  padding: contentPadding
42
60
  })), "".concat(componentCls).concat(componentCls, "-with-footer"), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty({}, "".concat(componentCls, "-body-content"), {
43
- padding: "".concat(token.paddingXS, "px ").concat(token.paddingLG, "px")
61
+ paddingBottom: token.paddingXS
44
62
  })));
45
63
  };
46
64
  export default (function (prefixCls) {
@@ -17,6 +17,7 @@ export type LabelTooltipType = WrapperTooltipProps | React.ReactNode;
17
17
  export interface FormItemProps extends AntFormItemProps {
18
18
  tooltip?: WrapperTooltipProps | ReactNode;
19
19
  action?: ReactNode;
20
+ description?: ReactNode;
20
21
  }
21
22
  type CompoundedComponent = React.FC<FormItemProps> & {
22
23
  useStatus: typeof AntFormItem.useStatus;
@@ -1,11 +1,11 @@
1
- var _excluded = ["children", "label", "tooltip", "action", "layout", "prefixCls", "className"],
1
+ var _excluded = ["children", "label", "tooltip", "action", "description", "layout", "prefixCls", "className"],
2
2
  _excluded2 = ["icon", "type", "overlayInnerStyle"];
3
3
  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; }
4
4
  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; }
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); }
5
6
  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; }
6
7
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
7
8
  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); }
8
- 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
9
  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; }
10
10
  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; }
11
11
  import React, { useContext } from 'react';
@@ -27,6 +27,7 @@ var FormItem = function FormItem(_ref) {
27
27
  label = _ref.label,
28
28
  tooltip = _ref.tooltip,
29
29
  action = _ref.action,
30
+ description = _ref.description,
30
31
  externalLayout = _ref.layout,
31
32
  customizePrefixCls = _ref.prefixCls,
32
33
  className = _ref.className,
@@ -36,7 +37,7 @@ var FormItem = function FormItem(_ref) {
36
37
  var prefixCls = getPrefixCls('form', customizePrefixCls);
37
38
  var _useStyle = useStyle(prefixCls),
38
39
  wrapSSR = _useStyle.wrapSSR;
39
- var formItemCls = classNames(className);
40
+ var formItemCls = classNames(className, _defineProperty({}, "".concat(prefixCls, "-item-has-description"), !!description));
40
41
  var _useContext2 = useContext(FormContext),
41
42
  contextLayout = _useContext2.layout,
42
43
  vertical = _useContext2.vertical;
@@ -59,6 +60,13 @@ var FormItem = function FormItem(_ref) {
59
60
  }, overlayInnerStyle)
60
61
  }, restTooltipProps);
61
62
  }
63
+
64
+ // description config - only show in vertical layout
65
+ var isVertical = layout === 'vertical' || vertical;
66
+ var descriptionContent = description && isVertical ? /*#__PURE__*/_jsx("div", {
67
+ className: "".concat(prefixCls, "-item-description"),
68
+ children: description
69
+ }) : null;
62
70
  return wrapSSR( /*#__PURE__*/_jsx(AntFormItem, _objectSpread(_objectSpread({
63
71
  layout: layout,
64
72
  label: action && (layout === 'vertical' || vertical) ? /*#__PURE__*/_jsxs(_Fragment, {
@@ -75,7 +83,9 @@ var FormItem = function FormItem(_ref) {
75
83
  prefixCls: customizePrefixCls,
76
84
  className: formItemCls
77
85
  }, restProps), {}, {
78
- children: children
86
+ children: /*#__PURE__*/_jsxs(_Fragment, {
87
+ children: [descriptionContent, children]
88
+ })
79
89
  })));
80
90
  };
81
91
  FormItem.useStatus = AntFormItem.useStatus;
@@ -5,12 +5,23 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
5
5
  import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
6
6
  export var genFormStyle = function genFormStyle(token) {
7
7
  var componentCls = token.componentCls;
8
- return _defineProperty({}, "".concat(componentCls).concat(componentCls, "-vertical"), _defineProperty({}, "".concat(componentCls, "-item:not(").concat(componentCls, "-item-horizontal)"), _defineProperty({}, "".concat(componentCls, "-item-label > label"), _defineProperty({
8
+ return _defineProperty(_defineProperty({}, componentCls, _defineProperty({}, "".concat(componentCls, "-item-extra"), {
9
+ paddingTop: token.paddingXXS,
10
+ fontSize: token.fontSizeSM
11
+ })), "".concat(componentCls).concat(componentCls, "-vertical"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-item:not(").concat(componentCls, "-item-horizontal)"), _defineProperty({}, "".concat(componentCls, "-item-label > label"), _defineProperty({
9
12
  width: '100%'
10
13
  }, "".concat(componentCls, "-item-action"), {
11
14
  position: 'absolute',
12
15
  right: 0
13
- }))));
16
+ }))), "".concat(componentCls, "-item-has-description"), _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-item-control-input"), {
17
+ minHeight: 'auto'
18
+ }), "".concat(componentCls, "-item-label"), {
19
+ paddingBottom: token.paddingXXS
20
+ }), "".concat(componentCls, "-item-description"), {
21
+ paddingBottom: token.paddingXXS + 2,
22
+ fontSize: token.fontSizeSM,
23
+ color: token.colorTextDescription
24
+ })));
14
25
  };
15
26
  export default (function (prefixCls) {
16
27
  var useStyle = genComponentStyleHook('Form', function (token) {
@@ -8,7 +8,8 @@ export interface InputNumberLocale {
8
8
  export interface InputNumberProps extends AntInputNumberProps {
9
9
  locale?: InputNumberLocale;
10
10
  }
11
- type CompoundedComponent = React.ForwardRefExoticComponent<InputNumberProps & React.RefAttributes<HTMLInputElement>> & {
11
+ type InputNumberRef = React.ComponentRef<typeof AntInputNumber>;
12
+ type CompoundedComponent = React.ForwardRefExoticComponent<InputNumberProps & React.RefAttributes<InputNumberRef>> & {
12
13
  _InternalPanelDoNotUseOrYouWillBeFired: typeof AntInputNumber._InternalPanelDoNotUseOrYouWillBeFired;
13
14
  };
14
15
  declare const InputNumber: CompoundedComponent;
@@ -0,0 +1,3 @@
1
+ import type { Locale } from '.';
2
+ declare const _default: Locale;
3
+ export default _default;
@@ -0,0 +1,28 @@
1
+ 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); }
2
+ 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; }
3
+ 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; }
4
+ 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; }
5
+ function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
6
+ 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); }
7
+ import jaJP from 'antd/es/locale/ja_JP';
8
+ export default _objectSpread(_objectSpread({}, jaJP), {}, {
9
+ global: _objectSpread(_objectSpread({}, jaJP.global), {}, {
10
+ inputPlaceholder: '入力してください'
11
+ }),
12
+ Pagination: _objectSpread(_objectSpread({}, jaJP.Pagination), {}, {
13
+ total: '合計 ${total} 件'
14
+ }),
15
+ Drawer: {
16
+ okText: '確定',
17
+ cancelText: 'キャンセル'
18
+ },
19
+ Table: _objectSpread(_objectSpread({}, jaJP.Table), {}, {
20
+ batchOperationBar: {
21
+ selected: '選択済み',
22
+ object: '件',
23
+ cancel: 'キャンセル',
24
+ collapse: '折りたたむ',
25
+ open: '展開'
26
+ }
27
+ })
28
+ });
package/es/modal/Modal.js CHANGED
@@ -8,6 +8,7 @@ function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e
8
8
  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; }
9
9
  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; }
10
10
  import { Modal as AntModal } from 'antd';
11
+ import { ExclamationCircleOutlined, CloseCircleOutlined, CheckCircleOutlined, InfoCircleOutlined } from '@oceanbase/icons';
11
12
  import classNames from 'classnames';
12
13
  import React, { useContext } from 'react';
13
14
  import ConfigProvider from "../config-provider";
@@ -52,22 +53,35 @@ var Modal = function Modal(_ref) {
52
53
  // 替换 Modal 上的静态方法,支持消费 ConfigProvider 配置
53
54
  // 注意: 不能使用 Modal.info = modal.info 进行属性赋值,需要新建函数赋值,否则仍然无法消费 ConfigProvider 配置
54
55
  Modal.info = function (props) {
55
- return modal.info(props);
56
+ return modal.info(_objectSpread({
57
+ // use outlined icon
58
+ icon: /*#__PURE__*/_jsx(InfoCircleOutlined, {})
59
+ }, props));
56
60
  };
57
61
  Modal.success = function (props) {
58
- return modal.success(props);
62
+ return modal.success(_objectSpread({
63
+ icon: /*#__PURE__*/_jsx(CheckCircleOutlined, {})
64
+ }, props));
59
65
  };
60
66
  Modal.error = function (props) {
61
- return modal.error(props);
67
+ return modal.error(_objectSpread({
68
+ icon: /*#__PURE__*/_jsx(CloseCircleOutlined, {})
69
+ }, props));
62
70
  };
63
71
  Modal.warning = function (props) {
64
- return modal.warning(props);
72
+ return modal.warning(_objectSpread({
73
+ icon: /*#__PURE__*/_jsx(ExclamationCircleOutlined, {})
74
+ }, props));
65
75
  };
66
76
  Modal.warn = function (props) {
67
- return modal.warning(props);
77
+ return modal.warning(_objectSpread({
78
+ icon: /*#__PURE__*/_jsx(ExclamationCircleOutlined, {})
79
+ }, props));
68
80
  };
69
81
  Modal.confirm = function (props) {
70
- return modal.confirm(props);
82
+ return modal.confirm(_objectSpread({
83
+ icon: /*#__PURE__*/_jsx(ExclamationCircleOutlined, {})
84
+ }, props));
71
85
  };
72
86
  Modal.useModal = AntModal.useModal;
73
87
  Modal.destroyAll = AntModal.destroyAll;
@@ -6,21 +6,48 @@ import { genComponentStyleHook } from "../../_util/genComponentStyleHook";
6
6
  export var genModalStyle = function genModalStyle(token) {
7
7
  var antCls = token.antCls,
8
8
  componentCls = token.componentCls,
9
- marginXXS = token.marginXXS,
10
9
  marginLG = token.marginLG,
11
- paddingMD = token.paddingMD,
12
- borderRadius = token.borderRadius,
13
- controlHeight = token.controlHeight,
14
10
  fontSizeHeading5 = token.fontSizeHeading5,
15
- lineHeightHeading5 = token.lineHeightHeading5;
11
+ lineHeightHeading5 = token.lineHeightHeading5,
12
+ fontSizeHeading3 = token.fontSizeHeading3,
13
+ colorSplit = token.colorSplit;
16
14
  var top = 100;
17
15
  var bottom = 100;
18
16
  var titleHeight = fontSizeHeading5 * lineHeightHeading5;
19
- return _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, ":not(").concat(componentCls, "-confirm)"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-header"), {
20
- marginBottom: marginLG
21
- }), "".concat(componentCls, "-footer"), _defineProperty({
22
- marginTop: marginLG
23
- }, "".concat(componentCls, "-footer-content"), _defineProperty({
17
+ return _defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, ":not(").concat(componentCls, "-confirm):not(").concat(componentCls, "-progress)"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty({
18
+ paddingBlock: token.padding
19
+ }, "".concat(componentCls, "-close"), {
20
+ marginTop: token.marginXXS,
21
+ marginRight: token.marginXXS
22
+ }), "".concat(componentCls, "-header"), _defineProperty(_defineProperty({
23
+ position: 'relative',
24
+ marginBottom: 0,
25
+ paddingBottom: token.padding
26
+ }, "".concat(componentCls, "-title"), {
27
+ fontSize: fontSizeHeading3
28
+ }), '&::after', {
29
+ content: '""',
30
+ position: 'absolute',
31
+ bottom: 0,
32
+ left: 0,
33
+ right: 0,
34
+ height: '1px',
35
+ backgroundColor: colorSplit,
36
+ // antd Modal content默认padding通常是24px,使用负margin让分割线贯通
37
+ // 如果antd使用其他padding值,可能需要调整
38
+ marginLeft: "-".concat(token.paddingLG, "px"),
39
+ marginRight: "-".concat(token.paddingLG, "px")
40
+ })), "".concat(componentCls, "-body"), {
41
+ paddingTop: token.paddingLG,
42
+ marginInline: "-".concat(token.marginLG, "px"),
43
+ paddingInline: token.paddingLG
44
+ })), "".concat(componentCls, "-footer"), _defineProperty(_defineProperty({
45
+ paddingTop: token.paddingLG,
46
+ marginTop: 0
47
+ }, "".concat(antCls, "-btn"), {
48
+ height: 28,
49
+ minHeight: 28
50
+ }), "".concat(componentCls, "-footer-content"), _defineProperty({
24
51
  display: 'flex',
25
52
  justifyContent: 'space-between',
26
53
  alignItems: 'center'
@@ -28,13 +55,16 @@ export var genModalStyle = function genModalStyle(token) {
28
55
  marginInlineEnd: token.margin,
29
56
  // make extra align to start
30
57
  textAlign: 'start'
31
- })))), "".concat(componentCls).concat(componentCls, "-progress"), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty({
32
- padding: "".concat(token.paddingXL + token.padding, "px ").concat(token.paddingLG + token.padding, "px")
33
- }, "".concat(componentCls, "-header"), _defineProperty({
58
+ })))), "".concat(componentCls).concat(componentCls, "-progress"), _defineProperty({}, "".concat(componentCls, "-content"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({
59
+ padding: token.paddingLG
60
+ }, "".concat(componentCls, "-close"), {
61
+ marginTop: token.marginSM,
62
+ marginRight: token.marginXXS
63
+ }), "".concat(componentCls, "-header"), _defineProperty({
34
64
  textAlign: 'center',
35
65
  marginBottom: token.marginXXL
36
66
  }, "".concat(componentCls, "-title"), {
37
- fontSize: token.fontSizeHeading4
67
+ fontSize: fontSizeHeading3
38
68
  })), "".concat(componentCls, "-body"), _defineProperty(_defineProperty(_defineProperty({
39
69
  textAlign: 'center'
40
70
  }, "".concat(componentCls, "-progress-loading"), {
@@ -45,14 +75,27 @@ export var genModalStyle = function genModalStyle(token) {
45
75
  color: token.colorTextTertiary
46
76
  }), "".concat(antCls, "-alert"), {
47
77
  textAlign: 'left'
48
- })), "".concat(componentCls, "-footer"), {
78
+ })), "".concat(componentCls, "-footer"), _defineProperty({
49
79
  textAlign: 'center'
50
- }))), "".concat(componentCls, "-confirm"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-body ").concat(componentCls, "-confirm-title +").concat(componentCls, "-confirm-content"), {
51
- marginBlockStart: marginXXS,
80
+ }, "".concat(antCls, "-btn"), {
81
+ height: 28,
82
+ minHeight: 28
83
+ })))), "".concat(componentCls, "-confirm"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-content"), {
84
+ padding: token.paddingLG
85
+ }), "".concat(componentCls, "-body"), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "".concat(componentCls, "-confirm-title"), {
86
+ fontSize: fontSizeHeading3
87
+ }), "".concat(componentCls, "-confirm-body > ").concat(token.iconCls), {
88
+ height: token.fontSizeHeading3 * token.lineHeight
89
+ }), "".concat(componentCls, "-confirm-paragraph"), {
90
+ rowGap: token.marginSM
91
+ }), "".concat(componentCls, "-confirm-content"), {
52
92
  color: token.colorTextSecondary
53
- }), "".concat(componentCls, "-confirm-btns"), {
93
+ }), "".concat(componentCls, "-confirm-btns"), _defineProperty({
54
94
  marginTop: marginLG
55
- }));
95
+ }, "".concat(antCls, "-btn"), {
96
+ height: 28,
97
+ minHeight: 28
98
+ }))));
56
99
  };
57
100
  export default (function (prefixCls) {
58
101
  var useStyle = genComponentStyleHook('Modal', function (token) {
@@ -5,17 +5,20 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
5
5
  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; }
6
6
  function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : String(i); }
7
7
  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); }
8
+ import { useContext } from 'react';
8
9
  import { App, message as antMessage, Modal as AntModal, notification as antNotification } from 'antd';
9
10
  import formatToken from 'antd/lib/theme/util/alias';
11
+ import ConfigProvider from "../config-provider";
12
+ import useModalStyle from "../modal/style";
10
13
  import theme from "../theme";
11
14
  import defaultTheme from "../theme/default";
12
15
  var defaultAlgorithm = theme.defaultAlgorithm,
13
16
  defaultSeed = theme.defaultSeed,
14
17
  useToken = theme.useToken;
15
18
 
16
- // 设置默认 token
19
+ // set default token
17
20
  var mapToken = _objectSpread(_objectSpread(_objectSpread({}, defaultAlgorithm(defaultSeed)), defaultTheme.token), {}, {
18
- // 需要覆盖部分 Alias Token 的值
21
+ // need to override some Alias Token values
19
22
  override: {
20
23
  boxShadow: (_defaultTheme$token = defaultTheme.token) === null || _defaultTheme$token === void 0 ? void 0 : _defaultTheme$token.boxShadow,
21
24
  boxShadowSecondary: (_defaultTheme$token2 = defaultTheme.token) === null || _defaultTheme$token2 === void 0 ? void 0 : _defaultTheme$token2.boxShadowSecondary,
@@ -27,10 +30,16 @@ var message = antMessage;
27
30
  var notification = antNotification;
28
31
  var modal = AntModal;
29
32
  export default (function () {
30
- // 自动注入 useToken,避免每次使用都要声明一遍,比较繁琐
33
+ // automatically inject useToken, avoid declaring it every time
31
34
  token = useToken().token;
35
+ var _useContext = useContext(ConfigProvider.ConfigContext),
36
+ getPrefixCls = _useContext.getPrefixCls;
37
+ var prefixCls = getPrefixCls('modal');
38
+
39
+ // register Modal style, ensure static function can also apply style
40
+ useModalStyle(prefixCls);
32
41
  var staticFunction = App.useApp();
33
- // 替换 antd 的静态方法,支持消费 ConfigProvider 配置
42
+ // replace antd's static methods, support consuming ConfigProvider configuration
34
43
  message = _objectSpread(_objectSpread({}, staticFunction.message), {}, {
35
44
  useMessage: antMessage.useMessage
36
45
  });
@@ -18,6 +18,7 @@ export var genTableStyle = function genTableStyle(token) {
18
18
  padding = token.padding,
19
19
  marginLG = token.marginLG,
20
20
  marginXS = token.marginXS;
21
+ console.log(token.fontWeight);
21
22
  return _ref = {}, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_ref, "".concat(componentCls, "-wrapper ").concat(componentCls), _defineProperty(_defineProperty(_defineProperty({
22
23
  color: colorText,
23
24
  backgroundColor: colorBgBase,
@@ -26,9 +27,8 @@ export var genTableStyle = function genTableStyle(token) {
26
27
  borderBottom: "1px solid ".concat(colorBorderSecondary),
27
28
  borderRadius: 0
28
29
  }), "".concat(componentCls, "-thead > tr"), _defineProperty(_defineProperty(_defineProperty(_defineProperty({}, 'th', {
29
- // 弱化列标题
30
30
  color: colorTextSecondary,
31
- fontWeight: 'normal',
31
+ fontWeight: token.fontWeight,
32
32
  backgroundColor: colorBgBase
33
33
  }), "th".concat(componentCls, "-column-has-sorters"), {
34
34
  backgroundColor: colorBgBase
@@ -73,7 +73,6 @@ export var genTableStyle = function genTableStyle(token) {
73
73
  }, "".concat(componentCls, "-thead > tr > th, ").concat(componentCls, "-tbody > tr > td"), _defineProperty({}, '&:last-child', {
74
74
  borderInlineEnd: 'none'
75
75
  })))), "".concat(componentCls, "-wrapper ").concat(componentCls, ":not(").concat(componentCls, "-bordered)"), _defineProperty({}, "".concat(componentCls, "-thead, ").concat(componentCls, "-tbody"), _defineProperty({}, 'td, th', _defineProperty(_defineProperty({}, "&".concat(componentCls, "-row-expand-icon-cell"), {
76
- backgroundColor: colorBgBase,
77
76
  // 设置 paddingRight 即可
78
77
  paddingRight: token.paddingXS
79
78
  }), "&".concat(componentCls, "-selection-column, &").concat(componentCls, "-row-expand-icon-cell"), _defineProperty({}, "& + td, & + th", {
@@ -110,7 +109,7 @@ export var genTableStyle = function genTableStyle(token) {
110
109
  marginRight: marginLG
111
110
  }, "".concat(componentCls, "-batch-operation-selection"), _defineProperty({
112
111
  color: colorTextSecondary,
113
- fontWeight: 500
112
+ fontWeight: token.fontWeightStrong
114
113
  }, "".concat(componentCls, "-batch-operation-selection-count"), {
115
114
  margin: "0 ".concat(marginXS, "px"),
116
115
  color: colorLink
@@ -10,9 +10,11 @@ export var genTabsStyle = function genTabsStyle(token) {
10
10
  colorInfoBg = token.colorInfoBg,
11
11
  colorTextSecondary = token.colorTextSecondary,
12
12
  colorFillQuaternary = token.colorFillQuaternary;
13
- return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "&".concat(componentCls, "-no-divider"), _defineProperty({}, "&".concat(componentCls, "-top, &").concat(componentCls, "-bottom"), _defineProperty({}, "".concat(componentCls, "-nav::before"), {
13
+ return _defineProperty({}, componentCls, _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({}, "&".concat(componentCls, "-no-divider"), _defineProperty({}, "&".concat(componentCls, "-top, &").concat(componentCls, "-bottom"), _defineProperty({}, "".concat(componentCls, "-nav::before"), {
14
14
  border: 'none'
15
- }))), "".concat(componentCls, "-tab"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-tab-tag"), {
15
+ }))), "&".concat(componentCls, "-left, &").concat(componentCls, "-right"), _defineProperty({}, "".concat(componentCls, "-tab[data-node-key^=divider-]"), {
16
+ paddingBlock: 0
17
+ })), "".concat(componentCls, "-tab"), _defineProperty(_defineProperty({}, "".concat(componentCls, "-tab-tag"), {
16
18
  color: colorTextSecondary,
17
19
  fontSize: 12,
18
20
  borderRadius: 12,
package/es/tag/index.d.ts CHANGED
@@ -4,6 +4,7 @@ import type { Ellipsis } from '../_util/getEllipsisConfig';
4
4
  export * from 'antd/es/tag';
5
5
  export interface TagProps extends AntTagProps {
6
6
  ellipsis?: Ellipsis;
7
+ pill?: boolean;
7
8
  }
8
9
  declare const _default: React.ForwardRefExoticComponent<TagProps & React.RefAttributes<HTMLSpanElement>> & {
9
10
  CheckableTag: React.ForwardRefExoticComponent<import("antd/es/tag").CheckableTagProps & React.RefAttributes<HTMLSpanElement>>;
package/es/tag/index.js CHANGED
@@ -1,5 +1,5 @@
1
1
  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); }
2
- var _excluded = ["children", "prefixCls", "icon", "className", "ellipsis"];
2
+ var _excluded = ["children", "prefixCls", "icon", "className", "ellipsis", "pill"];
3
3
  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; }
4
4
  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; }
5
5
  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; }
@@ -28,6 +28,7 @@ var Tag = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
28
28
  title: children
29
29
  }
30
30
  } : _ref$ellipsis,
31
+ pill = _ref.pill,
31
32
  restProps = _objectWithoutProperties(_ref, _excluded);
32
33
  var _useContext = useContext(ConfigProvider.ConfigContext),
33
34
  getPrefixCls = _useContext.getPrefixCls;
@@ -35,7 +36,7 @@ var Tag = /*#__PURE__*/React.forwardRef(function (_ref, ref) {
35
36
  var _useStyle = useStyle(prefixCls),
36
37
  wrapSSR = _useStyle.wrapSSR;
37
38
  var ellipsisConfig = getEllipsisConfig(ellipsis, children);
38
- var tagCls = classNames(_defineProperty({}, "".concat(prefixCls, "-ellipsis"), !!ellipsisConfig), className);
39
+ var tagCls = classNames(_defineProperty(_defineProperty({}, "".concat(prefixCls, "-ellipsis"), !!ellipsisConfig), "".concat(prefixCls, "-pill"), pill), className);
39
40
  var realIcon = icon ? /*#__PURE__*/_jsx("span", {
40
41
  className: "".concat(prefixCls, "-icon"),
41
42
  children: icon
@@ -19,10 +19,12 @@ export var genTagStyle = function genTagStyle(token) {
19
19
  var antCls = token.antCls,
20
20
  componentCls = token.componentCls,
21
21
  iconCls = token.iconCls;
22
- return _defineProperty({}, "".concat(componentCls), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
22
+ return _defineProperty({}, "".concat(componentCls), _defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty(_defineProperty({
23
23
  paddingInline: token.paddingXS,
24
24
  fontSize: token.fontSizeSM
25
- }, "".concat(componentCls, "-close-icon").concat(iconCls), {
25
+ }, "&:not(".concat(componentCls, "-pill)"), {
26
+ fontWeight: token.fontWeightStrong
27
+ }), "".concat(componentCls, "-close-icon").concat(iconCls), {
26
28
  marginInlineStart: token.marginXXS
27
29
  }), "".concat(antCls, "-typography"), _defineProperty({}, "".concat(componentCls, "-icon"), {
28
30
  marginInlineEnd: token.marginXXS
@@ -37,6 +39,10 @@ export var genTagStyle = function genTagStyle(token) {
37
39
  display: 'none'
38
40
  }), '&-borderless', {
39
41
  borderColor: 'transparent'
42
+ }), '&-pill', {
43
+ borderRadius: 100,
44
+ lineHeight: token.lineHeight,
45
+ marginInlineEnd: token.marginXXS
40
46
  }));
41
47
  };
42
48
  export default (function (prefixCls) {
@@ -14,8 +14,8 @@ var colorTextTertiary = '#8592AD';
14
14
  var colorTextQuaternary = '#B6C0D4';
15
15
  var colorFill = '#CDD5E4';
16
16
  var colorFillSecondary = '#E2E8F3';
17
- var colorFillTertiary = '#EFF3FA';
18
- var colorFillQuaternary = '#F7F9FC';
17
+ var colorFillTertiary = '#EBEFF7';
18
+ var colorFillQuaternary = '#F5F7FC';
19
19
  var colorBorderSecondary = colorFillSecondary;
20
20
  var fontSizeSM = 12;
21
21
  var tagColorBorder = colorTextQuaternary;
@@ -77,7 +77,7 @@ var defaultTheme = {
77
77
  colorIcon: colorTextSecondary,
78
78
  colorBgBase: '#ffffff',
79
79
  colorBgContainer: '#ffffff',
80
- colorBgLayout: colorFillQuaternary,
80
+ colorBgLayout: '#FBFCFE',
81
81
  colorBorder: colorFill,
82
82
  colorBorderSecondary: colorBorderSecondary,
83
83
  colorFill: colorFill,
@@ -96,6 +96,12 @@ var defaultTheme = {
96
96
  lineWidthFocus: 0
97
97
  },
98
98
  components: {
99
+ Alert: {
100
+ borderRadiusLG: 6
101
+ },
102
+ Badge: {
103
+ statusSize: 8
104
+ },
99
105
  Breadcrumb: {
100
106
  fontSize: fontSizeSM,
101
107
  fontHeight: 20,
@@ -310,12 +310,12 @@
310
310
  @colorTextQuaternary: #b6c0d4;
311
311
  @colorFill: #cdd5e4;
312
312
  @colorFillSecondary: #e2e8f3;
313
- @colorFillTertiary: #eff3fa;
314
- @colorFillQuaternary: #f7f9fc;
313
+ @colorFillTertiary: #ebeff7;
314
+ @colorFillQuaternary: #f5f7fc;
315
315
  @colorBgSolid: rgb(0,0,0);
316
316
  @colorBgSolidHover: rgba(0,0,0,0.75);
317
317
  @colorBgSolidActive: rgba(0,0,0,0.95);
318
- @colorBgLayout: #f7f9fc;
318
+ @colorBgLayout: #fbfcfe;
319
319
  @colorBgContainer: #ffffff;
320
320
  @colorBgElevated: #ffffff;
321
321
  @colorBgSpotlight: #ffffff;
@@ -421,14 +421,14 @@
421
421
  @colorFuchsiaBg: #faf0fc;
422
422
  @colorFuchsiaText: #580e67;
423
423
  @colorIcon: #8592ad;
424
- @colorBgContainerDisabled: #eff3fa;
424
+ @colorBgContainerDisabled: #ebeff7;
425
425
  @boxShadow: 0 6px 16px 0 rgba(54, 69, 99, 0.08), 0 3px 6px -4px rgba(54, 69, 99, 0.12), 0 9px 28px 8px rgba(54, 69, 99, 0.05);
426
426
  @boxShadowSecondary: 0 6px 16px 0 rgba(54, 69, 99, 0.08), 0 3px 6px -4px rgba(54, 69, 99, 0.12), 0 9px 28px 8px rgba(54, 69, 99, 0.05);
427
427
  @boxShadowTertiary: 0 1px 2px 0 rgba(54, 69, 99, 0.03), 0 1px 6px -1px rgba(54, 69, 99, 0.02), 0 2px 4px 0 rgba(54, 69, 99, 0.02);
428
428
  @lineWidthFocus: 3px;
429
429
  @colorFillContent: #e2e8f3;
430
430
  @colorFillContentHover: #cdd5e4;
431
- @colorFillAlter: #f7f9fc;
431
+ @colorFillAlter: #f5f7fc;
432
432
  @colorBorderBg: #ffffff;
433
433
  @colorSplit: rgba(13,63,155,0.12);
434
434
  @colorTextPlaceholder: #b6c0d4;
@@ -446,11 +446,11 @@
446
446
  @fontSizeIcon: 12px;
447
447
  @controlOutlineWidth: 2px;
448
448
  @controlInteractiveSize: 14px;
449
- @controlItemBgHover: #eff3fa;
449
+ @controlItemBgHover: #ebeff7;
450
450
  @controlItemBgActive: #e6f4ff;
451
451
  @controlItemBgActiveHover: #b0dbff;
452
452
  @controlItemBgActiveDisabled: #cdd5e4;
453
- @controlTmpOutline: #f7f9fc;
453
+ @controlTmpOutline: #f5f7fc;
454
454
  @controlOutline: rgba(5,145,255,0.1);
455
455
  @opacityLoading: 0.65;
456
456
  @linkDecoration: none;