@oceanbase/ui 0.2.11 → 0.2.13

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.
@@ -45,8 +45,9 @@ var import_LocaleWrapper = __toESM(require("../locale/LocaleWrapper"));
45
45
  var import_util2 = require("../_util");
46
46
  var import_useHistory = __toESM(require("../_util/useHistory"));
47
47
  var import_Header = __toESM(require("./Header"));
48
- var import_index = require("./index.less");
49
48
  var import_zh_CN = __toESM(require("./locale/zh-CN"));
49
+ var import_style = __toESM(require("./style"));
50
+ var import_index = require("./index.less");
50
51
  var { Content, Sider } = import_design2.Layout;
51
52
  var { SubMenu, Item } = import_design2.Menu;
52
53
  var prefix = (0, import_util2.getPrefix)("layout");
@@ -65,9 +66,14 @@ var BasicLayout = ({
65
66
  sideHeader,
66
67
  subSideMenuProps,
67
68
  subSideMenus,
69
+ prefixCls: customizePrefixCls,
68
70
  className,
69
71
  ...restProps
70
72
  }) => {
73
+ const { getPrefixCls } = (0, import_react.useContext)(import_design2.ConfigProvider.ConfigContext);
74
+ const prefixCls = getPrefixCls("basic-layout", customizePrefixCls);
75
+ const { wrapSSR, hashId } = (0, import_style.default)(prefixCls);
76
+ const basicLayoutCls = (0, import_classnames.default)(className, hashId);
71
77
  const history = (0, import_useHistory.default)();
72
78
  const [collapsed, setCollapsed] = (0, import_react.useState)(defaultCollapsed);
73
79
  const [selectedKeys, setSelectedKeys] = (0, import_react.useState)(defaultSelectedKeys);
@@ -235,110 +241,112 @@ var BasicLayout = ({
235
241
  } else if (!subSideMenus && !menus) {
236
242
  siderWidth = 0;
237
243
  }
238
- return /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, banner && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-banner-wrapper` }, banner), /* @__PURE__ */ import_react.default.createElement(
239
- import_design2.Layout,
240
- {
241
- className: (0, import_classnames.default)(prefix, className, {
242
- [`${prefix}-with-banner`]: banner
243
- }),
244
- ...restProps
245
- },
246
- /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
247
- import_Header.default,
248
- {
249
- pathname,
250
- iconUrl,
251
- logoUrl,
252
- simpleLogoUrl,
253
- ...topHeader
254
- }
255
- ), /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
244
+ return wrapSSR(
245
+ /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, banner && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-banner-wrapper` }, banner), /* @__PURE__ */ import_react.default.createElement(
256
246
  import_design2.Layout,
257
247
  {
258
- className: `${prefix}-content-layout`,
259
- style: {
260
- marginTop: 48
261
- }
248
+ className: (0, import_classnames.default)(prefix, className, basicLayoutCls, {
249
+ [`${prefix}-with-banner`]: banner
250
+ }),
251
+ ...restProps
262
252
  },
263
- (subSideMenus || menus) && /* @__PURE__ */ import_react.default.createElement(
264
- Sider,
253
+ /* @__PURE__ */ import_react.default.createElement(import_react.default.Fragment, null, /* @__PURE__ */ import_react.default.createElement(
254
+ import_Header.default,
255
+ {
256
+ pathname,
257
+ iconUrl,
258
+ logoUrl,
259
+ simpleLogoUrl,
260
+ ...topHeader
261
+ }
262
+ ), /* @__PURE__ */ import_react.default.createElement("div", null, /* @__PURE__ */ import_react.default.createElement(
263
+ import_design2.Layout,
265
264
  {
266
- theme: "light",
267
- width: siderWidth,
268
- className: (0, import_classnames.default)(`${prefix}-sider`, {
269
- [`${prefix}-sider-collapsed`]: collapsed,
270
- [`${prefix}-sider-has-sub-sider`]: subSideMenus
271
- })
265
+ className: `${prefix}-content-layout`,
266
+ style: {
267
+ marginTop: 48
268
+ }
272
269
  },
273
- /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-wrapper` }, subSideMenus && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sub-sider` }, /* @__PURE__ */ import_react.default.createElement(
274
- import_design2.Menu,
270
+ (subSideMenus || menus) && /* @__PURE__ */ import_react.default.createElement(
271
+ Sider,
275
272
  {
276
- ...subSideMenuProps,
277
- mode: "vertical",
278
- className: `${prefix}-menu-vertical`
273
+ theme: "light",
274
+ width: siderWidth,
275
+ className: (0, import_classnames.default)(`${prefix}-sider`, {
276
+ [`${prefix}-sider-collapsed`]: collapsed,
277
+ [`${prefix}-sider-has-sub-sider`]: subSideMenus
278
+ })
279
279
  },
280
- renderCollapsedMenu(subSideMenus, true)
281
- )), (sideHeader || menus) && /* @__PURE__ */ import_react.default.createElement(
282
- "div",
283
- {
284
- style: {
285
- display: "flex",
286
- width: "100%"
287
- }
288
- },
289
- /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-content` }, sideHeader && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-header` }, sideHeader), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-menu-wrapper` }, collapsed ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-menu-collapsed` }, /* @__PURE__ */ import_react.default.createElement(
280
+ /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-wrapper` }, subSideMenus && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sub-sider` }, /* @__PURE__ */ import_react.default.createElement(
290
281
  import_design2.Menu,
291
282
  {
292
- ...menuProps,
283
+ ...subSideMenuProps,
293
284
  mode: "vertical",
294
285
  className: `${prefix}-menu-vertical`
295
286
  },
296
- renderCollapsedMenu(menus, false)
297
- )) : /* @__PURE__ */ import_react.default.createElement(
298
- import_design2.Menu,
299
- {
300
- ...menuProps,
301
- mode: "inline",
302
- expandIcon: ({ isOpen }) => {
303
- return /* @__PURE__ */ import_react.default.createElement(
304
- import_icons.CaretRightFilled,
305
- {
306
- rotate: isOpen ? 90 : 0,
307
- style: {
308
- fontSize: 12
309
- }
310
- }
311
- );
312
- },
313
- className: `${prefix}-menu`
314
- },
315
- renderMenu(menus)
316
- ))),
317
- /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-border` }, /* @__PURE__ */ import_react.default.createElement(
287
+ renderCollapsedMenu(subSideMenus, true)
288
+ )), (sideHeader || menus) && /* @__PURE__ */ import_react.default.createElement(
318
289
  "div",
319
290
  {
320
- className: `${prefix}-sider-collapse`,
321
- onClick: () => {
322
- setCollapsed(!collapsed);
323
- setOpenKeys([]);
291
+ style: {
292
+ display: "flex",
293
+ width: "100%"
324
294
  }
325
295
  },
326
- collapsed ? /* @__PURE__ */ import_react.default.createElement(import_icons.RightOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.LeftOutlined, null)
296
+ /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-content` }, sideHeader && /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-header` }, sideHeader), /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-menu-wrapper` }, collapsed ? /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-menu-collapsed` }, /* @__PURE__ */ import_react.default.createElement(
297
+ import_design2.Menu,
298
+ {
299
+ ...menuProps,
300
+ mode: "vertical",
301
+ className: `${prefix}-menu-vertical`
302
+ },
303
+ renderCollapsedMenu(menus, false)
304
+ )) : /* @__PURE__ */ import_react.default.createElement(
305
+ import_design2.Menu,
306
+ {
307
+ ...menuProps,
308
+ mode: "inline",
309
+ expandIcon: ({ isOpen }) => {
310
+ return /* @__PURE__ */ import_react.default.createElement(
311
+ import_icons.CaretRightFilled,
312
+ {
313
+ rotate: isOpen ? 90 : 0,
314
+ style: {
315
+ fontSize: 12
316
+ }
317
+ }
318
+ );
319
+ },
320
+ className: `${prefix}-menu`
321
+ },
322
+ renderMenu(menus)
323
+ ))),
324
+ /* @__PURE__ */ import_react.default.createElement("div", { className: `${prefix}-sider-border` }, /* @__PURE__ */ import_react.default.createElement(
325
+ "div",
326
+ {
327
+ className: `${prefix}-sider-collapse`,
328
+ onClick: () => {
329
+ setCollapsed(!collapsed);
330
+ setOpenKeys([]);
331
+ }
332
+ },
333
+ collapsed ? /* @__PURE__ */ import_react.default.createElement(import_icons.RightOutlined, null) : /* @__PURE__ */ import_react.default.createElement(import_icons.LeftOutlined, null)
334
+ ))
327
335
  ))
328
- ))
329
- ),
330
- /* @__PURE__ */ import_react.default.createElement(
331
- Content,
332
- {
333
- className: (0, import_classnames.default)(`${prefix}-content`, `${prefix}-content-${siderWidth}`),
334
- style: {
335
- marginLeft: siderWidth
336
- }
337
- },
338
- children
339
- )
340
- )))
341
- ));
336
+ ),
337
+ /* @__PURE__ */ import_react.default.createElement(
338
+ Content,
339
+ {
340
+ className: (0, import_classnames.default)(`${prefix}-content`, `${prefix}-content-${siderWidth}`),
341
+ style: {
342
+ marginLeft: siderWidth
343
+ }
344
+ },
345
+ children
346
+ )
347
+ )))
348
+ ))
349
+ );
342
350
  };
343
351
  var BasicLayout_default = (0, import_LocaleWrapper.default)({
344
352
  componentName: "BasicLayout",
@@ -371,10 +371,6 @@
371
371
  }
372
372
  }
373
373
 
374
- .@{prefixCls}-pro-footer-bar {
375
- width: calc(100% - 192px - 24px);
376
- }
377
-
378
374
  @media (min-width: @maxWidth) {
379
375
  .@{prefixCls}-pro-footer-bar {
380
376
  right: calc((100% - @maxWidth) / 2 + 24px);
@@ -0,0 +1,5 @@
1
+ import type { FullToken, GenerateStyle } from 'antd/es/theme/internal';
2
+ export declare type BasicLayoutToken = FullToken<any>;
3
+ export declare const genBasicLayoutStyle: GenerateStyle<BasicLayoutToken>;
4
+ declare const _default: (prefixCls: string) => any;
5
+ export default _default;
@@ -0,0 +1,49 @@
1
+ var __defProp = Object.defineProperty;
2
+ var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
3
+ var __getOwnPropNames = Object.getOwnPropertyNames;
4
+ var __hasOwnProp = Object.prototype.hasOwnProperty;
5
+ var __export = (target, all) => {
6
+ for (var name in all)
7
+ __defProp(target, name, { get: all[name], enumerable: true });
8
+ };
9
+ var __copyProps = (to, from, except, desc) => {
10
+ if (from && typeof from === "object" || typeof from === "function") {
11
+ for (let key of __getOwnPropNames(from))
12
+ if (!__hasOwnProp.call(to, key) && key !== except)
13
+ __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
14
+ }
15
+ return to;
16
+ };
17
+ var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
18
+
19
+ // src/BasicLayout/style/index.ts
20
+ var style_exports = {};
21
+ __export(style_exports, {
22
+ default: () => style_default,
23
+ genBasicLayoutStyle: () => genBasicLayoutStyle
24
+ });
25
+ module.exports = __toCommonJS(style_exports);
26
+ var import_genComponentStyleHook = require("../../_util/genComponentStyleHook");
27
+ var genBasicLayoutStyle = (token) => {
28
+ const { proComponentsCls } = token;
29
+ return {
30
+ // Set style of PageContainer in BasicLayout
31
+ [`${proComponentsCls}-page-container`]: {
32
+ // 48px is the height of BasicLayout header
33
+ minHeight: "calc(100vh - 48px)"
34
+ },
35
+ [`${proComponentsCls}-footer-bar`]: {
36
+ width: `calc(100% - 192px - 24px)`
37
+ }
38
+ };
39
+ };
40
+ var style_default = (prefixCls) => {
41
+ const useStyle = (0, import_genComponentStyleHook.genComponentStyleHook)("BasicLayout", (token) => {
42
+ return [genBasicLayoutStyle(token)];
43
+ });
44
+ return useStyle(prefixCls);
45
+ };
46
+ // Annotate the CommonJS export names for ESM import in node:
47
+ 0 && (module.exports = {
48
+ genBasicLayoutStyle
49
+ });
@@ -29,7 +29,7 @@ export declare const THEME_DARK = "dark";
29
29
  export declare const THEME_LIGHT = "light";
30
30
  declare const ThemeTypes: ["dark", "light"];
31
31
  export declare type ThemeType = (typeof ThemeTypes)[number];
32
- declare const supportedLanguages: ("ruby" | "javascript" | "typescript" | "css" | "groovy" | "java" | "python" | "bash" | "json" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "go" | "yaml" | "solidity" | "tsx" | "jsx")[];
32
+ declare const supportedLanguages: ("ruby" | "json" | "javascript" | "typescript" | "css" | "groovy" | "java" | "python" | "bash" | "cpp" | "http" | "markdown" | "nginx" | "sql" | "xml" | "dockerfile" | "go" | "yaml" | "solidity" | "tsx" | "jsx")[];
33
33
  export declare type LanguageType = (typeof supportedLanguages)[number] | 'html';
34
34
  export interface HighlightProps extends LocaleWrapperProps {
35
35
  /**
@@ -231,7 +231,6 @@ var Highlight = (props) => {
231
231
  "table",
232
232
  {
233
233
  style: {
234
- padding: "0",
235
234
  height
236
235
  },
237
236
  className: (0, import_classnames.default)(
@@ -1,10 +1,15 @@
1
- import type { AnimationConfig } from 'lottie-web';
1
+ import type { AnimationConfig, AnimationItem } from 'lottie-web';
2
2
  import React from 'react';
3
- interface LottieProps extends Omit<AnimationConfig, 'container'> {
3
+ export interface LottieProps extends Omit<AnimationConfig, 'container'> {
4
4
  path: string;
5
+ mode?: 'default' | 'icon';
6
+ loop?: boolean;
5
7
  speed?: number;
6
- mode?: 'normal' | 'icon';
8
+ className?: string;
7
9
  style?: React.CSSProperties;
8
10
  }
9
- declare const Lottie: React.FC<LottieProps>;
11
+ export interface LottieRef {
12
+ animation: AnimationItem;
13
+ }
14
+ declare const Lottie: React.ForwardRefExoticComponent<LottieProps & React.RefAttributes<LottieRef>>;
10
15
  export default Lottie;
@@ -32,31 +32,48 @@ __export(Lottie_exports, {
32
32
  default: () => Lottie_default
33
33
  });
34
34
  module.exports = __toCommonJS(Lottie_exports);
35
- var import_classnames = __toESM(require("classnames"));
36
35
  var import_lottie_web = __toESM(require("lottie-web"));
37
36
  var import_react = __toESM(require("react"));
38
- var Lottie = ({ mode, speed = 1, style, ...restProps }) => {
39
- const ref = (0, import_react.useRef)();
40
- (0, import_react.useEffect)(() => {
41
- const animation = import_lottie_web.default.loadAnimation({
42
- container: ref.current,
43
- renderer: "svg",
44
- loop: false,
45
- autoplay: true,
46
- ...restProps
47
- });
48
- animation.setSpeed(speed);
49
- }, []);
50
- return /* @__PURE__ */ import_react.default.createElement(
51
- "span",
52
- {
53
- ref,
54
- className: (0, import_classnames.default)("ob-lottie", {
55
- // 图标展示模式,则追加 anticon 类名,这样可共享相关样式
56
- ["anticon"]: mode === "icon"
57
- }),
58
- style
59
- }
60
- );
61
- };
37
+ var import_ahooks = require("ahooks");
38
+ var import_classnames = __toESM(require("classnames"));
39
+ var Lottie = import_react.default.forwardRef(
40
+ ({ mode = "default", loop = true, speed = 1, className, style, ...restProps }, ref) => {
41
+ const [animation, setAnimation] = (0, import_react.useState)();
42
+ const containerRef = (0, import_react.useRef)();
43
+ (0, import_react.useEffect)(() => {
44
+ if (!animation) {
45
+ const newAnimation = import_lottie_web.default.loadAnimation({
46
+ container: containerRef.current,
47
+ renderer: "svg",
48
+ loop,
49
+ ...restProps
50
+ });
51
+ setAnimation(newAnimation);
52
+ }
53
+ }, []);
54
+ (0, import_ahooks.useUpdateEffect)(() => {
55
+ if (animation) {
56
+ animation.setLoop(loop);
57
+ animation.setSpeed(speed);
58
+ }
59
+ }, [loop, speed]);
60
+ (0, import_react.useImperativeHandle)(ref, () => ({
61
+ animation
62
+ }));
63
+ return /* @__PURE__ */ import_react.default.createElement(
64
+ "div",
65
+ {
66
+ ref: containerRef,
67
+ className: (0, import_classnames.default)(className, {
68
+ // 图标展示模式,则追加 anticon 类名
69
+ ["anticon"]: mode === "icon"
70
+ }),
71
+ style: {
72
+ display: "inline-block",
73
+ ...style
74
+ }
75
+ }
76
+ );
77
+ }
78
+ );
62
79
  var Lottie_default = Lottie;
@@ -50,20 +50,29 @@ var NavMenu_default = (props) => {
50
50
  const preProcess = (0, import_react.useCallback)(
51
51
  (list) => {
52
52
  const { pathname } = location;
53
- for (let i = 0; i < list.length; i++) {
54
- const { link, openNewTab, href, key, children } = list[i];
55
- const linkList = (0, import_lodash.isArray)(link) ? link : [link];
56
- const match = linkList.some((lk) => (0, import_path_to_regexp.pathToRegexp)(lk).test(pathname));
57
- if (match) {
58
- if (openNewTab || href)
59
- return false;
60
- setSelectedKeys([key]);
61
- setMenus(list);
62
- return;
63
- }
64
- if (!!(children == null ? void 0 : children.length)) {
65
- preProcess(children);
53
+ try {
54
+ for (let i = 0; i < list.length; i++) {
55
+ const { link, openNewTab, href, key, children } = list[i];
56
+ const linkList = (0, import_lodash.isArray)(link) ? link : [link];
57
+ const match = linkList.some(
58
+ (lk) => (
59
+ // pathToRegexp 不支持 http/https 协议解析,需要去掉协议头
60
+ (0, import_path_to_regexp.pathToRegexp)(lk.replace(/^https?:\/\//, "")).test(pathname)
61
+ )
62
+ );
63
+ if (match) {
64
+ if (openNewTab || href)
65
+ return false;
66
+ setSelectedKeys([key]);
67
+ setMenus(list);
68
+ return;
69
+ }
70
+ if (!!(children == null ? void 0 : children.length)) {
71
+ preProcess(children);
72
+ }
66
73
  }
74
+ } catch (error) {
75
+ console.log("error", error);
67
76
  }
68
77
  },
69
78
  [location]
@@ -1,7 +1,8 @@
1
+ import React from 'react';
1
2
  declare const _default: ({ route, params, routes, paths }: {
2
3
  route: any;
3
4
  params: any;
4
5
  routes: any;
5
6
  paths: any;
6
- }) => import("react").JSX.Element;
7
+ }) => React.JSX.Element;
7
8
  export default _default;
@@ -32,6 +32,7 @@ __export(ItemRender_exports, {
32
32
  default: () => ItemRender_default
33
33
  });
34
34
  module.exports = __toCommonJS(ItemRender_exports);
35
+ var import_react = __toESM(require("react"));
35
36
  var import_useHistory = __toESM(require("../_util/useHistory"));
36
37
  var ItemRender_default = ({ route, params, routes, paths }) => {
37
38
  const routeIndex = routes.indexOf(route);
@@ -39,7 +40,7 @@ var ItemRender_default = ({ route, params, routes, paths }) => {
39
40
  const title = route.title || route.breadcrumbName;
40
41
  const path = route.href || routes.slice(0, routeIndex + 1).map((item) => item.path).join("/");
41
42
  const history = (0, import_useHistory.default)();
42
- return last ? /* @__PURE__ */ React.createElement("span", null, title) : /* @__PURE__ */ React.createElement(
43
+ return last ? /* @__PURE__ */ import_react.default.createElement("span", null, title) : /* @__PURE__ */ import_react.default.createElement(
43
44
  "a",
44
45
  {
45
46
  onClick: () => {
@@ -34,11 +34,10 @@ __export(PageContainer_exports, {
34
34
  module.exports = __toCommonJS(PageContainer_exports);
35
35
  var import_icons = require("@oceanbase/icons");
36
36
  var import_pro_components = require("@ant-design/pro-components");
37
- var import_design = require("@oceanbase/design");
38
37
  var import_classnames = __toESM(require("classnames"));
39
38
  var import_lodash = require("lodash");
40
39
  var import_react = __toESM(require("react"));
41
- var import_design2 = require("@oceanbase/design");
40
+ var import_design = require("@oceanbase/design");
42
41
  var import_LocaleWrapper = __toESM(require("../locale/LocaleWrapper"));
43
42
  var import_ItemRender = __toESM(require("./ItemRender"));
44
43
  var import_zh_CN = __toESM(require("./locale/zh-CN"));
@@ -54,7 +53,7 @@ var PageContainer = ({
54
53
  locale,
55
54
  ...restProps
56
55
  }) => {
57
- const { getPrefixCls } = (0, import_react.useContext)(import_design2.ConfigProvider.ConfigContext);
56
+ const { getPrefixCls } = (0, import_react.useContext)(import_design.ConfigProvider.ConfigContext);
58
57
  const rootPrefixCls = getPrefixCls();
59
58
  const prefixCls = getPrefixCls("pro-page-container", customizePrefixCls);
60
59
  const { wrapSSR, hashId } = (0, import_style.default)(prefixCls);
@@ -64,7 +63,7 @@ var PageContainer = ({
64
63
  `${rootPrefixCls}-page-header-heading-reload`,
65
64
  reloadProps.className
66
65
  );
67
- const newSubTitle = subTitle && /* @__PURE__ */ import_react.default.createElement(import_design.Space, { size: 12 }, reload && /* @__PURE__ */ import_react.default.createElement(import_design2.Tooltip, { title: locale.reload }, (0, import_lodash.isObject)(reload) && import_react.default.isValidElement(reload) ? reload : /* @__PURE__ */ import_react.default.createElement(import_icons.SyncOutlined, { ...reloadProps, className: reloadCls })), subTitle);
66
+ const newSubTitle = subTitle && /* @__PURE__ */ import_react.default.createElement(import_design.Space, { size: 12 }, reload && /* @__PURE__ */ import_react.default.createElement(import_design.Tooltip, { title: locale.reload }, (0, import_lodash.isObject)(reload) && import_react.default.isValidElement(reload) ? reload : /* @__PURE__ */ import_react.default.createElement(import_icons.SyncOutlined, { ...reloadProps, className: reloadCls })), subTitle);
68
67
  const newHeader = header && {
69
68
  ...header,
70
69
  subTitle: newSubTitle,
@@ -29,6 +29,7 @@ var genPageContainerStyle = (token) => {
29
29
  antCls,
30
30
  proComponentsCls,
31
31
  componentCls,
32
+ colorBgLayout,
32
33
  colorBgBase,
33
34
  borderRadius,
34
35
  boxShadowSecondary,
@@ -41,8 +42,8 @@ var genPageContainerStyle = (token) => {
41
42
  const lineHeight = `${controlHeightLG}px`;
42
43
  return {
43
44
  [`${componentCls}`]: {
44
- // 48px is the height of BasicLayout header
45
- minHeight: "calc(100vh - 48px)",
45
+ minHeight: "100vh",
46
+ backgroundColor: colorBgLayout,
46
47
  [`${proComponentsCls}-grid-content`]: {
47
48
  minHeight: "auto"
48
49
  },
@@ -97,6 +98,7 @@ var genPageContainerStyle = (token) => {
97
98
  paddingBottom: 64
98
99
  },
99
100
  [`${proComponentsCls}-footer-bar`]: {
101
+ width: "100%",
100
102
  backgroundColor: colorBgBase,
101
103
  borderRadius,
102
104
  boxShadow: boxShadowSecondary,
@@ -75,7 +75,7 @@
75
75
  user-select: none;
76
76
 
77
77
  &.@{prefix}-button-primary {
78
- background-color: #1677ff;
78
+ background-color: #006aff;
79
79
  }
80
80
 
81
81
  &.@{prefix}-button-small {
@@ -95,7 +95,7 @@
95
95
  position: absolute;
96
96
  width: 56px;
97
97
  height: 56px;
98
- color: #1677ff;
98
+ color: #006aff;
99
99
  font-size: 56px;
100
100
  inset-block-start: 0;
101
101
  inset-inline-end: 0;
@@ -25,6 +25,7 @@ module.exports = __toCommonJS(useHistory_exports);
25
25
  var import_react_router_dom = require("react-router-dom");
26
26
  var useHistory_default = () => {
27
27
  return {
28
- push: import_react_router_dom.useHistory ? (0, import_react_router_dom.useHistory)().push : import_react_router_dom.useNavigate ? (0, import_react_router_dom.useNavigate)() : null
28
+ // push: useHistory ? useHistory().push : useNavigate ? useNavigate() : null,
29
+ push: import_react_router_dom.useNavigate ? (0, import_react_router_dom.useNavigate)() : null
29
30
  };
30
31
  };
package/lib/index.less CHANGED
@@ -1,15 +1 @@
1
1
  @import './variable.less';
2
-
3
- html,
4
- body {
5
- height: 100%;
6
- margin: 0;
7
- padding: 0;
8
- background-color: @colorBgLayout;
9
- }
10
-
11
- #root {
12
- display: flex;
13
- flex-direction: column;
14
- height: 100%;
15
- }