aldehyde 0.2.117 → 0.2.119
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/menu/block.d.ts +1 -0
- package/lib/layout/menu/block.d.ts.map +1 -1
- package/lib/layout/menu/block.js +14 -2
- package/lib/layout/menu/block.js.map +1 -1
- package/lib/layout/menu/menu-render.d.ts +3 -1
- package/lib/layout/menu/menu-render.d.ts.map +1 -1
- package/lib/layout/menu/menu-render.js +2 -0
- package/lib/layout/menu/menu-render.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/layout/menu/block.tsx +28 -3
- package/src/aldehyde/layout/menu/menu-render.tsx +4 -2
|
@@ -24,6 +24,7 @@ declare class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
|
24
24
|
findBlockId: (blocks: BlockMenu[], currentL2MenuId: string) => string;
|
|
25
25
|
get computedBlocks(): BlockMenu[];
|
|
26
26
|
get menuItems(): import("antd/es/menu/hooks/useItems").ItemType[];
|
|
27
|
+
getDefaultIndexPath(menuItem: any): any;
|
|
27
28
|
render(): React.JSX.Element;
|
|
28
29
|
}
|
|
29
30
|
export default Block;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,OAAO,EAAE,SAAS,
|
|
1
|
+
{"version":3,"file":"block.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAE7C,OAAO,EAAE,SAAS,EAAc,MAAM,sBAAsB,CAAC;AAE7D,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,aAAa,CAAC;AAIrB,MAAM,WAAW,UAAU;IACzB,MAAM,EAAE,SAAS,EAAE,CAAC;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,eAAe,CAAC,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,MAAM,CAAC;CACtB;AACD,UAAU,UAAU;CAAG;AAEvB,cAAM,KAAM,SAAQ,KAAK,CAAC,aAAa,CAAC,UAAU,EAAE,UAAU,CAAC;IAC7D,MAAM,CAAC,WAAW;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBACrC,KAAK,KAAA;IAIjB,UAAU,cAAe,SAAS,sDAEhC;IAEF,WAAW,WAAY,SAAS,EAAE,mBAAmB,MAAM,YAwBzD;IAEF,IAAI,cAAc,gBAmBjB;IAED,IAAI,SAAS,qDAiCZ;IAED,mBAAmB,CAAC,QAAQ,KAAA;IAK5B,MAAM;CAwDP;AAED,eAAe,KAAK,CAAC"}
|
package/lib/layout/menu/block.js
CHANGED
|
@@ -3,6 +3,7 @@ import { Menu } from "antd";
|
|
|
3
3
|
import MenuRender from "./menu-render";
|
|
4
4
|
import { LocaleContext } from "../../locale/LocaleProvider";
|
|
5
5
|
import "./block.css";
|
|
6
|
+
import { NavLink } from "react-router-dom";
|
|
6
7
|
class Block extends React.PureComponent {
|
|
7
8
|
constructor(props) {
|
|
8
9
|
super(props);
|
|
@@ -55,17 +56,28 @@ class Block extends React.PureComponent {
|
|
|
55
56
|
get menuItems() {
|
|
56
57
|
const blocks = this.computedBlocks;
|
|
57
58
|
const items = [];
|
|
59
|
+
console.log(items);
|
|
58
60
|
blocks.forEach((block) => {
|
|
59
61
|
const item = {
|
|
60
62
|
className: "menu-item",
|
|
61
|
-
label: block.title,
|
|
62
63
|
key: block.id,
|
|
63
64
|
children: this.getSubMenu(block),
|
|
64
65
|
};
|
|
66
|
+
item.label = (React.createElement(NavLink, { to: this.getDefaultIndexPath(block), style: {
|
|
67
|
+
color: "inherit",
|
|
68
|
+
width: "100%",
|
|
69
|
+
height: "100%",
|
|
70
|
+
display: "block",
|
|
71
|
+
} }, block.title));
|
|
65
72
|
items.push(item);
|
|
66
73
|
});
|
|
67
74
|
return items;
|
|
68
75
|
}
|
|
76
|
+
getDefaultIndexPath(menuItem) {
|
|
77
|
+
if (menuItem.items)
|
|
78
|
+
return this.getDefaultIndexPath(menuItem.items[0]);
|
|
79
|
+
return menuItem.path;
|
|
80
|
+
}
|
|
69
81
|
render() {
|
|
70
82
|
const { currentBlockId, blocks, currentL2MenuId, activeColor } = this.props;
|
|
71
83
|
const syyy = {
|
|
@@ -105,7 +117,7 @@ class Block extends React.PureComponent {
|
|
|
105
117
|
// </div>
|
|
106
118
|
// );
|
|
107
119
|
// });
|
|
108
|
-
return (React.createElement(Menu, { mode: "horizontal", defaultSelectedKeys: [currentBlockId, currentL2MenuId], items: this.menuItems, style: {
|
|
120
|
+
return (React.createElement(Menu, { mode: "horizontal", defaultSelectedKeys: [currentBlockId, currentL2MenuId], items: this.menuItems, selectedKeys: [currentBlockId, currentL2MenuId], style: {
|
|
109
121
|
flex: 1,
|
|
110
122
|
minWidth: 0,
|
|
111
123
|
} }));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAY,IAAI,
|
|
1
|
+
{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"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"}
|
|
@@ -5,7 +5,9 @@ declare const _default: {
|
|
|
5
5
|
toL1Menu(subMenus: (Level1Menu)[], target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
|
|
6
6
|
toSubMenu(subMenus: (Level2Menu | BlockMenu)[], target: any, basePath?: string): import("antd/es/menu/hooks/useItems").ItemType[];
|
|
7
7
|
getRoutePath(menu: Level2Menu, basePath: any, defaultCriteriaData: any): string;
|
|
8
|
-
toL2MenuTitle(item: Level2Menu
|
|
8
|
+
toL2MenuTitle(item: Level2Menu & {
|
|
9
|
+
path?: string;
|
|
10
|
+
}, target: any, basePath?: string): React.JSX.Element;
|
|
9
11
|
findOpenId(blockMenu: BlockMenu, currentL2MenuId: string): string;
|
|
10
12
|
};
|
|
11
13
|
export default _default;
|
|
@@ -1 +1 @@
|
|
|
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;;uBAQH,SAAS;uBAST,CAAC,UAAU,CAAC,EAAE;
|
|
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;;uBAQH,SAAS;uBAST,CAAC,UAAU,CAAC,EAAE;wBAkBb,CAAC,UAAU,GAAE,SAAS,CAAC,EAAE;uBAwC1B,UAAU;wBAqCT,UAAU,GAAG;QAAC,IAAI,CAAC,EAAE,MAAM,CAAA;KAAC;0BAwB1B,SAAS,mBAAmB,MAAM;;AAlI5D,wBAmKC"}
|
|
@@ -58,6 +58,7 @@ export default {
|
|
|
58
58
|
}
|
|
59
59
|
else {
|
|
60
60
|
menu.label = this.toL2MenuTitle(i, target, basePath);
|
|
61
|
+
menu.path = i.path;
|
|
61
62
|
}
|
|
62
63
|
}
|
|
63
64
|
if (menu) {
|
|
@@ -116,6 +117,7 @@ export default {
|
|
|
116
117
|
defaultCriteriaData = '&' + Units.transQueryParamsToStr(item.defaultCriteriaValue);
|
|
117
118
|
}
|
|
118
119
|
let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
|
|
120
|
+
item.path = path;
|
|
119
121
|
return React.createElement(NavLink, { to: path, target: target }, translate('${' + item.title + '}'));
|
|
120
122
|
},
|
|
121
123
|
findOpenId(blockMenu, currentL2MenuId) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"AACA,OAAO,EAAM,OAAO,EAAC,MAAM,MAAM,CAAC;AAElC,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAAC,OAAO,EAAC,MAAM,kBAAkB,CAAC;AACzC,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,SAAS,MAAM,wBAAwB,CAAC;AAG/C,eAAe;IAEX,OAAO,CAAC,SAAoB,EAAG,MAAM,EAAE,QAAQ,GAAG,EAAE;QAChD,IAAG,SAAS,CAAC,OAAO,EAAC,CAAC;YACnB,OAAO,IAAI,CAAC,QAAQ,CAAC,SAAS,CAAC,OAAO,EAAE,MAAM,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAA;QACjE,CAAC;aAAI,CAAC;YACF,OAAO,IAAI,CAAC,SAAS,CAAC,SAAS,CAAC,KAAK,EAAE,MAAM,EAAE,QAAQ,GAAG,EAAE,CAAC,CAAC;QAClE,CAAC;IAEL,CAAC;IAED,QAAQ,CAAC,QAAwB,EAAE,MAAM,EAAE,QAAQ,GAAG,EAAE;
|
|
1
|
+
{"version":3,"file":"menu-render.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-render.tsx"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,9 +1,11 @@
|
|
|
1
1
|
import React, { CSSProperties } from "react";
|
|
2
|
-
import { Dropdown, Menu, MenuProps } from "antd";
|
|
3
|
-
import { BlockMenu } from "../../tmpl/interface";
|
|
2
|
+
import { Dropdown, Menu, MenuItemProps, MenuProps } from "antd";
|
|
3
|
+
import { BlockMenu, Level2Menu } from "../../tmpl/interface";
|
|
4
4
|
import MenuRender from "./menu-render";
|
|
5
5
|
import { LocaleContext } from "../../locale/LocaleProvider";
|
|
6
6
|
import "./block.css";
|
|
7
|
+
import { NavLink } from "react-router-dom";
|
|
8
|
+
import { inherits } from "util";
|
|
7
9
|
|
|
8
10
|
export interface BlockProps {
|
|
9
11
|
blocks: BlockMenu[];
|
|
@@ -73,22 +75,44 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
|
73
75
|
|
|
74
76
|
get menuItems() {
|
|
75
77
|
const blocks = this.computedBlocks;
|
|
78
|
+
|
|
76
79
|
const items: MenuProps["items"] = [];
|
|
77
80
|
|
|
81
|
+
console.log(items);
|
|
82
|
+
|
|
78
83
|
blocks.forEach((block) => {
|
|
79
84
|
const item: typeof items[0] = {
|
|
80
85
|
className: "menu-item",
|
|
81
|
-
|
|
86
|
+
|
|
82
87
|
key: block.id,
|
|
83
88
|
children: this.getSubMenu(block),
|
|
84
89
|
};
|
|
85
90
|
|
|
91
|
+
item.label = (
|
|
92
|
+
<NavLink
|
|
93
|
+
to={this.getDefaultIndexPath(block)}
|
|
94
|
+
style={{
|
|
95
|
+
color: "inherit",
|
|
96
|
+
width: "100%",
|
|
97
|
+
height: "100%",
|
|
98
|
+
display: "block",
|
|
99
|
+
}}
|
|
100
|
+
>
|
|
101
|
+
{block.title}
|
|
102
|
+
</NavLink>
|
|
103
|
+
);
|
|
104
|
+
|
|
86
105
|
items.push(item);
|
|
87
106
|
});
|
|
88
107
|
|
|
89
108
|
return items;
|
|
90
109
|
}
|
|
91
110
|
|
|
111
|
+
getDefaultIndexPath(menuItem) {
|
|
112
|
+
if (menuItem.items) return this.getDefaultIndexPath(menuItem.items[0]);
|
|
113
|
+
return menuItem.path;
|
|
114
|
+
}
|
|
115
|
+
|
|
92
116
|
render() {
|
|
93
117
|
const { currentBlockId, blocks, currentL2MenuId, activeColor } = this.props;
|
|
94
118
|
|
|
@@ -137,6 +161,7 @@ class Block extends React.PureComponent<BlockProps, BlockState> {
|
|
|
137
161
|
mode="horizontal"
|
|
138
162
|
defaultSelectedKeys={[currentBlockId, currentL2MenuId]}
|
|
139
163
|
items={this.menuItems}
|
|
164
|
+
selectedKeys={[currentBlockId, currentL2MenuId]}
|
|
140
165
|
style={{
|
|
141
166
|
flex: 1,
|
|
142
167
|
minWidth: 0,
|
|
@@ -19,7 +19,6 @@ export default {
|
|
|
19
19
|
},
|
|
20
20
|
|
|
21
21
|
toL1Menu(subMenus: (Level1Menu)[], target, basePath = "") {
|
|
22
|
-
|
|
23
22
|
let menus:MenuProps['items'] =[];
|
|
24
23
|
let menu;
|
|
25
24
|
if(subMenus){
|
|
@@ -67,6 +66,7 @@ export default {
|
|
|
67
66
|
}
|
|
68
67
|
}else{
|
|
69
68
|
menu.label = this.toL2MenuTitle(i , target, basePath);
|
|
69
|
+
menu.path = (i as (Level2Menu & {path: string})).path
|
|
70
70
|
}
|
|
71
71
|
}
|
|
72
72
|
if(menu){
|
|
@@ -113,7 +113,7 @@ export default {
|
|
|
113
113
|
}
|
|
114
114
|
return null;
|
|
115
115
|
},
|
|
116
|
-
toL2MenuTitle(item: Level2Menu, target, basePath = "") {
|
|
116
|
+
toL2MenuTitle(item: Level2Menu & {path?: string}, target, basePath = "") {
|
|
117
117
|
|
|
118
118
|
if(!item){
|
|
119
119
|
return null;
|
|
@@ -133,6 +133,8 @@ export default {
|
|
|
133
133
|
|
|
134
134
|
let path = customPath ? `${basePath}/page/${item.id}${delimiter}${customPath}?menuId=${item.id}` : this.getRoutePath(item, basePath, defaultCriteriaData);
|
|
135
135
|
|
|
136
|
+
item.path = path;
|
|
137
|
+
|
|
136
138
|
return <NavLink to={path} target={target}>{translate('${' + item.title + '}')}</NavLink>;
|
|
137
139
|
},
|
|
138
140
|
findOpenId(blockMenu: BlockMenu, currentL2MenuId: string) {
|