aldehyde 0.2.63 → 0.2.64
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.
- package/lib/layout/MainPage.d.ts.map +1 -1
- package/lib/layout/MainPage.js +50 -10
- package/lib/layout/MainPage.js.map +1 -1
- package/lib/layout/menu/block.d.ts +1 -1
- package/lib/layout/menu/block.d.ts.map +1 -1
- package/lib/layout/menu/block.js +21 -9
- package/lib/layout/menu/block.js.map +1 -1
- package/lib/layout/menu/menu-2layers.js +5 -5
- package/lib/layout/menu/menu-2layers.js.map +1 -1
- package/lib/layout/menu/menu-render.d.ts +6 -4
- package/lib/layout/menu/menu-render.d.ts.map +1 -1
- package/lib/layout/menu/menu-render.js +85 -30
- package/lib/layout/menu/menu-render.js.map +1 -1
- package/lib/tmpl/interface.d.ts +2 -0
- package/lib/tmpl/interface.d.ts.map +1 -1
- package/lib/tmpl/interface.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/layout/MainPage.tsx +87 -49
- package/src/aldehyde/layout/menu/block.tsx +20 -12
- package/src/aldehyde/layout/menu/menu-2layers.tsx +5 -5
- package/src/aldehyde/layout/menu/menu-render.tsx +108 -48
- package/src/aldehyde/tmpl/interface.tsx +3 -1
- package/lib/layout/menu/block1.d.ts +0 -18
- package/lib/layout/menu/block1.d.ts.map +0 -1
- package/lib/layout/menu/block1.js +0 -46
- package/lib/layout/menu/block1.js.map +0 -1
- package/src/aldehyde/layout/menu/block1.tsx +0 -81
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAUzB,OAAO,cAAc,CAAA;AACrB,OAAO,kBAAkB,CAAA;;
|
|
1
|
+
{"version":3,"file":"MainPage.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AAUzB,OAAO,cAAc,CAAA;AACrB,OAAO,kBAAkB,CAAA;;AA4QzB,wBAAoC"}
|
package/lib/layout/MainPage.js
CHANGED
|
@@ -53,11 +53,31 @@ class MainPage extends React.PureComponent {
|
|
|
53
53
|
const { blocks } = this.state;
|
|
54
54
|
if (leMenuId) {
|
|
55
55
|
for (const block of blocks) {
|
|
56
|
-
|
|
57
|
-
for (const
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
56
|
+
if (block.l1Menus) {
|
|
57
|
+
for (const menul1 of block.l1Menus) {
|
|
58
|
+
for (const menul2 of menul1.l2Menus) {
|
|
59
|
+
if (menul2.id == leMenuId) {
|
|
60
|
+
blockId = block.id;
|
|
61
|
+
break;
|
|
62
|
+
}
|
|
63
|
+
}
|
|
64
|
+
}
|
|
65
|
+
}
|
|
66
|
+
else {
|
|
67
|
+
for (const menul1 of block.items) {
|
|
68
|
+
if (menul1.items) {
|
|
69
|
+
for (const menul2 of menul1.items) {
|
|
70
|
+
if (menul2.id == leMenuId) {
|
|
71
|
+
blockId = block.id;
|
|
72
|
+
break;
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
}
|
|
76
|
+
else {
|
|
77
|
+
if (menul1.id == leMenuId) {
|
|
78
|
+
blockId = block.id;
|
|
79
|
+
break;
|
|
80
|
+
}
|
|
61
81
|
}
|
|
62
82
|
}
|
|
63
83
|
}
|
|
@@ -70,11 +90,31 @@ class MainPage extends React.PureComponent {
|
|
|
70
90
|
let result = undefined;
|
|
71
91
|
if (currentL2MenuId) {
|
|
72
92
|
for (const block of blocks) {
|
|
73
|
-
|
|
74
|
-
for (const
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
93
|
+
if (block.l1Menus) {
|
|
94
|
+
for (const menul1 of block.l1Menus) {
|
|
95
|
+
for (const menul2 of menul1.l2Menus) {
|
|
96
|
+
if (menul2.id == currentL2MenuId) {
|
|
97
|
+
result = block;
|
|
98
|
+
break;
|
|
99
|
+
}
|
|
100
|
+
}
|
|
101
|
+
}
|
|
102
|
+
}
|
|
103
|
+
else {
|
|
104
|
+
for (const menul1 of block.items) {
|
|
105
|
+
if (menul1.items) {
|
|
106
|
+
for (const menul2 of menul1.items) {
|
|
107
|
+
if (menul2.id == currentL2MenuId) {
|
|
108
|
+
result = block;
|
|
109
|
+
break;
|
|
110
|
+
}
|
|
111
|
+
}
|
|
112
|
+
}
|
|
113
|
+
else {
|
|
114
|
+
if (menul1.id == currentL2MenuId) {
|
|
115
|
+
result = block;
|
|
116
|
+
break;
|
|
117
|
+
}
|
|
78
118
|
}
|
|
79
119
|
}
|
|
80
120
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"MainPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,
|
|
1
|
+
{"version":3,"file":"MainPage.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout/MainPage.tsx"],"names":[],"mappings":"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"}
|
|
@@ -10,7 +10,7 @@ interface BlockState {
|
|
|
10
10
|
}
|
|
11
11
|
declare class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
12
12
|
constructor(props: any);
|
|
13
|
-
|
|
13
|
+
getSubMenu: (blockMenu: BlockMenu) => import("antd/es/menu/hooks/useItems").ItemType[];
|
|
14
14
|
findBlockId: (blocks: BlockMenu[], currentL2MenuId: string) => string;
|
|
15
15
|
render(): React.JSX.Element | React.JSX.Element[];
|
|
16
16
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,WAAW,UAAU;IACvB,MAAM,EAAC,SAAS,EAAE,CAAC;IACnB,cAAc,CAAC,EAAC,MAAM,CAAC;IACvB,eAAe,CAAC,EAAC,MAAM,CAAC;IACxB,WAAW,CAAC,EAAC,MAAM,CAAC;CACvB;AACD,UAAU,UAAU;CAEnB;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;gBAE/C,KAAK,KAAA;IAIjB,
|
|
1
|
+
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,WAAW,UAAU;IACvB,MAAM,EAAC,SAAS,EAAE,CAAC;IACnB,cAAc,CAAC,EAAC,MAAM,CAAC;IACvB,eAAe,CAAC,EAAC,MAAM,CAAC;IACxB,WAAW,CAAC,EAAC,MAAM,CAAC;CACvB;AACD,UAAU,UAAU;CAEnB;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;gBAE/C,KAAK,KAAA;IAIjB,UAAU,cAAc,SAAS,sDAEhC;IAED,WAAW,WAAW,SAAS,EAAE,mBAAiB,MAAM,YAyBvD;IAED,MAAM;CAiCT;AAED,eAAe,KAAK,CAAC"}
|
package/lib/layout/menu/block.js
CHANGED
|
@@ -1,20 +1,32 @@
|
|
|
1
1
|
import React from "react";
|
|
2
|
-
import { Dropdown
|
|
2
|
+
import { Dropdown } from 'antd';
|
|
3
3
|
import MenuRender from './menu-render';
|
|
4
4
|
class Block extends React.PureComponent {
|
|
5
5
|
constructor(props) {
|
|
6
6
|
super(props);
|
|
7
|
-
this.
|
|
8
|
-
return
|
|
7
|
+
this.getSubMenu = (blockMenu) => {
|
|
8
|
+
return MenuRender.getMenu(blockMenu, null);
|
|
9
9
|
};
|
|
10
10
|
this.findBlockId = (blocks, currentL2MenuId) => {
|
|
11
11
|
let blockId = undefined;
|
|
12
12
|
for (const block of blocks) {
|
|
13
|
-
|
|
14
|
-
for (const
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
13
|
+
if (block.l1Menus) {
|
|
14
|
+
for (const menul1 of block.l1Menus) {
|
|
15
|
+
for (const menul2 of menul1.l2Menus) {
|
|
16
|
+
if (menul2.id === currentL2MenuId) {
|
|
17
|
+
blockId = block.id;
|
|
18
|
+
return blockId;
|
|
19
|
+
}
|
|
20
|
+
}
|
|
21
|
+
}
|
|
22
|
+
}
|
|
23
|
+
else {
|
|
24
|
+
for (const menul1 of block.items) {
|
|
25
|
+
for (const menul2 of menul1.items) {
|
|
26
|
+
if (menul2.id === currentL2MenuId) {
|
|
27
|
+
blockId = block.id;
|
|
28
|
+
return blockId;
|
|
29
|
+
}
|
|
18
30
|
}
|
|
19
31
|
}
|
|
20
32
|
}
|
|
@@ -37,7 +49,7 @@ class Block extends React.PureComponent {
|
|
|
37
49
|
}
|
|
38
50
|
return (blocks.map((item, index) => {
|
|
39
51
|
return React.createElement("div", { key: index, className: `${item.id == blockId ? "active" : ""} header-block`, style: syyy },
|
|
40
|
-
React.createElement(Dropdown, {
|
|
52
|
+
React.createElement(Dropdown, { menu: { items: this.getSubMenu(item) } },
|
|
41
53
|
React.createElement("a", { className: "dropdown-link", style: item.id == blockId ? { color: '#fff' } : { color: activeColor }, rel: "noopener noreferrer" }, item.title)));
|
|
42
54
|
}));
|
|
43
55
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,QAAQ,
|
|
1
|
+
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"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"}
|
|
@@ -30,7 +30,7 @@ class Menu2layers extends React.PureComponent {
|
|
|
30
30
|
componentDidMount() {
|
|
31
31
|
const { currentL2MenuId, blockMenu, collapsed } = this.props;
|
|
32
32
|
const { openKeys } = this.state;
|
|
33
|
-
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu
|
|
33
|
+
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
|
|
34
34
|
if (openKey && openKeys.length < 1) {
|
|
35
35
|
this.setState({
|
|
36
36
|
openKeys: [openKey.toString()]
|
|
@@ -43,7 +43,7 @@ class Menu2layers extends React.PureComponent {
|
|
|
43
43
|
const { openKeys } = this.state;
|
|
44
44
|
if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
|
|
45
45
|
//console.log('currentL2MenuId:',currentL2MenuId);
|
|
46
|
-
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu
|
|
46
|
+
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
|
|
47
47
|
if (openKey) {
|
|
48
48
|
this.setState({
|
|
49
49
|
openKeys: [openKey],
|
|
@@ -51,8 +51,8 @@ class Menu2layers extends React.PureComponent {
|
|
|
51
51
|
}
|
|
52
52
|
}
|
|
53
53
|
else {
|
|
54
|
-
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu
|
|
55
|
-
let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu
|
|
54
|
+
let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
|
|
55
|
+
let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu, preMenuId) : undefined;
|
|
56
56
|
if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
|
|
57
57
|
this.setState({
|
|
58
58
|
openKeys: [openKey],
|
|
@@ -63,7 +63,7 @@ class Menu2layers extends React.PureComponent {
|
|
|
63
63
|
render() {
|
|
64
64
|
const _a = this.props, { blockMenu, collapsed, currentL2MenuId, basePath } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId", "basePath"]);
|
|
65
65
|
const { openKeys } = this.state;
|
|
66
|
-
return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined
|
|
66
|
+
return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined, items: blockMenu ? MenuRender.getMenu(blockMenu, undefined, basePath) : [] })));
|
|
67
67
|
}
|
|
68
68
|
}
|
|
69
69
|
export default Menu2layers;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,IAAI,EAAC,MAAM,MAAM,CAAC;AAE1B,OAAO,UAAU,MAAM,eAAe,CAAC;AAMvC,MAAM,WAAY,SAAQ,KAAK,CAAC,aAAiD;IAG7E,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;QAwCjB,eAAU,GAAG,CAAC,QAAQ,EAAE,EAAE;YACtB,IAAI,QAAQ,IAAI,QAAQ,CAAC,MAAM,GAAC,CAAC,EAAE;gBAC/B,QAAQ,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;aACzB;YACD,IAAI,CAAC,QAAQ,CAAC;gBACV,QAAQ;aACX,CAAC,CAAA;QACN,CAAC,CAAA;QA9CG,IAAI,CAAC,KAAK,GAAG;YACT,QAAQ,EAAE,EAAE;SACf,CAAA;IACL,CAAC;IAED,iBAAiB;QACb,MAAM,EAAC,eAAe,EAAE,SAAS,EAAC,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC1D,MAAM,EAAC,QAAQ,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAC9B,IAAI,OAAO,GAAG,SAAS,CAAA,CAAC,CAAA,UAAU,CAAC,UAAU,CAAC,SAAS,
|
|
1
|
+
{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1,10 +1,12 @@
|
|
|
1
|
-
import { Level1Menu, Level2Menu } from "../../tmpl/interface";
|
|
1
|
+
import { BlockMenu, Level1Menu, Level2Menu } from "../../tmpl/interface";
|
|
2
2
|
import React from "react";
|
|
3
3
|
declare const _default: {
|
|
4
|
-
|
|
4
|
+
getMenu(blockMenu: BlockMenu, target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
|
|
5
|
+
toL1Menu(subMenus: (Level1Menu)[], target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
|
|
6
|
+
toSubMenu(subMenus: (Level2Menu | BlockMenu)[], target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
|
|
5
7
|
getRoutePath(menu: Level2Menu, basePath: any, defaultCriteriaData: any): string;
|
|
6
|
-
|
|
7
|
-
findOpenId(
|
|
8
|
+
toL2MenuTitle(item: Level2Menu, target: any, basePath?: string): React.JSX.Element;
|
|
9
|
+
findOpenId(blockMenu: BlockMenu, currentL2MenuId: string): string;
|
|
8
10
|
};
|
|
9
11
|
export default _default;
|
|
10
12
|
//# sourceMappingURL=menu-render.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"menu-render.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAC,SAAS,EAAE,UAAU,EAAE,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAGvE,OAAO,KAAK,MAAM,OAAO,CAAC;;uBAOH,SAAS;uBAST,CAAC,UAAU,CAAC,EAAE;wBAiBb,CAAC,UAAU,GAAE,SAAS,CAAC,EAAE;uBAmB1B,UAAU;wBAkCT,UAAU;0BAsBR,SAAS,mBAAmB,MAAM;;AAvG5D,wBAwIC"}
|
|
@@ -1,15 +1,50 @@
|
|
|
1
|
-
import { Menu } from "antd";
|
|
2
1
|
import React from "react";
|
|
3
2
|
import { NavLink } from 'react-router-dom';
|
|
4
3
|
import Units from "../../units";
|
|
5
|
-
const { SubMenu } = Menu;
|
|
6
4
|
export default {
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
5
|
+
getMenu(blockMenu, target, basePath = "") {
|
|
6
|
+
if (blockMenu.l1Menus) {
|
|
7
|
+
return this.toL1Menu(blockMenu.l1Menus, target, basePath = "");
|
|
8
|
+
}
|
|
9
|
+
else {
|
|
10
|
+
return this.toSubMenu(blockMenu.items, target, basePath = "");
|
|
11
|
+
}
|
|
12
|
+
},
|
|
13
|
+
toL1Menu(subMenus, target, basePath = "") {
|
|
14
|
+
let menus = [];
|
|
15
|
+
let menu;
|
|
16
|
+
if (subMenus) {
|
|
17
|
+
subMenus.map((item) => {
|
|
18
|
+
menu = { key: item.id };
|
|
19
|
+
let subItems = item.l2Menus;
|
|
20
|
+
if (subItems) { //菜单
|
|
21
|
+
menu.label = item.title;
|
|
22
|
+
menu.children = this.toSubMenu(subItems, target, basePath);
|
|
23
|
+
}
|
|
24
|
+
menus.push(menu);
|
|
25
|
+
});
|
|
26
|
+
}
|
|
27
|
+
return menus;
|
|
28
|
+
},
|
|
29
|
+
toSubMenu(subMenus, target, basePath = "") {
|
|
30
|
+
let menus = [];
|
|
31
|
+
let menu;
|
|
32
|
+
if (subMenus) {
|
|
33
|
+
subMenus.map((item) => {
|
|
34
|
+
menu = { key: item.id };
|
|
35
|
+
let subItems = item.items;
|
|
36
|
+
if (subItems) { //菜单
|
|
37
|
+
menu.label = item.title;
|
|
38
|
+
menu.children = this.toSubMenu(subItems, target, basePath);
|
|
39
|
+
}
|
|
40
|
+
else {
|
|
41
|
+
let i = item;
|
|
42
|
+
menu.label = this.toL2MenuTitle(i, target, basePath);
|
|
43
|
+
}
|
|
44
|
+
menus.push(menu);
|
|
45
|
+
});
|
|
46
|
+
}
|
|
47
|
+
return menus;
|
|
13
48
|
},
|
|
14
49
|
getRoutePath(menu, basePath, defaultCriteriaData) {
|
|
15
50
|
if (menu) {
|
|
@@ -41,31 +76,51 @@ export default {
|
|
|
41
76
|
}
|
|
42
77
|
return null;
|
|
43
78
|
},
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
47
|
-
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
let defaultCriteriaData = "";
|
|
54
|
-
if (item.defaultCriteriaValue) {
|
|
55
|
-
defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
|
|
79
|
+
toL2MenuTitle(item, target, basePath = "") {
|
|
80
|
+
if (!item) {
|
|
81
|
+
return null;
|
|
82
|
+
}
|
|
83
|
+
let delimiter = "/";
|
|
84
|
+
let customPath = item.customPath;
|
|
85
|
+
if (customPath) {
|
|
86
|
+
if (customPath.startsWith('/') || customPath.startsWith('\\')) {
|
|
87
|
+
delimiter = "";
|
|
56
88
|
}
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
89
|
+
}
|
|
90
|
+
let defaultCriteriaData = "";
|
|
91
|
+
if (item['defaultCriteriaValue']) {
|
|
92
|
+
defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
|
|
93
|
+
}
|
|
94
|
+
let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
|
|
95
|
+
return React.createElement(NavLink, { to: path, target: target }, item.title);
|
|
61
96
|
},
|
|
62
|
-
findOpenId(
|
|
97
|
+
findOpenId(blockMenu, currentL2MenuId) {
|
|
63
98
|
let openL2MenuId = undefined;
|
|
64
|
-
|
|
65
|
-
for (const
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
99
|
+
if (blockMenu.l1Menus) {
|
|
100
|
+
for (const menul1 of blockMenu.l1Menus) {
|
|
101
|
+
for (const menul2 of menul1.l2Menus) {
|
|
102
|
+
if (menul2.id == currentL2MenuId) {
|
|
103
|
+
openL2MenuId = menul1.id;
|
|
104
|
+
return openL2MenuId;
|
|
105
|
+
}
|
|
106
|
+
}
|
|
107
|
+
}
|
|
108
|
+
}
|
|
109
|
+
else {
|
|
110
|
+
for (const menul1 of blockMenu.items) {
|
|
111
|
+
if (menul1.items) {
|
|
112
|
+
for (const menul2 of menul1.items) {
|
|
113
|
+
if (menul2.id == currentL2MenuId) {
|
|
114
|
+
openL2MenuId = menul1.id;
|
|
115
|
+
return openL2MenuId;
|
|
116
|
+
}
|
|
117
|
+
}
|
|
118
|
+
}
|
|
119
|
+
else {
|
|
120
|
+
if (menul1.id == currentL2MenuId) {
|
|
121
|
+
openL2MenuId = menul1.id;
|
|
122
|
+
return openL2MenuId;
|
|
123
|
+
}
|
|
69
124
|
}
|
|
70
125
|
}
|
|
71
126
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"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"}
|
package/lib/tmpl/interface.d.ts
CHANGED
|
@@ -66,6 +66,7 @@ export interface JumpConfig extends OrderableTmplBase {
|
|
|
66
66
|
routeParams: FieldConfig[];
|
|
67
67
|
}
|
|
68
68
|
export interface Level2Menu extends MenuBase {
|
|
69
|
+
items: (BlockMenu | Level2Menu)[];
|
|
69
70
|
customPath?: string;
|
|
70
71
|
displayTotal?: boolean;
|
|
71
72
|
count?: number;
|
|
@@ -80,6 +81,7 @@ export interface MenuBase extends OrderableTmplBase {
|
|
|
80
81
|
}
|
|
81
82
|
export interface BlockMenu extends MenuBase {
|
|
82
83
|
l1Menus: Level1Menu[];
|
|
84
|
+
items: (BlockMenu | Level2Menu)[];
|
|
83
85
|
}
|
|
84
86
|
export interface CriteriaConfig extends FieldConfig {
|
|
85
87
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"interface.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"AAmDC,CAAC;
|
|
1
|
+
{"version":3,"file":"interface.js","sourceRoot":"","sources":["../../../../src/aldehyde/tmpl/interface.tsx"],"names":[],"mappings":"AAmDC,CAAC;AAkRD,CAAC;AAYD,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import React from 'react'
|
|
2
|
-
import {
|
|
2
|
+
import {Layout} from 'antd'
|
|
3
3
|
import Footer from './footer/index';
|
|
4
4
|
import {BlockMenu} from "../tmpl/interface";
|
|
5
5
|
import Header from './header';
|
|
@@ -11,6 +11,7 @@ import Scrollbars from 'react-custom-scrollbars';
|
|
|
11
11
|
import "./common.css"
|
|
12
12
|
import "./coverstyle.css"
|
|
13
13
|
import withRouter from "../routable/withroute";
|
|
14
|
+
|
|
14
15
|
const {Content, Sider} = Layout;
|
|
15
16
|
|
|
16
17
|
interface MainPageProps {
|
|
@@ -23,8 +24,8 @@ interface MainPageState {
|
|
|
23
24
|
currentL2MenuId?: string,
|
|
24
25
|
blocks?: BlockMenu[],
|
|
25
26
|
currentBlockId?: string,
|
|
26
|
-
isImporter?:boolean,
|
|
27
|
-
sideBartitle?:string,
|
|
27
|
+
isImporter?: boolean,
|
|
28
|
+
sideBartitle?: string,
|
|
28
29
|
}
|
|
29
30
|
|
|
30
31
|
class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
@@ -34,8 +35,8 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
34
35
|
blocks: [],
|
|
35
36
|
currentL2MenuId: undefined,
|
|
36
37
|
currentBlockId: undefined,
|
|
37
|
-
isImporter:false,
|
|
38
|
-
sideBartitle:undefined,
|
|
38
|
+
isImporter: false,
|
|
39
|
+
sideBartitle: undefined,
|
|
39
40
|
}
|
|
40
41
|
|
|
41
42
|
async componentDidMount() {
|
|
@@ -56,12 +57,12 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
56
57
|
}
|
|
57
58
|
}
|
|
58
59
|
let blockRes = await HCDataSource.requestBlocks(l2MenuId ? l2MenuId : undefined, blockId ? blockId : undefined);
|
|
59
|
-
this.setState((state)=>({
|
|
60
|
-
isImporter:currentURL.hash.indexOf('/importer')>0,
|
|
61
|
-
blocks: blockRes.blocks?blockRes.blocks:[],
|
|
60
|
+
this.setState((state) => ({
|
|
61
|
+
isImporter: currentURL.hash.indexOf('/importer') > 0,
|
|
62
|
+
blocks: blockRes.blocks ? blockRes.blocks : [],
|
|
62
63
|
currentL2MenuId: blockRes.l2MenuId,
|
|
63
64
|
currentBlockId: blockRes.blockId,
|
|
64
|
-
sideBartitle:blockRes.programName,
|
|
65
|
+
sideBartitle: blockRes.programName,
|
|
65
66
|
}));
|
|
66
67
|
|
|
67
68
|
}
|
|
@@ -74,10 +75,10 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
74
75
|
var searchParams = new URLSearchParams('?' + search);
|
|
75
76
|
let blockId = searchParams.get('blockId');
|
|
76
77
|
let l2MenuId = searchParams.get('menuId');
|
|
77
|
-
let isImporter_= currentURL.hash.indexOf('/importer')>0;
|
|
78
|
-
if(prevState.isImporter!=isImporter_){
|
|
79
|
-
this.setState((state)=>({
|
|
80
|
-
isImporter:isImporter_,
|
|
78
|
+
let isImporter_ = currentURL.hash.indexOf('/importer') > 0;
|
|
79
|
+
if (prevState.isImporter != isImporter_) {
|
|
80
|
+
this.setState((state) => ({
|
|
81
|
+
isImporter: isImporter_,
|
|
81
82
|
}))
|
|
82
83
|
}
|
|
83
84
|
//进一步找找l2MenuId
|
|
@@ -93,7 +94,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
93
94
|
|
|
94
95
|
const {currentL2MenuId, currentBlockId} = this.state;
|
|
95
96
|
if (l2MenuId && currentL2MenuId != l2MenuId) {
|
|
96
|
-
this.setState((state)=>({
|
|
97
|
+
this.setState((state) => ({
|
|
97
98
|
currentL2MenuId: l2MenuId,
|
|
98
99
|
}));
|
|
99
100
|
}
|
|
@@ -102,7 +103,7 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
102
103
|
blockId = this.findBlockIdOfL2Menu(l2MenuId);
|
|
103
104
|
}
|
|
104
105
|
if (blockId && currentBlockId != blockId) {
|
|
105
|
-
this.setState((state)=>({
|
|
106
|
+
this.setState((state) => ({
|
|
106
107
|
currentBlockId: blockId,
|
|
107
108
|
}));
|
|
108
109
|
}
|
|
@@ -130,11 +131,29 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
130
131
|
const {blocks} = this.state;
|
|
131
132
|
if (leMenuId) {
|
|
132
133
|
for (const block of blocks) {
|
|
133
|
-
|
|
134
|
-
for (const
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
134
|
+
if (block.l1Menus) {
|
|
135
|
+
for (const menul1 of block.l1Menus) {
|
|
136
|
+
for (const menul2 of menul1.l2Menus) {
|
|
137
|
+
if (menul2.id == leMenuId) {
|
|
138
|
+
blockId = block.id;
|
|
139
|
+
break;
|
|
140
|
+
}
|
|
141
|
+
}
|
|
142
|
+
}
|
|
143
|
+
} else {
|
|
144
|
+
for (const menul1 of block.items) {
|
|
145
|
+
if (menul1.items) {
|
|
146
|
+
for (const menul2 of menul1.items) {
|
|
147
|
+
if (menul2.id == leMenuId) {
|
|
148
|
+
blockId = block.id;
|
|
149
|
+
break;
|
|
150
|
+
}
|
|
151
|
+
}
|
|
152
|
+
} else {
|
|
153
|
+
if (menul1.id == leMenuId) {
|
|
154
|
+
blockId = block.id;
|
|
155
|
+
break;
|
|
156
|
+
}
|
|
138
157
|
}
|
|
139
158
|
}
|
|
140
159
|
}
|
|
@@ -147,13 +166,32 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
147
166
|
const {blocks, currentL2MenuId, currentBlockId} = this.state;
|
|
148
167
|
let result: BlockMenu = undefined;
|
|
149
168
|
|
|
150
|
-
if (currentL2MenuId
|
|
169
|
+
if (currentL2MenuId) {
|
|
151
170
|
for (const block of blocks) {
|
|
152
|
-
|
|
153
|
-
|
|
154
|
-
|
|
155
|
-
|
|
156
|
-
|
|
171
|
+
|
|
172
|
+
if (block.l1Menus) {
|
|
173
|
+
for (const menul1 of block.l1Menus) {
|
|
174
|
+
for (const menul2 of menul1.l2Menus) {
|
|
175
|
+
if (menul2.id == currentL2MenuId) {
|
|
176
|
+
result = block;
|
|
177
|
+
break;
|
|
178
|
+
}
|
|
179
|
+
}
|
|
180
|
+
}
|
|
181
|
+
} else {
|
|
182
|
+
for (const menul1 of block.items) {
|
|
183
|
+
if (menul1.items) {
|
|
184
|
+
for (const menul2 of menul1.items) {
|
|
185
|
+
if (menul2.id == currentL2MenuId) {
|
|
186
|
+
result = block;
|
|
187
|
+
break;
|
|
188
|
+
}
|
|
189
|
+
}
|
|
190
|
+
} else {
|
|
191
|
+
if (menul1.id == currentL2MenuId) {
|
|
192
|
+
result = block;
|
|
193
|
+
break;
|
|
194
|
+
}
|
|
157
195
|
}
|
|
158
196
|
}
|
|
159
197
|
}
|
|
@@ -167,50 +205,50 @@ class MainPage extends React.PureComponent<MainPageProps, MainPageState> {
|
|
|
167
205
|
}
|
|
168
206
|
}
|
|
169
207
|
}
|
|
170
|
-
if(!result){
|
|
208
|
+
if (!result) {
|
|
171
209
|
result = blocks.at(0);
|
|
172
210
|
}
|
|
173
211
|
return result;
|
|
174
212
|
}
|
|
175
213
|
|
|
176
214
|
toggle = () => {
|
|
177
|
-
this.setState((state)=>({
|
|
215
|
+
this.setState((state) => ({
|
|
178
216
|
collapsed: !this.state.collapsed,
|
|
179
217
|
}));
|
|
180
218
|
};
|
|
181
219
|
|
|
182
220
|
render() {
|
|
183
221
|
|
|
184
|
-
const {collapsed, currentL2MenuId, currentBlockId,isImporter,sideBartitle} = this.state;
|
|
222
|
+
const {collapsed, currentL2MenuId, currentBlockId, isImporter, sideBartitle} = this.state;
|
|
185
223
|
//滚动条回到顶部
|
|
186
224
|
// document.body.scrollTop = document.documentElement.scrollTop = 0;
|
|
187
|
-
|
|
225
|
+
// @ts-ignore
|
|
188
226
|
// eslint-disable-next-line no-unused-expressions
|
|
189
227
|
this.scrollbarRef?.current?.scrollToTop();
|
|
190
228
|
return (
|
|
191
|
-
<Scrollbars ref={this.scrollbarRef} style={{
|
|
229
|
+
<Scrollbars ref={this.scrollbarRef} style={{height: 'calc(100vh)'}} autoHide autoHideTimeout={1000}>
|
|
192
230
|
|
|
193
|
-
|
|
194
|
-
|
|
195
|
-
|
|
196
|
-
|
|
197
|
-
|
|
231
|
+
{/*<Row justify="space-around" align="middle" style={{'background':'#0f4da1',height:'80px'}}>*/}
|
|
232
|
+
{/* <Col span={12}>*/}
|
|
233
|
+
{/* <img style={{height:'60px'}} src={Logo}></img>*/}
|
|
234
|
+
{/* </Col>*/}
|
|
235
|
+
{/* <Col span={4}>*/}
|
|
198
236
|
|
|
199
|
-
|
|
200
|
-
|
|
201
|
-
<DocumentTitle title={(isImporter?'导入-':"") + this.findBlockTitle(currentBlockId)}>
|
|
237
|
+
{/* </Col>*/}
|
|
238
|
+
{/*</Row>*/}
|
|
239
|
+
<DocumentTitle title={(isImporter ? '导入-' : "") + this.findBlockTitle(currentBlockId)}>
|
|
202
240
|
<Layout>
|
|
203
241
|
<Sider theme={"light"}
|
|
204
|
-
|
|
205
|
-
|
|
206
|
-
|
|
207
|
-
|
|
208
|
-
|
|
209
|
-
|
|
210
|
-
|
|
211
|
-
|
|
212
|
-
|
|
213
|
-
|
|
242
|
+
style={{
|
|
243
|
+
// background: '#0f4da1',
|
|
244
|
+
overflow: 'auto',
|
|
245
|
+
height: '100vh',
|
|
246
|
+
position: 'fixed',
|
|
247
|
+
left: 0,
|
|
248
|
+
top: 0,
|
|
249
|
+
bottom: 0,
|
|
250
|
+
}}
|
|
251
|
+
collapsed={collapsed}
|
|
214
252
|
>
|
|
215
253
|
<SideBar title={sideBartitle} blockMenu={this.findCurrentBlock()}
|
|
216
254
|
currentL2MenuId={currentL2MenuId} collapsed={collapsed}/>
|
|
@@ -20,25 +20,33 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
|
20
20
|
super(props);
|
|
21
21
|
}
|
|
22
22
|
|
|
23
|
-
|
|
24
|
-
return
|
|
25
|
-
{MenuRender.renderL1Menu(blockMenu.l1Menus,null)}
|
|
26
|
-
</Menu>
|
|
27
|
-
|
|
23
|
+
getSubMenu = (blockMenu:BlockMenu)=>{
|
|
24
|
+
return MenuRender.getMenu(blockMenu,null);
|
|
28
25
|
}
|
|
29
26
|
|
|
30
|
-
|
|
31
27
|
findBlockId = (blocks:BlockMenu[],currentL2MenuId:string) => {
|
|
32
28
|
let blockId:string=undefined;
|
|
33
29
|
for(const block of blocks){
|
|
34
|
-
|
|
35
|
-
for(const
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
30
|
+
if(block.l1Menus){
|
|
31
|
+
for(const menul1 of block.l1Menus){
|
|
32
|
+
for(const menul2 of menul1.l2Menus){
|
|
33
|
+
if(menul2.id===currentL2MenuId){
|
|
34
|
+
blockId=block.id;
|
|
35
|
+
return blockId;
|
|
36
|
+
}
|
|
37
|
+
}
|
|
38
|
+
}
|
|
39
|
+
}else{
|
|
40
|
+
for(const menul1 of block.items){
|
|
41
|
+
for(const menul2 of menul1.items){
|
|
42
|
+
if(menul2.id===currentL2MenuId){
|
|
43
|
+
blockId=block.id;
|
|
44
|
+
return blockId;
|
|
45
|
+
}
|
|
39
46
|
}
|
|
40
47
|
}
|
|
41
48
|
}
|
|
49
|
+
|
|
42
50
|
}
|
|
43
51
|
return blockId;
|
|
44
52
|
}
|
|
@@ -63,7 +71,7 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
|
63
71
|
blocks.map((item, index) => {
|
|
64
72
|
return <div key={index}
|
|
65
73
|
className={`${item.id == blockId ? "active" : ""} header-block`} style={syyy}>
|
|
66
|
-
<Dropdown
|
|
74
|
+
<Dropdown menu={{ items:this.getSubMenu(item) }}>
|
|
67
75
|
<a className="dropdown-link"
|
|
68
76
|
style={item.id == blockId?{color:'#fff'}:{color:activeColor}}
|
|
69
77
|
rel="noopener noreferrer"
|
|
@@ -20,7 +20,7 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
|
|
|
20
20
|
componentDidMount() {
|
|
21
21
|
const {currentL2MenuId, blockMenu,collapsed} = this.props;
|
|
22
22
|
const {openKeys} = this.state;
|
|
23
|
-
let openKey = blockMenu?MenuRender.findOpenId(blockMenu
|
|
23
|
+
let openKey = blockMenu?MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
|
|
24
24
|
if(openKey && openKeys.length<1){
|
|
25
25
|
this.setState({
|
|
26
26
|
openKeys:[openKey.toString()]
|
|
@@ -34,15 +34,15 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
|
|
|
34
34
|
|
|
35
35
|
if(!preBlockMenu || !blockMenu || blockMenu.id!=preBlockMenu.id ){
|
|
36
36
|
//console.log('currentL2MenuId:',currentL2MenuId);
|
|
37
|
-
let openKey = blockMenu?MenuRender.findOpenId(blockMenu
|
|
37
|
+
let openKey = blockMenu? MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
|
|
38
38
|
if (openKey) {
|
|
39
39
|
this.setState({
|
|
40
40
|
openKeys:[openKey],
|
|
41
41
|
})
|
|
42
42
|
}
|
|
43
43
|
}else {
|
|
44
|
-
let openKey = blockMenu?MenuRender.findOpenId(blockMenu
|
|
45
|
-
let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu
|
|
44
|
+
let openKey = blockMenu?MenuRender.findOpenId(blockMenu, currentL2MenuId):undefined;
|
|
45
|
+
let preOpenKey = blockMenu?MenuRender.findOpenId(preBlockMenu, preMenuId):undefined;
|
|
46
46
|
if((!preOpenKey && openKey) || (openKey && openKey!=preOpenKey)){
|
|
47
47
|
this.setState({
|
|
48
48
|
openKeys:[openKey],
|
|
@@ -70,8 +70,8 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
|
|
|
70
70
|
onOpenChange={this.handleOpen} //手风琴
|
|
71
71
|
selectedKeys={currentL2MenuId ? [currentL2MenuId.toString()] : undefined}
|
|
72
72
|
openKeys={!collapsed?openKeys:undefined}
|
|
73
|
+
items={blockMenu ? MenuRender.getMenu(blockMenu, undefined,basePath) : []}
|
|
73
74
|
>
|
|
74
|
-
{blockMenu ? MenuRender.renderL1Menu(blockMenu.l1Menus, undefined,basePath) : ""}
|
|
75
75
|
</Menu>
|
|
76
76
|
);
|
|
77
77
|
}
|
|
@@ -1,46 +1,84 @@
|
|
|
1
|
-
import {Level1Menu, Level2Menu} from "../../tmpl/interface";
|
|
1
|
+
import {BlockMenu, Level1Menu, Level2Menu} from "../../tmpl/interface";
|
|
2
2
|
import {Menu} from "antd";
|
|
3
|
+
import type {MenuProps} from "antd";
|
|
3
4
|
import React from "react";
|
|
4
5
|
import {NavLink} from 'react-router-dom';
|
|
5
6
|
import Units from "../../units";
|
|
6
|
-
|
|
7
|
+
|
|
7
8
|
|
|
8
9
|
export default {
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
10
|
+
|
|
11
|
+
getMenu(blockMenu: BlockMenu , target, basePath = ""){
|
|
12
|
+
if(blockMenu.l1Menus){
|
|
13
|
+
return this.toL1Menu(blockMenu.l1Menus, target, basePath = "")
|
|
14
|
+
}else{
|
|
15
|
+
return this.toSubMenu(blockMenu.items, target, basePath = "");
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
},
|
|
19
|
+
|
|
20
|
+
toL1Menu(subMenus: (Level1Menu)[], target, basePath = "") {
|
|
21
|
+
let menus:MenuProps['items'] =[];
|
|
22
|
+
let menu;
|
|
23
|
+
if(subMenus){
|
|
24
|
+
subMenus.map((item) => {
|
|
25
|
+
menu = {key: item.id};
|
|
26
|
+
let subItems = item.l2Menus;
|
|
27
|
+
if (subItems) {//菜单
|
|
28
|
+
menu.label = item.title;
|
|
29
|
+
menu.children = this.toSubMenu(subItems, target, basePath);
|
|
30
|
+
}
|
|
31
|
+
menus.push(menu);
|
|
32
|
+
})
|
|
33
|
+
}
|
|
34
|
+
return menus;
|
|
35
|
+
},
|
|
36
|
+
|
|
37
|
+
toSubMenu(subMenus: (Level2Menu |BlockMenu)[], target, basePath = "") {
|
|
38
|
+
let menus:MenuProps['items'] =[];
|
|
39
|
+
let menu;
|
|
40
|
+
if(subMenus){
|
|
41
|
+
subMenus.map((item) => {
|
|
42
|
+
menu = {key: item.id};
|
|
43
|
+
let subItems = item.items;
|
|
44
|
+
if (subItems) {//菜单
|
|
45
|
+
menu.label = item.title;
|
|
46
|
+
menu.children = this.toSubMenu(subItems, target, basePath);
|
|
47
|
+
} else {
|
|
48
|
+
let i:Level2Menu=item as Level2Menu;
|
|
49
|
+
menu.label = this.toL2MenuTitle(i , target, basePath);
|
|
50
|
+
}
|
|
51
|
+
menus.push(menu);
|
|
52
|
+
})
|
|
53
|
+
}
|
|
54
|
+
return menus;
|
|
17
55
|
},
|
|
18
|
-
getRoutePath(menu:Level2Menu,basePath,defaultCriteriaData){
|
|
19
|
-
if(menu){
|
|
20
|
-
let pageType=menu.pageType;
|
|
56
|
+
getRoutePath(menu: Level2Menu, basePath, defaultCriteriaData) {
|
|
57
|
+
if (menu) {
|
|
58
|
+
let pageType = menu.pageType;
|
|
21
59
|
|
|
22
|
-
let routePath='act-table';
|
|
60
|
+
let routePath = 'act-table';
|
|
23
61
|
|
|
24
|
-
let codeSource='';
|
|
62
|
+
let codeSource = '';
|
|
25
63
|
switch (pageType) {
|
|
26
64
|
case "列表":
|
|
27
|
-
routePath='act-table';
|
|
65
|
+
routePath = 'act-table';
|
|
28
66
|
break;
|
|
29
67
|
case "添加":
|
|
30
|
-
routePath='detail-edit';
|
|
31
|
-
codeSource='&codeSource=new';
|
|
68
|
+
routePath = 'detail-edit';
|
|
69
|
+
codeSource = '&codeSource=new';
|
|
32
70
|
break;
|
|
33
71
|
case "编辑":
|
|
34
|
-
routePath='detail-edit';
|
|
35
|
-
codeSource='&codeSource=listop';
|
|
72
|
+
routePath = 'detail-edit';
|
|
73
|
+
codeSource = '&codeSource=listop';
|
|
36
74
|
break;
|
|
37
75
|
case "编辑或添加":
|
|
38
|
-
routePath='detail-edit';
|
|
39
|
-
codeSource='&codeSource=listop-new';
|
|
76
|
+
routePath = 'detail-edit';
|
|
77
|
+
codeSource = '&codeSource=listop-new';
|
|
40
78
|
break;
|
|
41
79
|
case "详情":
|
|
42
|
-
routePath='detail-view';
|
|
43
|
-
codeSource='&codeSource=listop';
|
|
80
|
+
routePath = 'detail-view';
|
|
81
|
+
codeSource = '&codeSource=listop';
|
|
44
82
|
break;
|
|
45
83
|
}
|
|
46
84
|
|
|
@@ -49,37 +87,59 @@ export default {
|
|
|
49
87
|
}
|
|
50
88
|
return null;
|
|
51
89
|
},
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
defaultCriteriaData='&'+ Units.transQueryParamsToStr(item.defaultCriteriaValue);
|
|
90
|
+
toL2MenuTitle(item: Level2Menu, target, basePath = "") {
|
|
91
|
+
|
|
92
|
+
if(!item){
|
|
93
|
+
return null;
|
|
94
|
+
}
|
|
95
|
+
|
|
96
|
+
let delimiter = "/";
|
|
97
|
+
let customPath = item.customPath;
|
|
98
|
+
if (customPath) {
|
|
99
|
+
if (customPath.startsWith('/') || customPath.startsWith('\\')) {
|
|
100
|
+
delimiter = "";
|
|
64
101
|
}
|
|
102
|
+
}
|
|
103
|
+
let defaultCriteriaData = "";
|
|
104
|
+
if (item['defaultCriteriaValue']) {
|
|
105
|
+
defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
|
|
106
|
+
}
|
|
65
107
|
|
|
66
|
-
|
|
108
|
+
let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
|
|
67
109
|
|
|
68
|
-
|
|
69
|
-
<NavLink to={path} target={target} >{item.title}</NavLink>
|
|
70
|
-
</Menu.Item>
|
|
71
|
-
})
|
|
110
|
+
return <NavLink to={path} target={target}>{item.title}</NavLink>;
|
|
72
111
|
},
|
|
73
|
-
findOpenId(
|
|
74
|
-
let openL2MenuId:string=undefined;
|
|
75
|
-
|
|
76
|
-
for(const
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
112
|
+
findOpenId(blockMenu: BlockMenu, currentL2MenuId: string) {
|
|
113
|
+
let openL2MenuId: string = undefined;
|
|
114
|
+
if(blockMenu.l1Menus){
|
|
115
|
+
for (const menul1 of blockMenu.l1Menus) {
|
|
116
|
+
for (const menul2 of menul1.l2Menus) {
|
|
117
|
+
if (menul2.id == currentL2MenuId) {
|
|
118
|
+
openL2MenuId = menul1.id;
|
|
119
|
+
return openL2MenuId;
|
|
120
|
+
}
|
|
121
|
+
}
|
|
122
|
+
}
|
|
123
|
+
}else{
|
|
124
|
+
for (const menul1 of blockMenu.items) {
|
|
125
|
+
if(menul1.items){
|
|
126
|
+
for (const menul2 of menul1.items) {
|
|
127
|
+
if (menul2.id == currentL2MenuId) {
|
|
128
|
+
openL2MenuId = menul1.id;
|
|
129
|
+
return openL2MenuId;
|
|
130
|
+
}
|
|
131
|
+
}
|
|
132
|
+
}else{
|
|
133
|
+
if (menul1.id == currentL2MenuId) {
|
|
134
|
+
openL2MenuId = menul1.id;
|
|
135
|
+
return openL2MenuId;
|
|
136
|
+
}
|
|
80
137
|
}
|
|
138
|
+
|
|
81
139
|
}
|
|
82
140
|
}
|
|
141
|
+
|
|
142
|
+
|
|
83
143
|
return openL2MenuId;
|
|
84
144
|
}
|
|
85
145
|
}
|
|
@@ -79,6 +79,7 @@ export interface JumpConfig extends OrderableTmplBase {
|
|
|
79
79
|
}
|
|
80
80
|
|
|
81
81
|
export interface Level2Menu extends MenuBase {
|
|
82
|
+
items:(BlockMenu|Level2Menu)[],
|
|
82
83
|
customPath?: string;
|
|
83
84
|
displayTotal?: boolean;
|
|
84
85
|
count?:number;
|
|
@@ -95,7 +96,8 @@ export interface MenuBase extends OrderableTmplBase {
|
|
|
95
96
|
}
|
|
96
97
|
|
|
97
98
|
export interface BlockMenu extends MenuBase {
|
|
98
|
-
l1Menus: Level1Menu[]
|
|
99
|
+
l1Menus: Level1Menu[],
|
|
100
|
+
items:(BlockMenu|Level2Menu)[]
|
|
99
101
|
}
|
|
100
102
|
|
|
101
103
|
export interface CriteriaConfig extends FieldConfig {
|
|
@@ -1,18 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import { BlockMenu } from "../../tmpl/interface";
|
|
3
|
-
export interface BlockProps {
|
|
4
|
-
blocks: BlockMenu[];
|
|
5
|
-
currentBlockId?: string;
|
|
6
|
-
currentL2MenuId?: string;
|
|
7
|
-
activeColor?: string;
|
|
8
|
-
}
|
|
9
|
-
interface BlockState {
|
|
10
|
-
}
|
|
11
|
-
declare class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
12
|
-
constructor(props: any);
|
|
13
|
-
renderBlockMenu: (blockMenu: BlockMenu) => React.JSX.Element;
|
|
14
|
-
findBlockId: (blocks: BlockMenu[], currentL2MenuId: string) => string;
|
|
15
|
-
render(): React.JSX.Element | React.JSX.Element[];
|
|
16
|
-
}
|
|
17
|
-
export default Block;
|
|
18
|
-
//# sourceMappingURL=block1.d.ts.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"block1.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block1.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAE3C,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAI/C,MAAM,WAAW,UAAU;IACvB,MAAM,EAAC,SAAS,EAAE,CAAC;IACnB,cAAc,CAAC,EAAC,MAAM,CAAC;IACvB,eAAe,CAAC,EAAC,MAAM,CAAC;IACxB,WAAW,CAAC,EAAC,MAAM,CAAC;CACvB;AACD,UAAU,UAAU;CAEnB;AAED,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;gBAE/C,KAAK,KAAA;IAIjB,eAAe,cAAc,SAAS,uBAKrC;IAGD,WAAW,WAAW,SAAS,EAAE,mBAAiB,MAAM,YAavD;IAED,MAAM;CAiCT;AAED,eAAe,KAAK,CAAC"}
|
|
@@ -1,46 +0,0 @@
|
|
|
1
|
-
import React from "react";
|
|
2
|
-
import { Dropdown, Menu } from 'antd';
|
|
3
|
-
import MenuRender from './menu-render';
|
|
4
|
-
class Block extends React.PureComponent {
|
|
5
|
-
constructor(props) {
|
|
6
|
-
super(props);
|
|
7
|
-
this.renderBlockMenu = (blockMenu) => {
|
|
8
|
-
return React.createElement(Menu, null, MenuRender.renderL1Menu(blockMenu.l1Menus, null));
|
|
9
|
-
};
|
|
10
|
-
this.findBlockId = (blocks, currentL2MenuId) => {
|
|
11
|
-
let blockId = undefined;
|
|
12
|
-
for (const block of blocks) {
|
|
13
|
-
for (const menul1 of block.l1Menus) {
|
|
14
|
-
for (const menul2 of menul1.l2Menus) {
|
|
15
|
-
if (menul2.id === currentL2MenuId) {
|
|
16
|
-
blockId = block.id;
|
|
17
|
-
return blockId;
|
|
18
|
-
}
|
|
19
|
-
}
|
|
20
|
-
}
|
|
21
|
-
}
|
|
22
|
-
return blockId;
|
|
23
|
-
};
|
|
24
|
-
}
|
|
25
|
-
render() {
|
|
26
|
-
const { currentBlockId, blocks, currentL2MenuId, activeColor } = this.props;
|
|
27
|
-
const syyy = { '--header-block-active-bottom-color': activeColor ? activeColor : "#1E90FF", '--header-top-active-background': activeColor ? activeColor : "#1E90FF" };
|
|
28
|
-
if (!blocks || blocks.length < 1) {
|
|
29
|
-
return React.createElement(React.Fragment, null);
|
|
30
|
-
}
|
|
31
|
-
let blockId = currentBlockId;
|
|
32
|
-
if (currentL2MenuId && !blockId) {
|
|
33
|
-
blockId = this.findBlockId(blocks, currentL2MenuId);
|
|
34
|
-
}
|
|
35
|
-
if (!blockId) {
|
|
36
|
-
blockId = blocks.at(0).id;
|
|
37
|
-
}
|
|
38
|
-
return (blocks.map((item, index) => {
|
|
39
|
-
return React.createElement("div", { key: index, className: `${item.id == blockId ? "active" : ""} header-block`, style: syyy },
|
|
40
|
-
React.createElement(Dropdown, { overlay: this.renderBlockMenu(item) },
|
|
41
|
-
React.createElement("a", { className: "dropdown-link", style: item.id == blockId ? { color: '#fff' } : { color: activeColor }, rel: "noopener noreferrer" }, item.title)));
|
|
42
|
-
}));
|
|
43
|
-
}
|
|
44
|
-
}
|
|
45
|
-
export default Block;
|
|
46
|
-
//# sourceMappingURL=block1.js.map
|
|
@@ -1 +0,0 @@
|
|
|
1
|
-
{"version":3,"file":"block1.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block1.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAC,MAAM,MAAM,CAAC;AAErC,OAAO,UAAU,MAAM,eAAe,CAAC;AAavC,MAAM,KAAM,SAAQ,KAAK,CAAC,aAAqC;IAE3D,YAAY,KAAK;QACb,KAAK,CAAC,KAAK,CAAC,CAAC;QAGjB,oBAAe,GAAG,CAAC,SAAmB,EAAC,EAAE;YACrC,OAAO,oBAAC,IAAI,QACP,UAAU,CAAC,YAAY,CAAC,SAAS,CAAC,OAAO,EAAC,IAAI,CAAC,CAC7C,CAAA;QAEX,CAAC,CAAA;QAGD,gBAAW,GAAG,CAAC,MAAkB,EAAC,eAAsB,EAAE,EAAE;YACxD,IAAI,OAAO,GAAQ,SAAS,CAAC;YAC7B,KAAI,MAAM,KAAK,IAAI,MAAM,EAAC;gBACtB,KAAI,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAC;oBAC9B,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAC;wBAC/B,IAAG,MAAM,CAAC,EAAE,KAAG,eAAe,EAAC;4BAC3B,OAAO,GAAC,KAAK,CAAC,EAAE,CAAC;4BACjB,OAAO,OAAO,CAAC;yBAClB;qBACJ;iBACJ;aACJ;YACD,OAAO,OAAO,CAAC;QACnB,CAAC,CAAA;IAvBD,CAAC;IAyBD,MAAM;QACF,MAAM,EAAC,cAAc,EAAC,MAAM,EAAC,eAAe,EAAC,WAAW,EAAC,GAAC,IAAI,CAAC,KAAK,CAAC;QAErE,MAAM,IAAI,GAAC,EAAC,oCAAoC,EAAC,WAAW,CAAA,CAAC,CAAA,WAAW,CAAA,CAAC,CAAA,SAAS,EAAC,gCAAgC,EAAC,WAAW,CAAA,CAAC,CAAA,WAAW,CAAA,CAAC,CAAA,SAAS,EAAkB,CAAA;QAEvK,IAAG,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,GAAC,CAAC,EAAC;YAC1B,OAAO,yCAAK,CAAC;SAChB;QACD,IAAI,OAAO,GAAC,cAAc,CAAC;QAC3B,IAAG,eAAe,IAAI,CAAC,OAAO,EAAC;YAC3B,OAAO,GAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAC,eAAe,CAAC,CAAC;SACpD;QACD,IAAG,CAAC,OAAO,EAAC;YACR,OAAO,GAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;SAC3B;QAED,OAAO,CACP,MAAM,CAAC,GAAG,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE;YACvB,OAAO,6BAAK,GAAG,EAAE,KAAK,EACV,SAAS,EAAE,GAAG,IAAI,CAAC,EAAE,IAAI,OAAO,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,EAAE,eAAe,EAAG,KAAK,EAAE,IAAI;gBACrF,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,CAAC,eAAe,CAAC,IAAI,CAAC;oBACzC,2BAAI,SAAS,EAAC,eAAe,EACzB,KAAK,EAAE,IAAI,CAAC,EAAE,IAAI,OAAO,CAAA,CAAC,CAAA,EAAC,KAAK,EAAC,MAAM,EAAC,CAAA,CAAC,CAAA,EAAC,KAAK,EAAC,WAAW,EAAC,EAC7D,GAAG,EAAC,qBAAqB,IAEvB,IAAI,CAAC,KAAK,CACX,CACG,CACT,CAAA;QACV,CAAC,CAAC,CACD,CAAC;IACN,CAAC;CAEJ;AAED,eAAe,KAAK,CAAC"}
|
|
@@ -1,81 +0,0 @@
|
|
|
1
|
-
import React, {CSSProperties} from "react";
|
|
2
|
-
import { Dropdown, Menu} from 'antd';
|
|
3
|
-
import {BlockMenu} from "../../tmpl/interface";
|
|
4
|
-
import MenuRender from './menu-render';
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
export interface BlockProps{
|
|
8
|
-
blocks:BlockMenu[];
|
|
9
|
-
currentBlockId?:string;
|
|
10
|
-
currentL2MenuId?:string;
|
|
11
|
-
activeColor?:string;
|
|
12
|
-
}
|
|
13
|
-
interface BlockState{
|
|
14
|
-
|
|
15
|
-
}
|
|
16
|
-
|
|
17
|
-
class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
18
|
-
|
|
19
|
-
constructor(props) {
|
|
20
|
-
super(props);
|
|
21
|
-
}
|
|
22
|
-
|
|
23
|
-
renderBlockMenu = (blockMenu:BlockMenu)=>{
|
|
24
|
-
return <Menu>
|
|
25
|
-
{MenuRender.renderL1Menu(blockMenu.l1Menus,null)}
|
|
26
|
-
</Menu>
|
|
27
|
-
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
findBlockId = (blocks:BlockMenu[],currentL2MenuId:string) => {
|
|
32
|
-
let blockId:string=undefined;
|
|
33
|
-
for(const block of blocks){
|
|
34
|
-
for(const menul1 of block.l1Menus){
|
|
35
|
-
for(const menul2 of menul1.l2Menus){
|
|
36
|
-
if(menul2.id===currentL2MenuId){
|
|
37
|
-
blockId=block.id;
|
|
38
|
-
return blockId;
|
|
39
|
-
}
|
|
40
|
-
}
|
|
41
|
-
}
|
|
42
|
-
}
|
|
43
|
-
return blockId;
|
|
44
|
-
}
|
|
45
|
-
|
|
46
|
-
render(){
|
|
47
|
-
const {currentBlockId,blocks,currentL2MenuId,activeColor}=this.props;
|
|
48
|
-
|
|
49
|
-
const syyy={'--header-block-active-bottom-color':activeColor?activeColor:"#1E90FF",'--header-top-active-background':activeColor?activeColor:"#1E90FF"} as CSSProperties
|
|
50
|
-
|
|
51
|
-
if(!blocks || blocks.length<1){
|
|
52
|
-
return <></>;
|
|
53
|
-
}
|
|
54
|
-
let blockId=currentBlockId;
|
|
55
|
-
if(currentL2MenuId && !blockId){
|
|
56
|
-
blockId=this.findBlockId(blocks,currentL2MenuId);
|
|
57
|
-
}
|
|
58
|
-
if(!blockId){
|
|
59
|
-
blockId=blocks.at(0).id;
|
|
60
|
-
}
|
|
61
|
-
|
|
62
|
-
return (
|
|
63
|
-
blocks.map((item, index) => {
|
|
64
|
-
return <div key={index}
|
|
65
|
-
className={`${item.id == blockId ? "active" : ""} header-block`} style={syyy}>
|
|
66
|
-
<Dropdown overlay={this.renderBlockMenu(item)}>
|
|
67
|
-
<a className="dropdown-link"
|
|
68
|
-
style={item.id == blockId?{color:'#fff'}:{color:activeColor}}
|
|
69
|
-
rel="noopener noreferrer"
|
|
70
|
-
>
|
|
71
|
-
{item.title}
|
|
72
|
-
</a>
|
|
73
|
-
</Dropdown>
|
|
74
|
-
</div>
|
|
75
|
-
})
|
|
76
|
-
);
|
|
77
|
-
}
|
|
78
|
-
|
|
79
|
-
}
|
|
80
|
-
|
|
81
|
-
export default Block;
|