aldehyde 0.2.98 → 0.2.100

package/lib/layout/menu/block.d.ts

@@ -1,5 +1,7 @@
 import React from "react";
 import { BlockMenu } from "../../tmpl/interface";
+import { LocaleContext } from "../../locale/LocaleProvider";
+import "./block.less";
 export interface BlockProps {
     blocks: BlockMenu[];
     currentBlockId?: string;
@@ -9,10 +11,20 @@ export interface BlockProps {
 interface BlockState {
 }
 declare class Block extends React.PureComponent<BlockProps, BlockState> {
+    static contextType: React.Context<{
+        locale: import("../../locale/langMp").LocaleType;
+        langPkg: any;
+        changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        t: (...strs: string[]) => string;
+        translate: (...strs: string[]) => string;
+    }>;
+    context: React.ContextType<typeof LocaleContext>;
     constructor(props: any);
     getSubMenu: (blockMenu: BlockMenu) => import("antd/es/menu/hooks/useItems").ItemType[];
     findBlockId: (blocks: BlockMenu[], currentL2MenuId: string) => string;
-    render(): React.JSX.Element | React.JSX.Element[];
+    get computedBlocks(): BlockMenu[];
+    get menuItems(): import("antd/es/menu/hooks/useItems").ItemType[];
+    render(): React.JSX.Element;
 }
 export default Block;
 //# sourceMappingURL=block.d.ts.map

package/lib/layout/menu/block.d.ts.map

@@ -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,UAAU,cAAc,SAAS,sDAEhC;IAED,WAAW,WAAW,SAAS,EAAE,mBAAiB,MAAM,YAyBvD;IAED,MAAM;CAiCT;AAED,eAAe,KAAK,CAAC"}
+{"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,EAAE,MAAM,sBAAsB,CAAC;AAEjD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,cAAc,CAAC;AAEtB,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,qDAgBZ;IAED,MAAM;CAuDP;AAED,eAAe,KAAK,CAAC"}

package/lib/layout/menu/block.js

@@ -1,6 +1,8 @@
 import React from "react";
-import { Dropdown } from 'antd';
-import MenuRender from './menu-render';
+import { Menu } from "antd";
+import MenuRender from "./menu-render";
+import { LocaleContext } from "../../locale/LocaleProvider";
+import "./block.less";
 class Block extends React.PureComponent {
     constructor(props) {
         super(props);
@@ -34,9 +36,44 @@ class Block extends React.PureComponent {
             return blockId;
         };
     }
+    get computedBlocks() {
+        const { translate } = this.context;
+        const blocks = JSON.parse(JSON.stringify(this.props.blocks));
+        blocks &&
+            Array.isArray(blocks) &&
+            blocks.forEach((block) => {
+                block.title = translate("${" + block.title + "}");
+                const dropdownMenu = block.items;
+                dropdownMenu &&
+                    Array.isArray(dropdownMenu) &&
+                    dropdownMenu.forEach((menu) => {
+                        menu.title = translate("${" + menu.title + "}");
+                    });
+            });
+        return blocks;
+    }
+    get menuItems() {
+        const blocks = this.computedBlocks;
+        const items = [];
+        blocks.forEach((block) => {
+            const item = {
+                className: "menu-item",
+                label: block.title,
+                key: block.id,
+                children: this.getSubMenu(block),
+            };
+            items.push(item);
+        });
+        return items;
+    }
     render() {
         const { currentBlockId, blocks, currentL2MenuId, activeColor } = this.props;
-        const syyy = { '--header-block-active-bottom-color': activeColor ? activeColor : "#1E90FF", '--header-top-active-background': activeColor ? activeColor : "#1E90FF" };
+        const syyy = {
+            "--header-block-active-bottom-color": activeColor
+                ? activeColor
+                : "#1E90FF",
+            "--header-top-active-background": activeColor ? activeColor : "#1E90FF",
+        };
         if (!blocks || blocks.length < 1) {
             return React.createElement(React.Fragment, null);
         }
@@ -47,12 +84,33 @@ class Block extends React.PureComponent {
         if (!blockId) {
             blockId = blocks.at(0).id;
         }
-        return (blocks.map((item, index) => {
-            return React.createElement("div", { key: index, className: `${item.id == blockId ? "active" : ""} header-block`, style: syyy },
-                React.createElement(Dropdown, { menu: { items: this.getSubMenu(item) } },
-                    React.createElement("a", { className: "dropdown-link", style: item.id == blockId ? { color: '#fff' } : { color: activeColor }, rel: "noopener noreferrer" }, item.title)));
-        }));
+        // return this.computedBlocks.map((item, index) => {
+        //   return (
+        //     <div
+        //       key={index}
+        //       className={`${item.id == blockId ? "active" : ""} header-block`}
+        //       style={syyy}
+        //     >
+        //       <Dropdown menu={{ items: this.getSubMenu(item) }}>
+        //         <a
+        //           className="dropdown-link"
+        //           style={
+        //             item.id == blockId ? { color: "#fff" } : { color: activeColor }
+        //           }
+        //           rel="noopener noreferrer"
+        //         >
+        //           {item.title}
+        //         </a>
+        //       </Dropdown>
+        //     </div>
+        //   );
+        // });
+        return (React.createElement(Menu, { mode: "horizontal", defaultSelectedKeys: [currentBlockId, currentL2MenuId], items: this.menuItems, style: {
+                flex: 1,
+                minWidth: 0,
+            } }));
     }
 }
+Block.contextType = LocaleContext;
 export default Block;
 //# sourceMappingURL=block.js.map

package/lib/layout/menu/block.js.map

@@ -1 +1 @@
-{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/l2menu-quick-bar.d.ts

@@ -1,6 +1,7 @@
-import React from 'react';
-import 'antd/dist/reset.css';
+import React from "react";
+import "antd/dist/reset.css";
 import { Level2Menu } from "../../tmpl/interface";
+import { LocaleContext } from "../../locale/LocaleProvider";
 interface L2MenuQuickBarProps {
     backgroudColor?: string;
 }
@@ -24,6 +25,14 @@ declare class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2
     static defaultProps: {
         backgroudColor: string;
     };
+    static contextType: React.Context<{
+        locale: import("../../locale/langMp").LocaleType;
+        langPkg: any;
+        changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        t: (...strs: string[]) => string;
+        translate: (...strs: string[]) => string;
+    }>;
+    context: React.ContextType<typeof LocaleContext>;
     componentDidMount(): Promise<void>;
     showDraw: (currentId: string) => void;
     closeDrawer: () => void;

package/lib/layout/menu/l2menu-quick-bar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"l2menu-quick-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAA;AAG1C,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAC,UAAU,EAAC,MAAM,sBAAsB,CAAC;AAIhD,UAAU,mBAAmB;IACzB,cAAc,CAAC,EAAC,MAAM,CAAC;CAC1B;AAED,UAAU,QAAQ;IACd,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACjB;AAED,UAAU,mBAAmB;IACzB,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAC,OAAO,CAAC;IAClB,SAAS,CAAC,EAAC,MAAM,CAAC;IAClB,QAAQ,CAAC,EAAC,OAAO,CAAC;CACrB;AAGD,cAAM,cAAe,SAAQ,KAAK,CAAC,aAAa,CAAC,mBAAmB,EAAE,mBAAmB,CAAC;IACtF,KAAK;;;;;MAKJ;IACD,MAAM,CAAE,YAAY;;MAEnB;IAEK,iBAAiB;IAqBvB,QAAQ,cAAY,MAAM,UAOzB;IAED,WAAW,aAIV;IAED,cAAc,cAAe,QAAQ,EAAE,uBAmCtC;IAGD,MAAM;CA2BT;AAED,eAAe,cAAc,CAAC"}
+{"version":3,"file":"l2menu-quick-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAG7C,OAAO,qBAAqB,CAAC;AAC7B,OAAO,EAAE,UAAU,EAAE,MAAM,sBAAsB,CAAC;AAGlD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,mBAAmB;IAC3B,cAAc,CAAC,EAAE,MAAM,CAAC;CACzB;AAED,UAAU,QAAQ;IAChB,MAAM,EAAE,UAAU,CAAC;IACnB,KAAK,EAAE,MAAM,CAAC;CACf;AAED,UAAU,mBAAmB;IAC3B,SAAS,CAAC,EAAE,QAAQ,EAAE,CAAC;IACvB,QAAQ,CAAC,EAAE,OAAO,CAAC;IACnB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,cAAM,cAAe,SAAQ,KAAK,CAAC,aAAa,CAC9C,mBAAmB,EACnB,mBAAmB,CACpB;IACC,KAAK;;;;;MAKH;IACF,MAAM,CAAC,YAAY;;MAEjB;IACF,MAAM,CAAC,WAAW;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAqBvB,QAAQ,cAAe,MAAM,UAM3B;IAEF,WAAW,aAIT;IAEF,cAAc,cAAe,QAAQ,EAAE,uBAkDrC;IAEF,MAAM;CA4BP;AAED,eAAe,cAAc,CAAC"}

package/lib/layout/menu/l2menu-quick-bar.js

@@ -7,12 +7,13 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React from 'react';
-import { Dropdown, Menu, Drawer, Space, Button } from 'antd';
-import { AppstoreOutlined } from '@ant-design/icons';
-import 'antd/dist/reset.css';
-import HCDataSource from '../../tmpl/hc-data-source';
+import React from "react";
+import { Dropdown, Menu, Drawer, Space, Button } from "antd";
+import { AppstoreOutlined } from "@ant-design/icons";
+import "antd/dist/reset.css";
+import HCDataSource from "../../tmpl/hc-data-source";
 import LtmplTable from "../../module/ltmpl-table";
+import { LocaleContext } from "../../locale/LocaleProvider";
 class L2MenuQuickBar extends React.PureComponent {
     constructor() {
         super(...arguments);
@@ -26,24 +27,26 @@ class L2MenuQuickBar extends React.PureComponent {
             // console.log("点击了L2MenuQuickBar",currentId);
             this.setState({
                 currentId,
-                showDraw: true
+                showDraw: true,
             });
         };
         this.closeDrawer = () => {
             this.setState({
-                showDraw: false
+                showDraw: false,
             });
         };
         this.renderQuickBar = (quickBars) => {
             const { backgroudColor } = this.props;
             let total = 0;
-            const syyy = { '--message-bar-backgroupd': backgroudColor };
+            const syyy = {
+                "--message-bar-backgroupd": backgroudColor,
+            };
             const menu = (React.createElement(Menu, { key: 1 }, quickBars.map((quickBar, index) => {
                 if (quickBar.count) {
                     total = total + quickBar.count;
                 }
-                return React.createElement(Menu.Item, { key: index },
-                    React.createElement("span", { onClick: () => this.showDraw(quickBar.l2Menu.id) }, quickBar.l2Menu.title));
+                return (React.createElement(Menu.Item, { key: index },
+                    React.createElement("span", { onClick: () => this.showDraw(quickBar.l2Menu.id) }, quickBar.l2Menu.title)));
             })));
             if (!quickBars || quickBars.length == 0) {
                 return;
@@ -51,21 +54,21 @@ class L2MenuQuickBar extends React.PureComponent {
             else if (quickBars.length == 1) {
                 let quickBar = quickBars[0];
                 const l2Menu = quickBar.l2Menu;
-                return (React.createElement("div", { className: 'message-bar', style: syyy, onClick: () => this.showDraw(quickBar.l2Menu.id) },
-                    React.createElement("span", { style: { fontSize: '20px', color: '#08c' } },
+                return (React.createElement("div", { className: "message-bar", style: syyy, onClick: () => this.showDraw(quickBar.l2Menu.id) },
+                    React.createElement("span", { style: { fontSize: "20px", color: "#08c" } },
                         React.createElement(AppstoreOutlined, null))));
             }
             else {
-                return React.createElement(Dropdown, { overlay: menu, placement: "bottomCenter" },
-                    React.createElement("div", { className: 'message-bar', style: syyy },
-                        React.createElement("span", { style: { fontSize: '20px', color: '#08c' } },
-                            React.createElement(AppstoreOutlined, null))));
+                return (React.createElement(Dropdown, { overlay: menu, placement: "bottomCenter" },
+                    React.createElement("div", { className: "message-bar", style: syyy },
+                        React.createElement("span", { style: { fontSize: "20px", color: "#08c" } },
+                            React.createElement(AppstoreOutlined, null)))));
             }
         };
     }
     componentDidMount() {
         return __awaiter(this, void 0, void 0, function* () {
-            let l2Menus = yield HCDataSource.fastMenu('QuickQueryBar');
+            let l2Menus = yield HCDataSource.fastMenu("QuickQueryBar");
             const quickBars = [];
             if (l2Menus) {
                 for (const item of l2Menus) {
@@ -87,9 +90,10 @@ class L2MenuQuickBar extends React.PureComponent {
     }
     render() {
         const { quickBars, showDraw, currentId } = this.state;
+        const { translate } = this.context;
         return (React.createElement(React.Fragment, null,
             quickBars ? this.renderQuickBar(quickBars) : "",
-            React.createElement(Drawer, { placement: 'left', title: "\u5FEB\u6377\u67E5\u8BE2", closable: true, mask: false, onClose: this.closeDrawer, open: showDraw, width: 'calc(100% - 280px)', style: {
+            React.createElement(Drawer, { placement: "left", title: translate("${快捷查询}"), closable: true, mask: false, onClose: this.closeDrawer, open: showDraw, width: "calc(100% - 280px)", style: {
                     maxWidth: 1960,
                 }, extra: React.createElement(Space, null,
                     React.createElement(Button, { onClick: this.closeDrawer }, "\u5173\u95ED")) },
@@ -97,7 +101,8 @@ class L2MenuQuickBar extends React.PureComponent {
     }
 }
 L2MenuQuickBar.defaultProps = {
-    backgroudColor: "#4a5f74"
+    backgroudColor: "#4a5f74",
 };
+L2MenuQuickBar.contextType = LocaleContext;
 export default L2MenuQuickBar;
 //# sourceMappingURL=l2menu-quick-bar.js.map

package/lib/layout/menu/l2menu-quick-bar.js.map

@@ -1 +1 @@
-{"version":3,"file":"l2menu-quick-bar.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAsB,MAAM,OAAO,CAAA;AAC1C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAC,MAAM,EAAC,MAAM,MAAM,CAAA;AAC1D,OAAO,EAAC,gBAAgB,EAAC,MAAM,mBAAmB,CAAC;AACnD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAA;AACpD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAmBlD,MAAM,cAAe,SAAQ,KAAK,CAAC,aAAuD;IAA1F;;QACI,UAAK,GAAC;YACF,SAAS,EAAC,SAAS;YACnB,QAAQ,EAAC,KAAK;YACd,SAAS,EAAC,SAAS;YACnB,QAAQ,EAAC,KAAK;SACjB,CAAA;QA0BD,aAAQ,GAAC,CAAC,SAAgB,EAAC,EAAE;YACzB,8CAA8C;YAC9C,IAAI,CAAC,QAAQ,CAAC;gBACV,SAAS;gBACT,QAAQ,EAAC,IAAI;aAChB,CAAC,CAAA;QAEN,CAAC,CAAA;QAED,gBAAW,GAAC,GAAE,EAAE;YACZ,IAAI,CAAC,QAAQ,CAAC;gBACV,QAAQ,EAAC,KAAK;aACjB,CAAC,CAAA;QACN,CAAC,CAAA;QAED,mBAAc,GAAG,CAAC,SAAqB,EAAE,EAAE;YACvC,MAAM,EAAC,cAAc,EAAC,GAAC,IAAI,CAAC,KAAK,CAAA;YACjC,IAAK,KAAK,GAAQ,CAAC,CAAC;YACpB,MAAM,IAAI,GAAe,EAAC,0BAA0B,EAAC,cAAc,EAAkB,CAAC;YACtF,MAAM,IAAI,GAAG,CACT,oBAAC,IAAI,IAAC,GAAG,EAAE,CAAC,IACN,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;gBAChC,IAAG,QAAQ,CAAC,KAAK,EAAC,CAAC;oBACf,KAAK,GAAC,KAAK,GAAC,QAAQ,CAAC,KAAK,CAAC;gBAC/B,CAAC;gBACN,OAAO,oBAAC,IAAI,CAAC,IAAI,IAAC,GAAG,EAAE,KAAK;oBACxB,8BAAM,OAAO,EAAE,GAAE,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IAC9C,QAAQ,CAAC,MAAM,CAAC,KAAK,CACpB,CAEI,CAAA;YAClB,CAAC,CAAC,CACK,CACV,CAAC;YAEF,IAAG,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,IAAE,CAAC,EAAC,CAAC;gBAClC,OAAO;YACX,CAAC;iBAAK,IAAG,SAAS,CAAC,MAAM,IAAE,CAAC,EAAC,CAAC;gBAC1B,IAAI,QAAQ,GAAC,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC1B,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;gBAC/B,OAAO,CAAC,6BAAM,SAAS,EAAE,aAAa,EAAG,KAAK,EAAE,IAAI,EAAG,OAAO,EAAE,GAAE,EAAE,CAAA,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBAChG,8BAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;wBAAG,oBAAC,gBAAgB,OAAG,CAAO,CAC9E,CAAC,CAAA;YACX,CAAC;iBAAI,CAAC;gBACF,OAAO,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,cAAc;oBACpD,6BAAM,SAAS,EAAE,aAAa,EAAG,KAAK,EAAE,IAAI;wBACzC,8BAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;4BAAG,oBAAC,gBAAgB,OAAG,CAAO,CAC5E,CACC,CAAA;YACf,CAAC;QACL,CAAC,CAAA;IA8BL,CAAC;IArGS,iBAAiB;;YACnB,IAAI,OAAO,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAC3D,MAAM,SAAS,GAAa,EAAE,CAAC;YAC/B,IAAG,OAAO,EAAC,CAAC;gBACR,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;oBACzB,IAAG,IAAI,CAAC,QAAQ,EAAC,CAAC;wBACd,SAAS;oBACb,CAAC;oBACD,MAAM,QAAQ,GAAU;wBACpB,MAAM,EAAC,IAAI;wBACX,KAAK,EAAC,CAAC;qBACV,CAAC;oBACF,IAAI,IAAI,GAAC,IAAI,CAAC;oBACd,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC7B,CAAC;YACL,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC;gBACV,SAAS;aACZ,CAAC,CAAC;QACP,CAAC;KAAA;IAsDD,MAAM;QACF,MAAM,EAAC,SAAS,EAAC,QAAQ,EAAC,SAAS,EAAC,GAAG,IAAI,CAAC,KAAK,CAAC;QAClD,OAAO,CACH;YACK,SAAS,CAAA,CAAC,CAAA,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAA,CAAC,CAAA,EAAE;YAC5C,oBAAC,MAAM,IACH,SAAS,EAAE,MAAM,EACjB,KAAK,EAAC,0BAAM,EACZ,QAAQ,EAAE,IAAI,EACd,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,IAAI,CAAC,WAAW,EACzB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE;oBACH,QAAQ,EAAE,IAAI;iBACjB,EACD,KAAK,EACD,oBAAC,KAAK;oBACF,oBAAC,MAAM,IAAC,OAAO,EAAE,IAAI,CAAC,WAAW,mBAAa,CAC1C;gBAGb,oBAAC,UAAU,IAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,GAAe,CACzD,CACV,CACN,CAAC;IACN,CAAC;;AAxGO,2BAAY,GAAC;IACjB,cAAc,EAAC,SAAS;CAC3B,AAFmB,CAEnB;AAyGL,eAAe,cAAc,CAAC"}
+{"version":3,"file":"l2menu-quick-bar.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/l2menu-quick-bar.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAAE,QAAQ,EAAE,IAAI,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,MAAM,CAAC;AAC7D,OAAO,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AACrD,OAAO,qBAAqB,CAAC;AAE7B,OAAO,YAAY,MAAM,2BAA2B,CAAC;AACrD,OAAO,UAAU,MAAM,0BAA0B,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAkB5D,MAAM,cAAe,SAAQ,KAAK,CAAC,aAGlC;IAHD;;QAIE,UAAK,GAAG;YACN,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,KAAK;YACf,SAAS,EAAE,SAAS;YACpB,QAAQ,EAAE,KAAK;SAChB,CAAC;QA4BF,aAAQ,GAAG,CAAC,SAAiB,EAAE,EAAE;YAC/B,8CAA8C;YAC9C,IAAI,CAAC,QAAQ,CAAC;gBACZ,SAAS;gBACT,QAAQ,EAAE,IAAI;aACf,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,gBAAW,GAAG,GAAG,EAAE;YACjB,IAAI,CAAC,QAAQ,CAAC;gBACZ,QAAQ,EAAE,KAAK;aAChB,CAAC,CAAC;QACL,CAAC,CAAC;QAEF,mBAAc,GAAG,CAAC,SAAqB,EAAE,EAAE;YACzC,MAAM,EAAE,cAAc,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;YACtC,IAAI,KAAK,GAAW,CAAC,CAAC;YACtB,MAAM,IAAI,GAAkB;gBAC1B,0BAA0B,EAAE,cAAc;aAC1B,CAAC;YACnB,MAAM,IAAI,GAAG,CACX,oBAAC,IAAI,IAAC,GAAG,EAAE,CAAC,IACT,SAAS,CAAC,GAAG,CAAC,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;gBACjC,IAAI,QAAQ,CAAC,KAAK,EAAE,CAAC;oBACnB,KAAK,GAAG,KAAK,GAAG,QAAQ,CAAC,KAAK,CAAC;gBACjC,CAAC;gBACD,OAAO,CACL,oBAAC,IAAI,CAAC,IAAI,IAAC,GAAG,EAAE,KAAK;oBACnB,8BAAM,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC,IACnD,QAAQ,CAAC,MAAM,CAAC,KAAK,CACjB,CACG,CACb,CAAC;YACJ,CAAC,CAAC,CACG,CACR,CAAC;YAEF,IAAI,CAAC,SAAS,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACxC,OAAO;YACT,CAAC;iBAAM,IAAI,SAAS,CAAC,MAAM,IAAI,CAAC,EAAE,CAAC;gBACjC,IAAI,QAAQ,GAAG,SAAS,CAAC,CAAC,CAAC,CAAC;gBAC5B,MAAM,MAAM,GAAG,QAAQ,CAAC,MAAM,CAAC;gBAC/B,OAAO,CACL,6BACE,SAAS,EAAE,aAAa,EACxB,KAAK,EAAE,IAAI,EACX,OAAO,EAAE,GAAG,EAAE,CAAC,IAAI,CAAC,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,CAAC;oBAEhD,8BAAM,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;wBAC9C,oBAAC,gBAAgB,OAAG,CACf,CACH,CACP,CAAC;YACJ,CAAC;iBAAM,CAAC;gBACN,OAAO,CACL,oBAAC,QAAQ,IAAC,OAAO,EAAE,IAAI,EAAE,SAAS,EAAC,cAAc;oBAC/C,6BAAK,SAAS,EAAE,aAAa,EAAE,KAAK,EAAE,IAAI;wBACxC,8BAAM,KAAK,EAAE,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE;4BAC9C,oBAAC,gBAAgB,OAAG,CACf,CACH,CACG,CACZ,CAAC;YACJ,CAAC;QACH,CAAC,CAAC;IA8BJ,CAAC;IAnHO,iBAAiB;;YACrB,IAAI,OAAO,GAAG,MAAM,YAAY,CAAC,QAAQ,CAAC,eAAe,CAAC,CAAC;YAC3D,MAAM,SAAS,GAAe,EAAE,CAAC;YACjC,IAAI,OAAO,EAAE,CAAC;gBACZ,KAAK,MAAM,IAAI,IAAI,OAAO,EAAE,CAAC;oBAC3B,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;wBAClB,SAAS;oBACX,CAAC;oBACD,MAAM,QAAQ,GAAa;wBACzB,MAAM,EAAE,IAAI;wBACZ,KAAK,EAAE,CAAC;qBACT,CAAC;oBACF,IAAI,IAAI,GAAG,IAAI,CAAC;oBAChB,SAAS,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBAC3B,CAAC;YACH,CAAC;YAED,IAAI,CAAC,QAAQ,CAAC;gBACZ,SAAS;aACV,CAAC,CAAC;QACL,CAAC;KAAA;IAmED,MAAM;QACJ,MAAM,EAAE,SAAS,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,KAAK,CAAC;QACtD,MAAM,EAAE,SAAS,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC;QACnC,OAAO,CACL;YACG,SAAS,CAAC,CAAC,CAAC,IAAI,CAAC,cAAc,CAAC,SAAS,CAAC,CAAC,CAAC,CAAC,EAAE;YAChD,oBAAC,MAAM,IACL,SAAS,EAAE,MAAM,EACjB,KAAK,EAAE,SAAS,CAAC,SAAS,CAAC,EAC3B,QAAQ,EAAE,IAAI,EACd,IAAI,EAAE,KAAK,EACX,OAAO,EAAE,IAAI,CAAC,WAAW,EACzB,IAAI,EAAE,QAAQ,EACd,KAAK,EAAE,oBAAoB,EAC3B,KAAK,EAAE;oBACL,QAAQ,EAAE,IAAI;iBACf,EACD,KAAK,EACH,oBAAC,KAAK;oBACJ,oBAAC,MAAM,IAAC,OAAO,EAAE,IAAI,CAAC,WAAW,mBAAa,CACxC;gBAGV,oBAAC,UAAU,IAAC,SAAS,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,GAAe,CACxD,CACR,CACJ,CAAC;IACJ,CAAC;;AAxHM,2BAAY,GAAG;IACpB,cAAc,EAAE,SAAS;CAC1B,AAFkB,CAEjB;AACK,0BAAW,GAAG,aAAa,AAAhB,CAAiB;AAwHrC,eAAe,cAAc,CAAC"}

package/lib/layout/menu/menu-2layers.d.ts

@@ -1,13 +1,23 @@
 import React from "react";
 import { Menu2layersProps } from "../../tmpl/interface";
+import { LocaleContext } from "../../locale/LocaleProvider";
 interface Menu2layersState {
     openKeys?: string[];
 }
 declare class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2layersState> {
+    static contextType: React.Context<{
+        locale: import("../../locale/langMp").LocaleType;
+        langPkg: any;
+        changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        t: (...strs: string[]) => string;
+        translate: (...strs: string[]) => string;
+    }>;
+    context: React.ContextType<typeof LocaleContext>;
     constructor(props: any);
     componentDidMount(): void;
     componentDidUpdate(prevProps: any): void;
     handleOpen: (openKeys: any) => void;
+    get computedBlockMenu(): any;
     render(): React.JSX.Element;
 }
 export default Menu2layers;

package/lib/layout/menu/menu-2layers.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAC,gBAAgB,EAAC,MAAM,sBAAsB,CAAC;AAGtD,UAAU,gBAAgB;IACtB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACvB;AAED,cAAM,WAAY,SAAQ,KAAK,CAAC,aAAa,CAAC,gBAAgB,EAAE,gBAAgB,CAAC;gBAGjE,KAAK,KAAA;IAOjB,iBAAiB;IAUjB,kBAAkB,CAAC,SAAS,KAAA;IAwB5B,UAAU,0BAOT;IAED,MAAM;CAeT;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"menu-2layers.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAExD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,MAAM,EAAE,CAAC;CACrB;AAED,cAAM,WAAY,SAAQ,KAAK,CAAC,aAAa,CAC3C,gBAAgB,EAChB,gBAAgB,CACjB;IACC,MAAM,CAAC,WAAW;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBACrC,KAAK,KAAA;IAOjB,iBAAiB;IAYjB,kBAAkB,CAAC,SAAS,KAAA;IA8B5B,UAAU,0BAOR;IAEF,IAAI,iBAAiB,QAUpB;IAED,MAAM;CA0BP;AAED,eAAe,WAAW,CAAC"}

package/lib/layout/menu/menu-2layers.js

@@ -10,8 +10,9 @@ var __rest = (this && this.__rest) || function (s, e) {
     return t;
 };
 import React from "react";
-import { Menu } from 'antd';
-import MenuRender from './menu-render';
+import { Menu } from "antd";
+import MenuRender from "./menu-render";
+import { LocaleContext } from "../../locale/LocaleProvider";
 class Menu2layers extends React.PureComponent {
     constructor(props) {
         super(props);
@@ -20,7 +21,7 @@ class Menu2layers extends React.PureComponent {
                 openKeys.splice(0, 1);
             }
             this.setState({
-                openKeys
+                openKeys,
             });
         };
         this.state = {
@@ -30,10 +31,12 @@ class Menu2layers extends React.PureComponent {
     componentDidMount() {
         const { currentL2MenuId, blockMenu, collapsed } = this.props;
         const { openKeys } = this.state;
-        let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
+        let openKey = blockMenu
+            ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+            : undefined;
         if (openKey && openKeys.length < 1) {
             this.setState({
-                openKeys: [openKey.toString()]
+                openKeys: [openKey.toString()],
             });
         }
     }
@@ -43,7 +46,9 @@ class Menu2layers extends React.PureComponent {
         const { openKeys } = this.state;
         if (!preBlockMenu || !blockMenu || blockMenu.id != preBlockMenu.id) {
             //console.log('currentL2MenuId:',currentL2MenuId);
-            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
+            let openKey = blockMenu
+                ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+                : undefined;
             if (openKey) {
                 this.setState({
                     openKeys: [openKey],
@@ -51,8 +56,12 @@ class Menu2layers extends React.PureComponent {
             }
         }
         else {
-            let openKey = blockMenu ? MenuRender.findOpenId(blockMenu, currentL2MenuId) : undefined;
-            let preOpenKey = blockMenu ? MenuRender.findOpenId(preBlockMenu, preMenuId) : undefined;
+            let openKey = blockMenu
+                ? MenuRender.findOpenId(blockMenu, currentL2MenuId)
+                : undefined;
+            let preOpenKey = blockMenu
+                ? MenuRender.findOpenId(preBlockMenu, preMenuId)
+                : undefined;
             if ((!preOpenKey && openKey) || (openKey && openKey != preOpenKey)) {
                 this.setState({
                     openKeys: [openKey],
@@ -60,11 +69,25 @@ class Menu2layers extends React.PureComponent {
             }
         }
     }
+    get computedBlockMenu() {
+        const { translate } = this.context;
+        const menu = JSON.parse(JSON.stringify(this.props.blockMenu));
+        menu &&
+            Array.isArray(menu.items) &&
+            menu.items.forEach((item) => {
+                item.title = translate("${" + item.title + "}");
+                return item;
+            });
+        return menu;
+    }
     render() {
         const _a = this.props, { blockMenu, collapsed, currentL2MenuId, basePath } = _a, other = __rest(_a, ["blockMenu", "collapsed", "currentL2MenuId", "basePath"]);
         const { openKeys } = this.state;
-        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) : [] })));
+        return (React.createElement(Menu, Object.assign({}, other, { onOpenChange: this.handleOpen, selectedKeys: currentL2MenuId ? [currentL2MenuId.toString()] : undefined, openKeys: !collapsed ? openKeys : undefined, items: blockMenu
+                ? MenuRender.getMenu(this.computedBlockMenu, undefined, basePath)
+                : [] })));
     }
 }
+Menu2layers.contextType = LocaleContext;
 export default Menu2layers;
 //# sourceMappingURL=menu-2layers.js.map

package/lib/layout/menu/menu-2layers.js.map

@@ -1 +1 @@
-{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"menu-2layers.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/menu-2layers.tsx"],"names":[],"mappings":"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"}

package/lib/layout/menu/reset-password.d.ts

@@ -1,6 +1,7 @@
-import React from 'react';
-import { FormInstance } from 'antd';
-import 'antd/dist/reset.css';
+import React from "react";
+import { FormInstance } from "antd";
+import "antd/dist/reset.css";
+import { LocaleContext } from "../../locale/LocaleProvider";
 interface ResetPasswordProps {
     serverKey?: string;
 }
@@ -16,6 +17,14 @@ declare class ResetPassword extends React.PureComponent<ResetPasswordProps, Rese
         loading: boolean;
     };
     formRef: React.RefObject<FormInstance<any>>;
+    static contextType: React.Context<{
+        locale: import("../../locale/langMp").LocaleType;
+        langPkg: any;
+        changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        t: (...strs: string[]) => string;
+        translate: (...strs: string[]) => string;
+    }>;
+    context: React.ContextType<typeof LocaleContext>;
     componentDidMount(): Promise<void>;
     handleSubmit: (values: any) => Promise<void>;
     handleBlurCapture: () => void;

package/lib/layout/menu/reset-password.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"reset-password.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/reset-password.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAMS,YAAY,EAC3B,MAAM,MAAM,CAAC;AAEd,OAAO,qBAAqB,CAAC;AAG7B,UAAU,kBAAkB;IACxB,SAAS,CAAC,EAAC,MAAM,CAAC;CACrB;AAGD,UAAU,kBAAkB;IACxB,WAAW,CAAC,EAAC,OAAO,CAAC;IACrB,MAAM,CAAC,EAAC,MAAM,CAAC;IACf,OAAO,CAAC,EAAC,OAAO,CAAA;CACnB;AAGD,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAAC,kBAAkB,EAAE,kBAAkB,CAAC;IACnF,KAAK;;;;MAIJ;IACD,OAAO,qCAAmC;IAEpC,iBAAiB;IAUvB,YAAY,iCAkBX;IAED,iBAAiB,aAkBhB;IAED,OAAO,0BAyEN;IAED,MAAM;CAeT;AAED,eAAe,aAAa,CAAC"}
+{"version":3,"file":"reset-password.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/reset-password.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAQL,YAAY,EACb,MAAM,MAAM,CAAC;AAEd,OAAO,qBAAqB,CAAC;AAE7B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,kBAAkB;IAC1B,SAAS,CAAC,EAAE,MAAM,CAAC;CACpB;AAED,UAAU,kBAAkB;IAC1B,WAAW,CAAC,EAAE,OAAO,CAAC;IACtB,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,OAAO,CAAC,EAAE,OAAO,CAAC;CACnB;AAED,cAAM,aAAc,SAAQ,KAAK,CAAC,aAAa,CAC7C,kBAAkB,EAClB,kBAAkB,CACnB;IACC,KAAK;;;;MAIH;IACF,OAAO,qCAAmC;IAC1C,MAAM,CAAC,WAAW;;;;;;OAAiB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAQvB,YAAY,iCAwBV;IAEF,iBAAiB,aAuBf;IAEF,OAAO,0BAgGL;IAEF,MAAM;CA4BP;AAED,eAAe,aAAa,CAAC"}