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

package/es/DateRanger/index.less

@@ -10,7 +10,7 @@
     border: 1px solid @colorBorder;
     box-sizing: border-box;
     display: flex;
-    border-radius: ~'@{borderRadius}px';
+    border-radius: @borderRadius;
     transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
     // FIXED: 存在不生效情况
     .@{prefix}-picker {

package/es/GraphToolbar/index.less

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

package/es/Highlight/index.less

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

package/es/ProCard/index.d.ts

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

package/es/ProCard/index.js

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

package/lib/DateRanger/index.less

@@ -10,7 +10,7 @@
     border: 1px solid @colorBorder;
     box-sizing: border-box;
     display: flex;
-    border-radius: ~'@{borderRadius}px';
+    border-radius: @borderRadius;
     transition: all 0.2s cubic-bezier(0.645, 0.045, 0.355, 1);
     // FIXED: 存在不生效情况
     .@{prefix}-picker {

package/lib/GraphToolbar/index.less

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

package/lib/Highlight/index.less

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

package/lib/ProCard/index.d.ts

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

package/lib/ProCard/index.js

@@ -36,11 +36,11 @@ var import_react = __toESM(require("react"));
 var import_pro_components = require("@ant-design/pro-components");
 var import_design = require("@oceanbase/design");
 var import_util = require("@oceanbase/design/es/_util");
-var import_design2 = require("@oceanbase/design");
+var import_icons = require("@oceanbase/icons");
 var import_classnames = __toESM(require("classnames"));
 var import_style = __toESM(require("./style"));
-var import_icons = require("@oceanbase/icons");
 var ProCard = ({
+  bordered,
   ghost,
   title,
   tabs,
@@ -48,12 +48,17 @@ var ProCard = ({
   bodyStyle,
   prefixCls: customizePrefixCls,
   className,
+  style,
   ...restProps
 }) => {
-  const { getPrefixCls, iconPrefixCls } = (0, import_react.useContext)(import_design.ConfigProvider.ConfigContext);
+  const {
+    getPrefixCls,
+    iconPrefixCls,
+    card: contextCard
+  } = (0, import_react.useContext)(import_design.ConfigProvider.ConfigContext);
   const prefixCls = getPrefixCls("pro-card", customizePrefixCls);
   const { wrapSSR } = (0, import_style.default)(prefixCls);
-  const { token } = import_design2.theme.useToken();
+  const { token } = import_design.theme.useToken();
   const noBodyHorizontalPadding = (0, import_util.isHorizontalPaddingZero)(bodyStyle == null ? void 0 : bodyStyle.padding) || ghost;
   const proCardCls = (0, import_classnames.default)(
     {
@@ -62,6 +67,7 @@ var ProCard = ({
       [`${prefixCls}-no-divider`]: !headerBordered,
       [`${prefixCls}-contain-tabs`]: !!tabs
     },
+    contextCard == null ? void 0 : contextCard.className,
     className
   );
   return wrapSSR(
@@ -69,15 +75,20 @@ var ProCard = ({
       import_pro_components.ProCard,
       {
         prefixCls: customizePrefixCls,
+        bordered: bordered ?? ((contextCard == null ? void 0 : contextCard.variant) ? (contextCard == null ? void 0 : contextCard.variant) === "outlined" : void 0),
         ghost,
         title,
         tabs: typeof tabs === "object" ? {
           size: "large",
           ...tabs
         } : tabs,
-        headerBordered,
+        headerBordered: headerBordered ?? (contextCard == null ? void 0 : contextCard.divided),
         bodyStyle,
         className: proCardCls,
+        style: {
+          ...contextCard == null ? void 0 : contextCard.style,
+          ...style
+        },
         collapsibleIconRender: ({ collapsed }) => {
           return /* @__PURE__ */ import_react.default.createElement(
             import_icons.CaretRightFilled,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/ui",
-  "version": "1.0.0-alpha.0",
+  "version": "1.0.0-alpha.1",
   "description": "The UI library based on OceanBase Design",
   "keywords": [
     "oceanbase",
@@ -41,9 +41,9 @@
     "@ant-design/cssinjs": "^1.24.0",
     "@ant-design/pro-components": "^2.8.10",
     "@antv/g6": "3.4.10",
-    "@oceanbase/design": "^1.0.0-alpha.0",
-    "@oceanbase/icons": "^0.4.7",
-    "@oceanbase/util": "^0.4.4",
+    "@oceanbase/design": "^1.0.0-alpha.1",
+    "@oceanbase/icons": "^1.0.0-alpha.0",
+    "@oceanbase/util": "^1.0.0-alpha.0",
     "ahooks": "^2.10.14",
     "classnames": "^2.5.1",
     "dayjs": "^1.11.18",
@@ -70,5 +70,5 @@
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
-  "gitHead": "1aff1c2acc2b9494ff83a86ed597b9f46a08f59c"
+  "gitHead": "47b1ebfa75581585b83252085dddd33fc2c072a5"
 }