aldehyde 0.2.235 → 0.2.237

package/lib/hooks/use-match-route/index.js

@@ -0,0 +1,41 @@
+import { useEffect, useState } from 'react';
+import { useLocation, useMatches, useOutlet, useParams } from 'react-router-dom';
+export function useMatchRoute() {
+    // 获取路由组件实例
+    const children = useOutlet();
+    // 获取所有路由
+    const matches = useMatches();
+    // 获取当前url
+    const { pathname, search } = useLocation();
+    const { sourceId } = useParams();
+    // //const lastRoute = matches[matches.length - 1];
+    // const [searchParams, setSearchParams] = useSearchParams();
+    // console.log(searchParams.toString());
+    //  let searchParmStr=searchParams.toString();
+    //  if(searchParmStr){
+    //  searchParmStr="?"+searchParmStr;
+    //  }
+    let urlName = pathname + search;
+    //let urlName=pathname;
+    const [matchRoute, setMatchRoute] = useState();
+    // 监听pathname变了，说明路由有变化，重新匹配，返回新路由信息
+    useEffect(() => {
+        // 获取当前匹配的路由
+        //const lastRoute = matches[matches.length - 1];
+        // if (!lastRoute?.handle) return;
+        //let sourceId=lastRoute?.params['sourceId'];
+        let sourceId_ = sourceId;
+        if (pathname.indexOf("/home") > 0) {
+            sourceId_ = "home";
+        }
+        setMatchRoute({
+            title: sourceId_ || '其他',
+            pathname: urlName,
+            children,
+            routePath: pathname,
+            //icon: (lastRoute?.handle as any)?.icon,
+        });
+    }, [urlName]);
+    return matchRoute;
+}
+//# sourceMappingURL=index.js.map

package/lib/hooks/use-match-route/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/hooks/use-match-route/index.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AAC5C,OAAO,EAAC,WAAW,EAAE,UAAU,EAAE,SAAS,EAAE,SAAS,EAAkB,MAAM,kBAAkB,CAAC;AAiBhG,MAAM,UAAU,aAAa;IAC3B,WAAW;IACX,MAAM,QAAQ,GAAG,SAAS,EAAE,CAAC;IAC7B,SAAS;IACT,MAAM,OAAO,GAAG,UAAU,EAAE,CAAC;IAC7B,UAAU;IACV,MAAM,EAAE,QAAQ,EAAC,MAAM,EAAE,GAAG,WAAW,EAAE,CAAC;IAE1C,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;IAEhC,mDAAmD;IACnD,6DAA6D;IAC7D,wCAAwC;IACxC,8CAA8C;IAC9C,sBAAsB;IACtB,oCAAoC;IACpC,KAAK;IACN,IAAI,OAAO,GAAC,QAAQ,GAAC,MAAM,CAAC;IAC5B,uBAAuB;IACvB,MAAM,CAAC,UAAU,EAAE,aAAa,CAAC,GAAG,QAAQ,EAA8B,CAAC;IAE3E,oCAAoC;IACpC,SAAS,CAAC,GAAG,EAAE;QACb,YAAY;QACZ,gDAAgD;QAEjD,kCAAkC;QACjC,6CAA6C;QAC7C,IAAI,SAAS,GAAC,QAAQ,CAAC;QACvB,IAAG,QAAQ,CAAC,OAAO,CAAC,OAAO,CAAC,GAAC,CAAC,EAAC,CAAC;YAC9B,SAAS,GAAC,MAAM,CAAC;QACnB,CAAC;QACD,aAAa,CAAC;YACZ,KAAK,EAAC,SAAS,IAAE,IAAI;YACrB,QAAQ,EAAC,OAAO;YAChB,QAAQ;YACR,SAAS,EAAE,QAAQ;YACnB,yCAAyC;SAC1C,CAAC,CAAC;IAEL,CAAC,EAAC,CAAC,OAAO,CAAC,CAAC,CAAA;IAGZ,OAAO,UAAU,CAAC;AACpB,CAAC"}

package/lib/hooks/use-tabs/index.d.ts

@@ -0,0 +1,18 @@
+import React from 'react';
+export interface KeepAliveTab {
+    title: string;
+    routePath: string;
+    key: string;
+    pathname: string;
+    icon?: string;
+    children: React.ReactNode;
+}
+export declare function useTabs(): {
+    tabs: KeepAliveTab[];
+    activeTabRoutePath: string;
+    closeTab: (routePath?: string) => void;
+    closeOtherTab: (routePath?: string) => void;
+    refreshTab: (routePath?: string) => void;
+    setTabs: (this: unknown, value: import("ahooks/lib/createUseStorageState").SetState<KeepAliveTab[]>) => void;
+};
+//# sourceMappingURL=index.d.ts.map

