aldehyde 0.2.499 → 0.2.501

package/lib/controls/direct-file-view/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/direct-file-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAA;AAGlD,OAAO,EAAE,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AASnE,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,GAAG,CAAA;CACb;AASD,QAAA,MAAM,KAAK,GAAI,OAAO,aAAa,8BAsHlC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/controls/direct-file-view/index.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AAInD,OAAO,EAAE,WAAW,EAAkB,MAAM,sBAAsB,CAAC;AASnE,MAAM,WAAW,aAAa;IAC1B,WAAW,EAAE,WAAW,CAAC;IACzB,SAAS,CAAC,EAAE,MAAM,CAAC;IACnB,YAAY,CAAC,EAAE,OAAO,CAAC;IACvB,KAAK,EAAE,GAAG,CAAA;CACb;AAWD,QAAA,MAAM,KAAK,GAAI,OAAO,aAAa,8BAmJlC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/controls/direct-file-view/index.js

@@ -1,5 +1,6 @@
 import React, { useEffect, useState } from 'react';
 import { Button, Col, Image, Row, Space } from 'antd';
+import dayjs from 'dayjs';
 import DrawerFileView from './drawer-file-view';
 import { DownloadOutlined, PlayCircleOutlined } from '@ant-design/icons';
 import HCService from "../../tmpl/hcservice-v3";
