aldehyde 0.2.99 → 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":"AAAA,OAAO,KAAsB,MAAM,OAAO,CAAC;AAC3C,OAAO,EAAE,QAAQ,EAAO,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,eAAU,GAAG,CAAC,SAAmB,EAAC,EAAE;YAChC,OAAO,UAAU,CAAC,OAAO,CAAC,SAAS,EAAC,IAAI,CAAC,CAAC;QAC9C,CAAC,CAAA;QAED,gBAAW,GAAG,CAAC,MAAkB,EAAC,eAAsB,EAAE,EAAE;YACxD,IAAI,OAAO,GAAQ,SAAS,CAAC;YAC7B,KAAI,MAAM,KAAK,IAAI,MAAM,EAAC,CAAC;gBACvB,IAAG,KAAK,CAAC,OAAO,EAAC,CAAC;oBACd,KAAI,MAAM,MAAM,IAAI,KAAK,CAAC,OAAO,EAAC,CAAC;wBAC/B,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,OAAO,EAAC,CAAC;4BAChC,IAAG,MAAM,CAAC,EAAE,KAAG,eAAe,EAAC,CAAC;gCAC5B,OAAO,GAAC,KAAK,CAAC,EAAE,CAAC;gCACjB,OAAO,OAAO,CAAC;4BACnB,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;qBAAI,CAAC;oBACF,KAAI,MAAM,MAAM,IAAI,KAAK,CAAC,KAAK,EAAC,CAAC;wBAC7B,KAAI,MAAM,MAAM,IAAI,MAAM,CAAC,KAAK,EAAC,CAAC;4BAC9B,IAAG,MAAM,CAAC,EAAE,KAAG,eAAe,EAAC,CAAC;gCAC5B,OAAO,GAAC,KAAK,CAAC,EAAE,CAAC;gCACjB,OAAO,OAAO,CAAC;4BACnB,CAAC;wBACL,CAAC;oBACL,CAAC;gBACL,CAAC;YAEL,CAAC;YACD,OAAO,OAAO,CAAC;QACnB,CAAC,CAAA;IA/BD,CAAC;IAiCD,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,CAAC;YAC3B,OAAO,yCAAK,CAAC;QACjB,CAAC;QACD,IAAI,OAAO,GAAC,cAAc,CAAC;QAC3B,IAAG,eAAe,IAAI,CAAC,OAAO,EAAC,CAAC;YAC5B,OAAO,GAAC,IAAI,CAAC,WAAW,CAAC,MAAM,EAAC,eAAe,CAAC,CAAC;QACrD,CAAC;QACD,IAAG,CAAC,OAAO,EAAC,CAAC;YACT,OAAO,GAAC,MAAM,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC;QAC5B,CAAC;QAED,OAAO,CACH,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,IAAI,EAAE,EAAE,KAAK,EAAC,IAAI,CAAC,UAAU,CAAC,IAAI,CAAC,EAAE;oBAC3C,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,EAC5D,GAAG,EAAC,qBAAqB,IAExB,IAAI,CAAC,KAAK,CACX,CACG,CACT,CAAA;QACV,CAAC,CAAC,CACL,CAAC;IACN,CAAC;CAEJ;AAED,eAAe,KAAK,CAAC"}
+{"version":3,"file":"block.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/block.tsx"],"names":[],"mappings":"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"}

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/sidebar/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AAGrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAIxD,UAAU,YAAa,SAAQ,gBAAgB;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAID,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAqDnC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AAGrB,OAAO,EAAE,gBAAgB,EAAE,MAAM,sBAAsB,CAAC;AAKxD,UAAU,YAAa,SAAQ,gBAAgB;IAC7C,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,IAAI,CAAC,EAAE,GAAG,CAAC;CACZ;AAID,QAAA,MAAM,OAAO,EAAE,KAAK,CAAC,EAAE,CAAC,YAAY,CAwDnC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/lib/layout/sidebar/index.js