package/lib/hooks/use-tabs/index.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/hooks/use-tabs/index.tsx"],"names":[],"mappings":"AAIA,OAAO,KAA2C,MAAM,OAAO,CAAC;AAGhE,MAAM,WAAW,YAAY;IAC3B,KAAK,EAAE,MAAM,CAAC;IACd,SAAS,EAAE,MAAM,CAAC;IAClB,GAAG,EAAE,MAAM,CAAC;IACZ,QAAQ,EAAE,MAAM,CAAC;IAEjB,IAAI,CAAC,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,KAAK,CAAC,SAAS,CAAC;CAC3B;AAMD,wBAAgB,OAAO;;;2BAgBP,MAAM;gCAmB0B,MAAM;6BAUT,MAAM;;EA+DlD"}

package/lib/hooks/use-tabs/index.js

@@ -0,0 +1,112 @@
+import { useMatchRoute } from '../use-match-route';
+// import { router } from '@/router';
+import { useSessionStorageState } from 'ahooks';
+import { omit } from 'lodash-es';
+import { useCallback, useEffect, useState } from 'react';
+import { useNavigate } from "react-router-dom";
+function getKey() {
+    return new Date().getTime().toString();
+}
+export function useTabs() {
+    // 存放页面记录
+    const [keepAliveTabs, setKeepAliveTabs] = useSessionStorageState('keepAliveTabs', {
+        defaultValue: [],
+        serializer: value => {
+            // 把 children 剔除掉，不然会报错
+            return JSON.stringify(value.map(item => omit(item, ['children'])));
+        },
+    });
+    // 当前激活的tab
+    const [activeTabRoutePath, setActiveTabRoutePath] = useState('');
+    const matchRoute = useMatchRoute();
+    let navigate = useNavigate();
+    // 关闭tab
+    const closeTab = useCallback((routePath = activeTabRoutePath || '') => {
+        if (!(keepAliveTabs === null || keepAliveTabs === void 0 ? void 0 : keepAliveTabs.length)) {
+            return;
+        }
+        const index = (keepAliveTabs || []).findIndex(o => o.routePath === routePath);
+        if (keepAliveTabs[index].routePath === activeTabRoutePath && keepAliveTabs.length > 1) {
+            if (index > 0) {
+                navigate(keepAliveTabs[index - 1].pathname);
+            }
+            else {
+                navigate(keepAliveTabs[index + 1].pathname);
+            }
+        }
+        keepAliveTabs.splice(index, 1);
+        setKeepAliveTabs([...keepAliveTabs]);
+    }, [activeTabRoutePath]);
+    // 关闭除了自己其它tab
+    const closeOtherTab = useCallback((routePath = activeTabRoutePath || '') => {
+        if (!(keepAliveTabs === null || keepAliveTabs === void 0 ? void 0 : keepAliveTabs.length)) {
+            return;
+        }
+        const tab = keepAliveTabs.find(o => o.routePath === routePath);
+        setKeepAliveTabs(keepAliveTabs.filter(o => o.routePath === routePath));
+        //router.navigate(tab?.pathname || routePath);
+    }, [activeTabRoutePath]);
+    // 刷新tab
+    const refreshTab = useCallback((routePath = activeTabRoutePath || '') => {
+        // setKeepAliveTabs(prev => {
+        //   const index = (prev || []).findIndex(tab => tab.pathname === routePath);
+        //
+        //   if (index >= 0 && prev) {
+        //     // 这个是react的特性，key变了，组件会卸载重新渲染
+        //     prev[index].key = getKey();
+        //   }
+        //   return [...prev || []];
+        // });
+    }, [activeTabRoutePath]);
+    useEffect(() => {
+        if (!matchRoute)
+            return;
+        const existKeepAliveTab = (keepAliveTabs || []).find(o => o.routePath === (matchRoute === null || matchRoute === void 0 ? void 0 : matchRoute.routePath));
+        // 如果不存在则需要插入
+        if (!existKeepAliveTab) {
+            setKeepAliveTabs([...(keepAliveTabs || []), {
+                    title: matchRoute.title,
+                    key: getKey(),
+                    routePath: matchRoute.routePath,
+                    pathname: matchRoute.pathname,
+                    children: matchRoute.children,
+                    icon: matchRoute.icon
+                    // searchParmStr:matchRoute.searchParmStr||""
+                }]);
+        }
+        else if (existKeepAliveTab.pathname !== matchRoute.pathname) {
+            // 如果是同一个路由，但是参数不同，我们只需要刷新当前页签并且把pathname设置为新的pathname， children设置为新的children
+            setKeepAliveTabs(prev => {
+                const index = (prev || []).findIndex(tab => tab.routePath === matchRoute.routePath);
+                if (index >= 0 && prev) {
+                    prev[index].key = getKey();
+                    prev[index].pathname = matchRoute.pathname;
+                    prev[index].children = matchRoute.children;
+                    // prev[index].searchParmStr=matchRoute.searchParmStr ||""
+                }
+                return [...(prev || [])];
+            });
+        }
+        else if (!existKeepAliveTab.children) {
+            // 如果pathname相同，但是children为空，说明重缓存中加载的数据，我们只需要刷新当前页签并且把children设置为新的children
+            setKeepAliveTabs(prev => {
+                const index = (prev || []).findIndex(tab => tab.routePath === matchRoute.routePath);
+                if (index >= 0 && prev) {
+                    prev[index].key = getKey();
+                    prev[index].children = matchRoute.children;
+                }
+                return [...(prev || [])];
+            });
+        }
+        setActiveTabRoutePath(matchRoute.routePath);
+    }, [matchRoute]);
+    return {
+        tabs: keepAliveTabs,
+        activeTabRoutePath,
+        closeTab,
+        closeOtherTab,
+        refreshTab,
+        setTabs: setKeepAliveTabs,
+    };
+}
+//# sourceMappingURL=index.js.map

