aldehyde 0.2.500 → 0.2.501
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/lib/layout2/components/search-menu.d.ts.map +1 -1
- package/lib/layout2/components/search-menu.js +3 -3
- package/lib/layout2/components/search-menu.js.map +1 -1
- package/lib/layout2/header.d.ts.map +1 -1
- package/lib/layout2/header.js +3 -3
- package/lib/layout2/header.js.map +1 -1
- package/lib/layout2/sider.d.ts.map +1 -1
- package/lib/layout2/sider.js +4 -4
- package/lib/layout2/sider.js.map +1 -1
- package/lib/layout3/header.d.ts.map +1 -1
- package/lib/layout3/header.js +3 -3
- package/lib/layout3/header.js.map +1 -1
- package/lib/layout3/sider.d.ts.map +1 -1
- package/lib/layout3/sider.js +4 -4
- package/lib/layout3/sider.js.map +1 -1
- package/lib/layout4/header.d.ts.map +1 -1
- package/lib/layout4/header.js +3 -3
- package/lib/layout4/header.js.map +1 -1
- package/lib/layout4/sider.d.ts.map +1 -1
- package/lib/layout4/sider.js +4 -4
- package/lib/layout4/sider.js.map +1 -1
- package/lib/layout5/header.d.ts.map +1 -1
- package/lib/layout5/header.js +3 -3
- package/lib/layout5/header.js.map +1 -1
- package/lib/layout5/sider.d.ts.map +1 -1
- package/lib/layout5/sider.js +4 -4
- package/lib/layout5/sider.js.map +1 -1
- package/package.json +1 -1
- package/src/aldehyde/layout2/components/search-menu.tsx +3 -3
- package/src/aldehyde/layout2/header.tsx +3 -3
- package/src/aldehyde/layout2/sider.tsx +4 -4
- package/src/aldehyde/layout3/header.tsx +3 -3
- package/src/aldehyde/layout3/sider.tsx +4 -4
- package/src/aldehyde/layout4/header.tsx +3 -3
- package/src/aldehyde/layout4/sider.tsx +4 -4
- package/src/aldehyde/layout5/header.tsx +3 -3
- package/src/aldehyde/layout5/sider.tsx +4 -4
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-menu.d.ts","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/search-menu.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"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"}
|
|
@@ -9,12 +9,12 @@ var __rest = (this && this.__rest) || function (s, e) {
|
|
|
9
9
|
}
|
|
10
10
|
return t;
|
|
11
11
|
};
|
|
12
|
-
import React, { useEffect, useState } from "react";
|
|
12
|
+
import React, { useContext, useEffect, useState } from "react";
|
|
13
13
|
import { Button, Popover, TreeSelect } from "antd";
|
|
14
14
|
import { SearchOutlined } from "@ant-design/icons";
|
|
15
15
|
import { useNavigate } from "react-router-dom";
|
|
16
16
|
import { useLocale } from "../../locale/useLocale";
|
|
17
|
-
import {
|
|
17
|
+
import { KeepAliveTabContext } from "../tabs/tabs-context";
|
|
18
18
|
const handleMenu = (arr, translate) => {
|
|
19
19
|
return arr.map(item => {
|
|
20
20
|
const newItem = Object.assign(Object.assign({}, item), { value: item.id, label: translate("${" + item.label + "}") });
|
|
@@ -32,7 +32,7 @@ const Index = (props) => {
|
|
|
32
32
|
const [searchValue, setSearchValue] = useState();
|
|
33
33
|
const [selectInit, setSelectInit] = useState(true); // 解决搜索框初始化设置searchValue，onSearch返回空value的问题
|
|
34
34
|
const navigate = useNavigate();
|
|
35
|
-
const { tabs } =
|
|
35
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
36
36
|
useEffect(() => {
|
|
37
37
|
const newMenu = handleMenu(menuList, translate);
|
|
38
38
|
setMenu(newMenu);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"search-menu.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/search-menu.tsx"],"names":[],"mappings":";;;;;;;;;;;AAAA,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"search-menu.js","sourceRoot":"","sources":["../../../../../src/aldehyde/layout2/components/search-menu.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAQA,OAAO,
|
|
1
|
+
{"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
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, Space, theme, Tooltip, } from "antd";
|
|
2
|
-
import React, { useEffect, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useState } from "react";
|
|
3
3
|
import "./css/header.css";
|
|
4
4
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
5
5
|
import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
@@ -16,7 +16,7 @@ import SearchMenu from "./components/search-menu";
|
|
|
16
16
|
import ScreenfullButton from "./components/screenfull-button";
|
|
17
17
|
import SystemMessages from "./components/system-messages";
|
|
18
18
|
import UserNotification from "./components/user-notification";
|
|
19
|
-
import {
|
|
19
|
+
import { KeepAliveTabContext } from "./tabs/tabs-context";
|
|
20
20
|
const toolbarStyle = {
|
|
21
21
|
width: "100%",
|
|
22
22
|
height: "100%",
|
|
@@ -30,7 +30,7 @@ const { useToken } = theme;
|
|
|
30
30
|
const Header = ({ systemName, menuList, style, logoImg, themeConfig, customHome }) => {
|
|
31
31
|
var _a, _b;
|
|
32
32
|
const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
|
|
33
|
-
const { tabs } =
|
|
33
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
34
34
|
// token
|
|
35
35
|
const { token: { colorPrimary } } = useToken();
|
|
36
36
|
const colors = generate(colorPrimary);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EACL,cAAc,EACd,MAAM,EACN,IAAI,EACO,KAAK,EAChB,KAAK,EACL,OAAO,GACR,MAAM,MAAM,CAAC;AACd,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAiB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/header.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/sider.tsx"],"names":[],"mappings":"
|
|
1
|
+
{"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
CHANGED
|
@@ -8,7 +8,8 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { ConfigProvider, Layout, Menu, Space, theme, Tooltip } from "antd";
|
|
11
|
-
import
|
|
11
|
+
import { KeepAliveTabContext } from "./tabs/tabs-context";
|
|
12
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
12
13
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
13
14
|
import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "./util/menu-util";
|
|
14
15
|
import { useLocale } from "../locale/useLocale";
|
|
@@ -16,7 +17,6 @@ import { generate } from "@ant-design/colors";
|
|
|
16
17
|
import { useLayoutContext } from "./layout-context";
|
|
17
18
|
import IconFont from "./components/icon-font";
|
|
18
19
|
import Units from "../units";
|
|
19
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
20
20
|
import "./css/sider.less";
|
|
21
21
|
/**
|
|
22
22
|
* @param menuList 自定义的menu
|
|
@@ -40,7 +40,7 @@ const { useToken } = theme;
|
|
|
40
40
|
const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
41
41
|
const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
|
|
42
42
|
const [orgName, setOrgName] = useState(""); // 组织名称
|
|
43
|
-
const { tabs } =
|
|
43
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
44
44
|
const initUserConfig = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
45
45
|
let userInfo = yield Units.getCurrentUserInfo();
|
|
46
46
|
if (!userInfo) {
|
|
@@ -115,7 +115,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
115
115
|
setMenu(getMenuWithSecoundFloor(curSiderMenuList));
|
|
116
116
|
setSelectedKeys(getTargetMenuItemIdRouteList(curSiderMenuList, targetId));
|
|
117
117
|
}
|
|
118
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
118
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
119
119
|
// default select keys
|
|
120
120
|
useEffect(() => {
|
|
121
121
|
var _a;
|
package/lib/layout2/sider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/sider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout2/sider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/header.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"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
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Layout, Menu, Space } from "antd";
|
|
2
|
-
import React, { useEffect, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import { HomeFilled } from '@ant-design/icons';
|
|
5
5
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
@@ -8,6 +8,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
|
8
8
|
// import ThemeButton from "../layout2/components/theme-button";
|
|
9
9
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
10
10
|
import { useLocale } from "../locale/useLocale";
|
|
11
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
11
12
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
12
13
|
import UserButton from "../layout2/components/user-button";
|
|
13
14
|
import SearchMenu from "../layout2/components/search-menu";
|
|
@@ -18,7 +19,6 @@ import headerBgImg from "./imgs/header-bg.png";
|
|
|
18
19
|
import homeBgImg from "./imgs/home-bg.png";
|
|
19
20
|
import Time from "./components/time";
|
|
20
21
|
import IconFont from "../layout2/components/icon-font";
|
|
21
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
22
22
|
import "./css/header.less";
|
|
23
23
|
const toolbarStyle = {
|
|
24
24
|
width: "100%",
|
|
@@ -61,7 +61,7 @@ const Header = ({ systemName, menuList, themeConfig, customHome }) => {
|
|
|
61
61
|
const [selParentId, setSelParentId] = useState();
|
|
62
62
|
const { sourceId } = useParams();
|
|
63
63
|
const [search] = useSearchParams();
|
|
64
|
-
const { tabs } =
|
|
64
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
65
65
|
const menuId = search.get("menuId");
|
|
66
66
|
const renderMenuItem = (menuItem) => {
|
|
67
67
|
const { label, id, disabled, icon } = menuItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,MAAM,MAAM,CAAC;AACtD,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAiB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/header.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/sider.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"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
CHANGED
|
@@ -8,14 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { ConfigProvider, Layout, Menu, Space, Tooltip } from "antd";
|
|
11
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
11
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
12
12
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
13
13
|
import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "../layout2/util/menu-util";
|
|
14
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
14
15
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
15
16
|
import { useLocale } from "../locale/useLocale";
|
|
16
17
|
import IconFont from "../layout2/components/icon-font";
|
|
17
18
|
import Units from "../units";
|
|
18
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
19
19
|
import "./css/sider.less";
|
|
20
20
|
/**
|
|
21
21
|
* @param menuList 自定义的menu
|
|
@@ -45,7 +45,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
45
45
|
const { sourceId } = useParams();
|
|
46
46
|
const [search] = useSearchParams();
|
|
47
47
|
const menuId = search.get("menuId");
|
|
48
|
-
const { tabs } =
|
|
48
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
49
49
|
const initUserConfig = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
50
50
|
let userInfo = yield Units.getCurrentUserInfo();
|
|
51
51
|
if (!userInfo) {
|
|
@@ -112,7 +112,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
112
112
|
setOpenKeys(temIds);
|
|
113
113
|
}, 10);
|
|
114
114
|
}
|
|
115
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
115
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
116
116
|
// default select keys
|
|
117
117
|
useEffect(() => {
|
|
118
118
|
var _a;
|
package/lib/layout3/sider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/sider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,OAAO,EAAE,MAAM,MAAM,CAAC;AAC/E,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout3/sider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"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
CHANGED
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Layout, Menu, Space, theme } from "antd";
|
|
2
|
-
import React, { useEffect, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
5
5
|
import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
@@ -7,6 +7,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
|
7
7
|
// import ThemeButton from "../layout2/components/theme-button";
|
|
8
8
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
9
9
|
import { useLocale } from "../locale/useLocale";
|
|
10
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
10
11
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
11
12
|
import UserButton from "../layout2/components/user-button";
|
|
12
13
|
import SearchMenu from "../layout2/components/search-menu";
|
|
@@ -17,7 +18,6 @@ import headerBgImg from "./imgs/header-bg.png";
|
|
|
17
18
|
import menuItemBgImg from "./imgs/menu-item-bg.png";
|
|
18
19
|
import userImg from "./imgs/user.png";
|
|
19
20
|
import IconFont from "../layout2/components/icon-font";
|
|
20
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
21
21
|
import "./css/header.less";
|
|
22
22
|
// 查找当前选中菜单的顶层菜单id
|
|
23
23
|
const findPathToRoot = (menus, targetId) => {
|
|
@@ -52,7 +52,7 @@ const Header = ({ systemName, menuList, logoImg, themeConfig, customHome }) => {
|
|
|
52
52
|
const [selParentId, setSelParentId] = useState();
|
|
53
53
|
const { sourceId } = useParams();
|
|
54
54
|
const [search] = useSearchParams();
|
|
55
|
-
const { tabs } =
|
|
55
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
56
56
|
const menuId = search.get("menuId");
|
|
57
57
|
const { token: { colorPrimary } } = useToken();
|
|
58
58
|
const toolbarStyle = {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,QAAQ,EAAiB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/header.tsx"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AAC7D,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,QAAQ,EAAiB,MAAM,OAAO,CAAC;AAC9E,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,cAAc,MAAM,iCAAiC,CAAC;AAC7D,OAAO,gBAAgB,MAAM,mCAAmC,CAAC;AACjE,qDAAqD;AACrD,gEAAgE;AAChE,OAAO,EAAE,oBAAoB,EAAE,yBAAyB,EAAE,MAAM,2BAA2B,CAAC;AAE5F,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAC7D,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,UAAU,MAAM,mCAAmC,CAAC;AAC3D,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,cAAc,MAAM,uCAAuC,CAAC;AACnE,OAAO,gBAAgB,MAAM,yCAAyC,CAAC;AACvE,OAAO,WAAW,MAAM,sBAAsB,CAAC;AAC/C,OAAO,aAAa,MAAM,yBAAyB,CAAC;AACpD,OAAO,OAAO,MAAM,iBAAiB,CAAC;AACtC,OAAO,QAAQ,MAAM,iCAAiC,CAAC;AAEvD,OAAO,mBAAmB,CAAC;AAE3B,kBAAkB;AAClB,MAAM,cAAc,GAAG,CAAC,KAAK,EAAE,QAAQ,EAAE,EAAE;IACzC,6BAA6B;IAC7B,MAAM,KAAK,GAAG,EAAE,CAAC;IACjB,+BAA+B;IAC/B,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;QACzB,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,IAAI,EAAE,CAAC,IAAI,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC;IACxC,CAAC;IACD,OAAO,KAAK,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,MAAM,EAAE,IAAI,EAAE,IAAI,EAAE,GAAG,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,SAAS;QAC7C,gBAAgB;QAChB,IAAI,IAAI,CAAC,EAAE,KAAK,QAAQ,EAAE,CAAC;YACzB,OAAO,IAAI,CAAC,CAAC,CAAC,CAAC,CAAC,uBAAuB;QACzC,CAAC;QACD,oCAAoC;QACpC,IAAI,IAAI,CAAC,QAAQ,IAAI,IAAI,CAAC,QAAQ,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;YAC9C,KAAK,MAAM,KAAK,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClC,KAAK,CAAC,IAAI,CAAC,EAAE,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,GAAG,IAAI,EAAE,KAAK,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,cAAc;YACxE,CAAC;QACH,CAAC;IACH,CAAC;IACD,OAAO,IAAI,CAAC;AACd,CAAC,CAAA;AAED,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AAa3B,MAAM,MAAM,GAA8B,CAAC,EAAE,UAAU,EAAE,QAAQ,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;;IACvG,MAAM,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC9E,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAC7C,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAa,EAAE,CAAC,CAAC;IACjD,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,WAAW,EAAE,cAAc,CAAC,GAAG,QAAQ,EAAU,CAAC;IACzD,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;IACjC,MAAM,CAAC,MAAM,CAAC,GAAG,eAAe,EAAE,CAAC;IACnC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;IACjD,MAAM,MAAM,GAAW,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,GAAG,QAAQ,EAAE,CAAC;IAE/C,MAAM,YAAY,GAAkB;QAClC,KAAK,EAAE,MAAM;QACb,MAAM,EAAE,MAAM;QACd,SAAS,EAAE,YAAY;QACvB,OAAO,EAAE,CAAC;QACV,YAAY,EAAE,CAAC;QACf,QAAQ,EAAE,CAAC;QACX,KAAK,EAAE,YAAY;QACnB,QAAQ,EAAE,MAAM;KACjB,CAAC;IAEF,MAAM,cAAc,GAAG,CAAC,QAAQ,EAAE,EAAE;QAClC,MAAM,EAAE,KAAK,EAAE,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;QAC/C,MAAM,UAAU,GAAG,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,KAAI,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAC,QAAQ,IAAC,IAAI,EAAE,IAAI,EAAE,SAAS,EAAC,WAAW,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC;QAChH,OAAO,6BAAK,SAAS,EAAE,aAAa,QAAQ,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,IAAI,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,EAAE,eAAe,EAAE,WAAW,KAAK,EAAE,CAAC,CAAC,CAAC,OAAO,aAAa,GAAG,CAAC,CAAC,CAAC,SAAS,EAAE;YAAE,oBAAC,KAAK,IAAC,IAAI,EAAE,OAAO;gBAAG,UAAU;gBAAE,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAS,CAAM,CAAC;IACjS,CAAC,CAAA;IAED,MAAM,UAAU,GAAG,CAAC,QAAQ,EAAE,KAAK,EAAE,EAAE;QACrC,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;QACrD,IAAI,QAAQ,EAAE,CAAC;YACb,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;QAClC,CAAC;QACD,MAAM,UAAU,GAAG,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,eAAe,KAAI,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAC,QAAQ,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC,CAAC,CAAC,EAAE,CAAC;QAC1F,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;QACxD,sBAAsB;QACtB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;QAC5E,IAAI,KAAK,KAAK,CAAC,EAAE,CAAC;YAChB,OAAO,IAAI,KAAK,IAAI,CAAC,CAAC,CAAC,CACrB,cAAc,CAAC,QAAQ,CAAC,CACzB,CAAC,CAAC,CAAC,CACF,oBAAC,OAAO,IACN,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EACvC,MAAM,EAAE,MAAM,IAEb,cAAc,CAAC,QAAQ,CAAC,CACjB,CACX,CAAC;QACJ,CAAC;QACD,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YAChD,OAAO,CACL,oBAAC,OAAO,IAAC,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EAAE,MAAM,EAAE,MAAM;gBAC9D,oBAAC,KAAK,IAAC,IAAI,EAAE,OAAO;oBAAG,UAAU;oBAAE,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAS,CACjE,CACX,CAAC;QACJ,CAAC;QACD,OAAO,cAAc,CAAC,QAAQ,CAAC,CAAC;IAClC,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,MAAM,KAAK,SAAS;YAAE,eAAe,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC;IACtD,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC;IAEb,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,QAAQ,CAAC,MAAM,IAAI,WAAW,EAAE,CAAC;YACnC,OAAO,CAAC,yBAAyB,CAAC,QAAQ,EAAE,UAAU,CAAC,CAAC,CAAC;QAC3D,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,SAAS,EAAE,EAAE,WAAW,EAAE,IAAI,CAAC,CAAC,CAAC;IAE/C,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,QAAQ,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAC9B,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC;gBAClC,cAAc,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC;YACjC,CAAC;YACD,gBAAgB,CAAC,EAAE,CAAC,CAAC;QACvB,CAAC;aAAM,IAAI,QAAQ,CAAC,MAAM,EAAE,CAAC;YAC3B,MAAM,aAAa,GACjB,MAAA,QAAQ,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,0CAAE,KAAK,CAAC;YAC1D,gBAAgB,CAAC,SAAS,CAAC,IAAI,GAAG,aAAa,GAAG,GAAG,CAAC,CAAC,CAAC;YACxD,eAAe,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC;YAC5B,cAAc,CAAC,cAAc,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;QACrD,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,CAAC,CAAC,CAAC;IAEzB,OAAO,CACL,oBAAC,MAAM,CAAC,MAAM,IAAC,SAAS,EAAC,kBAAkB;QACzC,6BAAK,SAAS,EAAC,YAAY,EAAC,KAAK,EAAE,EAAE,eAAe,EAAE,OAAO,WAAW,GAAG,EAAE;YAC3E,oBAAC,OAAO,IAAC,EAAE,EAAE,UAAU,IAAI,UAAU,EAAE,KAAK,EAAE,EAAE,OAAO,EAAE,UAAU,EAAE;gBACnE,6BAAK,SAAS,EAAC,cAAc;oBAC1B,OAAO,CAAC,CAAC,CAAC,6BAAK,GAAG,EAAE,OAAO,EAAE,GAAG,EAAC,EAAE,GAAG,CAAC,CAAC,CAAC,oBAAC,QAAQ,IAAC,IAAI,EAAC,cAAc,EAAC,SAAS,EAAC,mBAAmB,GAAG;oBACxG,6BAAK,SAAS,EAAC,mBAAmB,IAAE,SAAS,CAAC,IAAI,GAAG,UAAU,GAAG,GAAG,CAAC,CAAO,CAAM,CAC7E;YACV,6BAAK,SAAS,EAAC,YAAY;gBACzB,oBAAC,IAAI,IACH,IAAI,EAAC,YAAY,EACjB,KAAK,EAAE,IAAI,EACX,YAAY,EAAE,YAAY,EAC1B,KAAK,EAAE,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,GACnE,CACE;YACN,6BAAK,SAAS,EAAC,cAAc;gBAC1B,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,0CAAE,QAAQ,CAAC,cAAc,CAAC,EAAC,CAAC,CAAC,oBAAC,cAAc,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAAC,CAAC,CAAC,EAAE;gBAC5F,CAAA,MAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,OAAO,0CAAE,QAAQ,CAAC,mBAAmB,CAAC,EAAC,CAAC,CAAC,oBAAC,gBAAgB,IAAC,QAAQ,EAAE,QAAQ,GAAI,CAAC,CAAC,CAAC,EAAE;gBACpG,oBAAC,KAAK,IAAC,IAAI,EAAC,OAAO;oBACjB,oBAAC,gBAAgB,IAAC,KAAK,EAAE,YAAY,GAAI;oBACzC,oBAAC,UAAU,IAAC,QAAQ,EAAE,QAAQ,EAAE,KAAK,EAAE,YAAY,GAAI;oBACvD,oBAAC,cAAc,IAAC,KAAK,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAI;oBACpE,oBAAC,gBAAgB,IAAC,OAAO,EAAC,IAAI,EAAC,KAAK,EAAE,EAAE,KAAK,EAAE,YAAY,EAAE,QAAQ,EAAE,MAAM,EAAE,GAAI;oBAanF,6BAAK,SAAS,EAAC,aAAa;wBAC1B,oBAAC,UAAU,IAAC,WAAW,EAAE,WAAW,EAAE,cAAc,EAAC,IAAI,EAAC,SAAS,EAAC,SAAS,EAAC,KAAK,EAAE,EAAE,OAAO,EAAE,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,YAAY,EAAE,6BAAK,GAAG,EAAE,OAAO,EAAE,GAAG,EAAC,EAAE,EAAC,SAAS,EAAC,YAAY,GAAG,GAAI,CACrL,CACA,CACJ,CACF,CACQ,CACjB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/sider.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/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;AA2BF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CA0JnC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/lib/layout4/sider.js
CHANGED
|
@@ -8,14 +8,14 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { ConfigProvider, Layout, Menu, Space, Tooltip, theme } from "antd";
|
|
11
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
11
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
12
12
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
13
13
|
import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "../layout2/util/menu-util";
|
|
14
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
14
15
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
15
16
|
import { useLocale } from "../locale/useLocale";
|
|
16
17
|
import IconFont from "../layout2/components/icon-font";
|
|
17
18
|
import Units from "../units";
|
|
18
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
19
19
|
import "./css/sider.less";
|
|
20
20
|
/**
|
|
21
21
|
* @param menuList 自定义的menu
|
|
@@ -45,7 +45,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
45
45
|
const [openKeys, setOpenKeys] = useState([]);
|
|
46
46
|
const { sourceId } = useParams();
|
|
47
47
|
const [search] = useSearchParams();
|
|
48
|
-
const { tabs } =
|
|
48
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
49
49
|
const menuId = search.get("menuId");
|
|
50
50
|
const { token: { colorPrimary } } = useToken();
|
|
51
51
|
const initUserConfig = () => __awaiter(void 0, void 0, void 0, function* () {
|
|
@@ -114,7 +114,7 @@ const Sider = ({ menuList, collapsed, themeConfig }) => {
|
|
|
114
114
|
setOpenKeys(temIds);
|
|
115
115
|
}, 10);
|
|
116
116
|
}
|
|
117
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
117
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
118
118
|
// default select keys
|
|
119
119
|
useEffect(() => {
|
|
120
120
|
var _a;
|
package/lib/layout4/sider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/sider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout4/sider.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"header.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAkE,MAAM,OAAO,CAAC;AAavF,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAKvD,OAAO,EAAE,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAChD,OAAO,mBAAmB,CAAC;AA4B3B,KAAK,eAAe,GAAG;IACrB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,WAAW,CAAC,EAAE,WAAW,CAAC;CAC3B,CAAC;AAGF,QAAA,MAAM,MAAM,EAAE,KAAK,CAAC,EAAE,CAAC,eAAe,CAwJrC,CAAC;AAEF,eAAe,MAAM,CAAC"}
|
package/lib/layout5/header.js
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState, useEffect, useMemo } from "react";
|
|
1
|
+
import React, { useContext, useState, useEffect, useMemo } from "react";
|
|
2
2
|
import { Layout, Space, theme, Button, Dropdown, Breadcrumb, ConfigProvider } from "antd";
|
|
3
3
|
import { NavLink, useParams, useSearchParams, useLocation } from "react-router-dom";
|
|
4
4
|
import { LeftOutlined, RightOutlined, UnorderedListOutlined } from '@ant-design/icons';
|
|
@@ -12,9 +12,9 @@ import ScreenfullButton from "../layout2/components/screenfull-button";
|
|
|
12
12
|
import SystemMessages from "../layout2/components/system-messages";
|
|
13
13
|
import UserNotification from "../layout2/components/user-notification";
|
|
14
14
|
import { useLocale } from "../locale/useLocale";
|
|
15
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
15
16
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
16
17
|
import IconFont from "../layout2/components/icon-font";
|
|
17
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
18
18
|
import "./css/header.less";
|
|
19
19
|
const { useToken } = theme;
|
|
20
20
|
// 查找当前选中菜单的顶层菜单id
|
|
@@ -52,7 +52,7 @@ const Header = ({ menuList, themeConfig }) => {
|
|
|
52
52
|
const { pathname } = useLocation();
|
|
53
53
|
const { sourceId } = useParams();
|
|
54
54
|
const [search] = useSearchParams();
|
|
55
|
-
const { tabs } =
|
|
55
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
56
56
|
const menuId = search.get("menuId");
|
|
57
57
|
const handleMenu = (menuItem, floor) => {
|
|
58
58
|
const { disabled, label, children, icon } = menuItem;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,EAAE,QAAQ,EAAE,SAAS,EAAE,OAAO,EAAiB,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"header.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/header.tsx"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":"AACA,OAAO,
|
|
1
|
+
{"version":3,"file":"sider.d.ts","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":"AACA,OAAO,KAAkD,MAAM,OAAO,CAAC;AAUvE,OAAO,EAAE,QAAQ,EAAE,MAAM,6BAA6B,CAAC;AAGvD,OAAO,EAAY,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAE1D,OAAO,kBAAkB,CAAC;AAE1B,KAAK,cAAc,GAAG;IACpB,QAAQ,EAAE,QAAQ,EAAE,CAAC;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,OAAO,CAAC,EAAE,MAAM,CAAC;IACjB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB,CAAC;AA2BF,QAAA,MAAM,KAAK,EAAE,KAAK,CAAC,EAAE,CAAC,cAAc,CAwLnC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/lib/layout5/sider.js
CHANGED
|
@@ -8,15 +8,15 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
|
|
|
8
8
|
});
|
|
9
9
|
};
|
|
10
10
|
import { ConfigProvider, Layout, Menu, Space, Tooltip, theme } from "antd";
|
|
11
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
11
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
12
12
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
13
13
|
import { generate } from "@ant-design/colors";
|
|
14
14
|
import { getLeftMostRouteInfo, getTargetMenuItemIdRouteList, handlePropsMenuToAntdMenu, } from "../layout2/util/menu-util";
|
|
15
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
15
16
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
16
17
|
import { useLocale } from "../locale/useLocale";
|
|
17
18
|
import IconFont from "../layout2/components/icon-font";
|
|
18
19
|
import Units from "../units";
|
|
19
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
20
20
|
import "./css/sider.less";
|
|
21
21
|
/**
|
|
22
22
|
* @param menuList 自定义的menu
|
|
@@ -46,7 +46,7 @@ const Sider = ({ menuList, collapsed, systemName, logoImg, themeConfig, customHo
|
|
|
46
46
|
const [openKeys, setOpenKeys] = useState([]);
|
|
47
47
|
const { sourceId } = useParams();
|
|
48
48
|
const [search] = useSearchParams();
|
|
49
|
-
const { tabs } =
|
|
49
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
50
50
|
const menuId = search.get("menuId");
|
|
51
51
|
const { token: { colorPrimary } } = useToken();
|
|
52
52
|
const colors = generate(colorPrimary);
|
|
@@ -116,7 +116,7 @@ const Sider = ({ menuList, collapsed, systemName, logoImg, themeConfig, customHo
|
|
|
116
116
|
setOpenKeys(temIds);
|
|
117
117
|
}, 10);
|
|
118
118
|
}
|
|
119
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
119
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
120
120
|
// default select keys
|
|
121
121
|
useEffect(() => {
|
|
122
122
|
var _a;
|
package/lib/layout5/sider.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;
|
|
1
|
+
{"version":3,"file":"sider.js","sourceRoot":"","sources":["../../../../src/aldehyde/layout5/sider.tsx"],"names":[],"mappings":";;;;;;;;;AAAA,OAAO,EAAE,cAAc,EAAE,MAAM,EAAE,IAAI,EAAa,KAAK,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,MAAM,CAAC;AACtF,OAAO,KAAK,EAAE,EAAE,UAAU,EAAE,SAAS,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,OAAO,CAAC;AACvE,OAAO,EAAE,OAAO,EAAE,SAAS,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AACvE,OAAO,EAAE,QAAQ,EAAE,MAAM,oBAAoB,CAAC;AAC9C,OAAO,EACL,oBAAoB,EACpB,4BAA4B,EAC5B,yBAAyB,GAC1B,MAAM,2BAA2B,CAAC;AACnC,OAAO,EAAE,mBAAmB,EAAE,MAAM,8BAA8B,CAAC;AACnE,OAAO,EAAE,gBAAgB,EAAE,MAAM,2BAA2B,CAAC;AAE7D,OAAO,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AAChD,OAAO,QAAQ,MAAM,iCAAiC,CAAC;AAEvD,OAAO,KAAK,MAAM,UAAU,CAAC;AAC7B,OAAO,kBAAkB,CAAC;AAc1B;;;;GAIG;AACH,MAAM,uBAAuB,GAAG,CAC9B,QAAoB,EACE,EAAE;IACxB,MAAM,oBAAoB,GAAyB,KAAK,CAAC,IAAI,CAAC;QAC5D,MAAM,EAAE,QAAQ,CAAC,MAAM;KACxB,CAAC,CAAC,GAAG,CAAC,GAAG,EAAE,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAExC,KAAK,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,QAAQ,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE,CAAC;QACzC,MAAM,QAAQ,GAAG,QAAQ,CAAC,CAAC,CAAC,CAAC;QAC7B,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,QAAQ,CAAC;YAC9B,CAAC,oBAAoB,CAAC,CAAC,CAAC,GAAG,QAAQ,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IACD,OAAO,oBAAoB,CAAC;AAC9B,CAAC,CAAC;AAEF,MAAM,EAAE,QAAQ,EAAE,GAAG,KAAK,CAAC;AAE3B,MAAM,KAAK,GAA6B,CAAC,EAAE,QAAQ,EAAE,SAAS,EAAE,UAAU,EAAE,OAAO,EAAE,WAAW,EAAE,UAAU,EAAE,EAAE,EAAE;IAChH,MAAM,EAAE,gBAAgB,EAAE,4BAA4B,EAAE,GAAG,gBAAgB,EAAE,CAAC;IAC9E,MAAM,EAAE,SAAS,EAAE,SAAS,EAAE,GAAG,SAAS,EAAE,CAAC;IAC7C,MAAM,oBAAoB,GAAG,MAAM,CAAuB,EAAE,CAAC,CAAC;IAC9D,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC,GAAG,QAAQ,CAAa,EAAE,CAAC,CAAC;IACjD,MAAM,CAAC,OAAO,EAAE,UAAU,CAAC,GAAG,QAAQ,CAAS,EAAE,CAAC,CAAC,CAAC,OAAO;IAC3D,cAAc;IACd,MAAM,CAAC,YAAY,EAAE,eAAe,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IACrD,MAAM,CAAC,QAAQ,EAAE,WAAW,CAAC,GAAG,QAAQ,CAAC,EAAE,CAAC,CAAC;IAC7C,MAAM,EAAE,QAAQ,EAAE,GAAG,SAAS,EAAE,CAAC;IACjC,MAAM,CAAC,MAAM,CAAC,GAAG,eAAe,EAAE,CAAC;IACnC,MAAM,EAAE,IAAI,EAAE,GAAG,UAAU,CAAC,mBAAmB,CAAC,CAAC;IACjD,MAAM,MAAM,GAAW,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAC5C,MAAM,EAAE,KAAK,EAAE,EAAE,YAAY,EAAE,EAAE,GAAG,QAAQ,EAAE,CAAC;IAC/C,MAAM,MAAM,GAAG,QAAQ,CAAC,YAAY,CAAC,CAAC;IAEtC,MAAM,cAAc,GAAG,GAAS,EAAE;QAChC,IAAI,QAAQ,GAAa,MAAM,KAAK,CAAC,kBAAkB,EAAE,CAAC;QAC1D,IAAI,CAAC,QAAQ,EAAE,CAAC;YACd,QAAQ,GAAG,MAAM,KAAK,CAAC,WAAW,EAAE,CAAC;QACvC,CAAC;QACD,UAAU,CAAC,QAAQ,aAAR,QAAQ,uBAAR,QAAQ,CAAE,OAAO,CAAC,CAAC;IAChC,CAAC,CAAA,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,cAAc,EAAE,CAAC;IACnB,CAAC,EAAE,EAAE,CAAC,CAAA;IAEN,SAAS,CAAC,GAAG,EAAE;QACb,oBAAoB,CAAC,OAAO,GAAG,uBAAuB,CAAC,QAAQ,CAAC,CAAC;IACnE,CAAC,EAAE,CAAC,QAAQ,CAAC,CAAC,CAAC;IAEf,OAAO;IACP,MAAM,uBAAuB,GAAG,CAAC,gBAA8C,EAAE,EAAE;QACjF,MAAM,MAAM,GAAG,SAAS,EAAE,CAAC;QAC3B,OAAO,yBAAyB,CAAC,gBAAgB,EAAE,CAAC,QAAQ,EAAE,EAAE;YAC9D,MAAM,EAAE,QAAQ,EAAE,KAAK,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,QAAQ,CAAC;YACrD,MAAM,UAAU,GAAG,CAAC,CAAA,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,gBAAgB,KAAI,IAAI,CAAC,CAAC,CAAC,CAAC,oBAAC,QAAQ,IAAC,IAAI,EAAE,IAAI,GAAI,CAAC,CAAC,CAAC,EAAE,CAAC;YAC3F,IAAI,QAAQ;gBACV,OAAO,CACL,6BACE,KAAK,EAAE;wBACL,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,OAAO;qBACjB,IAEA,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAC1B,CACP,CAAC;YACJ,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,GAAG,oBAAoB,CAAC,QAAQ,CAAC,CAAC;YACxD,sBAAsB;YACtB,MAAM,KAAK,GAAG,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,SAAS,KAAK,IAAI,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,KAAK,CAAC,GAAG,EAAE,CAAC,CAAC,EAAE,CAAC,CAAC;YAC5E,IAAI,KAAK,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;gBAChD,MAAM,OAAO,GAAG,oBAAC,OAAO,IACtB,EAAE,EAAE,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,IAAI,EAAE,EACvC,MAAM,EAAE,MAAM,EACd,KAAK,EAAE;wBACL,KAAK,EAAE,SAAS;wBAChB,KAAK,EAAE,MAAM;wBACb,MAAM,EAAE,MAAM;wBACd,OAAO,EAAE,OAAO;wBAChB,YAAY,EAAE,UAAU;wBACxB,QAAQ,EAAE,QAAQ;qBACnB;oBAED,oBAAC,KAAK,IAAC,IAAI,EAAE,OAAO;wBAAG,UAAU;wBAAE,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAS,CACjE,CAAC;gBACX,OAAO,CAAC,MAAM,KAAK,IAAI,CAAC,CAAC,CAAC,OAAO,CAAC,CAAC;oBACjC,oBAAC,OAAO,IAAC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,IAC1C,OAAO,CACA,CACX,CAAC;YACJ,CAAC;YACD,OAAO,oBAAC,KAAK,IAAC,IAAI,EAAE,OAAO;gBAAG,UAAU;gBAAE,SAAS,CAAC,IAAI,GAAG,KAAK,GAAG,GAAG,CAAC,CAAS,CAAC;QACnF,CAAC,CAAC,CAAC;IACL,CAAC,CAAC;IAEF,SAAS,CAAC,GAAG,EAAE;QACb,IAAI,CAAC,QAAQ,CAAC,MAAM,EAAE,CAAC;YACrB,OAAO,CAAC,EAAE,CAAC,CAAC;YACZ,OAAO;QACT,CAAC;QACD,MAAM,QAAQ,GACZ,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,IAAI,CAAC;QAC3E,IAAI,CAAC,QAAQ;YAAE,OAAO;QACtB,MAAM,gBAAgB,GACpB,oBAAoB,CAAC,OAAO,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,CAAC;QACvE,IAAI,gBAAgB,EAAE,CAAC;YACrB,OAAO,CAAC,uBAAuB,CAAC,gBAAgB,CAAC,CAAC,CAAC;YACnD,MAAM,MAAM,GAAG,4BAA4B,CAAC,gBAAgB,EAAE,QAAQ,CAAC,CAAC;YACxE,UAAU,CAAC,GAAG,EAAE;gBACd,eAAe,CAAC,MAAM,CAAC,CAAC;gBACxB,WAAW,CAAC,MAAM,CAAC,CAAC;YACtB,CAAC,EAAE,EAAE,CAAC,CAAC;QACT,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,IAAI,CAAC,CAAC,CAAC;IAEpD,sBAAsB;IACtB,SAAS,CAAC,GAAG,EAAE;;QACb,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC3B,IAAI,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,KAAK,SAAS,EAAE,CAAC;gBAClD,OAAO,CAAC,uBAAuB,CAAC,oBAAoB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;gBAClE,eAAe,CAAC,EAAE,CAAC,CAAC;gBACpB,WAAW,CAAC,EAAE,CAAC,CAAC;YAClB,CAAC;YACD,gBAAgB,CAAC,EAAE,CAAC,CAAC;QACvB,CAAC;aAAM,CAAC;YACN,MAAM,aAAa,GACjB,MAAA,QAAQ,CAAC,4BAA4B,CAAC,QAAQ,CAAC,CAAC,0CAAE,KAAK,CAAC;YAC1D,gBAAgB,CAAC,SAAS,CAAC,IAAI,GAAG,aAAa,GAAG,GAAG,CAAC,CAAC,CAAC;QAC1D,CAAC;IACH,CAAC,EAAE,CAAC,QAAQ,EAAE,QAAQ,EAAE,SAAS,EAAE,CAAC,CAAC,CAAC;IAEtC,OAAO,CACL,oBAAC,MAAM,CAAC,KAAK,IAAC,SAAS,EAAC,iBAAiB,EAAC,SAAS,EAAE,SAAS,EAAE,cAAc,EAAE,CAAC,EAAE,KAAK,EAAE,GAAG,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,MAAM,CAAC,CAAC,CAAC,EAAE;QAC7H,oBAAC,OAAO,IACN,KAAK,EAAE;gBACL,KAAK,EAAE,MAAM;gBACb,MAAM,EAAE,MAAM;gBACd,OAAO,EAAE,MAAM;gBACf,WAAW,EAAE,MAAM;gBACnB,UAAU,EAAE,QAAQ;gBACpB,QAAQ,EAAE,MAAM;gBAChB,UAAU,EAAE,MAAM;gBAClB,KAAK,EAAE,SAAS;gBAChB,YAAY,EAAE,6BAA6B;aAC5C,EACD,EAAE,EAAE,UAAU,IAAI,UAAU;YAE3B,OAAO,CAAC,CAAC,CAAC,6BACT,SAAS,EAAC,aAAa,EACvB,GAAG,EAAE,OAAO,EACZ,GAAG,EAAC,MAAM,GACV,CAAC,CAAC,CAAC,EAAE;YACP,oBAAC,OAAO,IAAC,KAAK,EAAE,SAAS,CAAC,IAAI,GAAG,UAAU,GAAG,GAAG,CAAC;gBAChD,8BACE,KAAK,EAAE;wBACL,KAAK,EAAE,MAAM;wBACb,QAAQ,EAAE,QAAQ;wBAClB,YAAY,EAAE,UAAU;wBACxB,UAAU,EAAE,QAAQ;wBACpB,UAAU,EAAE,QAAQ;wBACpB,KAAK,EAAE,kBAAkB;qBAC1B,IAEA,SAAS,CAAC,IAAI,GAAG,UAAU,GAAG,GAAG,CAAC,CAC9B,CACC,CACF;QACV,oBAAC,cAAc,IACb,KAAK,EAAE;gBACL,UAAU,EAAE;oBACV,IAAI,EAAE;wBACJ,MAAM,EAAE,aAAa;wBACrB,cAAc,EAAE,MAAM;wBACtB,SAAS,EAAE,MAAM;wBACjB,cAAc,EAAE,MAAM,CAAC,CAAC,CAAC;wBACzB,eAAe,EAAE,MAAM;wBACvB,QAAQ,EAAE,EAAE;wBACZ,QAAQ,EAAE,EAAE;qBACb;iBACF;aACF;YAEA,OAAO,CAAC,CAAC,CAAC,6BAAK,SAAS,EAAC,eAAe,IAAE,OAAO,CAAO,CAAC,CAAC,CAAC,EAAE;YAC9D,oBAAC,IAAI,IACH,IAAI,EAAC,QAAQ,EACb,KAAK,EAAE,IAAI,EACX,YAAY,EAAE,YAAY,EAC1B,QAAQ,EAAE,QAAQ,EAClB,eAAe,EAAE,KAAK,EACtB,KAAK,EAAE;oBACL,UAAU,EAAE,MAAM;oBAClB,eAAe,EAAE,MAAM;oBACvB,MAAM,EAAE,OAAO,CAAC,CAAC,CAAC,oBAAoB,CAAC,CAAC,CAAC,mBAAmB;oBAC5D,SAAS,EAAE,MAAM;iBAClB,EACD,YAAY,EAAE,CAAC,GAAG,EAAE,EAAE,CAAC,WAAW,CAAC,CAAC,GAAG,GAAG,CAAC,CAAC,GAC5C,CACa,CACJ,CAChB,CAAC;AACJ,CAAC,CAAC;AAEF,eAAe,KAAK,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,10 +1,10 @@
|
|
|
1
|
-
import React, { useEffect, useState } from "react";
|
|
1
|
+
import React, { useContext, useEffect, useState } from "react";
|
|
2
2
|
import { Button, ButtonProps, Popover, TreeSelect } from "antd";
|
|
3
3
|
import { SearchOutlined } from "@ant-design/icons";
|
|
4
4
|
import { useNavigate } from "react-router-dom";
|
|
5
5
|
import { MenuType } from "../type/layout-type";
|
|
6
6
|
import { useLocale } from "../../locale/useLocale";
|
|
7
|
-
import {
|
|
7
|
+
import { KeepAliveTabContext } from "../tabs/tabs-context";
|
|
8
8
|
|
|
9
9
|
const handleMenu = (arr: MenuType[], translate: any) => {
|
|
10
10
|
return arr.map(item => {
|
|
@@ -32,7 +32,7 @@ const Index = (props: Props) => {
|
|
|
32
32
|
const [searchValue, setSearchValue] = useState<string>();
|
|
33
33
|
const [selectInit, setSelectInit] = useState<boolean>(true); // 解决搜索框初始化设置searchValue，onSearch返回空value的问题
|
|
34
34
|
const navigate = useNavigate();
|
|
35
|
-
const { tabs } =
|
|
35
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
36
36
|
|
|
37
37
|
useEffect(() => {
|
|
38
38
|
const newMenu = handleMenu(menuList, translate);
|
|
@@ -6,7 +6,7 @@ import {
|
|
|
6
6
|
theme,
|
|
7
7
|
Tooltip,
|
|
8
8
|
} from "antd";
|
|
9
|
-
import React, { useEffect, useState, CSSProperties } from "react";
|
|
9
|
+
import React, { useContext, useEffect, useState, CSSProperties } from "react";
|
|
10
10
|
import "./css/header.css";
|
|
11
11
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
12
12
|
import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
@@ -28,7 +28,7 @@ import ScreenfullButton from "./components/screenfull-button";
|
|
|
28
28
|
import SystemMessages from "./components/system-messages";
|
|
29
29
|
import UserNotification from "./components/user-notification";
|
|
30
30
|
import { ThemeConfig } from "../tmpl/interface";
|
|
31
|
-
import {
|
|
31
|
+
import { KeepAliveTabContext } from "./tabs/tabs-context";
|
|
32
32
|
|
|
33
33
|
const toolbarStyle: CSSProperties = {
|
|
34
34
|
width: "100%",
|
|
@@ -56,7 +56,7 @@ const { useToken } = theme;
|
|
|
56
56
|
|
|
57
57
|
const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, style, logoImg, themeConfig, customHome }) => {
|
|
58
58
|
const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
|
|
59
|
-
const { tabs } =
|
|
59
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
60
60
|
|
|
61
61
|
// token
|
|
62
62
|
const { token: { colorPrimary } } = useToken();
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, theme, Tooltip } from "antd";
|
|
2
|
-
import
|
|
2
|
+
import { KeepAliveTabContext } from "./tabs/tabs-context";
|
|
3
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
4
|
|
|
4
5
|
import { MenuType } from "./type/layout-type";
|
|
5
6
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
@@ -14,7 +15,6 @@ import { useLayoutContext } from "./layout-context";
|
|
|
14
15
|
import IconFont from "./components/icon-font";
|
|
15
16
|
import { UserInfo, ThemeConfig } from "../tmpl/interface";
|
|
16
17
|
import Units from "../units";
|
|
17
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
18
18
|
import "./css/sider.less";
|
|
19
19
|
|
|
20
20
|
type SiderPropsType = {
|
|
@@ -59,7 +59,7 @@ const { useToken } = theme;
|
|
|
59
59
|
const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) => {
|
|
60
60
|
const { setDocumentTitle, menuItemIdToFirstFloorIdxMap } = useLayoutContext();
|
|
61
61
|
const [orgName, setOrgName] = useState<string>(""); // 组织名称
|
|
62
|
-
const { tabs } =
|
|
62
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
63
63
|
|
|
64
64
|
const initUserConfig = async () => {
|
|
65
65
|
let userInfo: UserInfo = await Units.getCurrentUserInfo();
|
|
@@ -163,7 +163,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
163
163
|
setMenu(getMenuWithSecoundFloor(curSiderMenuList));
|
|
164
164
|
setSelectedKeys(getTargetMenuItemIdRouteList(curSiderMenuList, targetId));
|
|
165
165
|
}
|
|
166
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
166
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
167
167
|
|
|
168
168
|
// default select keys
|
|
169
169
|
useEffect(() => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Layout, Menu, MenuProps, Space } from "antd";
|
|
2
|
-
import React, { useEffect, useState, CSSProperties } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useState, CSSProperties } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import { HomeFilled } from '@ant-design/icons';
|
|
5
5
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
@@ -9,6 +9,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
|
9
9
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
10
10
|
import { MenuType } from "../layout2/type/layout-type";
|
|
11
11
|
import { useLocale } from "../locale/useLocale";
|
|
12
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
12
13
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
13
14
|
import UserButton from "../layout2/components/user-button";
|
|
14
15
|
import SearchMenu from "../layout2/components/search-menu";
|
|
@@ -20,7 +21,6 @@ import homeBgImg from "./imgs/home-bg.png";
|
|
|
20
21
|
import Time from "./components/time";
|
|
21
22
|
import IconFont from "../layout2/components/icon-font";
|
|
22
23
|
import { ThemeConfig } from "../tmpl/interface";
|
|
23
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
24
24
|
import "./css/header.less";
|
|
25
25
|
|
|
26
26
|
const toolbarStyle: CSSProperties = {
|
|
@@ -75,7 +75,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, themeConfig,
|
|
|
75
75
|
const [selParentId, setSelParentId] = useState<string>();
|
|
76
76
|
const { sourceId } = useParams();
|
|
77
77
|
const [search] = useSearchParams();
|
|
78
|
-
const { tabs } =
|
|
78
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
79
79
|
const menuId: string = search.get("menuId");
|
|
80
80
|
|
|
81
81
|
const renderMenuItem = (menuItem) => {
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, Tooltip } from "antd";
|
|
2
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import {
|
|
5
5
|
getLeftMostRouteInfo,
|
|
6
6
|
getTargetMenuItemIdRouteList,
|
|
7
7
|
handlePropsMenuToAntdMenu,
|
|
8
8
|
} from "../layout2/util/menu-util";
|
|
9
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
9
10
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
10
11
|
import { MenuType } from "../layout2/type/layout-type";
|
|
11
12
|
import { useLocale } from "../locale/useLocale";
|
|
12
13
|
import IconFont from "../layout2/components/icon-font";
|
|
13
14
|
import { UserInfo, ThemeConfig } from "../tmpl/interface";
|
|
14
15
|
import Units from "../units";
|
|
15
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
16
16
|
import "./css/sider.less"
|
|
17
17
|
|
|
18
18
|
type SiderPropsType = {
|
|
@@ -56,7 +56,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
56
56
|
const { sourceId } = useParams();
|
|
57
57
|
const [search] = useSearchParams();
|
|
58
58
|
const menuId: string = search.get("menuId");
|
|
59
|
-
const { tabs } =
|
|
59
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
60
60
|
|
|
61
61
|
const initUserConfig = async () => {
|
|
62
62
|
let userInfo: UserInfo = await Units.getCurrentUserInfo();
|
|
@@ -139,7 +139,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
139
139
|
setOpenKeys(temIds);
|
|
140
140
|
}, 10);
|
|
141
141
|
}
|
|
142
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
142
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
143
143
|
|
|
144
144
|
// default select keys
|
|
145
145
|
useEffect(() => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Layout, Menu, MenuProps, Space, theme } from "antd";
|
|
2
|
-
import React, { useEffect, useState, CSSProperties } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useState, CSSProperties } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import L2MenuQuickBar from "../layout/menu/l2menu-quick-bar";
|
|
5
5
|
import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
@@ -8,6 +8,7 @@ import L2MenuMessageBar from "../layout/menu/l2menu-message-bar";
|
|
|
8
8
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
9
9
|
import { MenuType } from "../layout2/type/layout-type";
|
|
10
10
|
import { useLocale } from "../locale/useLocale";
|
|
11
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
11
12
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
12
13
|
import UserButton from "../layout2/components/user-button";
|
|
13
14
|
import SearchMenu from "../layout2/components/search-menu";
|
|
@@ -19,7 +20,6 @@ import menuItemBgImg from "./imgs/menu-item-bg.png";
|
|
|
19
20
|
import userImg from "./imgs/user.png";
|
|
20
21
|
import IconFont from "../layout2/components/icon-font";
|
|
21
22
|
import { ThemeConfig } from "../tmpl/interface";
|
|
22
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
23
23
|
import "./css/header.less";
|
|
24
24
|
|
|
25
25
|
// 查找当前选中菜单的顶层菜单id
|
|
@@ -67,7 +67,7 @@ const Header: React.FC<HeaderPropsType> = ({ systemName, menuList, logoImg, them
|
|
|
67
67
|
const [selParentId, setSelParentId] = useState<string>();
|
|
68
68
|
const { sourceId } = useParams();
|
|
69
69
|
const [search] = useSearchParams();
|
|
70
|
-
const { tabs } =
|
|
70
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
71
71
|
const menuId: string = search.get("menuId");
|
|
72
72
|
const { token: { colorPrimary } } = useToken();
|
|
73
73
|
|
|
@@ -1,18 +1,18 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, Tooltip, theme } from "antd";
|
|
2
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import {
|
|
5
5
|
getLeftMostRouteInfo,
|
|
6
6
|
getTargetMenuItemIdRouteList,
|
|
7
7
|
handlePropsMenuToAntdMenu,
|
|
8
8
|
} from "../layout2/util/menu-util";
|
|
9
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
9
10
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
10
11
|
import { MenuType } from "../layout2/type/layout-type";
|
|
11
12
|
import { useLocale } from "../locale/useLocale";
|
|
12
13
|
import IconFont from "../layout2/components/icon-font";
|
|
13
14
|
import { UserInfo, ThemeConfig } from "../tmpl/interface";
|
|
14
15
|
import Units from "../units";
|
|
15
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
16
16
|
import "./css/sider.less"
|
|
17
17
|
|
|
18
18
|
type SiderPropsType = {
|
|
@@ -57,7 +57,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
57
57
|
const [openKeys, setOpenKeys] = useState([]);
|
|
58
58
|
const { sourceId } = useParams();
|
|
59
59
|
const [search] = useSearchParams();
|
|
60
|
-
const { tabs } =
|
|
60
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
61
61
|
const menuId: string = search.get("menuId");
|
|
62
62
|
const { token: { colorPrimary } } = useToken();
|
|
63
63
|
|
|
@@ -142,7 +142,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, themeConfig }) =
|
|
|
142
142
|
setOpenKeys(temIds);
|
|
143
143
|
}, 10);
|
|
144
144
|
}
|
|
145
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
145
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
146
146
|
|
|
147
147
|
// default select keys
|
|
148
148
|
useEffect(() => {
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import React, { useState, useEffect, useMemo, CSSProperties } from "react";
|
|
1
|
+
import React, { useContext, useState, useEffect, useMemo, CSSProperties } from "react";
|
|
2
2
|
import { Layout, Space, theme, Button, MenuProps, Dropdown, Breadcrumb, ConfigProvider } from "antd";
|
|
3
3
|
import { NavLink, useParams, useSearchParams, useLocation } from "react-router-dom";
|
|
4
4
|
import { LeftOutlined, RightOutlined, UnorderedListOutlined } from '@ant-design/icons';
|
|
@@ -13,10 +13,10 @@ import SystemMessages from "../layout2/components/system-messages";
|
|
|
13
13
|
import UserNotification from "../layout2/components/user-notification";
|
|
14
14
|
import { MenuType } from "../layout2/type/layout-type";
|
|
15
15
|
import { useLocale } from "../locale/useLocale";
|
|
16
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
16
17
|
import { getLeftMostRouteInfo, handlePropsMenuToAntdMenu } from "../layout2/util/menu-util";
|
|
17
18
|
import IconFont from "../layout2/components/icon-font";
|
|
18
19
|
import { ThemeConfig } from "../tmpl/interface";
|
|
19
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
20
20
|
import "./css/header.less";
|
|
21
21
|
|
|
22
22
|
const { useToken } = theme;
|
|
@@ -62,7 +62,7 @@ const Header: React.FC<HeaderPropsType> = ({ menuList, themeConfig }) => {
|
|
|
62
62
|
const { pathname } = useLocation();
|
|
63
63
|
const { sourceId } = useParams();
|
|
64
64
|
const [search] = useSearchParams();
|
|
65
|
-
const { tabs } =
|
|
65
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
66
66
|
const menuId: string = search.get("menuId");
|
|
67
67
|
|
|
68
68
|
const handleMenu = (menuItem, floor) => {
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { ConfigProvider, Layout, Menu, MenuProps, Space, Tooltip, theme } from "antd";
|
|
2
|
-
import React, { useEffect, useRef, useState } from "react";
|
|
2
|
+
import React, { useContext, useEffect, useRef, useState } from "react";
|
|
3
3
|
import { NavLink, useParams, useSearchParams } from "react-router-dom";
|
|
4
4
|
import { generate } from "@ant-design/colors";
|
|
5
5
|
import {
|
|
@@ -7,13 +7,13 @@ import {
|
|
|
7
7
|
getTargetMenuItemIdRouteList,
|
|
8
8
|
handlePropsMenuToAntdMenu,
|
|
9
9
|
} from "../layout2/util/menu-util";
|
|
10
|
+
import { KeepAliveTabContext } from "../layout2/tabs/tabs-context";
|
|
10
11
|
import { useLayoutContext } from "../layout2/layout-context";
|
|
11
12
|
import { MenuType } from "../layout2/type/layout-type";
|
|
12
13
|
import { useLocale } from "../locale/useLocale";
|
|
13
14
|
import IconFont from "../layout2/components/icon-font";
|
|
14
15
|
import { UserInfo, ThemeConfig } from "../tmpl/interface";
|
|
15
16
|
import Units from "../units";
|
|
16
|
-
import { useTabs } from "../hooks/use-tabs";
|
|
17
17
|
import "./css/sider.less";
|
|
18
18
|
|
|
19
19
|
type SiderPropsType = {
|
|
@@ -61,7 +61,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, systemName, logo
|
|
|
61
61
|
const [openKeys, setOpenKeys] = useState([]);
|
|
62
62
|
const { sourceId } = useParams();
|
|
63
63
|
const [search] = useSearchParams();
|
|
64
|
-
const { tabs } =
|
|
64
|
+
const { tabs } = useContext(KeepAliveTabContext);
|
|
65
65
|
const menuId: string = search.get("menuId");
|
|
66
66
|
const { token: { colorPrimary } } = useToken();
|
|
67
67
|
const colors = generate(colorPrimary);
|
|
@@ -147,7 +147,7 @@ const Sider: React.FC<SiderPropsType> = ({ menuList, collapsed, systemName, logo
|
|
|
147
147
|
setOpenKeys(temIds);
|
|
148
148
|
}, 10);
|
|
149
149
|
}
|
|
150
|
-
}, [sourceId, menuId, menuList, getLocale()]);
|
|
150
|
+
}, [sourceId, menuId, menuList, getLocale(), tabs]);
|
|
151
151
|
|
|
152
152
|
// default select keys
|
|
153
153
|
useEffect(() => {
|