@oceanbase/ui 0.2.24 → 0.2.26

package/lib/PageContainer/style/index.js

@@ -48,6 +48,11 @@ var genPageContainerStyle = (token) => {
         minHeight: "auto"
       },
       [`${antCls}-page-header`]: {
+        // 减小内容区左右两侧间距
+        paddingInlineStart: paddingLG,
+        paddingInlineEnd: paddingLG,
+        paddingBlockStart: padding,
+        paddingBlockEnd: padding,
         [`${antCls}-page-header-breadcrumb`]: {
           // overwritten pro-components style
           paddingBlockStart: 0
@@ -79,17 +84,16 @@ var genPageContainerStyle = (token) => {
           marginBlockStart: 0
         }
       },
-      // 减小内容区左右两侧间距
-      [`${componentCls}-warp-page-header`]: {
-        paddingInlineStart: paddingLG,
-        paddingInlineEnd: paddingLG,
-        paddingBlockStart: padding,
-        paddingBlockEnd: padding
-      },
       [`${componentCls}-children-container`]: {
         paddingInline: paddingLG,
         paddingBlockStart: 0,
         paddingBlockEnd: paddingLG
+      },
+      // remove paddingBlockStart for page header without breadcrumb
+      [`${antCls}-page-header:not(${antCls}-page-header-has-breadcrumb)`]: {
+        [`${antCls}-page-header-heading`]: {
+          paddingBlockStart: 0
+        }
       }
     },
     [`${componentCls}-no-page-header`]: {

package/lib/Password/Content.js

@@ -37,9 +37,10 @@ var import_design = require("@oceanbase/design");
 var import_react = __toESM(require("react"));
 var import_design2 = require("@oceanbase/design");
 var Content = ({ rules, fieldError, isValidating, value, isTouched }) => {
+  const { token } = import_design2.theme.useToken();
   const statusIconMap = {
-    error: /* @__PURE__ */ import_react.default.createElement(import_icons.CloseCircleFilled, { style: { color: import_design2.token.colorError } }),
-    success: /* @__PURE__ */ import_react.default.createElement(import_icons.CheckCircleFilled, { style: { color: import_design2.token.colorSuccess } }),
+    error: /* @__PURE__ */ import_react.default.createElement(import_icons.CloseCircleFilled, { style: { color: token.colorError } }),
+    success: /* @__PURE__ */ import_react.default.createElement(import_icons.CheckCircleFilled, { style: { color: token.colorSuccess } }),
     wait: /* @__PURE__ */ import_react.default.createElement(
       "div",
       {
@@ -57,7 +58,7 @@ var Content = ({ rules, fieldError, isValidating, value, isTouched }) => {
           style: {
             width: 6,
             height: 6,
-            backgroundColor: import_design2.token.colorTextTertiary,
+            backgroundColor: token.colorTextTertiary,
             borderRadius: 4
           }
         }
@@ -71,12 +72,12 @@ var Content = ({ rules, fieldError, isValidating, value, isTouched }) => {
   );
   let strokeColor = "";
   if (isRequireFail) {
-    strokeColor = import_design2.token.colorError;
+    strokeColor = token.colorError;
     if (percent > 50 && percent < 100 && percent !== 100) {
-      strokeColor = import_design2.token.colorWarning;
+      strokeColor = token.colorWarning;
     }
   } else {
-    strokeColor = import_design2.token.colorSuccess;
+    strokeColor = token.colorSuccess;
   }
   return /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
     import_design.Progress,
@@ -100,7 +101,7 @@ var Content = ({ rules, fieldError, isValidating, value, isTouched }) => {
     if (!isTouched) {
       status = "wait";
     }
-    return /* @__PURE__ */ import_react.default.createElement("li", { key: index }, /* @__PURE__ */ import_react.default.createElement(import_design.Space, { align: "start" }, isValidating ? /* @__PURE__ */ import_react.default.createElement(import_icons.LoadingOutlined, null) : statusIconMap[status], /* @__PURE__ */ import_react.default.createElement("span", { style: { color: import_design2.token.colorTextSecondary } }, rule.message)));
+    return /* @__PURE__ */ import_react.default.createElement("li", { key: index }, /* @__PURE__ */ import_react.default.createElement(import_design.Space, { align: "start" }, isValidating ? /* @__PURE__ */ import_react.default.createElement(import_icons.LoadingOutlined, null) : statusIconMap[status], /* @__PURE__ */ import_react.default.createElement("span", { style: { color: token.colorTextSecondary } }, rule.message)));
   })));
 };
 var Content_default = Content;

package/lib/Password/index.js

@@ -49,6 +49,7 @@ var Password = ({
   generatePasswordRegex,
   ...restProps
 }) => {
+  const { token } = import_design2.theme.useToken();
   const [fieldError, setFieldError] = (0, import_react.useState)([]);
   const [isValidating, setIsValidating] = (0, import_react.useState)(false);
   const [isTouched, setIsTouched] = (0, import_react.useState)(false);
@@ -138,7 +139,7 @@ var Password = ({
     {
       style: {
         fontSize: 14,
-        color: import_design2.token.colorTextTertiary,
+        color: token.colorTextTertiary,
         lineHeight: "22px"
       }
     },

package/lib/Welcome/index.js

@@ -80,7 +80,17 @@ var Welcome = ({
     },
     /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 24, className: `${prefix}-title` }, /* @__PURE__ */ import_react.default.createElement("div", null, title)),
     /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 16, className: `${prefix}-description` }, /* @__PURE__ */ import_react.default.createElement("p", null, description))
-  ), /* @__PURE__ */ import_react.default.createElement(import_design.Card, { bordered: false, className: `${prefix}-introduce` }, /* @__PURE__ */ import_react.default.createElement(import_design.Row, { gutter: 78 }, introduces.map((item) => /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 8, key: item.image, className: `${prefix}-item`, "data-testid": "introduces" }, /* @__PURE__ */ import_react.default.createElement("img", { src: item.image, alt: "", height: 80 }), /* @__PURE__ */ import_react.default.createElement("span", null, /* @__PURE__ */ import_react.default.createElement("h3", { className: `${prefix}-title` }, item.title), /* @__PURE__ */ import_react.default.createElement("p", { className: `${prefix}-description` }, item.description)))))), /* @__PURE__ */ import_react.default.createElement(import_design.Row, { className: `${prefix}-content` }, /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 14, className: isDefault ? `${prefix}-left` : `${prefix}-border-right` }, /* @__PURE__ */ import_react.default.createElement(import_design.Row, { justify: "space-around" }, steps.map((item, index) => renderStep(item, index)), isDefault && /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-btn-wrapper` }, /* @__PURE__ */ import_react.default.createElement(import_design.Button, { type: "primary", icon: /* @__PURE__ */ import_react.default.createElement(import_icons.PlusOutlined, null), block: true, ...buttonProps }, buttonText))))), /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 10, className: `${prefix}-right` }, /* @__PURE__ */ import_react.default.createElement("h3", { className: `${prefix}-title` }, locale.helpTitle), helps.map((item) => /* @__PURE__ */ import_react.default.createElement(
+  ), /* @__PURE__ */ import_react.default.createElement(import_design.Card, { bordered: false, className: `${prefix}-introduce` }, /* @__PURE__ */ import_react.default.createElement(import_design.Row, { gutter: 78 }, introduces.map((item) => /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 8, key: item.image, className: `${prefix}-item`, "data-testid": "introduces" }, /* @__PURE__ */ import_react.default.createElement("img", { src: item.image, alt: "", height: 80 }), /* @__PURE__ */ import_react.default.createElement("span", null, /* @__PURE__ */ import_react.default.createElement("h3", { className: `${prefix}-title` }, item.title), /* @__PURE__ */ import_react.default.createElement("p", { className: `${prefix}-description` }, item.description)))))), /* @__PURE__ */ import_react.default.createElement(import_design.Row, { className: `${prefix}-content` }, /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 14, className: isDefault ? `${prefix}-left` : `${prefix}-border-right` }, /* @__PURE__ */ import_react.default.createElement(import_design.Row, { justify: "space-around" }, steps.map((item, index) => renderStep(item, index)), isDefault && /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 24 }, /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-btn-wrapper` }, /* @__PURE__ */ import_react.default.createElement(
+    import_design.Button,
+    {
+      size: "large",
+      type: "primary",
+      icon: /* @__PURE__ */ import_react.default.createElement(import_icons.PlusOutlined, null),
+      block: true,
+      ...buttonProps
+    },
+    buttonText
+  ))))), /* @__PURE__ */ import_react.default.createElement(import_design.Col, { span: 10, className: `${prefix}-right` }, /* @__PURE__ */ import_react.default.createElement("h3", { className: `${prefix}-title` }, locale.helpTitle), helps.map((item) => /* @__PURE__ */ import_react.default.createElement(
     import_design.Button,
     {
       key: item.title,

package/lib/Welcome/index.less

@@ -5,8 +5,7 @@
 .@{prefix}-container {
   height: 100%;
   padding-bottom: 0 !important;
-  overflow: auto;
-  background-color: #fff;
+  background-color: @colorBgContainer;
 
   .tech-page-container-content {
     // 由于 umi 的本地开发和线上打包的 CSS 样式优先级不一致，导致下列样式在线上环境不生效，因此先加上 !important
@@ -18,7 +17,7 @@
     height: 272px;
     padding-top: 72px;
     padding-left: 100px;
-    color: #fff;
+    color: @colorBgContainer;
     background-repeat: no-repeat;
     background-size: 100% 100%;
 
@@ -145,7 +144,7 @@
   // margin-right: 30px;
   margin-bottom: 30px;
   padding: 20px 30px 20px 0;
-  background: #fff;
+  background: @colorBgContainer;
   border: 1px solid rgba(0, 0, 0, 0.06);
   border-radius: 2px;
 
@@ -175,7 +174,7 @@
   }
 
   .@{prefix}-step-operations {
-    color: #0090ff;
+    color: @colorPrimary;
     font-size: 14px;
     line-height: 22px;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@oceanbase/ui",
-  "version": "0.2.24",
+  "version": "0.2.26",
   "description": "The UI library based on OceanBase Design",
   "keywords": [
     "oceanbase",
@@ -12,7 +12,7 @@
   "homepage": "https://github.com/oceanbase/oceanbase-design/packages/ui",
   "repository": {
     "type": "git",
-    "url": "git@github.com:oceanbase/design.git"
+    "url": "git@github.com:oceanbase/oceanbase-design.git"
   },
   "publishConfig": {
     "registry": "https://registry.npmjs.org",
@@ -35,11 +35,11 @@
   },
   "dependencies": {
     "@ant-design/cssinjs": "^1.17.2",
-    "@ant-design/pro-components": "^2.6.30",
+    "@ant-design/pro-components": "^2.6.34",
     "@ant-design/pro-layout": "^7.17.8",
-    "@oceanbase/design": "^0.2.23",
-    "@oceanbase/icons": "^0.2.8",
-    "@oceanbase/util": "^0.2.10",
+    "@oceanbase/design": "^0.2.25",
+    "@oceanbase/icons": "^0.2.9",
+    "@oceanbase/util": "^0.2.11",
     "ahooks": "^2.10.14",
     "classnames": "^2.3.2",
     "dayjs": "^1.11.10",
@@ -66,5 +66,5 @@
     "react": ">=16.9.0",
     "react-dom": ">=16.9.0"
   },
-  "gitHead": "1138341df7a35d3d4939ccea79225ddf220de2cc"
+  "gitHead": "98cd4d8a2af9b6e5dcde6210fc61f9efb74c7e01"
 }

package/es/BasicLayout/Header.less

@@ -1,134 +0,0 @@
-@import '../variable.less';
-
-@prefix: ob-layout-header;
-
-.@{prefix} {
-  position: fixed;
-  z-index: 10;
-  width: 100%;
-  height: 48px;
-  padding: 10px 24px;
-  line-height: 48px;
-  background-color: @colorBgLayout;
-  box-shadow: inset 0 -1px 0 0 #e2e8f3;
-
-  .@{prefix}-content {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    max-width: @maxWidth;
-    height: 100%;
-    margin: 0 auto;
-  }
-
-  .@{prefix}-logo {
-    height: 24px;
-    cursor: pointer;
-  }
-
-  .@{prefix}-icon {
-    width: 52px;
-    height: 48px;
-    line-height: 48px;
-    text-align: center;
-    border-right: 1px solid #e2e8f3;
-    border-bottom: 1px solid #e2e8f3;
-    cursor: pointer;
-    img {
-      height: 32px;
-      margin-top: 8px;
-    }
-  }
-
-  .@{prefix}-title {
-    /* 占据剩余的全部空间 */
-    flex: 1;
-    margin: 0 16px;
-  }
-
-  .@{prefix}-extra {
-    display: flex;
-    align-items: center;
-    justify-content: space-between;
-    .@{prefix}-extra-item {
-      display: inline-flex;
-      font-size: 12px;
-      cursor: pointer;
-      &:not(:last-child) {
-        margin-right: 24px;
-      }
-      .@{prefix}-extra-icon-wrapper {
-        width: 28px;
-        height: 28px;
-        line-height: 28px;
-        text-align: center;
-        border: 0.88px solid #ced4e1;
-        border-radius: 14px;
-      }
-      .@{prefix}-extra-user-wrapper {
-        height: 28px;
-        padding: 0 10px;
-        line-height: 28px;
-        border: 0.88px solid #ced4e1;
-        border-radius: 14px;
-        .@{prefix}-extra-user-icon {
-          margin-right: 6px;
-          margin-bottom: -2px;
-        }
-      }
-    }
-  }
-  .@{prefix}-extra-with-label {
-    .@{prefix}-extra-item {
-      &:not(:last-child) {
-        margin-right: 24px !important;
-      }
-    }
-  }
-}
-
-.@{prefix}-welcome {
-  color: #fff;
-  background-color: transparent;
-  border-bottom: none;
-
-  .@{prefix}-extra {
-    .@{prefixCls}-btn {
-      color: #fff;
-      background-color: rgba(255, 255, 255, 0.25);
-      border: 0.5px solid rgba(0, 0, 0, 0.1);
-    }
-  }
-}
-
-.@{prefix}-about-wrapper {
-  .@{prefix}-about {
-    margin-top: 12px;
-
-    .@{prefix}-logo {
-      height: 72px;
-    }
-
-    .@{prefix}-release-info {
-      margin-top: 20px;
-      margin-bottom: 50px;
-
-      .@{prefix}-version {
-        color: #000;
-      }
-
-      .@{prefix}-date {
-        color: #000;
-        font-size: 12px;
-        font-family: Helvetica;
-        opacity: 0.45;
-      }
-    }
-
-    .@{prefix}-copyright {
-      color: #000;
-      font-size: 12px;
-      opacity: 0.45;
-    }
-  }
-}