package/lib/hooks/use-tabs/index.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../../src/aldehyde/hooks/use-tabs/index.tsx"],"names":[],"mappings":"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"}

package/lib/import/excel-import.d.ts

@@ -41,6 +41,8 @@ export default class ExcelImport extends React.PureComponent<ExcelImportProps, E
         langPkg: any;
         availableLang: string[];
         changeLocale: (locale: import("../locale/langMp").LocaleType) => void;
+        siderCollapsed: boolean;
+        changeSiderCollapsed: () => void;
         t: (...strs: string[]) => string;
         translate: (...strs: string[]) => string;
         getServiceLangStr?: () => string;

package/lib/import/excel-import.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"excel-import.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/import/excel-import.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAwB1B,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,KAAK,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;AAUlD,UAAU,gBAAgB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,eAAe;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAC,MAAM,CAAC;CAClB;AAED,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,KAAK,CAAC,aAAa,CAC1D,gBAAgB,EAChB,eAAe,CAChB;IACC,KAAK;;;;;;;;;;;;;MAaH;IACF,MAAM,CAAC,WAAW;;;;;YAtDG,GAAG;oBACV,GAAG;;OAqDkB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,OAAO,MAAa;IAEd,iBAAiB;IAavB,oBAAoB;IAMpB,YAAY,aA8BV;IAEF,gBAAgB,aAId;IAEF,YAAY,GAAI,aAAQ,UAiFtB;IACF,wBAAwB,GAAI,qBAAgB,UAK1C;IAEF,KAAK,aAYH;IAEF,eAAe,aAQb;IACF,mBAAmB,GAAI,SAAI,UAEzB;IACF,QAAQ,aAYN;IAEF,MAAM;CAkLP"}
+{"version":3,"file":"excel-import.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/import/excel-import.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAwB1B,OAAO,aAAa,CAAC;AACrB,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAEhD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAKzD,KAAK,QAAQ,GAAG,MAAM,GAAG,KAAK,GAAG,OAAO,GAAG,MAAM,CAAC;AAUlD,UAAU,gBAAgB;IACxB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,UAAU,eAAe;IACvB,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,gBAAgB,CAAC,EAAE,QAAQ,EAAE,CAAC;IAC9B,aAAa,CAAC,EAAE,OAAO,CAAC;IACxB,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;IACb,UAAU,CAAC,EAAE,GAAG,CAAC;IACjB,WAAW,CAAC,EAAE,MAAM,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,QAAQ,CAAC,EAAC,MAAM,CAAC;CAClB;AAED,MAAM,CAAC,OAAO,OAAO,WAAY,SAAQ,KAAK,CAAC,aAAa,CAC1D,gBAAgB,EAChB,eAAe,CAChB;IACC,KAAK;;;;;;;;;;;;;MAaH;IACF,MAAM,CAAC,WAAW;;;;;;;YArDF,GAAG;oBAElB,GAAG;;OAmD+B;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,OAAO,MAAa;IAEd,iBAAiB;IAavB,oBAAoB;IAMpB,YAAY,aA8BV;IAEF,gBAAgB,aAId;IAEF,YAAY,GAAI,aAAQ,UAiFtB;IACF,wBAAwB,GAAI,qBAAgB,UAK1C;IAEF,KAAK,aAYH;IAEF,eAAe,aAQb;IACF,mBAAmB,GAAI,SAAI,UAEzB;IACF,QAAQ,aAYN;IAEF,MAAM;CAkLP"}