@@ -12,13 +13,41 @@ const Index = (props) => {
     const { downloadable = true, fieldConfig: { serverKey }, value } = props;
     const [filePaths, setFilePaths] = useState([]);
     const [playing, setPlaying] = useState(false);
-    const [ossConfig, setOssConfig] = useState();
+    const [ossConfigs, setOssConfigs] = useState([]);
     useEffect(() => {
         if (serverKey) {
-            const { accessKeySecret, bucket, endpoint, protocol } = Units.getExtendServers(serverKey) || {};
-            bucket && endpoint && setOssConfig({ accessKeySecret, bucket, endpoint, protocol });
+            const { accessKeySecret, bucket, endpoint, protocol, beginDate, endDate, otherConfig = [] } = Units.getExtendServers(serverKey) || {};
+            const temConfig = bucket && endpoint ? [{ accessKeySecret, bucket, endpoint, protocol, beginDate, endDate }] : [];
+            otherConfig.forEach(r => {
+                if (r.bucket && r.endpoint)
+                    temConfig.push(r);
+            });
+            setOssConfigs(temConfig);
         }
     }, [serverKey]);
+    // 根据时间使用对应的oss配置
+    const getOssConfig = (url) => {
+        // 截取地址中的日期
+        const match = url.match(/\/(\d{4})\/(\d{1,2})\/(\d{1,2})\//);
+        if (!match || ossConfigs.length === 1) {
+            return ossConfigs[0];
+        }
+        const date = dayjs(`${match[1]}-${match[2]}-${match[3]}`);
+        const temConfig = ossConfigs.find(r => {
+            const { beginDate, endDate } = r;
+            if (!beginDate && !endDate) {
+                return true;
+            }
+            if (!beginDate) { // 没有开始日期，则只判断结束日期,包含结束日期
+                return date.isBefore(endDate) || date.isSame(endDate);
+            }
+            if (!endDate) { // 不包含开始日期
+                return dayjs(beginDate).isBefore(date);
+            }
+            return dayjs(beginDate).isBefore(date) && (date.isBefore(endDate) || date.isSame(endDate));
+        });
+        return temConfig || ossConfigs[0];
+    };
     // 处理文件路径,多文件使用,分割
     const handleFilePaths = (val) => {
         var _a;
@@ -32,7 +61,8 @@ const Index = (props) => {
             if (url.startsWith("http")) {
                 temUrl = url;
             }
-            else if (ossConfig) {
+            else if (ossConfigs === null || ossConfigs === void 0 ? void 0 : ossConfigs.length) {
+                const ossConfig = getOssConfig(url);
                 temUrl = `${ossConfig.protocol || "http"}://${ossConfig.bucket}.${ossConfig.endpoint}/${temUrl}`;
             }
             else { // 无oss配置时，使用本地地址
@@ -62,7 +92,7 @@ const Index = (props) => {
     };
     useEffect(() => {
         handleValue(value);
-    }, [value, ossConfig]);
+    }, [value, ossConfigs]);
     const download = (filePath) => {
         const time = new Date().getTime(); // 音视频等文件下载时需要加上时间戳，(音视频播放会占用oss网络通道，导致下载失败)
         Units.downloadFile(`${filePath.path}?t=${time}`, filePath.fileName);

package/lib/controls/direct-file-view/index.js.map

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

package/lib/layout2/components/search-menu.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"search-menu.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/search-menu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA8B,MAAM,OAAO,CAAC;AACnD,OAAO,EAAU,WAAW,EAAuB,MAAM,MAAM,CAAC;AAGhE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAkB/C,UAAU,KAAM,SAAQ,WAAW;IAC/B,QAAQ,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,QAAA,MAAM,KAAK,GAAI,OAAO,KAAK,sBAwD1B,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"search-menu.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/search-menu.tsx"],"names":[],"mappings":"AAAA,OAAO,KAA0C,MAAM,OAAO,CAAC;AAC/D,OAAO,EAAU,WAAW,EAAuB,MAAM,MAAM,CAAC;AAGhE,OAAO,EAAE,QAAQ,EAAE,MAAM,qBAAqB,CAAC;AAmB/C,UAAU,KAAM,SAAQ,WAAW;IAC/B,QAAQ,EAAE,QAAQ,EAAE,CAAC;CACxB;AAED,QAAA,MAAM,KAAK,GAAI,OAAO,KAAK,sBA2D1B,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/layout2/components/search-menu.js

@@ -9,11 +9,12 @@ var __rest = (this && this.__rest) || function (s, e) {
         }
     return t;
 };
-import React, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { Button, Popover, TreeSelect } from "antd";
 import { SearchOutlined } from "@ant-design/icons";
 import { useNavigate } from "react-router-dom";
 import { useLocale } from "../../locale/useLocale";
+import { KeepAliveTabContext } from "../tabs/tabs-context";
 const handleMenu = (arr, translate) => {
     return arr.map(item => {
         const newItem = Object.assign(Object.assign({}, item), { value: item.id, label: translate("${" + item.label + "}") });
@@ -31,6 +32,7 @@ const Index = (props) => {
     const [searchValue, setSearchValue] = useState();
     const [selectInit, setSelectInit] = useState(true); // 解决搜索框初始化设置searchValue，onSearch返回空value的问题
     const navigate = useNavigate();
+    const { tabs } = useContext(KeepAliveTabContext);
     useEffect(() => {
         const newMenu = handleMenu(menuList, translate);
         setMenu(newMenu);
@@ -41,7 +43,9 @@ const Index = (props) => {
                 window.open(`${window.location.origin}/#/${node.url}`, '_blank', 'noopener,noreferrer');
             }
             else {
-                navigate(`/${node.url}`);
+                // 判断当前菜单是否保持在tab页激活页中
+                const isTab = tabs.find(tab => { var _a; return tab.routePath === `/${(_a = node.url) === null || _a === void 0 ? void 0 : _a.split("?")[0]}`; });
+                navigate(isTab ? isTab.pathname : `/${node.url}`);
             }
         }
     };

package/lib/layout2/components/search-menu.js.map

@@ -1 +1 @@
-{"version":3,"file":"search-menu.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/search-menu.tsx"],"names":[],"mappings":"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"}
+{"version":3,"file":"search-menu.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/search-menu.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":"AAQA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAClE,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAe9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAYhD,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAOF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA4NrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAQA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAC9E,OAAO,kBAAkB,CAAC;AAK1B,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAe9C,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAahD,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,EAAE,MAAM,CAAC;IAChB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAOF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+NrC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/lib/layout2/header.js

@@ -1,5 +1,5 @@
 import { ConfigProvider, Layout, Menu, Space, theme, Tooltip, } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import "./css/header.css";
 import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
 import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
@@ -16,6 +16,7 @@ import SearchMenu from "./components/search-menu";
 import ScreenfullButton from "./components/screenfull-button";
 import SystemMessages from "./components/system-messages";
 import UserNotification from "./components/user-notification";
+import { KeepAliveTabContext } from "./tabs/tabs-context";
 const toolbarStyle = {
     width: "100%",
     height: "100%",
@@ -29,6 +30,7 @@ const { useToken } = theme;
 const Header = ({ systemName, menuList, style, logoImg, themeConfig, customHome }) => {
     var _a, _b;
     const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
+    const { tabs } = useContext(KeepAliveTabContext);
     // token
     const { token: { colorPrimary } } = useToken();
     const colors = generate(colorPrimary);
@@ -50,6 +52,8 @@ const Header = ({ systemName, menuList, style, logoImg, themeConfig, customHome
                         renderIcon,
                         translate("${" + label + "}"))));
             const { path, target } = getLeftMostRouteInfo(menuItem);
+            // 判断当前菜单是否保持在tab页激活页中
+            const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
             if (floor === 0)
                 return path === null ? (React.createElement("div", { style: {
                         color: "inherit",
@@ -59,7 +63,7 @@ const Header = ({ systemName, menuList, style, logoImg, themeConfig, customHome
                     } },
                     React.createElement(Space, { size: "small" },
                         renderIcon,
-                        translate("${" + label + "}")))) : (React.createElement(NavLink, { to: `/${path}`, target: target, style: {
+                        translate("${" + label + "}")))) : (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target, style: {
                         color: "inherit",
                         width: "100%",
                         height: "100%",
@@ -69,7 +73,7 @@ const Header = ({ systemName, menuList, style, logoImg, themeConfig, customHome
                         renderIcon,
                         translate("${" + label + "}"))));
             if (Array.isArray(children) && !children.length)
-                return (React.createElement(NavLink, { to: `/${path}`, target: target, style: {
+                return (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target, style: {
                         color: "inherit",
                         width: "100%",
                         height: "100%",
@@ -82,7 +86,7 @@ const Header = ({ systemName, menuList, style, logoImg, themeConfig, customHome
                 renderIcon,
                 translate("${" + label + "}"));
         }, "layout2-header-menu-item"));
-    }, [menuList, getLocale()]);
+    }, [menuList, getLocale(), tabs]);
     // menu select
     const [selectedKeys, setSelectedKeys] = useState([]);
     const { sourceId } = useParams();

package/lib/layout2/header.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/sider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAE3D,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAW9C,OAAO,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,kBAAkB,CAAC;AAE1B,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAErB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAkCF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA0KnC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/sider.tsx"],"names":[],"mappings":"AAEA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAEvE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAW9C,OAAO,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,kBAAkB,CAAC;AAE1B,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IAErB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAkCF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA8KnC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/layout2/sider.js

@@ -8,7 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { ConfigProvider, Layout, Menu, Space, theme, Tooltip } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import { KeepAliveTabContext } from "./tabs/tabs-context";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { NavLink, useParams, useSearchParams } from "react-router-dom";
 import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "./util/menu-util";
 import { useLocale } from "../locale/useLocale";
@@ -39,6 +40,7 @@ const { useToken } = theme;
 const Sider = ({ menuList, collapsed, themeConfig }) => {
     const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
     const [orgName, setOrgName] = useState(""); // 组织名称
+    const { tabs } = useContext(KeepAliveTabContext);
     const initUserConfig = () => __awaiter(void 0, void 0, void 0, function* () {
         let userInfo = yield Units.getCurrentUserInfo();
         if (!userInfo) {
@@ -73,8 +75,10 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
                         display: "block",
                     } }, translate("${" + label + "}")));
             const { path, target } = getLeftMostRouteInfo(menuItem);
+            // 判断当前菜单是否保持在tab页激活页中
+            const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
             if (Array.isArray(children) && !children.length) {
-                const navLink = React.createElement(NavLink, { to: `/${path}`, target: target, style: {
+                const navLink = React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target, style: {
                         color: "inherit",
                         width: "100%",
                         height: "100%",
@@ -111,7 +115,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
             setMenu(getMenuWithSecoundFloor(curSiderMenuList));
             setSelectedKeys(getTargetMenuItemIdRouteList(curSiderMenuList, targetId));
         }
-    }, [sourceId, menuId, menuList, getLocale()]);
+    }, [sourceId, menuId, menuList, getLocale(), tabs]);
     // default select keys
     useEffect(() => {
         var _a;

package/lib/layout2/sider.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/header.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAQlE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAYvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,mBAAmB,CAAC;AAoC3B,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAoHrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/header.tsx"],"names":[],"mappings":"AACA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAQ9E,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAavD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,mBAAmB,CAAC;AAoC3B,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAuHrC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/lib/layout3/header.js

@@ -1,5 +1,5 @@
 import { Layout, Menu, Space } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { NavLink, useParams, useSearchParams } from "react-router-dom";
 import { HomeFilled } from '@ant-design/icons';
 import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
@@ -8,6 +8,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
 // import ThemeButton from "../layout2/components/theme-button";
 import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
 import { useLocale } from "../locale/useLocale";
+import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
 import { useLayoutContext } from "../layout2/layout-context";
 import UserButton from "../layout2/components/user-button";
 import SearchMenu from "../layout2/components/search-menu";
@@ -60,6 +61,7 @@ const Header = ({ systemName, menuList, themeConfig, customHome }) => {
     const [selParentId, setSelParentId] = useState();
     const { sourceId } = useParams();
     const [search] = useSearchParams();
+    const { tabs } = useContext(KeepAliveTabContext);
     const menuId = search.get("menuId");
     const renderMenuItem = (menuItem) => {
         const { label, id, disabled, icon } = menuItem;
@@ -77,11 +79,13 @@ const Header = ({ systemName, menuList, themeConfig, customHome }) => {
         }
         const renderIcon = ((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.showTopMenuIcon) && icon) ? React.createElement(IconFont, { type: icon }) : "";
         const { path, target } = getLeftMostRouteInfo(menuItem);
+        // 判断当前菜单是否保持在tab页激活页中
+        const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
         if (floor === 0) {
-            return path === null ? (renderMenuItem(menuItem)) : (React.createElement(NavLink, { to: `/${path}`, target: target }, renderMenuItem(menuItem)));
+            return path === null ? (renderMenuItem(menuItem)) : (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target }, renderMenuItem(menuItem)));
         }
         if (Array.isArray(children) && !children.length) {
-            return (React.createElement(NavLink, { to: `/${path}`, target: target },
+            return (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target },
                 React.createElement(Space, { size: "small" },
                     renderIcon,
                     translate("${" + label + "}"))));
@@ -96,7 +100,7 @@ const Header = ({ systemName, menuList, themeConfig, customHome }) => {
         if (menuList.length && selParentId) {
             setMenu(handlePropsMenuToAntdMenu(menuList, handleMenu));
         }
-    }, [menuList, getLocale(), selParentId]);
+    }, [menuList, getLocale(), selParentId, tabs]);
     useEffect(() => {
         var _a;
         if (sourceId === undefined) {

package/lib/layout3/header.js.map

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

package/lib/layout3/sider.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/sider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAsC,MAAM,OAAO,CAAC;AAQ3D,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,OAAO,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,kBAAkB,CAAA;AAEzB,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAyBF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAsJnC,CAAC;AAEF,eAAe,KAAK,CAAC"}
+{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/sider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AASvE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,OAAO,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,kBAAkB,CAAA;AAEzB,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAyBF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAyJnC,CAAC;AAEF,eAAe,KAAK,CAAC"}

package/lib/layout3/sider.js

@@ -8,9 +8,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { ConfigProvider, Layout, Menu, Space, Tooltip } from "antd";
-import React, { useEffect, useRef, useState } from "react";
+import React, { useContext, useEffect, useRef, useState } from "react";
 import { NavLink, useParams, useSearchParams } from "react-router-dom";
 import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "../layout2/util/menu-util";
+import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
 import { useLayoutContext } from "../layout2/layout-context";
 import { useLocale } from "../locale/useLocale";
 import IconFont from "../layout2/components/icon-font";
@@ -44,6 +45,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
     const { sourceId } = useParams();
     const [search] = useSearchParams();
     const menuId = search.get("menuId");
+    const { tabs } = useContext(KeepAliveTabContext);
     const initUserConfig = () => __awaiter(void 0, void 0, void 0, function* () {
         let userInfo = yield Units.getCurrentUserInfo();
         if (!userInfo) {
@@ -71,8 +73,10 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
                         display: "block",
                     } }, translate("${" + label + "}")));
             const { path, target } = getLeftMostRouteInfo(menuItem);
+            // 判断当前菜单是否保持在tab页激活页中
+            const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
             if (Array.isArray(children) && !children.length) {
-                const navLink = React.createElement(NavLink, { to: `/${path}`, target: target, style: {
+                const navLink = React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target, style: {
                         color: "inherit",
                         width: "100%",
                         height: "100%",
@@ -108,7 +112,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
                 setOpenKeys(temIds);
             }, 10);
         }
-    }, [sourceId, menuId, menuList, getLocale()]);
+    }, [sourceId, menuId, menuList, getLocale(), tabs]);
     // default select keys
     useEffect(() => {
         var _a;

package/lib/layout3/sider.js.map

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

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

@@ -1 +1 @@
-{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"AACA,OAAO,KAA6C,MAAM,OAAO,CAAC;AAOlE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAYvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,mBAAmB,CAAC;AA4B3B,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CA+HrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
+{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"AACA,OAAO,KAAyD,MAAM,OAAO,CAAC;AAO9E,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAavD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,mBAAmB,CAAC;AA4B3B,KAAK,eAAe,GAAG;IACrB,UAAU,EAAE,MAAM,CAAC;IACnB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,KAAK,CAAC,EAAE,GAAG,CAAC;IACZ,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AAIF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAkIrC,CAAC;AAEF,eAAe,MAAM,CAAC"}

package/lib/layout4/header.js

@@ -1,5 +1,5 @@
 import { Layout, Menu, Space, theme } from "antd";
-import React, { useEffect, useState } from "react";
+import React, { useContext, useEffect, useState } from "react";
 import { NavLink, useParams, useSearchParams } from "react-router-dom";
 import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
 import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
@@ -7,6 +7,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
 // import ThemeButton from "../layout2/components/theme-button";
 import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
 import { useLocale } from "../locale/useLocale";
+import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
 import { useLayoutContext } from "../layout2/layout-context";
 import UserButton from "../layout2/components/user-button";
 import SearchMenu from "../layout2/components/search-menu";
@@ -51,6 +52,7 @@ const Header = ({ systemName, menuList, logoImg, themeConfig, customHome }) => {
     const [selParentId, setSelParentId] = useState();
     const { sourceId } = useParams();
     const [search] = useSearchParams();
+    const { tabs } = useContext(KeepAliveTabContext);
     const menuId = search.get("menuId");
     const { token: { colorPrimary } } = useToken();
     const toolbarStyle = {
@@ -78,11 +80,13 @@ const Header = ({ systemName, menuList, logoImg, themeConfig, customHome }) => {
         }
         const renderIcon = ((themeConfig === null || themeConfig === void 0 ? void 0 : themeConfig.showTopMenuIcon) && icon) ? React.createElement(IconFont, { type: icon }) : "";
         const { path, target } = getLeftMostRouteInfo(menuItem);
+        // 判断当前菜单是否保持在tab页激活页中
+        const isTab = tabs.find(tab => tab.routePath === `/${path === null || path === void 0 ? void 0 : path.split("?")[0]}`);
         if (floor === 0) {
-            return path === null ? (renderMenuItem(menuItem)) : (React.createElement(NavLink, { to: `/${path}`, target: target }, renderMenuItem(menuItem)));
+            return path === null ? (renderMenuItem(menuItem)) : (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target }, renderMenuItem(menuItem)));
         }
         if (Array.isArray(children) && !children.length) {
-            return (React.createElement(NavLink, { to: `/${path}`, target: target },
+            return (React.createElement(NavLink, { to: isTab ? isTab.pathname : `/${path}`, target: target },
                 React.createElement(Space, { size: "small" },
                     renderIcon,
                     translate("${" + label + "}"))));
@@ -97,7 +101,7 @@ const Header = ({ systemName, menuList, logoImg, themeConfig, customHome }) => {
         if (menuList.length && selParentId) {
             setMenu(handlePropsMenuToAntdMenu(menuList, handleMenu));
         }
-    }, [menuList, getLocale(), selParentId]);
+    }, [menuList, getLocale(), selParentId, tabs]);
     useEffect(() => {
         var _a;
         if (sourceId === undefined) {

package/lib/layout4/header.js.map

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