aldehyde 0.2.410 → 0.2.412

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 (88) hide show
  1. package/lib/controls/entity-select/popover-entity-select.js +1 -1
  2. package/lib/controls/entity-select/popover-entity-select.js.map +1 -1
  3. package/lib/controls/enum-badge/index.js +1 -1
  4. package/lib/controls/enum-badge/index.js.map +1 -1
  5. package/lib/layout2/components/theme-button.d.ts.map +1 -1
  6. package/lib/layout2/components/theme-button.js +18 -4
  7. package/lib/layout2/components/theme-button.js.map +1 -1
  8. package/lib/layout2/css/header.css +10 -6
  9. package/lib/layout2/css/tabs-layout.less +6 -0
  10. package/lib/layout2/header.d.ts +1 -1
  11. package/lib/layout2/header.d.ts.map +1 -1
  12. package/lib/layout2/header.js +2 -5
  13. package/lib/layout2/header.js.map +1 -1
  14. package/lib/layout2/page.d.ts +1 -1
  15. package/lib/layout2/page.d.ts.map +1 -1
  16. package/lib/layout2/page.js +15 -7
  17. package/lib/layout2/page.js.map +1 -1
  18. package/lib/layout2/type/layout-type.d.ts +2 -0
  19. package/lib/layout2/type/layout-type.d.ts.map +1 -1
  20. package/lib/layout3/page.d.ts.map +1 -1
  21. package/lib/layout3/page.js +17 -5
  22. package/lib/layout3/page.js.map +1 -1
  23. package/lib/layout4/header.d.ts +1 -1
  24. package/lib/layout4/header.d.ts.map +1 -1
  25. package/lib/layout4/header.js +1 -2
  26. package/lib/layout4/header.js.map +1 -1
  27. package/lib/layout4/page.d.ts +1 -1
  28. package/lib/layout4/page.d.ts.map +1 -1
  29. package/lib/layout4/page.js +21 -6
  30. package/lib/layout4/page.js.map +1 -1
  31. package/lib/layout5/css/sider.less +6 -0
  32. package/lib/layout5/page.d.ts +1 -1
  33. package/lib/layout5/page.d.ts.map +1 -1
  34. package/lib/layout5/page.js +21 -6
  35. package/lib/layout5/page.js.map +1 -1
  36. package/lib/layout5/sider.d.ts +1 -1
  37. package/lib/layout5/sider.d.ts.map +1 -1
  38. package/lib/layout5/sider.js +1 -2
  39. package/lib/layout5/sider.js.map +1 -1
  40. package/lib/list/card-list/index.less +6 -4
  41. package/lib/list/vertical-list/index.less +108 -18
  42. package/lib/list/vertical-list/item.d.ts.map +1 -1
  43. package/lib/list/vertical-list/item.js +45 -42
  44. package/lib/list/vertical-list/item.js.map +1 -1
  45. package/lib/table/column/column-builder.d.ts.map +1 -1
  46. package/lib/table/column/column-builder.js +25 -7
  47. package/lib/table/column/column-builder.js.map +1 -1
  48. package/lib/table/column/index.less +7 -5
  49. package/lib/tmpl/hcservice-v3.d.ts +1 -0
  50. package/lib/tmpl/hcservice-v3.d.ts.map +1 -1
  51. package/lib/tmpl/hcservice-v3.js +16 -0
  52. package/lib/tmpl/hcservice-v3.js.map +1 -1
  53. package/lib/units/index.d.ts +3 -1
  54. package/lib/units/index.d.ts.map +1 -1
  55. package/lib/units/index.js +22 -4
  56. package/lib/units/index.js.map +1 -1
  57. package/lib/welcome/HCWelcome.js +1 -1
  58. package/lib/welcome/HCWelcome.js.map +1 -1
  59. package/lib/welcome/components/page-card.d.ts.map +1 -1
  60. package/lib/welcome/components/page-card.js +4 -0
  61. package/lib/welcome/components/page-card.js.map +1 -1
  62. package/lib/welcome/components/workbench.js +2 -1
  63. package/lib/welcome/components/workbench.js.map +1 -1
  64. package/package.json +1 -1
  65. package/src/aldehyde/controls/entity-select/popover-entity-select.tsx +1 -1
  66. package/src/aldehyde/controls/enum-badge/index.tsx +1 -1
  67. package/src/aldehyde/layout2/components/theme-button.tsx +9 -4
  68. package/src/aldehyde/layout2/css/header.css +10 -6
  69. package/src/aldehyde/layout2/css/tabs-layout.less +6 -0
  70. package/src/aldehyde/layout2/header.tsx +6 -10
  71. package/src/aldehyde/layout2/page.tsx +16 -8
  72. package/src/aldehyde/layout2/type/layout-type.ts +2 -0
  73. package/src/aldehyde/layout3/page.tsx +9 -5
  74. package/src/aldehyde/layout4/header.tsx +2 -3
  75. package/src/aldehyde/layout4/page.tsx +14 -7
  76. package/src/aldehyde/layout5/css/sider.less +6 -0
  77. package/src/aldehyde/layout5/page.tsx +14 -7
  78. package/src/aldehyde/layout5/sider.tsx +5 -8
  79. package/src/aldehyde/list/card-list/index.less +6 -4
  80. package/src/aldehyde/list/vertical-list/index.less +108 -18
  81. package/src/aldehyde/list/vertical-list/item.tsx +70 -64
  82. package/src/aldehyde/table/column/column-builder.tsx +28 -10
  83. package/src/aldehyde/table/column/index.less +7 -5
  84. package/src/aldehyde/tmpl/hcservice-v3.tsx +14 -0
  85. package/src/aldehyde/units/index.tsx +21 -4
  86. package/src/aldehyde/welcome/HCWelcome.js +1 -1
  87. package/src/aldehyde/welcome/components/page-card.tsx +4 -0
  88. package/src/aldehyde/welcome/components/workbench.tsx +1 -1