package/lib/layout/MainPage.js

@@ -240,7 +240,7 @@ class MainPage extends React.PureComponent {
                             top: 0,
                             bottom: 0,
                         }, collapsed: collapsed },
-                        React.createElement(SideBar, { header: leftHeader, collapsedHeader: leftCollapsedHeader, title: translate("${" + sideBartitle + "}"), logo: sideBarLogo, blockMenu: this.findCurrentBlock(), currentL2MenuId: currentL2MenuId, collapsed: collapsed })),
+                        React.createElement(SideBar, { header: leftHeader, collapsedHeader: leftCollapsedHeader, title: sideBartitle, logo: sideBarLogo, blockMenu: this.findCurrentBlock(), currentL2MenuId: currentL2MenuId, collapsed: collapsed })),
                     React.createElement(Layout, { style: collapsed
                             ? { background: "#fff", marginLeft: 80 }
                             : {

package/lib/layout/MainPage.js.map

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

package/lib/layout/coverstyle.css

@@ -17,7 +17,7 @@
 	font-size: 20px;
 }
 .ant-message{
-	z-index: 1090;
+	z-index: 2090;
 }
 .ant-tabs-bar{
 	z-index: 99;

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

@@ -16,6 +16,8 @@ declare class Block extends React.PureComponent<BlockProps, BlockState> {
         langPkg: any;
         availableLang: string[];
         changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        siderCollapsed: boolean;
+        changeSiderCollapsed: () => void;
         t: (...strs: string[]) => string;
         translate: (...strs: string[]) => string;
         getServiceLangStr?: () => string;

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,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;;;;;YANb,GAAG;oBAEV,GACA;;OAGqC;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBACrC,KAAK,KAAA;IAIjB,UAAU,GAAI,WAAW,SAAS,iDAEhC;IAEF,WAAW,GAAI,QAAQ,SAAS,EAAE,EAAE,iBAAiB,MAAM,YAwBzD;IAEF,IAAI,cAAc,gBAmBjB;IAED,IAAI,SAAS,gDAgCZ;IAED,mBAAmB,CAAC,QAAQ,KAAA;IAK5B,MAAM;CAyDP;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,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;;;;;;;YAHpB,GAAE;oBAEgB,GAAG;;OACgB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBACrC,KAAK,KAAA;IAIjB,UAAU,GAAI,WAAW,SAAS,iDAEhC;IAEF,WAAW,GAAI,QAAQ,SAAS,EAAE,EAAE,iBAAiB,MAAM,YAwBzD;IAEF,IAAI,cAAc,gBAmBjB;IAED,IAAI,SAAS,gDAgCZ;IAED,mBAAmB,CAAC,QAAQ,KAAA;IAK5B,MAAM;CAyDP;AAED,eAAe,KAAK,CAAC"}

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

@@ -30,6 +30,8 @@ declare class L2MenuQuickBar extends React.PureComponent<L2MenuQuickBarProps, L2
         langPkg: any;
         availableLang: string[];
         changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        siderCollapsed: boolean;
+        changeSiderCollapsed: () => void;
         t: (...strs: string[]) => string;
         translate: (...strs: string[]) => string;
         getServiceLangStr?: () => string;

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,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;;;;;YA5BD,GAAG;oBAIV,GAAG;;OAwBsB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAqBvB,QAAQ,GAAI,WAAW,MAAM,UAM3B;IAEF,WAAW,aAIT;IAEF,cAAc,GAAI,WAAW,QAAQ,EAAE,uBAkDrC;IAEF,MAAM;CA4BP;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;;;;;;;YAxBN,GAAG;oBAID,GAAG;;OAoBkB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAqBvB,QAAQ,GAAI,WAAW,MAAM,UAM3B;IAEF,WAAW,aAIT;IAEF,cAAc,GAAI,WAAW,QAAQ,EAAE,uBAkDrC;IAEF,MAAM;CA4BP;AAED,eAAe,cAAc,CAAC"}

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

@@ -10,6 +10,8 @@ declare class Menu2layers extends React.PureComponent<Menu2layersProps, Menu2lay
         langPkg: any;
         availableLang: string[];
         changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        siderCollapsed: boolean;
+        changeSiderCollapsed: () => void;
         t: (...strs: string[]) => string;
         translate: (...strs: string[]) => string;
         getServiceLangStr?: () => string;

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,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;;;;;YAET,GAAG;oBAEC,GAAE;;OAJoB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBACrC,KAAK,KAAA;IAOjB,iBAAiB;IAYjB,kBAAkB,CAAC,SAAS,KAAA;IA8B5B,UAAU,GAAI,aAAQ,UAOpB;IAEF,IAAI,iBAAiB,QAUpB;IAED,MAAM;CA4BP;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;;;;;;;YAIH,GACjB;oBAIS,GAAG;;OATyB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;gBACrC,KAAK,KAAA;IAOjB,iBAAiB;IAYjB,kBAAkB,CAAC,SAAS,KAAA;IA8B5B,UAAU,GAAI,aAAQ,UAOpB;IAEF,IAAI,iBAAiB,QAUpB;IAED,MAAM;CA4BP;AAED,eAAe,WAAW,CAAC"}

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

@@ -23,6 +23,8 @@ declare class ResetPassword extends React.PureComponent<ResetPasswordProps, Rese
         langPkg: any;
         availableLang: string[];
         changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        siderCollapsed: boolean;
+        changeSiderCollapsed: () => void;
         t: (...strs: string[]) => string;
         translate: (...strs: string[]) => string;
         getServiceLangStr?: () => string;

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,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;IACnB,YAAY,CAAC,EAAC,OAAO,CAAC;CACvB;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;;;;;YAfN,GAAG;oBAEH,GAAG;;OAaoB;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAQvB,YAAY,GAAU,WAAM,mBAsC1B;IAEF,iBAAiB,aAuBf;IAEF,OAAO,0BA6GL;IAEF,MAAM;CA4BP;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;IACnB,YAAY,CAAC,EAAC,OAAO,CAAC;CACvB;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;;;;;;;YAbJ,GAAG;oBAGiB,GAAG;;OAUF;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAE3C,iBAAiB;IAQvB,YAAY,GAAU,WAAM,mBAsC1B;IAEF,iBAAiB,aAuBf;IAEF,OAAO,0BA6GL;IAEF,MAAM;CA4BP;AAED,eAAe,aAAa,CAAC"}

package/lib/layout/menu/user-bar.d.ts

@@ -29,6 +29,8 @@ declare class UserBar extends React.PureComponent<UserBarProps, UserBarState> {
         langPkg: any;
         availableLang: string[];
         changeLocale: (locale: LocaleType) => void;
+        siderCollapsed: boolean;
+        changeSiderCollapsed: () => void;
         t: (...strs: string[]) => string;
         translate: (...strs: string[]) => string;
         getServiceLangStr?: () => string;

package/lib/layout/menu/user-bar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"user-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/user-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAA+B,SAAS,EAAgB,MAAM,MAAM,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,UAAU,YAAY;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,UAAU,YAAa,SAAQ,QAAQ;IACrC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB;AAED,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC;IACnE,KAAK;;;;;;;;;;MAUH;IACF,MAAM,CAAC,WAAW;;;;;YA5BL,GAAG;oBAAyC,GAC1D;;OA2BoC;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,MAAM,CAAC,YAAY;;;;MAIjB;IAEI,iBAAiB;IAWvB,UAAU,aAMR;IAEF,UAAU,mCAoBR;IACF,YAAY,aAEV;IAEF,QAAQ,0BAgBN;IAEF,MAAM;CAoJP;AAED,eAAe,OAAO,CAAC"}
+{"version":3,"file":"user-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/user-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAwB,MAAM,OAAO,CAAC;AAC7C,OAAO,EAA+B,SAAS,EAAgB,MAAM,MAAM,CAAC;AAE5E,OAAO,EAAE,QAAQ,EAAE,MAAM,sBAAsB,CAAC;AAKhD,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAC5D,OAAO,EAAE,UAAU,EAAE,MAAM,qBAAqB,CAAC;AAIjD,UAAU,YAAY;IACpB,cAAc,CAAC,EAAE,MAAM,CAAC;IACxB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,kBAAkB,CAAC,EAAE,OAAO,CAAC;IAC7B,IAAI,CAAC,EAAE,SAAS,CAAC;CAClB;AAED,UAAU,YAAa,SAAQ,QAAQ;IACrC,OAAO,EAAE,KAAK,CAAC,MAAM,CAAC,CAAC;CACxB;AAED,cAAM,OAAQ,SAAQ,KAAK,CAAC,aAAa,CAAC,YAAY,EAAE,YAAY,CAAC;IACnE,KAAK;;;;;;;;;;MAUH;IACF,MAAM,CAAC,WAAW;;;;;;;YA3BpB,GAAG;oBAAyC,GAAG;;OA2BV;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,MAAM,CAAC,YAAY;;;;MAIjB;IAEI,iBAAiB;IAWvB,UAAU,aAMR;IAEF,UAAU,mCAoBR;IACF,YAAY,aAEV;IAEF,QAAQ,0BAgBN;IAEF,MAAM;CAoJP;AAED,eAAe,OAAO,CAAC"}

package/lib/layout/menu/userinfo-bar.d.ts

@@ -17,6 +17,8 @@ declare class UserInfoBar extends React.PureComponent<UserInfoBarProps, UserInfo
         langPkg: any;
         availableLang: string[];
         changeLocale: (locale: import("../../locale/langMp").LocaleType) => void;
+        siderCollapsed: boolean;
+        changeSiderCollapsed: () => void;
         t: (...strs: string[]) => string;
         translate: (...strs: string[]) => string;
         getServiceLangStr?: () => string;

package/lib/layout/menu/userinfo-bar.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userinfo-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/userinfo-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,gBAAgB;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,cAAM,WAAY,SAAQ,KAAK,CAAC,aAAa,CAC3C,gBAAgB,EAChB,gBAAgB,CACjB;IACC,KAAK;;MAEH;IACF,MAAM,CAAC,WAAW;;;;;YAAS,GAAG;oBACI,GAAE;;OADD;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,MAAM,CAAC,YAAY;;MAEjB;IAEI,iBAAiB;IACvB,QAAQ,aAIN;IAEF,WAAW,aAIT;IAEF,MAAM;CAyBP;AAED,eAAe,WAAW,CAAC"}
+{"version":3,"file":"userinfo-bar.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout/menu/userinfo-bar.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,MAAM,OAAO,CAAC;AAE1B,OAAO,EAAE,aAAa,EAAE,MAAM,6BAA6B,CAAC;AAE5D,UAAU,gBAAgB;IACxB,aAAa,EAAE,MAAM,CAAC;IACtB,QAAQ,EAAE,MAAM,CAAC;IACjB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,UAAU,gBAAgB;IACxB,QAAQ,CAAC,EAAE,OAAO,CAAC;CACpB;AAED,cAAM,WAAY,SAAQ,KAAK,CAAC,aAAa,CAC3C,gBAAgB,EAChB,gBAAgB,CACjB;IACC,KAAK;;MAEH;IACF,MAAM,CAAC,WAAW;;;;;;;YACiB,GAAG;oBAGpC,GAAC;;OAJgC;IACnC,OAAO,EAAE,KAAK,CAAC,WAAW,CAAC,OAAO,aAAa,CAAC,CAAC;IAEjD,MAAM,CAAC,YAAY;;MAEjB;IAEI,iBAAiB;IACvB,QAAQ,aAIN;IAEF,WAAW,aAIT;IAEF,MAAM;CAyBP;AAED,eAAe,WAAW,CAAC"}

package/lib/layout/sidebar/index.js

@@ -10,7 +10,9 @@ const SideBar = (props) => {
     const { translate } = useLocale();
     const { token } = useToken();
     let syyy = { "--logo-blue-background": token.colorPrimary };
-    let { collapsed, header, collapsedHeader } = props;
+    let { collapsed, header, collapsedHeader, title } = props;
+    let programLabel = title ? title : Units.programName_NavLeft();
+    programLabel = translate("${" + programLabel + "}");
     return (React.createElement("div", null,
         React.createElement(Scrollbars, { style: { height: "calc(100vh)" }, autoHide: true, autoHideTimeout: 1000 },
             React.createElement("div", { className: collapsed ? "logonly" : "logo-blue", style: syyy },
@@ -38,7 +40,7 @@ const SideBar = (props) => {
                             } },
                             React.createElement(React.Fragment, null,
                                 props.logo ? (React.createElement(Image, { width: "30px", src: props.logo })) : (React.createElement(React.Fragment, null)),
-                                translate(props.title ? props.title : Units.programName_NavLeft()))))))),
+                                programLabel)))))),
             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;AAEpC,OAAO,EAAE,SAAS,EAAE,MAAM,wBAAwB,CAAC;AASnD,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,EAAC,MAAM,EAAC,eAAe,EAAE,GAAG,KAAK,CAAC;IACjD,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,CAAA,CAAE,eAAe,CAAC,CAAC,CAAC,6BAAK,KAAK,EAAE;wBAClC,QAAQ,EAAE,QAAQ;wBAClB,MAAM,EAAE,MAAM;wBACd,OAAO,EAAC,KAAK;qBACd,IAAG,eAAe,CAAO,CAAA,CAAC;oBAC/B,KAAK,CAAC,IAAI,CAAC,CAAC;wBACR,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,IAAI,GAAG;wBAC5B,CAAC,CAAC,CACC,4BACI,KAAK,EAAE;gCACL,QAAQ,EAAE,QAAQ;gCAClB,MAAM,EAAE,MAAM;gCACd,WAAW,EAAE,OAAO;6BACrB,QAGA,CACR,CACJ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,6BAAK,KAAK,EAAE;wBAChB,QAAQ,EAAE,QAAQ;wBAClB,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,KAAK;qBACf,IAAG,MAAM,CAAO,CAAC,CAAC;oBACnB;wBACE,4BACI,KAAK,EAAE;gCACL,QAAQ,EAAE,QAAQ;gCAClB,MAAM,EAAE,MAAM;gCACd,WAAW,EAAE,OAAO;6BACrB;4BAEH;gCACG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CACV,oBAAC,KAAK,IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,GAAG,CAC3C,CAAC,CAAC,CAAC,CACA,yCAAK,CACR;gCACA,SAAS,CACN,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAC1D,CACA,CACA,CACJ,CACV,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;AASnD,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,EAAC,MAAM,EAAC,eAAe,EAAE,KAAK,EAAC,GAAG,KAAK,CAAC;IACvD,IAAI,YAAY,GAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,mBAAmB,EAAE,CAAC;IAC9D,YAAY,GAAC,SAAS,CAAC,IAAI,GAAE,YAAY,GAAE,GAAG,CAAC,CAAC;IAChD,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,CAAA,CAAE,eAAe,CAAC,CAAC,CAAC,6BAAK,KAAK,EAAE;wBAClC,QAAQ,EAAE,QAAQ;wBAClB,MAAM,EAAE,MAAM;wBACd,OAAO,EAAC,KAAK;qBACd,IAAG,eAAe,CAAO,CAAA,CAAC;oBAC/B,KAAK,CAAC,IAAI,CAAC,CAAC;wBACR,oBAAC,KAAK,IAAC,GAAG,EAAE,KAAK,CAAC,IAAI,GAAG;wBAC5B,CAAC,CAAC,CACC,4BACI,KAAK,EAAE;gCACL,QAAQ,EAAE,QAAQ;gCAClB,MAAM,EAAE,MAAM;gCACd,WAAW,EAAE,OAAO;6BACrB,QAGA,CACR,CACJ,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,6BAAK,KAAK,EAAE;wBAChB,QAAQ,EAAE,QAAQ;wBAClB,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,KAAK;qBACf,IAAG,MAAM,CAAO,CAAC,CAAC;oBACnB;wBACE,4BACI,KAAK,EAAE;gCACL,QAAQ,EAAE,QAAQ;gCAClB,MAAM,EAAE,MAAM;gCACd,WAAW,EAAE,OAAO;6BACrB;4BAEH;gCACG,KAAK,CAAC,IAAI,CAAC,CAAC,CAAC,CACV,oBAAC,KAAK,IAAC,KAAK,EAAE,MAAM,EAAE,GAAG,EAAE,KAAK,CAAC,IAAI,GAAG,CAC3C,CAAC,CAAC,CAAC,CACA,yCAAK,CACR;gCACA,YAAY,CACZ,CACA,CACJ,CACV,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/layout2/components/userButton.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"userButton.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAU9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAgBzE,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA8IrC,CAAC;AAEF,eAAe,UAAU,CAAC"}