@@ -4,8 +4,10 @@ import Units from "../../units";
 import Menu2layers from "../menu/menu-2layers";
 import Scrollbars from "react-custom-scrollbars";
 import { Image, theme } from "antd";
+import { useLocale } from "../../locale/useLocale";
 const { useToken } = theme;
 const SideBar = (props) => {
+    const { translate } = useLocale();
     const { token } = useToken();
     let syyy = { "--logo-blue-background": token.colorPrimary };
     let { collapsed } = props;
@@ -24,7 +26,7 @@ const SideBar = (props) => {
                         } },
                         React.createElement(React.Fragment, null,
                             props.logo ? (React.createElement(Image, { width: "30px", src: props.logo })) : (React.createElement(React.Fragment, null)),
-                            props.title ? props.title : Units.programName_NavLeft())))))),
+                            translate(props.title ? props.title : Units.programName_NavLeft()))))))),
             React.createElement(Menu2layers, Object.assign({ mode: "inline", theme: "light" }, props)))));
 };
 export default SideBar;

package/lib/layout/sidebar/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AACrB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAE/C,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAQpC,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AAC3B,MAAM,OAAO,GAA2B,CAAC,KAAK,EAAE,EAAE;IAChD,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7B,IAAI,IAAI,GAAG,EAAE,wBAAwB,EAAE,KAAK,CAAC,YAAY,EAAmB,CAAC;IAC7E,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC1B,OAAO,CACL;QACE,oBAAC,UAAU,IACT,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAChC,QAAQ,QACR,eAAe,EAAE,IAAI;YAErB,6BAAK,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI;gBAC9D,2BAAG,IAAI,EAAC,QAAQ,IACb,SAAS,CAAC,CAAC,CAAC,CACX,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CACX,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,IAAI,GAAI,CAC3B,CAAC,CAAC,CAAC,CACF,4BACE,KAAK,EAAE;wBACL,QAAQ,EAAE,QAAQ;wBAClB,MAAM,EAAE,MAAM;wBACd,WAAW,EAAE,OAAO;qBACrB,QAGE,CACN,CACF,CAAC,CAAC,CAAC,CACF;oBACE,4BACE,KAAK,EAAE;4BACL,QAAQ,EAAE,QAAQ;4BAClB,MAAM,EAAE,MAAM;4BACd,WAAW,EAAE,OAAO;yBACrB;wBAED;4BACG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CACZ,oBAAC,KAAK,IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,GAAI,CAC1C,CAAC,CAAC,CAAC,CACF,yCAAK,CACN;4BACA,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,EAAE,CACvD,CACA,CACJ,CACJ,CACC,CACA;YACN,oBAAC,WAAW,kBAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAC,OAAO,IAAK,KAAK,EAAgB,CACvD,CACT,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/sidebar/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,aAAa,CAAC;AACrB,OAAO,KAAK,MAAM,aAAa,CAAC;AAChC,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAE/C,OAAO,UAAU,MAAM,yBAAyB,CAAC;AACjD,OAAO,EAAE,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AAOnD,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AAC3B,MAAM,OAAO,GAA2B,CAAC,KAAK,EAAE,EAAE;IAChD,MAAM,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAClC,MAAM,EAAE,KAAK,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC7B,IAAI,IAAI,GAAG,EAAE,wBAAwB,EAAE,KAAK,CAAC,YAAY,EAAmB,CAAC;IAC7E,IAAI,EAAE,SAAS,EAAE,GAAG,KAAK,CAAC;IAC1B,OAAO,CACL;QACE,oBAAC,UAAU,IACT,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,EAChC,QAAQ,QACR,eAAe,EAAE,IAAI;YAErB,6BAAK,SAAS,EAAE,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,WAAW,EAAE,KAAK,EAAE,IAAI;gBAC9D,2BAAG,IAAI,EAAC,QAAQ,IACb,SAAS,CAAC,CAAC,CAAC,CACX,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CACX,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,IAAI,GAAI,CAC3B,CAAC,CAAC,CAAC,CACF,4BACE,KAAK,EAAE;wBACL,QAAQ,EAAE,QAAQ;wBAClB,MAAM,EAAE,MAAM;wBACd,WAAW,EAAE,OAAO;qBACrB,QAGE,CACN,CACF,CAAC,CAAC,CAAC,CACF;oBACE,4BACE,KAAK,EAAE;4BACL,QAAQ,EAAE,QAAQ;4BAClB,MAAM,EAAE,MAAM;4BACd,WAAW,EAAE,OAAO;yBACrB;wBAED;4BACG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CACZ,oBAAC,KAAK,IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,GAAI,CAC1C,CAAC,CAAC,CAAC,CACF,yCAAK,CACN;4BACA,SAAS,CACR,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,EAAE,CACxD,CACA,CACA,CACJ,CACJ,CACC,CACA;YACN,oBAAC,WAAW,kBAAC,IAAI,EAAC,QAAQ,EAAC,KAAK,EAAC,OAAO,IAAK,KAAK,EAAgB,CACvD,CACT,CACP,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,OAAO,CAAC"}