package/lib/controls/entity-select/popover-entity-select.js CHANGED
@@ -95,7 +95,7 @@ class PopoverEntitySelect extends React.PureComponent {
95
95
  maxHeight: "calc(100vh - 50px)",
96
96
  },
97
97
  body: { padding: 0 }
98
- }, getPopupContainer: (triggerNode) => triggerNode, content: React.createElement("div", { className: "select-table-popover", style: {
98
+ }, align: { offset: [20, 0] }, content: React.createElement("div", { className: "select-table-popover", style: {
99
99
  padding: 4,
100
100
  height: 350,
101
101
  backgroundColor: "#fafafa",
package/lib/controls/entity-select/popover-entity-select.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"popover-entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"popover-entity-select.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/entity-select/popover-entity-select.tsx"],"names":[],"mappings":"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"}
package/lib/controls/enum-badge/index.js CHANGED
@@ -7,7 +7,7 @@ const MenuBadge = (props) => {
7
7
  const { value, itemType, fieldConfig } = props;
8
8
  let viewControl = undefined;
9
9
  let color = HCDataSource.getEnumValueColor(fieldConfig.mstrucId, value);
10
- viewControl = (React.createElement("span", { className: "infoStyle" }, value ? (React.createElement(Badge, { status: "processing", color: color ? color : "green", text: translate("${" + value + "}") })) : null));
10
+ viewControl = (React.createElement("span", { className: "infoStyle" }, value ? (React.createElement(Badge, { status: "processing", color: color ? color : "green", text: React.createElement("span", { style: { color: color ? color : "green" } }, translate("${" + value + "}")) })) : null));
11
11
  return viewControl;
12
12
  };
13
13
  export default MenuBadge;
package/lib/controls/enum-badge/index.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/enum-badge/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,MAAM,SAAS,GAA6B,CAAC,KAAK,EAAE,EAAE;IACpD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE/C,IAAI,WAAW,GAAG,SAAS,CAAC;IAE5B,IAAI,KAAK,GAAG,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxE,WAAW,GAAG,CACZ,8BAAM,SAAS,EAAC,WAAW,IACxB,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,KAAK,IACJ,MAAM,EAAC,YAAY,EACnB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAC9B,IAAI,EAAE,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,GACnC,CACH,CAAC,CAAC,CAAC,IAAI,CACH,CACR,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
1
+ {"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/enum-badge/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAInD,MAAM,SAAS,GAA6B,CAAC,KAAK,EAAE,EAAE;IACpD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAElC,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,WAAW,EAAE,GAAG,KAAK,CAAC;IAE/C,IAAI,WAAW,GAAG,SAAS,CAAC;IAE5B,IAAI,KAAK,GAAG,YAAY,CAAC,iBAAiB,CAAC,WAAW,CAAC,QAAQ,EAAE,KAAK,CAAC,CAAC;IACxE,WAAW,GAAG,CACZ,8BAAM,SAAS,EAAC,WAAW,IACxB,KAAK,CAAC,CAAC,CAAC,CACP,oBAAC,KAAK,IACJ,MAAM,EAAC,YAAY,EACnB,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAC9B,IAAI,EAAE,8BAAM,KAAK,EAAE,EAAE,KAAK,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,OAAO,EAAE,IAAG,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAQ,GAC7F,CACH,CAAC,CAAC,CAAC,IAAI,CACH,CACR,CAAC;IAEF,OAAO,WAAW,CAAC;AACrB,CAAC,CAAC;AAEF,eAAe,SAAS,CAAC"}
package/lib/layout2/components/theme-button.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theme-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAU,WAAW,EAA8B,MAAM,MAAM,CAAC;AAWvE,QAAA,MAAM,WAAW,GAAI,OAAO,WAAW,sBAqCtC,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"theme-button.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAuC,MAAM,OAAO,CAAC;AAC5D,OAAO,EAAU,WAAW,EAA8B,MAAM,MAAM,CAAC;AAWvE,QAAA,MAAM,WAAW,GAAI,OAAO,WAAW,sBA0CtC,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/lib/layout2/components/theme-button.js CHANGED
@@ -1,3 +1,12 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
1
10
  import React, { useEffect, useMemo, useState } from "react";
2
11
  import { Button, Dropdown, theme } from "antd";
3
12
  import { useSessionStorageState } from "ahooks";
@@ -11,12 +20,17 @@ const ThemeButton = (props) => {
11
20
  const [version, setVersion] = useState();
12
21
  const [themes, setThemes] = useState([]);
13
22
  const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', { defaultValue: [] });
14
- const themeKeys = ProgramConfig.themes();
23
+ const getThemeConfig = () => __awaiter(void 0, void 0, void 0, function* () {
24
+ var _a;
25
+ const themeConfig = yield ProgramConfig.getThemeConfig();
26
+ const themeKeys = ((_a = themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.styleTheme) === null || _a === void 0 ? void 0 : _a.split(",")) || ProgramConfig.themes();
27
+ const temThemes = defThemes.filter(item => themeKeys === null || themeKeys === void 0 ? void 0 : themeKeys.includes(item.value));
28
+ setThemes(temThemes.length ? temThemes : [{ label: "默认", value: "v2" }]);
29
+ });
15
30
  useEffect(() => {
31
+ getThemeConfig();
16
32
  const version = localStorage.getItem("version") || "v2";
17
33
  setVersion(version);
18
- const temThemes = defThemes.filter(item => themeKeys === null || themeKeys === void 0 ? void 0 : themeKeys.includes(item.value));
19
- setThemes(temThemes.length ? temThemes : [{ label: "默认", value: "v2" }]);
20
34
  }, []);
21
35
  const onClick = ({ key }) => {
22
36
  setKeepAliveTabs([]);
@@ -30,7 +44,7 @@ const ThemeButton = (props) => {
30
44
  label: (React.createElement("span", { style: version === item.value ? { color: token.colorPrimary } : {} }, item.label)),
31
45
  key: item.value,
32
46
  })), [themes]);
33
- return (themes.length > 1 ? React.createElement(Dropdown, { overlayClassName: "themeButton", menu: { items, onClick } },
47
+ return (themes.length > 1 ? React.createElement(Dropdown, { overlayClassName: "themeButton", menu: { items, onClick, selectedKeys: [version] } },
34
48
  React.createElement(Button, Object.assign({ type: "text", icon: React.createElement(AliIcon, { type: "icon-theme" }) }, props))) : undefined);
35
49
  };
36
50
  export default ThemeButton;
package/lib/layout2/components/theme-button.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"theme-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"theme-button.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/theme-button.tsx"],"names":[],"mappings":"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"}
package/lib/layout2/css/header.css CHANGED
@@ -8,13 +8,13 @@
8
8
  border-color: #ffffff !important;
9
9
  } */
10
10
 
11
- .ant-menu-submenu > .ant-menu-submenu-selected {
11
+ .ant-menu-submenu>.ant-menu-submenu-selected {
12
12
  /* background: #fff !important; */
13
13
  /* color: #53b572; */
14
14
  /* width: calc(100% - 8px); */
15
15
  }
16
16
 
17
- .ant-menu-submenu-selected > .ant-menu-submenu-title {
17
+ .ant-menu-submenu-selected>.ant-menu-submenu-title {
18
18
  /*color: #fff !important;*/
19
19
  }
20
20
 
@@ -27,12 +27,16 @@
27
27
  width: 0;
28
28
  }
29
29
 
30
- .layout2-header-menu > li:nth-last-child(1)::after {
30
+ .layout2-header-menu>li:nth-last-child(1)::after {
31
31
  width: 0;
32
32
  }
33
33
 
34
- .ant-menu-sub:has(.layout2-header-menu-item)
35
- > .ant-menu-submenu-selected
36
- > .ant-menu-submenu-title {
34
+ .ant-menu-sub:has(.layout2-header-menu-item)>.ant-menu-submenu-selected>.ant-menu-submenu-title {
37
35
  background-color: var(--color-3) !important;
38
36
  }
37
+
38
+ .v2-header .header-logo {
39
+ width: 24%;
40
+ max-width: 80px;
41
+ margin-right: 4%;
42
+ }
package/lib/layout2/css/tabs-layout.less CHANGED
@@ -10,4 +10,10 @@
10
10
  .overflow-y-auto {
11
11
  height: 100%;
12
12
  }
13
+
14
+ .list-item {
15
+ .list-item-icon {
16
+ background: var(--ant-layout-body-bg);
17
+ }
18
+ }
13
19
  }
package/lib/layout2/header.d.ts CHANGED
@@ -5,7 +5,7 @@ type HeaderPropsType = {
5
5
  systemName: string;
6
6
  menuList: MenuType[];
7
7
  style?: any;
8
- logoImg?: React.ReactNode;
8
+ logoImg: string;
9
9
  };
10
10
  declare const Header: React.FC<HeaderPropsType>;
11
11
  export default Header;
package/lib/layout2/header.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAClE,OAAO,kBAAkB,CAAC;AAM1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAwB9C,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAOF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6NrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAQA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAClE,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAwB9C,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAOF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA0NrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/lib/layout2/header.js CHANGED
@@ -5,7 +5,6 @@ import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
5
5
  import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
6
6
  import LocaleButton from "../locale/LocaleButton";
7
7
  import UserButton from "./components/user-button";
8
- import homePng from "./imgs/home.png";
9
8
  import { NavLink, useParams, useSearchParams } from "react-router-dom";
10
9
  import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu, } from "./util/menu-util";
11
10
  import { useLocale } from "../locale/useLocale";
@@ -107,7 +106,7 @@ const Header = ({ systemName, menuList, style, logoImg }) => {
107
106
  }
108
107
  }, [menuList, sourceId]);
109
108
  let systemLabel = translate("${" + systemName + "}");
110
- return (React.createElement(Layout.Header, { style: Object.assign({ padding: 0, display: "flex", flexDirection: "row", background: colorPrimary, color: "#FFFFFF" }, style) },
109
+ return (React.createElement(Layout.Header, { style: Object.assign({ padding: 0, display: "flex", flexDirection: "row", background: colorPrimary, color: "#FFFFFF" }, style), className: "v2-header" },
111
110
  React.createElement(NavLink, { style: {
112
111
  width: "200px",
113
112
  minWidth: "200px",
@@ -119,9 +118,7 @@ const Header = ({ systemName, menuList, style, logoImg }) => {
119
118
  userSelect: "none",
120
119
  color: "inherit",
121
120
  }, to: "/v2/home" },
122
- React.createElement("img", { src: logoImg || homePng, alt: "home", width: 35, height: 35, style: {
123
- marginRight: 5,
124
- } }),
121
+ logoImg ? React.createElement("img", { className: "header-logo", src: logoImg, alt: "home" }) : "",
125
122
  React.createElement(Tooltip, { title: systemLabel },
126
123
  React.createElement("span", { style: {
127
124
  width: "100%",
package/lib/layout2/header.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"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"}
package/lib/layout2/page.d.ts CHANGED
@@ -3,7 +3,7 @@ import { MenuType } from "./type/layout-type";
3
3
  import { BlockType } from "../tmpl/interface";
4
4
  type PagePropsType = {
5
5
  children?: React.ReactNode;
6
- logo?: React.ReactNode;
6
+ logo?: string;
7
7
  };
8
8
  export declare const handleMenuItemUrl: (id: string, pageType: BlockType["pageType"], query?: {
9
9
  [key: string]: string;
package/lib/layout2/page.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAIN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAUjE,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACxB,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,IAAI,MAAM,EACV,UAAU,SAAS,CAAC,UAAU,CAAC,EAC/B,QAAO;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACrC,aAAa,MAAM,EACnB,iBAAiB,MAAM,EACvB,aAAa,OAAO,EACpB,UAAU,MAAM,WA8DjB,CAAC;AAiDF,eAAO,MAAM,aAAa,GAAU,gBAAc,KAAG,OAAO,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB,CAiBA,CAAC;AAqFF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAOxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAIN,MAAM,OAAO,CAAC;AAKf,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EAAE,SAAS,EAAqB,MAAM,mBAAmB,CAAC;AAWjE,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AAEF,eAAO,MAAM,iBAAiB,GAC5B,IAAI,MAAM,EACV,UAAU,SAAS,CAAC,UAAU,CAAC,EAC/B,QAAO;IAAE,CAAC,GAAG,EAAE,MAAM,GAAG,MAAM,CAAA;CAAO,EACrC,aAAa,MAAM,EACnB,iBAAiB,MAAM,EACvB,aAAa,OAAO,EACpB,UAAU,MAAM,WA8DjB,CAAC;AAmDF,eAAO,MAAM,aAAa,GAAU,gBAAc,KAAG,OAAO,CAAC;IAC3D,UAAU,EAAE,MAAM,CAAC;IACnB,IAAI,EAAE,QAAQ,EAAE,CAAC;CAClB,CAiBA,CAAC;AA0FF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAOxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/lib/layout2/page.js CHANGED
@@ -20,6 +20,7 @@ import DocumentTitle from "react-document-title";
20
20
  import Units from '../units';
21
21
  import { useLocale } from "../locale/useLocale";
22
22
  import { useSessionStorageState } from "ahooks";
23
+ import homePng from "./imgs/home.png";
23
24
  export const handleMenuItemUrl = (id, pageType, query = {}, customPath, dragDropPageId, fullScreen, version) => {
24
25
  if (customPath)
25
26
  return `${fullScreen ? "" : `${version}/`}page/${id}/${customPath}?menuId=${id}`;
@@ -101,7 +102,9 @@ const handleMenuRes = (menuList, version) => {
101
102
  children: (items === null || items === void 0 ? void 0 : items.length) ? handleMenuRes(items, version) : [],
102
103
  icon,
103
104
  themeColor,
104
- funcDescription
105
+ funcDescription,
106
+ dragDropPageId,
107
+ customPath
105
108
  };
106
109
  retList.push(menu);
107
110
  }
@@ -151,13 +154,18 @@ const Page = (props) => {
151
154
  localStorage.setItem("version", "v2");
152
155
  }, []);
153
156
  const [systemName, setSystemName] = useState("");
157
+ const [systemLogo, setSystemLogo] = useState("");
154
158
  const [menu, SetMenu] = useState([]);
159
+ const getThemeConfigAndMenuConfig = () => __awaiter(void 0, void 0, void 0, function* () {
160
+ const themeConfig = yield Units.getThemeConfig();
161
+ const menuConfig = yield getMenuConfig();
162
+ setSystemName((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.programName) || (menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.systemName));
163
+ setSystemLogo((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.programIcon) || homePng);
164
+ SetMenu(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
165
+ updateMenuItemIdToFirstFloorIdxMap(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
166
+ });
155
167
  useEffect(() => {
156
- getMenuConfig().then(({ menu, systemName: name }) => {
157
- setSystemName(name);
158
- SetMenu(menu);
159
- updateMenuItemIdToFirstFloorIdxMap(menu);
160
- });
168
+ getThemeConfigAndMenuConfig();
161
169
  }, []);
162
170
  // page ref
163
171
  const pageRef = useRef(undefined);
@@ -174,7 +182,7 @@ const Page = (props) => {
174
182
  algorithm: compactTheme ? [theme.compactAlgorithm] : [],
175
183
  } },
176
184
  React.createElement(Layout, { style: { height: "100%" }, className: compactTheme ? "layout-compactTheme" : undefined },
177
- React.createElement(Header, { logoImg: logo, systemName: systemName ? systemName : Units.programName_NavLeft(), menuList: menu }),
185
+ React.createElement(Header, { logoImg: logo || systemLogo, systemName: systemName ? systemName : Units.programName_NavLeft(), menuList: menu }),
178
186
  React.createElement(Layout, null,
179
187
  React.createElement(Sider, { menuList: menu, collapsed: getSiderCollapsed() }),
180
188
  React.createElement(Main, null, props.children)))))));
package/lib/layout2/page.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/page.tsx"],"names":[],"mappings":"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"}
package/lib/layout2/type/layout-type.d.ts CHANGED
@@ -9,5 +9,7 @@ export type MenuType = {
9
9
  children?: MenuType[];
10
10
  themeColor?: string;
11
11
  funcDescription?: string;
12
+ dragDropPageId?: string;
13
+ customPath?: string;
12
14
  };
13
15
  //# sourceMappingURL=layout-type.d.ts.map
package/lib/layout2/type/layout-type.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"layout-type.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/type/layout-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AAElD,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC1B,CAAC"}
1
+ {"version":3,"file":"layout-type.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/type/layout-type.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,yBAAyB,EAAE,MAAM,OAAO,CAAC;AAElD,MAAM,MAAM,QAAQ,GAAG;IACrB,EAAE,EAAE,MAAM,CAAC;IACX,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,OAAO,CAAC;IAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;IACnB,UAAU,CAAC,EAAE,yBAAyB,CAAC;IACvC,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,CAAC,EAAE,QAAQ,EAAE,CAAC;IACtB,UAAU,CAAC,EAAE,MAAM,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC"}
package/lib/layout3/page.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAc3D,OAAO,iBAAiB,CAAC;AAIzB,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AA0DF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAMxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAc3D,OAAO,iBAAiB,CAAC;AAIzB,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC5B,CAAC;AA8DF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAMxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/lib/layout3/page.js CHANGED
@@ -1,3 +1,12 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
1
10
  import { Layout, theme, ConfigProvider } from "antd";
2
11
  import React, { useEffect, useRef, useState } from "react";
3
12
  import DocumentTitle from "react-document-title";
@@ -22,12 +31,15 @@ const Page = (props) => {
22
31
  const { documentTitle, updateMenuItemIdToFirstFloorIdxMap } = useLayoutContext();
23
32
  const { getSiderCollapsed, compactTheme } = useLocale();
24
33
  const { token: { colorPrimary } } = useToken();
34
+ const getThemeConfigAndMenuConfig = () => __awaiter(void 0, void 0, void 0, function* () {
35
+ const themeConfig = yield Units.getThemeConfig();
36
+ const menuConfig = yield getMenuConfig("v3");
37
+ setSystemName((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.programName) || (menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.systemName));
38
+ setMenu(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
39
+ updateMenuItemIdToFirstFloorIdxMap(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
40
+ });
25
41
  useEffect(() => {
26
- getMenuConfig("v3").then(({ menu, systemName: name }) => {
27
- setSystemName(name);
28
- setMenu(menu);
29
- updateMenuItemIdToFirstFloorIdxMap(menu);
30
- });
42
+ getThemeConfigAndMenuConfig();
31
43
  useVarCssColor(generate(colorPrimary));
32
44
  localStorage.setItem("version", "v3");
33
45
  window.addEventListener('beforeunload', () => { setKeepAliveTabs([]); });
package/lib/layout3/page.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/page.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/page.tsx"],"names":[],"mappings":"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"}
package/lib/layout4/header.d.ts CHANGED
@@ -5,7 +5,7 @@ type HeaderPropsType = {
5
5
  systemName: string;
6
6
  menuList: MenuType[];
7
7
  style?: any;
8
- logoImg?: React.ReactNode;
8
+ logoImg?: string;
9
9
  };
10
10
  declare const Header: React.FC<HeaderPropsType>;
11
11
  export default Header;
package/lib/layout4/header.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAOlE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAWvD,OAAO,mBAAmB,CAAC;AA4B3B,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6HrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
1
+ {"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAOlE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAUvD,OAAO,mBAAmB,CAAC;AA4B3B,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA6HrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
package/lib/layout4/header.js CHANGED
@@ -12,7 +12,6 @@ import UserButton from "../layout2/components/user-button";
12
12
  import SearchMenu from "../layout2/components/search-menu";
13
13
  import ScreenfullButton from "../layout2/components/screenfull-button";
14
14
  import headerBgImg from "./imgs/header-bg.png";
15
- import homeImg from "./imgs/home.png";
16
15
  import menuItemBgImg from "./imgs/menu-item-bg.png";
17
16
  import userImg from "./imgs/user.png";
18
17
  import IconFont from "../layout2/components/icon-font";
@@ -116,7 +115,7 @@ const Header = ({ systemName, menuList, logoImg }) => {
116
115
  React.createElement("div", { className: "header-top", style: { backgroundImage: `url(${headerBgImg})` } },
117
116
  React.createElement(NavLink, { to: "/v4/home", style: { display: "contents" } },
118
117
  React.createElement("div", { className: "header-title" },
119
- logoImg ? React.createElement("img", { src: logoImg || homeImg, alt: "" }) : React.createElement(IconFont, { type: "icon-xinpian", className: "header-title-icon" }),
118
+ logoImg ? React.createElement("img", { src: logoImg, alt: "" }) : React.createElement(IconFont, { type: "icon-xinpian", className: "header-title-icon" }),
120
119
  React.createElement("div", { className: "header-title-text" }, translate("${" + systemName + "}")))),
121
120
  React.createElement("div", { className: "header-nav" },
122
121
  React.createElement(Menu, { mode: "horizontal", items: menu, selectedKeys: selectedKeys, style: { background: "transparent", border: "none", width: "100%" } })),
package/lib/layout4/header.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"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"}
package/lib/layout4/page.d.ts CHANGED
@@ -2,7 +2,7 @@ import React from "react";
2
2
  import "./css/main.less";
3
3
  type PagePropsType = {
4
4
  children?: React.ReactNode;
5
- logo?: React.ReactNode;
5
+ logo?: string;
6
6
  };
7
7
  declare const ContextPage: React.FC<PagePropsType>;
8
8
  export default ContextPage;
package/lib/layout4/page.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAc3D,OAAO,iBAAiB,CAAC;AAIzB,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;CACxB,CAAC;AAqEF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAMxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
1
+ {"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/page.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAe3D,OAAO,iBAAiB,CAAC;AAIzB,KAAK,aAAa,GAAG;IACnB,QAAQ,CAAC,EAAE,KAAK,CAAC,SAAS,CAAC;IAC3B,IAAI,CAAC,EAAE,MAAM,CAAC;CACf,CAAC;AA2EF,QAAA,MAAM,WAAW,EAAE,KAAK,CAAC,EAAE,CAAC,aAAa,CAMxC,CAAC;AAEF,eAAe,WAAW,CAAC"}
package/lib/layout4/page.js CHANGED
@@ -1,3 +1,12 @@
1
+ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
2
+ function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
3
+ return new (P || (P = Promise))(function (resolve, reject) {
4
+ function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
5
+ function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
6
+ function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
7
+ step((generator = generator.apply(thisArg, _arguments || [])).next());
8
+ });
9
+ };
1
10
  import { Layout, theme, ConfigProvider } from "antd";
2
11
  import React, { useEffect, useRef, useState } from "react";
3
12
  import DocumentTitle from "react-document-title";
@@ -11,11 +20,13 @@ import { LayoutProvider, useLayoutContext } from "../layout2/layout-context";
11
20
  import Units from '../units';
12
21
  import { useLocale } from "../locale/useLocale";
13
22
  import { getMenuConfig } from "../layout2/page";
23
+ import homePng from "./imgs/home.png";
14
24
  import "./css/main.less";
15
25
  const { useToken } = theme;
16
26
  const Page = (props) => {
17
27
  const { logo } = props;
18
28
  const [systemName, setSystemName] = useState("");
29
+ const [systemLogo, setSystemLogo] = useState("");
19
30
  const [menu, setMenu] = useState([]);
20
31
  const pageRef = useRef(undefined); // page ref
21
32
  //清空缓存
@@ -23,12 +34,16 @@ const Page = (props) => {
23
34
  const { documentTitle, updateMenuItemIdToFirstFloorIdxMap } = useLayoutContext();
24
35
  const { getSiderCollapsed, compactTheme } = useLocale();
25
36
  const { token: { colorPrimary } } = useToken();
37
+ const getThemeConfigAndMenuConfig = () => __awaiter(void 0, void 0, void 0, function* () {
38
+ const themeConfig = yield Units.getThemeConfig();
39
+ const menuConfig = yield getMenuConfig("v4");
40
+ setSystemName((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.programName) || (menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.systemName));
41
+ setSystemLogo((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.programIcon) || homePng);
42
+ setMenu(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
43
+ updateMenuItemIdToFirstFloorIdxMap(menuConfig === null || menuConfig === void 0 ? void 0 : menuConfig.menu);
44
+ });
26
45
  useEffect(() => {
27
- getMenuConfig("v4").then(({ menu, systemName: name }) => {
28
- setSystemName(name);
29
- setMenu(menu);
30
- updateMenuItemIdToFirstFloorIdxMap(menu);
31
- });
46
+ getThemeConfigAndMenuConfig();
32
47
  useVarCssColor(generate(colorPrimary));
33
48
  localStorage.setItem("version", "v4");
34
49
  window.addEventListener('beforeunload', () => { setKeepAliveTabs([]); });
@@ -55,7 +70,7 @@ const Page = (props) => {
55
70
  }
56
71
  }, table: { className: "v4-antd-table" }, drawer: { className: "v4-antd-drawer" }, modal: { className: "v4-antd-modal" }, card: { className: "v4-antd-card" } },
57
72
  React.createElement(Layout, { style: { height: "100%" }, className: compactTheme ? "layout-compactTheme" : undefined },
58
- React.createElement(Header, { logoImg: logo, systemName: systemName ? systemName : Units.programName_NavLeft(), menuList: menu }),
73
+ React.createElement(Header, { logoImg: logo || systemLogo, systemName: systemName ? systemName : Units.programName_NavLeft(), menuList: menu }),
59
74
  React.createElement(Layout, null,
60
75
  React.createElement(Sider, { menuList: menu, collapsed: getSiderCollapsed() }),
61
76
  React.createElement(Main, null, props.children)))))));
package/lib/layout4/page.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/page.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/page.tsx"],"names":[],"mappings":"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"}
package/lib/layout5/css/sider.less CHANGED
@@ -10,4 +10,10 @@
10
10
  overflow: hidden;
11
11
  white-space: nowrap;
12
12
  }
13
+
14
+ .header-logo {
15
+ width: 24%;
16
+ max-width: 80px;
17
+ margin-right: 4%;
18
+ }
13
19
  }