aldehyde 0.1.8 → 0.1.10
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/menu-2layers.d.ts +2 -1
- package/lib/layout/menu/menu-2layers.d.ts.map +1 -1
- package/lib/layout/menu/menu-2layers.js +13 -2
- package/lib/layout/menu/menu-2layers.js.map +1 -1
- package/lib/layout/sidebar/index.d.ts.map +1 -1
- package/lib/layout/sidebar/index.js +1 -1
- package/lib/layout/sidebar/index.js.map +1 -1
- package/package.json +2 -2
- package/src/aldehyde/layout/menu/menu-2layers.tsx +4 -4
- package/src/aldehyde/layout/sidebar/index.tsx +3 -2
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;
|
|
1
|
+
{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"AAEA,OAAO,EAAC,SAAS,EAAC,MAAM,sBAAsB,CAAC;AAG/C,OAAO,EAAC,SAAS,EAAC,MAAM,eAAe,CAAC;AAGxC,MAAM,WAAW,gBAAiB,SAAQ,SAAS;IAC/C,SAAS,EAAE,SAAS,CAAC;IACrB,SAAS,CAAC,EAAE,OAAO,CAAC;IACpB,eAAe,CAAC,EAAE,MAAM,CAAC;CAC5B;;AA+ED,wBAAuC"}
|
|
@@ -1,3 +1,14 @@
|
|
|
1
|
+
var __rest = (this && this.__rest) || function (s, e) {
|
|
2
|
+
var t = {};
|
|
3
|
+
for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p) && e.indexOf(p) < 0)
|
|
4
|
+
t[p] = s[p];
|
|
5
|
+
if (s != null && typeof Object.getOwnPropertySymbols === "function")
|
|
6
|
+
for (var i = 0, p = Object.getOwnPropertySymbols(s); i < p.length; i++) {
|
|
7
|
+
if (e.indexOf(p[i]) < 0 && Object.prototype.propertyIsEnumerable.call(s, p[i]))
|
|
8
|
+
t[p[i]] = s[p[i]];
|
|
9
|
+
}
|
|
10
|
+
return t;
|
|
11
|
+
};
|
|
1
12
|
import React from "react";
|
|
2
13
|
import { Menu } from 'antd';
|
|
3
14
|
import MenuRender from './menu-render';
|
|
@@ -54,9 +65,9 @@ class Menu2layers extends React.PureComponent {
|
|
|
54
65
|
//}
|
|
55
66
|
}
|
|
56
67
|
render() {
|
|
57
|
-
const { blockMenu, collapsed, currentL2MenuId } =
|
|
68
|
+
const _a = this.props, { blockMenu, collapsed, currentL2MenuId } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId"]);
|
|
58
69
|
const { openKeys } = this.state;
|
|
59
|
-
return (React.createElement(Menu, {
|
|
70
|
+
return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined }), blockMenu ? MenuRender.renderL1Menu(blockMenu.l1Menus, undefined) : ""));
|
|
60
71
|
}
|
|
61
72
|
}
|
|
62
73
|
export default withRouter(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;AACvC,OAAO,EAAC,UAAU,EAAC,MAAM,kBAAkB,CAAC;
|
|
1
|
+
{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,CAAA;AAEpB,OAAoB,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAInE,UAAU,YAAa,SAAQ,gBAAgB;CAE9C;AAED,UAAU,YAAY;CAErB;AAED,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC;IAEjE,MAAM;
|
|
1
|
+
{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,CAAA;AAEpB,OAAoB,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAInE,UAAU,YAAa,SAAQ,gBAAgB;CAE9C;AAED,UAAU,YAAY;CAErB;AAED,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC;IAEjE,MAAM;CAmBT;AAED,eAAe,OAAO,CAAA"}
|
|
@@ -12,7 +12,7 @@ class NavLeft extends React.PureComponent {
|
|
|
12
12
|
React.createElement(Scrollbars, { style: { height: 'calc(100vh)' }, autoHide: true, autoHideTimeout: 1000 },
|
|
13
13
|
React.createElement("div", { className: collapsed ? "logonly" : "logo" },
|
|
14
14
|
React.createElement("a", { href: "#/home" }, collapsed ? React.createElement(Image, { src: logo }) : React.createElement("h1", null, Units.programName_NavLeft()))),
|
|
15
|
-
React.createElement(Menu2layers, Object.assign({}, this.props)))));
|
|
15
|
+
React.createElement(Menu2layers, Object.assign({ mode: "inline", theme: "dark" }, this.props)))));
|
|
16
16
|
}
|
|
17
17
|
}
|
|
18
18
|
export default NavLeft;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,WAA+B,MAAM,sBAAsB,CAAC;AACnE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,KAAK,
|
|
1
|
+
{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,aAAa,CAAA;AACpB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,WAA+B,MAAM,sBAAsB,CAAC;AACnE,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAC,KAAK,EAAe,MAAM,MAAM,CAAC;AACzC,OAAO,IAAI,MAAM,6BAA6B,CAAC;AAS/C,MAAM,OAAQ,SAAQ,KAAK,CAAC,aAAyC;IAEjE,MAAM;QACF,IAAI,EAAC,SAAS,EAAC,GAAC,IAAI,CAAC,KAAK,CAAA;QAC1B,OAAO,CACH;YACI,oBAAC,UAAU,IAAC,KAAK,EAAE,EAAC,MAAM,EAAE,aAAa,EAAC,EAAE,QAAQ,QAAC,eAAe,EAAE,IAAI;gBACtE,6BAAK,SAAS,EAAE,SAAS,CAAA,CAAC,CAAA,SAAS,CAAC,CAAC,CAAA,MAAM;oBACvC,2BAAG,IAAI,EAAC,QAAQ,IACX,SAAS,CAAA,CAAC,CAAA,oBAAC,KAAK,IACb,GAAG,EAAE,IAAI,GACX,CAAC,CAAC,CAAA,gCAAK,KAAK,CAAC,mBAAmB,EAAE,CAAM,CAC1C,CACF;gBACN,oBAAC,WAAW,kBAAG,IAAI,EAAC,QAAQ,EACX,KAAK,EAAC,MAAM,IAAK,IAAI,CAAC,KAAK,EAAgB,CACnD,CACX,CAET,CAAA;IACL,CAAC;CACJ;AAED,eAAe,OAAO,CAAA"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "aldehyde",
|
|
3
|
-
"version": "0.1.
|
|
3
|
+
"version": "0.1.10",
|
|
4
4
|
"author": "cosmicparticle",
|
|
5
5
|
"main": "lib/index.js",
|
|
6
6
|
"module": "src/aldehyde/index.txs",
|
|
@@ -14,7 +14,7 @@
|
|
|
14
14
|
"build": "cross-env NODE_ENV=production webpack --config config/webpack.prod.js",
|
|
15
15
|
"dev": "cross-env NODE_ENV=development webpack server --config config/webpack.dev.js",
|
|
16
16
|
"package-npm": "yarn tsc && yarn build",
|
|
17
|
-
"npm:publish":"yarn tsc && npm version patch && npm publish",
|
|
17
|
+
"npm:publish": "yarn tsc && npm version patch && npm publish",
|
|
18
18
|
"clean-lib": "rimraf lib && rimraf templib && rimraf dist",
|
|
19
19
|
"tsc": "yarn clean-lib && tsc && yarn copy-files",
|
|
20
20
|
"copy-files": "copyfiles -u 3 templib/src/aldehyde/**/* lib/ && copyfiles -u 2 src/aldehyde/**/*.html src/aldehyde/**/*.css src/aldehyde/**/*.png lib/"
|
|
@@ -3,9 +3,10 @@ import {Menu} from 'antd';
|
|
|
3
3
|
import {BlockMenu} from "../../tmpl/interface";
|
|
4
4
|
import MenuRender from './menu-render';
|
|
5
5
|
import {withRouter} from 'react-router-dom';
|
|
6
|
+
import {MenuProps} from "antd/lib/menu";
|
|
6
7
|
|
|
7
8
|
|
|
8
|
-
export interface Menu2layersProps {
|
|
9
|
+
export interface Menu2layersProps extends MenuProps{
|
|
9
10
|
blockMenu: BlockMenu;
|
|
10
11
|
collapsed?: boolean;
|
|
11
12
|
currentL2MenuId?: string;
|
|
@@ -72,13 +73,12 @@ class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState
|
|
|
72
73
|
}
|
|
73
74
|
|
|
74
75
|
render() {
|
|
75
|
-
const {blockMenu, collapsed, currentL2MenuId} = this.props;
|
|
76
|
+
const {blockMenu, collapsed, currentL2MenuId,...other} = this.props;
|
|
76
77
|
const {openKeys} = this.state;
|
|
77
78
|
|
|
78
79
|
return (
|
|
79
80
|
<Menu
|
|
80
|
-
|
|
81
|
-
theme="dark"
|
|
81
|
+
{...other}
|
|
82
82
|
onOpenChange={this.handleOpen} //手风琴
|
|
83
83
|
selectedKeys={currentL2MenuId ? [currentL2MenuId.toString()] : undefined}
|
|
84
84
|
openKeys={!collapsed?openKeys:undefined}
|
|
@@ -3,7 +3,7 @@ import './index.css'
|
|
|
3
3
|
import Units from '../../units';
|
|
4
4
|
import Menu2layers, {Menu2layersProps} from "../menu/menu-2layers";
|
|
5
5
|
import Scrollbars from 'react-custom-scrollbars';
|
|
6
|
-
import {Image, Layout} from 'antd';
|
|
6
|
+
import {Image, Layout, Menu} from 'antd';
|
|
7
7
|
import logo from '../../../../public/logo.png';
|
|
8
8
|
interface NavLeftProps extends Menu2layersProps {
|
|
9
9
|
|
|
@@ -27,7 +27,8 @@ class NavLeft extends React.PureComponent<NavLeftProps, NavLeftState> {
|
|
|
27
27
|
/> :<h1>{Units.programName_NavLeft()}</h1>}
|
|
28
28
|
</a>
|
|
29
29
|
</div>
|
|
30
|
-
<Menu2layers
|
|
30
|
+
<Menu2layers mode="inline"
|
|
31
|
+
theme="dark" {...this.props}></Menu2layers>
|
|
31
32
|
</Scrollbars>
|
|
32
33
|
</div>
|
|
33
34
|
|