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
@@ -1 +1 @@
1
- {"version":3,"file":"HCWelcome.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/HCWelcome.js"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"HCWelcome.js","sourceRoot":"","sources":["../../../../src/aldehyde/welcome/HCWelcome.js"],"names":[],"mappings":"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"}
@@ -1 +1 @@
1
- {"version":3,"file":"page-card.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,OAAO,kBAAkB,CAAC;AA8B1B,UAAU,QAAS,SAAQ,UAAU;IACjC,GAAG,EAAE,MAAM,CAAC;CACf;AAED,UAAU,KAAK;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,QAAA,MAAM,KAAK,GAAI,OAAO,KAAK,sBAuC1B,CAAA;AAED,eAAe,KAAK,CAAC"}
1
+ {"version":3,"file":"page-card.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAIlD,OAAO,kBAAkB,CAAC;AAkC1B,UAAU,QAAS,SAAQ,UAAU;IACjC,GAAG,EAAE,MAAM,CAAC;CACf;AAED,UAAU,KAAK;IACX,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,QAAQ,EAAE,MAAM,CAAC;IACjB,KAAK,EAAE,QAAQ,EAAE,CAAC;IAClB,SAAS,EAAE,MAAM,CAAC;CACrB;AAED,QAAA,MAAM,KAAK,GAAI,OAAO,KAAK,sBAuC1B,CAAA;AAED,eAAe,KAAK,CAAC"}
@@ -26,6 +26,10 @@ const findNthLeaf = (tree, n = 1) => {
26
26
  let count = 0; // 已找到的叶子数量(从 0 开始计)
27
27
  const dfs = (nodes) => {
28
28
  for (const node of nodes) {
29
+ // 检查当前节点是否为大屏或者自定义页面
30
+ if (node.dragDropPageId || node.customPath) {
31
+ continue; // 跳过被排除的节点及其子树
32
+ }
29
33
  const isLeaf = !node.children || node.children.length === 0;
30
34
  if (isLeaf) {
31
35
  count++;
@@ -1 +1 @@
1
- {"version":3,"file":"page-card.js","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"page-card.js","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/page-card.tsx"],"names":[],"mappings":"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"}
@@ -27,10 +27,11 @@ const Workbench = (props) => {
27
27
  const navigate = useNavigate();
28
28
  const { token } = useToken();
29
29
  const getL2Menus = () => __awaiter(void 0, void 0, void 0, function* () {
30
+ var _a;
30
31
  let temData = yield HCDataSource.fastMenu("QuickPanel");
31
32
  let temMenu = [];
32
33
  if (!(temData === null || temData === void 0 ? void 0 : temData.length)) {
33
- temMenu = (menus === null || menus === void 0 ? void 0 : menus.slice(0, 4)) || [];
34
+ temMenu = ((_a = menus.filter(r => !r.dragDropPageId && !r.customPath)) === null || _a === void 0 ? void 0 : _a.slice(0, 4)) || [];
34
35
  }
35
36
  else {
36
37
  temData.forEach(item => {
@@ -1 +1 @@
1
- {"version":3,"file":"workbench.js","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/workbench.tsx"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"workbench.js","sourceRoot":"","sources":["../../../../../src/aldehyde/welcome/components/workbench.tsx"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "aldehyde",
3
- "version": "0.2.410",
3
+ "version": "0.2.412",
4
4
  "author": "cosmicparticle",
5
5
  "main": "lib/index.js",
6
6
  "module": "src/aldehyde/index.txs",
@@ -143,7 +143,7 @@ export default class PopoverEntitySelect extends React.PureComponent<
143
143
  },
144
144
  body: { padding: 0 }
145
145
  }}
146
- getPopupContainer={(triggerNode) => triggerNode}
146
+ align={{ offset: [20, 0] }}
147
147
  content={
148
148
  <div
149
149
  className="select-table-popover"
@@ -20,7 +20,7 @@ const MenuBadge: React.FC<MenuBadgeProps> = (props) => {
20
20
  <Badge
21
21
  status="processing"
22
22
  color={color ? color : "green"}
23
- text={translate("${" + value + "}")}
23
+ text={<span style={{ color: color ? color : "green" }}>{translate("${" + value + "}")}</span>}
24
24
  />
25
25
  ) : null}
26
26
  </span>
@@ -15,13 +15,18 @@ const ThemeButton = (props: ButtonProps) => {
15
15
  const [version, setVersion] = useState<string>();
16
16
  const [themes, setThemes] = useState<{ label: string, value: string }[]>([]);
17
17
  const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState<KeepAliveTab[]>('keepAliveTabs', { defaultValue: [] });
18
- const themeKeys = ProgramConfig.themes();
18
+
19
+ const getThemeConfig = async () => {
20
+ const themeConfig = await ProgramConfig.getThemeConfig();
21
+ const themeKeys = themeConfig?.styleTheme?.split(",") || ProgramConfig.themes();
22
+ const temThemes = defThemes.filter(item => themeKeys?.includes(item.value));
23
+ setThemes(temThemes.length ? temThemes : [{ label: "默认", value: "v2" }]);
24
+ }
19
25
 
20
26
  useEffect(() => {
27
+ getThemeConfig();
21
28
  const version = localStorage.getItem("version") || "v2";
22
29
  setVersion(version);
23
- const temThemes = defThemes.filter(item => themeKeys?.includes(item.value));
24
- setThemes(temThemes.length ? temThemes : [{ label: "默认", value: "v2" }]);
25
30
  }, []);
26
31
 
27
32
  const onClick: MenuProps["onClick"] = ({ key }) => {
@@ -43,7 +48,7 @@ const ThemeButton = (props: ButtonProps) => {
43
48
  })), [themes]);
44
49
 
45
50
  return (
46
- themes.length > 1 ? <Dropdown overlayClassName="themeButton" menu={{ items, onClick }}>
51
+ themes.length > 1 ? <Dropdown overlayClassName="themeButton" menu={{ items, onClick, selectedKeys: [version] }}>
47
52
  <Button type="text" icon={<AliIcon type="icon-theme" />} {...props} />
48
53
  </Dropdown> : undefined
49
54
  );
@@ -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
+ }
@@ -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
  }
@@ -12,7 +12,6 @@ import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
12
12
  import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
13
13
  import LocaleButton from "../locale/LocaleButton";
14
14
  import UserButton from "./components/user-button";
15
- import homePng from "./imgs/home.png";
16
15
  import { MenuType } from "./type/layout-type";
17
16
  import { NavLink, useParams, useSearchParams } from "react-router-dom";
18
17
  import {
@@ -41,7 +40,7 @@ type HeaderPropsType = {
41
40
  systemName: string;
42
41
  menuList: MenuType[];
43
42
  style?: any;
44
- logoImg?: React.ReactNode;
43
+ logoImg: string;
45
44
  };
46
45
 
47
46
  type MenuItem = Required<MenuProps>["items"][number];
@@ -163,6 +162,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoIm
163
162
  color: "#FFFFFF",
164
163
  ...style,
165
164
  }}
165
+ className="v2-header"
166
166
  >
167
167
  <NavLink
168
168
  style={{
@@ -178,15 +178,11 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoIm
178
178
  }}
179
179
  to={"/v2/home"}
180
180
  >
181
- <img
182
- src={logoImg || homePng}
181
+ {logoImg ? <img
182
+ className="header-logo"
183
+ src={logoImg}
183
184
  alt="home"
184
- width={35}
185
- height={35}
186
- style={{
187
- marginRight: 5,
188
- }}
189
- />
185
+ /> : ""}
190
186
  <Tooltip title={systemLabel}>
191
187
  <span
192
188
  style={{
@@ -18,10 +18,11 @@ import Units from '../units';
18
18
  import { useLocale } from "../locale/useLocale";
19
19
  import { useSessionStorageState } from "ahooks";
20
20
  import { KeepAliveTab } from "../hooks/use-tabs";
21
+ import homePng from "./imgs/home.png";
21
22
 
22
23
  type PagePropsType = {
23
24
  children?: React.ReactNode;
24
- logo?: React.ReactNode;
25
+ logo?: string;
25
26
  };
26
27
 
27
28
  export const handleMenuItemUrl = (
@@ -131,7 +132,9 @@ const handleMenuRes = (menuList: MenuConfigAPIType["blocks"], version: string):
131
132
  children: items?.length ? handleMenuRes(items, version) : [],
132
133
  icon,
133
134
  themeColor,
134
- funcDescription
135
+ funcDescription,
136
+ dragDropPageId,
137
+ customPath
135
138
  };
136
139
  retList.push(menu);
137
140
  }
@@ -200,17 +203,22 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
200
203
  }, []);
201
204
 
202
205
  const [systemName, setSystemName] = useState("");
206
+ const [systemLogo, setSystemLogo] = useState("");
203
207
 
204
208
  const [menu, SetMenu] = useState<MenuType[]>([]);
205
209
 
210
+ const getThemeConfigAndMenuConfig = async () => {
211
+ const themeConfig = await Units.getThemeConfig();
212
+ const menuConfig = await getMenuConfig();
213
+ setSystemName(themeConfig?.programName || menuConfig?.systemName);
214
+ setSystemLogo(themeConfig?.programIcon || homePng);
215
+ SetMenu(menuConfig?.menu);
216
+ updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
217
+ };
206
218
 
207
219
 
208
220
  useEffect(() => {
209
- getMenuConfig().then(({ menu, systemName: name }) => {
210
- setSystemName(name);
211
- SetMenu(menu);
212
- updateMenuItemIdToFirstFloorIdxMap(menu);
213
- });
221
+ getThemeConfigAndMenuConfig();
214
222
  }, []);
215
223
 
216
224
  // page ref
@@ -235,7 +243,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
235
243
  algorithm: compactTheme ? [theme.compactAlgorithm] : [],
236
244
  }}>
237
245
  <Layout style={{ height: "100%" }} className={compactTheme ? "layout-compactTheme" : undefined}>
238
- <Header logoImg={logo} systemName={systemName ? systemName : Units.programName_NavLeft()} menuList={menu}></Header>
246
+ <Header logoImg={logo || systemLogo} systemName={systemName ? systemName : Units.programName_NavLeft()} menuList={menu}></Header>
239
247
  <Layout>
240
248
  <Sider menuList={menu} collapsed={getSiderCollapsed()}></Sider>
241
249
  <Main>{props.children}</Main>
@@ -10,4 +10,6 @@ export type MenuType = {
10
10
  children?: MenuType[]; // 子菜单
11
11
  themeColor?: string;
12
12
  funcDescription?: string;
13
+ dragDropPageId?: string;
14
+ customPath?: string;
13
15
  };
@@ -31,12 +31,16 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
31
31
  const { getSiderCollapsed, compactTheme } = useLocale();
32
32
  const { token: { colorPrimary } } = useToken();
33
33
 
34
+ const getThemeConfigAndMenuConfig = async () => {
35
+ const themeConfig = await Units.getThemeConfig();
36
+ const menuConfig = await getMenuConfig("v3");
37
+ setSystemName(themeConfig?.programName || menuConfig?.systemName);
38
+ setMenu(menuConfig?.menu);
39
+ updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
40
+ };
41
+
34
42
  useEffect(() => {
35
- getMenuConfig("v3").then(({ menu, systemName: name }) => {
36
- setSystemName(name);
37
- setMenu(menu);
38
- updateMenuItemIdToFirstFloorIdxMap(menu);
39
- });
43
+ getThemeConfigAndMenuConfig();
40
44
  useVarCssColor(generate(colorPrimary));
41
45
  localStorage.setItem("version", "v3");
42
46
  window.addEventListener('beforeunload', () => { setKeepAliveTabs([]); });
@@ -13,7 +13,6 @@ import UserButton from "../layout2/components/user-button";
13
13
  import SearchMenu from "../layout2/components/search-menu";
14
14
  import ScreenfullButton from "../layout2/components/screenfull-button";
15
15
  import headerBgImg from "./imgs/header-bg.png";
16
- import homeImg from "./imgs/home.png";
17
16
  import menuItemBgImg from "./imgs/menu-item-bg.png";
18
17
  import userImg from "./imgs/user.png";
19
18
  import IconFont from "../layout2/components/icon-font";
@@ -49,7 +48,7 @@ type HeaderPropsType = {
49
48
  systemName: string;
50
49
  menuList: MenuType[];
51
50
  style?: any;
52
- logoImg?: React.ReactNode;
51
+ logoImg?: string;
53
52
  };
54
53
 
55
54
  type MenuItem = Required<MenuProps>["items"][number];
@@ -142,7 +141,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, logoImg }) =>
142
141
  <div className="header-top" style={{ backgroundImage: `url(${headerBgImg})` }}>
143
142
  <NavLink to="/v4/home" style={{ display: "contents" }}>
144
143
  <div className="header-title">
145
- {logoImg ? <img src={logoImg || homeImg} alt="" /> : <IconFont type="icon-xinpian" className="header-title-icon" />}
144
+ {logoImg ? <img src={logoImg} alt="" /> : <IconFont type="icon-xinpian" className="header-title-icon" />}
146
145
  <div className="header-title-text">{translate("${" + systemName + "}")}</div></div>
147
146
  </NavLink>
148
147
  <div className="header-nav">
@@ -13,18 +13,20 @@ import Units from '../units';
13
13
  import { useLocale } from "../locale/useLocale";
14
14
  import { KeepAliveTab } from "../hooks/use-tabs";
15
15
  import { getMenuConfig } from "../layout2/page";
16
+ import homePng from "./imgs/home.png";
16
17
  import "./css/main.less";
17
18
 
18
19
  const { useToken } = theme;
19
20
 
20
21
  type PagePropsType = {
21
22
  children?: React.ReactNode;
22
- logo?: React.ReactNode;
23
+ logo?: string;
23
24
  };
24
25
 
25
26
  const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
26
27
  const { logo } = props;
27
28
  const [systemName, setSystemName] = useState("");
29
+ const [systemLogo, setSystemLogo] = useState("");
28
30
  const [menu, setMenu] = useState<MenuType[]>([]);
29
31
  const pageRef = useRef<HTMLDivElement>(undefined); // page ref
30
32
  //清空缓存
@@ -33,12 +35,17 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
33
35
  const { getSiderCollapsed, compactTheme } = useLocale();
34
36
  const { token: { colorPrimary } } = useToken();
35
37
 
38
+ const getThemeConfigAndMenuConfig = async () => {
39
+ const themeConfig = await Units.getThemeConfig();
40
+ const menuConfig = await getMenuConfig("v4");
41
+ setSystemName(themeConfig?.programName || menuConfig?.systemName);
42
+ setSystemLogo(themeConfig?.programIcon || homePng);
43
+ setMenu(menuConfig?.menu);
44
+ updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
45
+ };
46
+
36
47
  useEffect(() => {
37
- getMenuConfig("v4").then(({ menu, systemName: name }) => {
38
- setSystemName(name);
39
- setMenu(menu);
40
- updateMenuItemIdToFirstFloorIdxMap(menu);
41
- });
48
+ getThemeConfigAndMenuConfig();
42
49
  useVarCssColor(generate(colorPrimary));
43
50
  localStorage.setItem("version", "v4");
44
51
  window.addEventListener('beforeunload', () => { setKeepAliveTabs([]); });
@@ -77,7 +84,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
77
84
  card={{ className: "v4-antd-card" }}
78
85
  >
79
86
  <Layout style={{ height: "100%" }} className={compactTheme ? "layout-compactTheme" : undefined}>
80
- <Header logoImg={logo} systemName={systemName ? systemName : Units.programName_NavLeft()} menuList={menu}></Header>
87
+ <Header logoImg={logo || systemLogo} systemName={systemName ? systemName : Units.programName_NavLeft()} menuList={menu}></Header>
81
88
  <Layout>
82
89
  <Sider menuList={menu} collapsed={getSiderCollapsed()}></Sider>
83
90
  <Main>{props.children}</Main>
@@ -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
  }
@@ -13,17 +13,19 @@ import Units from '../units';
13
13
  import { useLocale } from "../locale/useLocale";
14
14
  import { KeepAliveTab } from "../hooks/use-tabs";
15
15
  import { getMenuConfig } from "../layout2/page";
16
+ import homePng from "./imgs/home.png";
16
17
 
17
18
  const { useToken } = theme;
18
19
 
19
20
  type PagePropsType = {
20
21
  children?: React.ReactNode;
21
- logo?: React.ReactNode;
22
+ logo?: string;
22
23
  };
23
24
 
24
25
  const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
25
26
  const { logo } = props;
26
27
  const [systemName, setSystemName] = useState("");
28
+ const [systemLogo, setSystemLogo] = useState("");
27
29
  const [menu, setMenu] = useState<MenuType[]>([]);
28
30
  const pageRef = useRef<HTMLDivElement>(undefined); // page ref
29
31
  //清空缓存
@@ -32,12 +34,17 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
32
34
  const { getSiderCollapsed, compactTheme } = useLocale();
33
35
  const { token: { colorPrimary } } = useToken();
34
36
 
37
+ const getThemeConfigAndMenuConfig = async () => {
38
+ const themeConfig = await Units.getThemeConfig();
39
+ const menuConfig = await getMenuConfig("v5");
40
+ setSystemName(themeConfig?.programName || menuConfig?.systemName);
41
+ setSystemLogo(themeConfig?.programIcon || homePng);
42
+ setMenu(menuConfig?.menu);
43
+ updateMenuItemIdToFirstFloorIdxMap(menuConfig?.menu);
44
+ };
45
+
35
46
  useEffect(() => {
36
- getMenuConfig("v5").then(({ menu, systemName: name }) => {
37
- setSystemName(name);
38
- setMenu(menu);
39
- updateMenuItemIdToFirstFloorIdxMap(menu);
40
- });
47
+ getThemeConfigAndMenuConfig();
41
48
  useVarCssColor(generate(colorPrimary));
42
49
  localStorage.setItem("version", "v5");
43
50
  window.addEventListener('beforeunload', () => { setKeepAliveTabs([]); });
@@ -58,7 +65,7 @@ const Page: React.FC<PagePropsType> = (props: PagePropsType) => {
58
65
  algorithm: compactTheme ? [theme.compactAlgorithm] : [],
59
66
  }}>
60
67
  <Layout style={{ height: "100%" }} className={compactTheme ? "layout-compactTheme" : undefined}>
61
- <Sider logoImg={logo} menuList={menu} collapsed={getSiderCollapsed()} systemName={systemName ? systemName : Units.programName_NavLeft()} />
68
+ <Sider logoImg={logo || systemLogo} menuList={menu} collapsed={getSiderCollapsed()} systemName={systemName ? systemName : Units.programName_NavLeft()} />
62
69
  <Layout>
63
70
  <Header menuList={menu} />
64
71
  <Main>{props.children}</Main>
@@ -11,7 +11,6 @@ import { useLayoutContext } from "../layout2/layout-context";
11
11
  import { MenuType } from "../layout2/type/layout-type";
12
12
  import { useLocale } from "../locale/useLocale";
13
13
  import IconFont from "../layout2/components/icon-font";
14
- import homePng from "./imgs/home.png";
15
14
  import { UserInfo } from "../tmpl/interface";
16
15
  import Units from "../units";
17
16
  import "./css/sider.less";
@@ -20,7 +19,7 @@ type SiderPropsType = {
20
19
  menuList: MenuType[];
21
20
  collapsed: boolean;
22
21
  systemName: string;
23
- logoImg?: React.ReactNode;
22
+ logoImg?: string;
24
23
  };
25
24
 
26
25
  type MenuItem = Required<MenuProps>["items"][number];
@@ -173,13 +172,11 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, systemName, logo
173
172
  }}
174
173
  to={"/v5/home"}
175
174
  >
176
- <img
177
- src={logoImg || homePng}
175
+ {logoImg ? <img
176
+ className="header-logo"
177
+ src={logoImg}
178
178
  alt="home"
179
- width={35}
180
- height={35}
181
- style={{ marginRight: 5 }}
182
- />
179
+ /> : ""}
183
180
  <Tooltip title={translate("${" + systemName + "}")}>
184
181
  <span
185
182
  style={{
@@ -53,11 +53,13 @@
53
53
 
54
54
  .primary-column-label,
55
55
  .second-column-label {
56
- transform: translate(4px, -50%);
56
+ margin-left: 8px;
57
57
 
58
- .ant-tag {
59
- font-size: 10px;
60
- padding: 0 4px;
58
+ .tag {
59
+ font-size: 12px !important;
60
+ padding: 2px 6px !important;
61
+ border-radius: 6px !important;
62
+ white-space: nowrap;
61
63
  }
62
64
  }
63
65