+{"version":3,"file":"userButton.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/userButton.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAyC,MAAM,OAAO,CAAC;AAU9D,OAAO,EAAU,WAAW,EAAgC,MAAM,MAAM,CAAC;AAiBzE,QAAA,MAAM,UAAU,EAAE,KAAK,CAAC,EAAE,CAAC,WAAW,CA0JrC,CAAC;AAEF,eAAe,UAAU,CAAC"}

package/lib/layout2/components/userButton.js

@@ -8,7 +8,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import React, { useEffect, useState } from "react";
-import { CaretDownOutlined, ClearOutlined, LoginOutlined, LogoutOutlined, SettingOutlined, UnlockOutlined, UserOutlined, } from "@ant-design/icons";
+import { CaretDownOutlined, ClearOutlined, LoginOutlined, LogoutOutlined, MenuFoldOutlined, MenuUnfoldOutlined, SettingOutlined, UnlockOutlined, UserOutlined, } from "@ant-design/icons";
 import { Button, Dropdown } from "antd";
 import HcserviceV3 from "../../tmpl/hcservice-v3";
 import UserInfoBar from "../../layout/menu/userinfo-bar";
@@ -18,7 +18,7 @@ import ResetPassword from "../../layout/menu/reset-password";
 import HCDataSource from "../../tmpl/hc-data-source";
 const UserButton = (props) => {
     // translate
-    const { translate } = useLocale();
+    const { translate, changeSiderCollapsed, getSiderCollapsed } = useLocale();
     // navigation
     const navigate = useNavigate();
     // 用户配置信息
@@ -98,6 +98,13 @@ const UserButton = (props) => {
             show: () => {
                 return isLogin && userConfig.cleanCachable;
             },
+        }, {
+            label: (React.createElement("span", { onClick: () => changeSiderCollapsed() }, getSiderCollapsed() ? translate("${显示侧边栏}") : translate("${隐藏侧边栏}"))),
+            key: "collapseSider",
+            icon: React.createElement("span", null, getSiderCollapsed() ? React.createElement(MenuUnfoldOutlined, null) : React.createElement(MenuFoldOutlined, null)),
+            show: () => {
+                return isLogin;
+            },
         },
         {
             label: React.createElement("span", { onClick: logout }, translate("${退出}")),

package/lib/layout2/components/userButton.js.map

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

package/lib/layout2/header.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EAGL,MAAM,EAKP,MAAM,MAAM,CAAC;AACd,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,kBAAkB,CAAC;AAM1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAW9C,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC;CACjD,CAAC;AAsEF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA2QrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EAEL,MAAM,EAKP,MAAM,MAAM,CAAC;AACd,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,kBAAkB,CAAC;AAM1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAW9C,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,OAAO,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,KAAK,CAAC;CACjD,CAAC;AAOF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA2QrC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/lib/layout2/header.js

@@ -11,69 +11,6 @@ import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu, } from "./util/menu.ut
 import { useLocale } from "../locale/useLocale";
 import { generate } from "@ant-design/colors";
 import { useLayoutContext } from "./LayoutContext";
-// const items: MenuItem[] = [
-//   {
-//     label: "Navigation One",
-//     key: "mail",
-//     icon: <img src={png1} alt="1" width={16} height={16}></img>,
-//   },
-//   {
-//     label: "Navigation Two",
-//     key: "app",
-//     disabled: false,
-//     icon: <img src={png2} alt="2" width={16} height={16}></img>,
-//   },
-//   {
-//     label: "Navigation Two",
-//     key: "app2",
-//     disabled: false,
-//     icon: <img src={png3} alt="2" width={16} height={16}></img>,
-//   },
-//   {
-//     label: "Navigation Two",
-//     key: "app3",
-//     disabled: false,
-//     icon: <img src={png4} alt="2" width={16} height={16}></img>,
-//   },
-//   {
-//     label: "Navigation Two",
-//     key: "app4",
-//     disabled: true,
-//     icon: <img src={png5} alt="2" width={16} height={16}></img>,
-//   },
-//   {
-//     label: "Navigation Three - Submenu",
-//     key: "SubMenu",
-//     icon: <img src={png6} alt="2" width={16} height={16}></img>,
-//     children: [
-//       {
-//         type: "group",
-//         label: "Item 1",
-//         children: [
-//           { label: "Option 1", key: "setting:1" },
-//           { label: "Option 2", key: "setting:2" },
-//         ],
-//       },
-//       {
-//         type: "group",
-//         label: "Item 2",
-//         children: [
-//           { label: "Option 3", key: "setting:3" },
-//           { label: "Option 4", key: "setting:4" },
-//         ],
-//       },
-//     ],
-//   },
-//   {
-//     key: "alipay",
-//     label: (
-//       <a href="https://ant.design" target="_blank" rel="noopener noreferrer">
-//         Navigation Four - Link
-//       </a>
-//     ),
-//     icon: <img src={png6} alt="2" width={16} height={16}></img>,
-//   },
-// ];
 const { useToken } = theme;
 const Header = ({ systemName, menuList, style }) => {
     const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
@@ -142,6 +79,7 @@ const Header = ({ systemName, menuList, style }) => {
             setDocumentTitle(translate("${" + documentTitle + "}"));
         }
     }, [menuList, sourceId]);
+    let systemLabel = translate("${" + systemName + "}");
     return (React.createElement(Layout.Header, { style: Object.assign({ padding: 0, display: "flex", flexDirection: "row", background: colorPrimary, color: "#FFFFFF" }, style) },
         React.createElement(NavLink, { style: {
                 width: "200px",
@@ -153,18 +91,18 @@ const Header = ({ systemName, menuList, style }) => {
                 fontSize: "18px",
                 userSelect: "none",
                 color: "inherit",
-            }, to: "/v2" },
+            }, to: "/v2/home" },
             React.createElement("img", { src: homePng, alt: "home", width: 35, height: 35, style: {
                     marginRight: 5,
                 } }),
-            React.createElement(Tooltip, { title: systemName },
+            React.createElement(Tooltip, { title: systemLabel },
                 React.createElement("span", { style: {
                         width: "100%",
                         height: "100%",
                         overflow: "hidden",
                         textOverflow: "ellipsis",
                         whiteSpace: "nowrap",
-                    } }, systemName))),
+                    } }, translate(systemLabel)))),
         React.createElement("div", { style: {
                 display: "flex",
                 flexDirection: "row",