package/lib/locale/LocaleProvider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"LocaleProvider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/locale/LocaleProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAsC,MAAM,OAAO,CAAC;AAG7E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,eAAO,MAAM,aAAa;YAChB,UAAU;aACT,GAAG;kBACE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI;OACvC,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,MAAM;eACrB,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,MAAM;EA+BxC,CAAC;AAcH,eAAO,MAAM,cAAc,iBAAkB;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,sBA2GnE,CAAC"}
+{"version":3,"file":"LocaleProvider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/locale/LocaleProvider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAsC,MAAM,OAAO,CAAC;AAG7E,OAAO,EAAE,UAAU,EAAE,MAAM,UAAU,CAAC;AAGtC,eAAO,MAAM,aAAa;YAChB,UAAU;aACT,GAAG;kBACE,CAAC,MAAM,EAAE,UAAU,KAAK,IAAI;OACvC,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,MAAM;eACrB,CAAC,GAAG,IAAI,EAAE,MAAM,EAAE,KAAK,MAAM;EA+BxC,CAAC;AAcH,eAAO,MAAM,cAAc,iBAAkB;IAAE,QAAQ,EAAE,SAAS,CAAA;CAAE,sBA4GnE,CAAC"}

package/lib/locale/LocaleProvider.js

@@ -93,9 +93,11 @@ export const LocaleProvider = ({ children }) => {
         for (const char of str) {
             if (char === "$") {
                 enableMatch = true;
-                res.push(tres);
-                tres = "";
-                resMp.push(false);
+                if (tres !== "") {
+                    res.push(tres);
+                    tres = "";
+                    resMp.push(false);
+                }
             }
             else if (enableMatch && char === "{") {
                 continue;
@@ -115,16 +117,16 @@ export const LocaleProvider = ({ children }) => {
             else
                 tres += char;
         }
-        res.push(tres);
-        resMp.push(false);
+        if (tres !== "") {
+            res.push(tres);
+            resMp.push(false);
+        }
         if (flag)
             return res.join("");
         let resStr = "";
         for (let i = 0; i < res.length; i++) {
-            if (i !== 0)
-                resStr = " " + resStr;
             if (resMp[i])
-                resStr += langPkg[locale][res[i]];
+                resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
             else
                 resStr += res[i];
         }

package/lib/locale/LocaleProvider.js.map

@@ -1 +1 @@
-{"version":3,"file":"LocaleProvider.js","sourceRoot":"","sources":["../../../../src/aldehyde/locale/LocaleProvider.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"LocaleProvider.js","sourceRoot":"","sources":["../../../../src/aldehyde/locale/LocaleProvider.tsx"],"names":[],"mappings":";;;;;;;;;AACA,OAAO,KAAK,EAAE,EAAa,aAAa,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC7E,OAAO,EAAE,oBAAoB,EAAE,MAAM,aAAa,CAAC;AACnD,OAAO,EAAc,oBAAoB,EAAE,iBAAiB,EAAE,MAAM,UAAU,CAAC;AAE/E,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAE/C,MAAM,CAAC,MAAM,aAAa,GAAG,aAAa,CAMvC;IACD,MAAM,EAAE,SAAS;IACjB,OAAO,EAAE,EAAE;IACX,YAAY,EAAE,GAAG,EAAE,GAAE,CAAC;IACtB,CAAC,EAAE,CAAC,GAAG,GAAG,EAAE,EAAE,CAAC,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC;IAC3B,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE;QACjB,IAAI,GAAG,GAAG,EAAE,EACV,IAAI,GAAG,EAAE,CAAC;QAEZ,IAAI,QAAQ,GAAG,EAAE,EACf,WAAW,GAAG,KAAK,CAAC;QAEtB,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;YACvB,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjB,WAAW,GAAG,IAAI,CAAC;gBACnB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACf,IAAI,GAAG,EAAE,CAAC;YACZ,CAAC;iBAAM,IAAI,WAAW,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACvC,SAAS;YACX,CAAC;iBAAM,IAAI,WAAW,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACvC,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnB,WAAW,GAAG,KAAK,CAAC;gBACpB,QAAQ,GAAG,EAAE,CAAC;YAChB,CAAC;iBAAM,IAAI,WAAW;gBAAE,QAAQ,IAAI,IAAI,CAAC;;gBACpC,IAAI,IAAI,IAAI,CAAC;QACpB,CAAC;QAED,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;QACf,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;IACtB,CAAC;CACF,CAAC,CAAC;AAEH,MAAM,mBAAmB,GAAG,CAAO,IAAY,EAAE,EAAE;IACjD,MAAM,OAAO,GAAG,oBAAoB,CAAC,IAAI,CAAC,CAAC;IAC3C,IAAI,OAAO,KAAK,IAAI;QAAE,OAAO;IAE7B,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GAAG,MAAM,WAAW,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC;IAE/D,IAAI,MAAM,KAAK,SAAS,EAAE,CAAC;QACzB,OAAO,KAAK,CAAC;IACf,CAAC;IACD,OAAO,EAAE,CAAC;AACZ,CAAC,CAAA,CAAC;AAEF,MAAM,CAAC,MAAM,cAAc,GAAG,CAAC,EAAE,QAAQ,EAA2B,EAAE,EAAE;IACtE,MAAM,EAAE,iBAAiB,EAAE,GAAG,oBAAoB,EAAE,CAAC;IACrD,MAAM,iBAAiB,GAAe,MAAM,CAAC,YAAY,CAAC,OAAO,CAC/D,QAAQ,CACK,CAAC;IAChB,MAAM,oBAAoB,GAAW,IAAI,CAAC,KAAK,CAC7C,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,CAAC,CACvC,CAAC;IAEF,MAAM,CAAC,MAAM,EAAE,SAAS,CAAC,GAAG,QAAQ,CAClC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,CAAC,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAC7E,CAAC;IACF,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CACpC,oBAAoB,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,CACjD,CAAC;IAEF,MAAM,YAAY,GAAG,CAAO,MAAkB,EAAE,EAAE;QAChD,SAAS,CAAC,MAAM,CAAC,CAAC;IACpB,CAAC,CAAA,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,mBAAmB,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,CAAC,GAAG,EAAE,EAAE;YACvC,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,QAAQ,EAAE,MAAM,CAAC,CAAC;YAC9C,MAAM,UAAU,mCACX,OAAO,KACV,CAAC,MAAM,CAAC,EAAE,GAAG,GACd,CAAC;YACF,UAAU,CAAC,UAAU,CAAC,CAAC;QACzB,CAAC,CAAC,CAAC;IACL,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,SAAS,CAAC,GAAG,EAAE;QACb,MAAM,CAAC,YAAY,CAAC,OAAO,CAAC,SAAS,EAAE,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,CAAC;IAClE,CAAC,EAAE,CAAC,OAAO,CAAC,CAAC,CAAC;IAEd,MAAM,CAAC,GAAG,CAAC,GAAG,IAAc,EAAE,EAAE;QAC9B,IAAI,MAAM,KAAK,IAAI;YAAE,OAAO,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAE1C,IAAI,GAAG,GAAG,EAAE,EACV,IAAI,GAAG,KAAK,CAAC;QAEf,KAAK,MAAM,GAAG,IAAI,IAAI,EAAE,CAAC;YACvB,MAAM,IAAI,GACR,OAAO,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC;YACnE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;gBACvB,IAAI,GAAG,IAAI,CAAC;gBACZ,MAAM;YACR,CAAC;iBAAM,CAAC;gBACN,GAAG,IAAI,IAAI,GAAG,GAAG,CAAC;YACpB,CAAC;QACH,CAAC;QACD,OAAO,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,EAAE,GAAG,CAAC,MAAM,GAAG,CAAC,CAAC,CAAC;IAC7D,CAAC,CAAC;IAEF,MAAM,SAAS,GAAG,CAAC,GAAG,EAAE,EAAE;QACxB,IAAI,GAAG,GAAG,EAAE,EACV,KAAK,GAAG,EAAE,EACV,IAAI,GAAG,KAAK,EACZ,IAAI,GAAG,EAAE,CAAC;QAEZ,IAAI,QAAQ,GAAG,EAAE,EACf,WAAW,GAAG,KAAK,CAAC;QAEtB,KAAK,MAAM,IAAI,IAAI,GAAG,EAAE,CAAC;YACvB,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACjB,WAAW,GAAG,IAAI,CAAC;gBACnB,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;oBAChB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;oBACf,IAAI,GAAG,EAAE,CAAC;oBACV,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;gBACpB,CAAC;YACH,CAAC;iBAAM,IAAI,WAAW,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACvC,SAAS;YACX,CAAC;iBAAM,IAAI,WAAW,IAAI,IAAI,KAAK,GAAG,EAAE,CAAC;gBACvC,MAAM,IAAI,GACR,OAAO,CAAC,MAAM,CAAC,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,QAAQ,CAAC,CAAC;gBACxE,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBACvB,IAAI,GAAG,IAAI,CAAC;gBACd,CAAC;gBACD,GAAG,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC;gBACnB,KAAK,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;gBACjB,WAAW,GAAG,KAAK,CAAC;gBACpB,QAAQ,GAAG,EAAE,CAAC;YAChB,CAAC;iBAAM,IAAI,WAAW;gBAAE,QAAQ,IAAI,IAAI,CAAC;;gBACpC,IAAI,IAAI,IAAI,CAAC;QACpB,CAAC;QAED,IAAI,IAAI,KAAK,EAAE,EAAE,CAAC;YAChB,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;YACf,KAAK,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC;QACpB,CAAC;QAED,IAAI,IAAI;YAAE,OAAO,GAAG,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QAC9B,IAAI,MAAM,GAAG,EAAE,CAAC;QAChB,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,GAAG,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;YACpC,IAAI,KAAK,CAAC,CAAC,CAAC;gBAAE,MAAM,IAAI,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,GAAG,OAAO,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC,CAAC;;gBAClE,MAAM,IAAI,GAAG,CAAC,CAAC,CAAC,CAAC;QACxB,CAAC;QACD,OAAO,MAAM,CAAC;IAChB,CAAC,CAAC;IAEF,OAAO,CACL,oBAAC,aAAa,CAAC,QAAQ,IACrB,KAAK,EAAE,EAAE,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,CAAC,EAAE,SAAS,EAAE,IAErD,QAAQ,CACc,CAC1B,CAAC;AACJ,CAAC,CAAC"}

package/lib/locale/translate.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"translate.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/locale/translate.ts"],"names":[],"mappings":"AAyBA,QAAA,MAAM,SAAS,sBAkDd,CAAC;AAEF,eAAe,SAAS,CAAC"}
+{"version":3,"file":"translate.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/locale/translate.ts"],"names":[],"mappings":"AAyBA,QAAA,MAAM,SAAS,sBAqDd,CAAC;AAEF,eAAe,SAAS,CAAC"}

package/lib/locale/translate.js

@@ -33,9 +33,11 @@ const translate = (str) => {
     for (const char of str) {
         if (char === "$") {
             enableMatch = true;
-            res.push(tres);
-            tres = "";
-            resMp.push(false);
+            if (tres !== "") {
+                res.push(tres);
+                tres = "";
+                resMp.push(false);
+            }
         }
         else if (enableMatch && char === "{") {
             continue;
@@ -55,16 +57,16 @@ const translate = (str) => {
         else
             tres += char;
     }
-    res.push(tres);
-    resMp.push(false);
+    if (tres !== "") {
+        res.push(tres);
+        resMp.push(false);
+    }
     if (flag)
         return res.join("");
     let resStr = "";
     for (let i = 0; i < res.length; i++) {
-        if (i !== 0)
-            resStr = " " + resStr;
         if (resMp[i])
-            resStr += langPkg[locale][res[i]];
+            resStr += (i !== 0 ? " " : "") + langPkg[locale][res[i]];
         else
             resStr += res[i];
     }

package/lib/locale/translate.js.map

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

package/lib/routable/ltmpl-route.d.ts

@@ -1,5 +1,5 @@
-import React from 'react';
-import { LtmplConfigRes, RouterCompProps } from '../tmpl/interface';
+import React from "react";
+import { LtmplConfigRes, RouterCompProps } from "../tmpl/interface";
 export interface LtmplRouteProps extends RouterCompProps {
 }
 export interface LtmplRouteState {

package/lib/routable/ltmpl-route.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAA;AACzB,OAAO,EAAc,cAAc,EAAE,eAAe,EAAC,MAAM,mBAAmB,CAAC;AAM/E,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAEvD;AAED,MAAM,WAAW,eAAe;IAC5B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACrB;;AA8LD,wBAAsC"}
+{"version":3,"file":"ltmpl-route.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/routable/ltmpl-route.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAC1B,OAAO,EAEL,cAAc,EACd,eAAe,EAChB,MAAM,mBAAmB,CAAC;AAM3B,MAAM,WAAW,eAAgB,SAAQ,eAAe;CAAG;AAE3D,MAAM,WAAW,eAAe;IAC9B,cAAc,CAAC,EAAE,cAAc,CAAC;IAChC,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,CAAC,EAAE,MAAM,CAAC;CACnB;;AAqND,wBAAsC"}

package/lib/routable/ltmpl-route.js

@@ -7,14 +7,12 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         step((generator = generator.apply(thisArg, _arguments || [])).next());
     });
 };
-import React from 'react';
+import React from "react";
 import Units from "../units";
-import ActTable from '../table/act-table';
+import ActTable from "../table/act-table";
 // import StatActTable from '../table/stat-act-table'
 import HCDataSource from "../tmpl/hc-data-source";
 import withRouter from "../routable/withroute";
-;
-;
 class LtmplRoute extends React.PureComponent {
     constructor() {
         super(...arguments);
@@ -28,7 +26,7 @@ class LtmplRoute extends React.PureComponent {
         };
         this.getMenuId = () => {
             const { searchParams } = this.props;
-            let menuId = searchParams.get('menuId');
+            let menuId = searchParams.get("menuId");
             return menuId;
         };
         this.loadData = () => __awaiter(this, void 0, void 0, function* () {
@@ -67,7 +65,7 @@ class LtmplRoute extends React.PureComponent {
             const { searchParams } = this.props;
             let mainCode = undefined;
             // let criteriaData = Units.transQueryStrToParams(search);
-            let mcode = searchParams.get('mainCode');
+            let mcode = searchParams.get("mainCode");
             if (mcode) {
                 // criteriaData = Units.transQueryStrToParams(search);
                 mainCode = mcode;
@@ -99,7 +97,9 @@ class LtmplRoute extends React.PureComponent {
             let params = Object.assign({}, params_);
             //params['sourceId'] = sourceId;
             const newfliter = Units.transQueryParamsToStr(params);
-            this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`, { replace: true });
+            this.props.navigate(`${basePath}/${sourceId}/act-table?${newfliter}`, {
+                replace: true,
+            });
         };
         this.onChangeSearch = (params_) => {
             let params = Object.assign({}, params_);
@@ -107,25 +107,25 @@ class LtmplRoute extends React.PureComponent {
             const { searchParams } = this.props;
             let mcode = searchParams.get("mainCode");
             if (mcode) {
-                params['mainCode'] = mcode;
+                params["mainCode"] = mcode;
             }
             const { pageSize, pageNo } = this.state;
             if (pageSize) {
-                params['pageNo'] = pageNo;
+                params["pageNo"] = pageNo;
             }
             if (pageNo) {
-                params['pageSize'] = pageSize;
+                params["pageSize"] = pageSize;
             }
-            params['menuId'] = this.getMenuId();
-            params['sourceId'] = this.getMenuId();
+            params["menuId"] = this.getMenuId();
+            params["sourceId"] = this.getMenuId();
             this.doSearch(params);
         };
         this.onChangePage = (pageNo, pageSize) => {
             const { location } = this.props;
             let search = location.search;
             let params = Units.transQueryStrToParams(search);
-            params['pageNo'] = pageNo;
-            params['pageSize'] = pageSize;
+            params["pageNo"] = pageNo;
+            params["pageSize"] = pageSize;
             this.doSearch(params);
             // this.setState({
             //     pageNo,
@@ -145,8 +145,9 @@ class LtmplRoute extends React.PureComponent {
             let { sourceId: preSourceId } = prevProps.params;
             let { location: preLocation } = prevProps;
             if (!sourceId ||
-                (!preSourceId && this.state.ltmplConfigRes)
-                || (location.pathname == preLocation.pathname && location.search == preLocation.search)) {
+                (!preSourceId && this.state.ltmplConfigRes) ||
+                (location.pathname == preLocation.pathname &&
+                    location.search == preLocation.search)) {
                 return;
             }
             this.loadData();
@@ -166,17 +167,17 @@ class LtmplRoute extends React.PureComponent {
         // } else {
         //     menuId = sourceId;
         // }
-        let pageSize = criteriaData['pageSize'];
-        let pageNo = criteriaData['pageNo'];
-        if (search.indexOf('mainCode') > 0) {
+        let pageSize = criteriaData["pageSize"];
+        let pageNo = criteriaData["pageNo"];
+        if (search.indexOf("mainCode") > 0) {
             //criteriaData = Units.transQueryStrToParams(search);
-            mainCode = criteriaData['mainCode'];
+            mainCode = criteriaData["mainCode"];
         }
         if (!ltmplConfigRes) {
             return React.createElement(React.Fragment, null);
         }
         else {
-            return React.createElement(ActTable, { serverKey: null, pageSize: pageSize, pageNo: pageNo, onChangePage: this.onChangePage, menuId: this.getMenuId(), mainCode: mainCode, showView: this.showView, doSearch: this.onChangeSearch, doEdit: this.doEdit, doCreate: this.doCreate, sourceId: sourceId, criteriaData: criteriaData, ltmplConfig: ltmplConfigRes ? ltmplConfigRes.ltmplConfig : null, doRAction: this.doRAction });
+            return (React.createElement(ActTable, { serverKey: null, pageSize: pageSize, pageNo: pageNo, onChangePage: this.onChangePage, menuId: this.getMenuId(), mainCode: mainCode, showView: this.showView, doSearch: this.onChangeSearch, doEdit: this.doEdit, doCreate: this.doCreate, sourceId: sourceId, criteriaData: criteriaData, ltmplConfig: ltmplConfigRes ? ltmplConfigRes.ltmplConfig : null, doRAction: this.doRAction }));
         }
     }
 }